Changeset 38290 in webkit for trunk/JavaScriptCore

Timestamp:

Nov 10, 2008, 9:45:14 PM (17 years ago)

Author:

[email protected]

Message:

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

Reviewed by Sam Weinig.

Rename CodeBlock::isConstant() to isConstantRegisterIndex().

• VM/CTI.cpp: (JSC::CTI::emitGetArg): (JSC::CTI::emitGetPutArg): (JSC::CTI::getConstantImmediateNumericArg): (JSC::CTI::printOpcodeOperandTypes): (JSC::CTI::privateCompileMainPass):
• VM/CodeBlock.h: (JSC::CodeBlock::isConstantRegisterIndex):
• bytecompiler/CodeGenerator.cpp: (JSC::CodeGenerator::emitEqualityOp):

Location:

trunk/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• VM/CTI.cpp (modified) (6 diffs)
• VM/CodeBlock.h (modified) (1 diff)
• bytecompiler/CodeGenerator.cpp (modified) (1 diff)

trunk/JavaScriptCore/ChangeLog

@@ +1 @@
+2008-11-10  Cameron Zwarich  <[email protected]>
+
+        Reviewed by Sam Weinig.
+
+        Rename CodeBlock::isConstant() to isConstantRegisterIndex().
+
+        * VM/CTI.cpp:
+        (JSC::CTI::emitGetArg):
+        (JSC::CTI::emitGetPutArg):
+        (JSC::CTI::getConstantImmediateNumericArg):
+        (JSC::CTI::printOpcodeOperandTypes):
+        (JSC::CTI::privateCompileMainPass):
+        * VM/CodeBlock.h:
+        (JSC::CodeBlock::isConstantRegisterIndex):
+        * bytecompiler/CodeGenerator.cpp:
+        (JSC::CodeGenerator::emitEqualityOp):
+
 2008-11-10  Gavin Barraclough  <[email protected]>
 

trunk/JavaScriptCore/VM/CTI.cpp

@@ -183 +183 @@
 {
     // TODO: we want to reuse values that are already in registers if we can - add a register allocator!
-    if (m_codeBlock->isConstant(src)) {
+    if (m_codeBlock->isConstantRegisterIndex(src)) {
         JSValue* js = getConstant(src);
         m_jit.movl_i32r(asInteger(js), dst);
@@ -193 +193 @@
 ALWAYS_INLINE void CTI::emitGetPutArg(unsigned src, unsigned offset, X86Assembler::RegisterID scratch)
 {
-    if (m_codeBlock->isConstant(src)) {
+    if (m_codeBlock->isConstantRegisterIndex(src)) {
         JSValue* js = getConstant(src);
         m_jit.movl_i32m(asInteger(js), offset + sizeof(void*), X86::esp);
@@ -215 +215 @@
 ALWAYS_INLINE JSValue* CTI::getConstantImmediateNumericArg(unsigned src)
 {
-    if (m_codeBlock->isConstant(src)) {
+    if (m_codeBlock->isConstantRegisterIndex(src)) {
         JSValue* js = getConstant(src);
         return JSImmediate::isNumber(js) ? js : noValue();
@@ -274 +274 @@
 {
     char which1 = '*';
-    if (m_codeBlock->isConstant(src1)) {
+    if (m_codeBlock->isConstantRegisterIndex(src1)) {
         JSValue* js = getConstant(src1);
         which1 = 
@@ -288 +288 @@
     }
     char which2 = '*';
-    if (m_codeBlock->isConstant(src2)) {
+    if (m_codeBlock->isConstantRegisterIndex(src2)) {
         JSValue* js = getConstant(src2);
         which2 = 
@@ -1005 +1005 @@
         case op_mov: {
             unsigned src = instruction[i + 2].u.operand;
-            if (m_codeBlock->isConstant(src))
+            if (m_codeBlock->isConstantRegisterIndex(src))
                 m_jit.movl_i32r(asInteger(getConstant(src)), X86::eax);
             else

trunk/JavaScriptCore/VM/CodeBlock.h

@@ -291 +291 @@
         }
 
-        ALWAYS_INLINE bool isConstant(int index)
+        ALWAYS_INLINE bool isConstantRegisterIndex(int index)
         {
             return index >= numVars && index < numVars + numConstants;

trunk/JavaScriptCore/bytecompiler/CodeGenerator.cpp

@@ -787 +787 @@
         if (src1->index() == dstIndex
             && src1->isTemporary()
-            && m_codeBlock->isConstant(src2->index())
+            && m_codeBlock->isConstantRegisterIndex(src2->index())
             && m_codeBlock->constantRegisters[src2->index() - m_codeBlock->numVars].jsValue(m_scopeChain->globalObject()->globalExec())->isString()) {
             const UString& value = asString(m_codeBlock->constantRegisters[src2->index() - m_codeBlock->numVars].jsValue(m_scopeChain->globalObject()->globalExec()))->value();