Changeset 34032 in webkit for trunk/JavaScriptCore/VM/CodeGenerator.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/CodeGenerator.cpp (modified) (4 diffs)

trunk/JavaScriptCore/VM/CodeGenerator.cpp

@@ -944 +944 @@
 }
 
-RegisterID* CodeGenerator::emitCall(RegisterID* r0, RegisterID* r1, RegisterID* r2, ArgumentsNode* argumentsNode)
-{
-    return emitCall(op_call, r0, r1, r2, argumentsNode);
-}
-
-RegisterID* CodeGenerator::emitCallEval(RegisterID* r0, RegisterID* r1, RegisterID* r2, ArgumentsNode* argumentsNode)
-{
-    return emitCall(op_call_eval, r0, r1, r2, argumentsNode);
-}
-
-RegisterID* CodeGenerator::emitCall(OpcodeID opcodeID, RegisterID* r0, RegisterID* r1, RegisterID* r2, ArgumentsNode* argumentsNode)
+RegisterID* CodeGenerator::emitCall(RegisterID* dst, RegisterID* func, RegisterID* base, ArgumentsNode* argumentsNode)
+{
+    return emitCall(op_call, dst, func, base, argumentsNode);
+}
+
+RegisterID* CodeGenerator::emitCallEval(RegisterID* dst, RegisterID* func, RegisterID* base, ArgumentsNode* argumentsNode)
+{
+    return emitCall(op_call_eval, dst, func, base, argumentsNode);
+}
+
+RegisterID* CodeGenerator::emitCall(OpcodeID opcodeID, RegisterID* dst, RegisterID* func, RegisterID* base, ArgumentsNode* argumentsNode)
 {
     ASSERT(opcodeID == op_call || opcodeID == op_call_eval);
 
-    RefPtr<RegisterID> ref1 = r1;
-    RefPtr<RegisterID> ref2 = r2;
+    RefPtr<RegisterID> refFunc = func;
+    RefPtr<RegisterID> refBase = base;
     
     // Reserve space for call frame.
@@ -975 +975 @@
 
     instructions().append(machine().getOpcode(opcodeID));
-    instructions().append(r0->index());
-    instructions().append(r1->index());
-    instructions().append(r2 ? r2->index() : missingThisObjectMarker()); // We encode the "this" value in the instruction stream, to avoid an explicit instruction for copying or loading it.
+    instructions().append(dst->index());
+    instructions().append(func->index());
+    instructions().append(base ? base->index() : missingThisObjectMarker()); // We encode the "this" value in the instruction stream, to avoid an explicit instruction for copying or loading it.
     instructions().append(argv.size() ? argv[0]->index() : m_temporaries.size()); // argv
     instructions().append(argv.size()); // argc
-
-    return r0;
+    return dst;
 }
 
@@ -991 +990 @@
 }
 
-RegisterID* CodeGenerator::emitEnd(RegisterID* r0)
+RegisterID* CodeGenerator::emitEnd(RegisterID* dst)
 {
     instructions().append(machine().getOpcode(op_end));
-    instructions().append(r0->index());
-    return r0;
-}
-
-RegisterID* CodeGenerator::emitConstruct(RegisterID* r0, RegisterID* r1, ArgumentsNode* argumentsNode)
+    instructions().append(dst->index());
+    return dst;
+}
+
+RegisterID* CodeGenerator::emitConstruct(RegisterID* dst, RegisterID* func, ArgumentsNode* argumentsNode)
 {
     // Reserve space for call frame.
@@ -1014 +1013 @@
 
     instructions().append(machine().getOpcode(op_construct));
-    instructions().append(r0->index());
-    instructions().append(r1->index());
+    instructions().append(dst->index());
+    instructions().append(func->index());
     instructions().append(argv.size() ? argv[0]->index() : m_temporaries.size()); // argv
     instructions().append(argv.size()); // argc
-    return r0;
+    return dst;
 }