Changeset 34032 in webkit for trunk/JavaScriptCore/VM/Machine.cpp

Timestamp:

May 22, 2008, 12:55:18 PM (17 years ago)

Author:

[email protected]

Message:

2008-05-22 Sam Weinig <​[email protected]>

Reviewed by Oliver Hunt.

Rename register arguments for op_call, op_call_eval, op_end, and op_construct
to document what they are for.

• VM/CodeGenerator.cpp: (KJS::CodeGenerator::emitCall): (KJS::CodeGenerator::emitCallEval): (KJS::CodeGenerator::emitEnd): (KJS::CodeGenerator::emitConstruct):
• VM/CodeGenerator.h:
• VM/Machine.cpp: (KJS::Machine::privateExecute):

File:

• trunk/JavaScriptCore/VM/Machine.cpp (modified) (11 diffs)

trunk/JavaScriptCore/VM/Machine.cpp

@@ -1799 +1799 @@
     }
     BEGIN_OPCODE(op_call_eval) {
-        int r0 = (++vPC)->u.operand;
-        int r1 = (++vPC)->u.operand;
-        int r2 = (++vPC)->u.operand;
+        int dst = (++vPC)->u.operand;
+        int func = (++vPC)->u.operand;
+        int base = (++vPC)->u.operand;
         int argv = (++vPC)->u.operand;
         int argc = (++vPC)->u.operand;
 
-        JSValue* v = r[r1].u.jsValue;
-        JSValue* base = r[r2].u.jsValue;
-        
-        if (base == scopeChain->globalObject() && v == scopeChain->globalObject()->evalFunction()) {
+        JSValue* funcVal = r[func].u.jsValue;
+        JSValue* baseVal = r[base].u.jsValue;
+        
+        if (baseVal == scopeChain->globalObject() && funcVal == scopeChain->globalObject()->evalFunction()) {
             int registerOffset = r - (*registerBase);
 
@@ -1821 +1821 @@
                 goto vm_throw;
 
-            r[r0].u.jsValue = result;
+            r[dst].u.jsValue = result;
             
             ++vPC;
@@ -1831 +1831 @@
         // value.
         vPC -= 5;
-        r[r2].u.jsValue = base->toObject(exec)->toThisObject(exec);
+        r[base].u.jsValue = baseVal->toObject(exec)->toThisObject(exec);
 
 #if HAVE(COMPUTED_GOTO)
@@ -1842 +1842 @@
     }
     BEGIN_OPCODE(op_call) {
-        int r0 = (++vPC)->u.operand;
-        int r1 = (++vPC)->u.operand;
-        int r2 = (++vPC)->u.operand;
+        int dst = (++vPC)->u.operand;
+        int func = (++vPC)->u.operand;
+        int base = (++vPC)->u.operand;
         int argv = (++vPC)->u.operand;
         int argc = (++vPC)->u.operand;
         
-        JSValue* v = r[r1].u.jsValue;
+        JSValue* v = r[func].u.jsValue;
         
         CallData callData;
@@ -1858 +1858 @@
             int callFrameOffset = registerOffset + argv - CallFrameHeaderSize;
 
-            r[argv].u.jsValue = r2 == missingThisObjectMarker() ? exec->globalThisValue() : r[r2].u.jsValue; // "this" value
-            initializeCallFrame(callFrame, codeBlock, vPC, scopeChain, registerOffset, r0, argv, argc, 0, v);
+            r[argv].u.jsValue = base == missingThisObjectMarker() ? exec->globalThisValue() : r[base].u.jsValue; // "this" value
+            initializeCallFrame(callFrame, codeBlock, vPC, scopeChain, registerOffset, dst, argv, argc, 0, v);
 
             ScopeChainNode* callDataScopeChain = callData.js.scopeChain;
@@ -1881 +1881 @@
             int registerOffset = r - (*registerBase);
             
-            r[argv].u.jsValue = r2 == missingThisObjectMarker() ? exec->globalThisValue() : (r[r2].u.jsValue)->toObject(exec); // "this" value
+            r[argv].u.jsValue = base == missingThisObjectMarker() ? exec->globalThisValue() : (r[base].u.jsValue)->toObject(exec); // "this" value
             JSObject* thisObj = static_cast<JSObject*>(r[argv].u.jsValue);
 
@@ -1891 +1891 @@
 
             r = (*registerBase) + registerOffset;
-            r[r0].u.jsValue = returnValue;
+            r[dst].u.jsValue = returnValue;
 
             VM_CHECK_EXCEPTION();
@@ -1942 +1942 @@
     }
     BEGIN_OPCODE(op_construct) {
-        int r0 = (++vPC)->u.operand;
-        int r1 = (++vPC)->u.operand;
+        int dst = (++vPC)->u.operand;
+        int func = (++vPC)->u.operand;
         int argv = (++vPC)->u.operand;
         int argc = (++vPC)->u.operand;
 
-        JSValue* v = r[r1].u.jsValue;
+        JSValue* funcVal = r[func].u.jsValue;
 
         ConstructData constructData;
-        ConstructType constructType = v->getConstructData(constructData);
+        ConstructType constructType = funcVal->getConstructData(constructData);
 
         // Removing this line of code causes a measurable regression on squirrelfish.
-        JSObject* constructor = static_cast<JSObject*>(v);
+        JSObject* constructor = static_cast<JSObject*>(funcVal);
 
         if (constructType == ConstructTypeJS) {
@@ -1969 +1969 @@
             r[argv].u.jsValue = newObject; // "this" value
 
-            initializeCallFrame(callFrame, codeBlock, vPC, scopeChain, registerOffset, r0, argv, argc, 1, constructor);
-            
+            initializeCallFrame(callFrame, codeBlock, vPC, scopeChain, registerOffset, dst, argv, argc, 1, constructor);
+
             ScopeChainNode* callDataScopeChain = constructData.js.scopeChain;
             FunctionBodyNode* functionBodyNode = constructData.js.functionBody;
@@ -1995 +1995 @@
             JSValue* returnValue = constructor->construct(exec, args);
             registerFile->setSafeForReentry(false);
-        
+
             r = (*registerBase) + registerOffset;
             VM_CHECK_EXCEPTION();
-            r[r0].u.jsValue = returnValue;
-            
+            r[dst].u.jsValue = returnValue;
+
             ++vPC;
             NEXT_OPCODE;
@@ -2006 +2006 @@
         ASSERT(constructType == ConstructTypeNone);
 
-        exceptionValue = createNotAConstructorError(exec, v, 0);
+        exceptionValue = createNotAConstructorError(exec, funcVal, 0);
         goto vm_throw;
     }