Changeset 38291 in webkit for trunk/JavaScriptCore/VM/CTI.cpp

Timestamp:

Nov 10, 2008, 9:55:50 PM (17 years ago)

Author:

[email protected]

Message:

2008-11-10 Cameron Zwarich <​[email protected]>

Reviewed by Maciej Stachowiak.

Make CTI::getConstant() a member function of CodeBlock instead.

• VM/CTI.cpp: (JSC::CTI::emitGetArg): (JSC::CTI::emitGetPutArg): (JSC::CTI::getConstantImmediateNumericArg): (JSC::CTI::printOpcodeOperandTypes): (JSC::CTI::privateCompileMainPass):
• VM/CTI.h:
• VM/CodeBlock.h: (JSC::CodeBlock::getConstant):

File:

• trunk/JavaScriptCore/VM/CTI.cpp (modified) (7 diffs)

trunk/JavaScriptCore/VM/CTI.cpp

@@ -169 +169 @@
 #endif
 
-ALWAYS_INLINE JSValue* CTI::getConstant(int src)
-{
-    return m_codeBlock->constantRegisters[src - m_codeBlock->numVars].getJSValue();
-}
-
 inline uintptr_t CTI::asInteger(JSValue* value)
 {
@@ -184 +179 @@
     // TODO: we want to reuse values that are already in registers if we can - add a register allocator!
     if (m_codeBlock->isConstantRegisterIndex(src)) {
-        JSValue* js = getConstant(src);
+        JSValue* js = m_codeBlock->getConstant(src);
         m_jit.movl_i32r(asInteger(js), dst);
     } else
@@ -194 +189 @@
 {
     if (m_codeBlock->isConstantRegisterIndex(src)) {
-        JSValue* js = getConstant(src);
+        JSValue* js = m_codeBlock->getConstant(src);
         m_jit.movl_i32m(asInteger(js), offset + sizeof(void*), X86::esp);
     } else {
@@ -216 +211 @@
 {
     if (m_codeBlock->isConstantRegisterIndex(src)) {
-        JSValue* js = getConstant(src);
+        JSValue* js = m_codeBlock->getConstant(src);
         return JSImmediate::isNumber(js) ? js : noValue();
     }
@@ -275 +270 @@
     char which1 = '*';
     if (m_codeBlock->isConstantRegisterIndex(src1)) {
-        JSValue* js = getConstant(src1);
+        JSValue* js = m_codeBlock->getConstant(src1);
         which1 = 
             JSImmediate::isImmediate(js) ?
@@ -289 +284 @@
     char which2 = '*';
     if (m_codeBlock->isConstantRegisterIndex(src2)) {
-        JSValue* js = getConstant(src2);
+        JSValue* js = m_codeBlock->getConstant(src2);
         which2 = 
             JSImmediate::isImmediate(js) ?
@@ -1006 +1001 @@
             unsigned src = instruction[i + 2].u.operand;
             if (m_codeBlock->isConstantRegisterIndex(src))
-                m_jit.movl_i32r(asInteger(getConstant(src)), X86::eax);
+                m_jit.movl_i32r(asInteger(m_codeBlock->getConstant(src)), X86::eax);
             else
                 emitGetArg(src, X86::eax);