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

Timestamp:

Nov 10, 2008, 10:04:37 PM (17 years ago)

Author:

[email protected]

Message:

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

Reviewed by Maciej Stachowiak.

Use 'value' instead of 'js' in CTI as a name for JSValue* to match our
usual convention elsewhere.

• VM/CTI.cpp: (JSC::CTI::emitGetArg): (JSC::CTI::emitGetPutArg): (JSC::CTI::getConstantImmediateNumericArg): (JSC::CTI::printOpcodeOperandTypes):

File:

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

trunk/JavaScriptCore/VM/CTI.cpp

@@ -179 +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 = m_codeBlock->getConstant(src);
-        m_jit.movl_i32r(asInteger(js), dst);
+        JSValue* value = m_codeBlock->getConstant(src);
+        m_jit.movl_i32r(asInteger(value), dst);
     } else
         m_jit.movl_mr(src * sizeof(Register), X86::edi, dst);
@@ -189 +189 @@
 {
     if (m_codeBlock->isConstantRegisterIndex(src)) {
-        JSValue* js = m_codeBlock->getConstant(src);
-        m_jit.movl_i32m(asInteger(js), offset + sizeof(void*), X86::esp);
+        JSValue* value = m_codeBlock->getConstant(src);
+        m_jit.movl_i32m(asInteger(value), offset + sizeof(void*), X86::esp);
     } else {
         m_jit.movl_mr(src * sizeof(Register), X86::edi, scratch);
@@ -211 +211 @@
 {
     if (m_codeBlock->isConstantRegisterIndex(src)) {
-        JSValue* js = m_codeBlock->getConstant(src);
-        return JSImmediate::isNumber(js) ? js : noValue();
+        JSValue* value = m_codeBlock->getConstant(src);
+        return JSImmediate::isNumber(value) ? value : noValue();
     }
     return noValue();
@@ -270 +270 @@
     char which1 = '*';
     if (m_codeBlock->isConstantRegisterIndex(src1)) {
-        JSValue* js = m_codeBlock->getConstant(src1);
+        JSValue* value = m_codeBlock->getConstant(src1);
         which1 = 
-            JSImmediate::isImmediate(js) ?
-                (JSImmediate::isNumber(js) ? 'i' :
-                JSImmediate::isBoolean(js) ? 'b' :
-                js->isUndefined() ? 'u' :
-                js->isNull() ? 'n' : '?')
+            JSImmediate::isImmediate(value) ?
+                (JSImmediate::isNumber(value) ? 'i' :
+                JSImmediate::isBoolean(value) ? 'b' :
+                value->isUndefined() ? 'u' :
+                value->isNull() ? 'n' : '?')
                 :
-            (js->isString() ? 's' :
-            js->isObject() ? 'o' :
+            (value->isString() ? 's' :
+            value->isObject() ? 'o' :
             'k');
     }
     char which2 = '*';
     if (m_codeBlock->isConstantRegisterIndex(src2)) {
-        JSValue* js = m_codeBlock->getConstant(src2);
+        JSValue* value = m_codeBlock->getConstant(src2);
         which2 = 
-            JSImmediate::isImmediate(js) ?
-                (JSImmediate::isNumber(js) ? 'i' :
-                JSImmediate::isBoolean(js) ? 'b' :
-                js->isUndefined() ? 'u' :
-                js->isNull() ? 'n' : '?')
+            JSImmediate::isImmediate(value) ?
+                (JSImmediate::isNumber(value) ? 'i' :
+                JSImmediate::isBoolean(value) ? 'b' :
+                value->isUndefined() ? 'u' :
+                value->isNull() ? 'n' : '?')
                 :
-            (js->isString() ? 's' :
-            js->isObject() ? 'o' :
+            (value->isString() ? 's' :
+            value->isObject() ? 'o' :
             'k');
     }