Changeset 39268 in webkit for trunk/JavaScriptCore/jit/JITCall.cpp

Timestamp:

Dec 12, 2008, 9:25:22 PM (16 years ago)

Author:

[email protected]

Message:

2008-12-12 Gavin Barraclough <​[email protected]>

Reviewed by Camron Zwarich.

Replace emitPutCallArg methods with emitPutJITStubArg methods. Primarily to make the argument numbering
more sensible (1-based incrementing by 1, rather than 0-based incrementing by 4). The CTI name also seems
to be being deprecated from the code generally.

• jit/JIT.cpp: (JSC::JIT::privateCompileMainPass): (JSC::JIT::privateCompileSlowCases): (JSC::JIT::privateCompileCTIMachineTrampolines):
• jit/JIT.h:
• jit/JITArithmetic.cpp: (JSC::JIT::compileBinaryArithOp): (JSC::JIT::compileBinaryArithOpSlowCase):
• jit/JITCall.cpp: (JSC::JIT::compileOpCallSetupArgs): (JSC::JIT::compileOpCallEvalSetupArgs): (JSC::JIT::compileOpConstructSetupArgs): (JSC::JIT::compileOpCall):
• jit/JITInlineMethods.h: (JSC::JIT::emitPutJITStubArg): (JSC::JIT::emitPutJITStubArgConstant): (JSC::JIT::emitGetJITStubArg): (JSC::JIT::emitPutJITStubArgFromVirtualRegister):
• jit/JITPropertyAccess.cpp: (JSC::JIT::compileGetByIdHotPath): (JSC::JIT::compilePutByIdHotPath): (JSC::JIT::compileGetByIdSlowCase): (JSC::JIT::compilePutByIdSlowCase):

File:

• trunk/JavaScriptCore/jit/JITCall.cpp (modified) (4 diffs)

trunk/JavaScriptCore/jit/JITCall.cpp

@@ -87 +87 @@
 
     // ecx holds func
-    emitPutCTIArg(X86::ecx, 0);
-    emitPutCTIArgConstant(registerOffset, 4);
-    emitPutCTIArgConstant(argCount, 8);
-    emitPutCTIArgConstant(reinterpret_cast<unsigned>(instruction), 12);
+    emitPutJITStubArg(X86::ecx, 1);
+    emitPutJITStubArgConstant(registerOffset, 2);
+    emitPutJITStubArgConstant(argCount, 3);
+    emitPutJITStubArgConstant(reinterpret_cast<unsigned>(instruction), 4);
 }
 
@@ -99 +99 @@
 
     // ecx holds func
-    emitPutCTIArg(X86::ecx, 0);
-    emitPutCTIArgConstant(registerOffset, 4);
-    emitPutCTIArgConstant(argCount, 8);
+    emitPutJITStubArg(X86::ecx, 1);
+    emitPutJITStubArgConstant(registerOffset, 2);
+    emitPutJITStubArgConstant(argCount, 3);
 }
 
@@ -112 +112 @@
 
     // ecx holds func
-    emitPutCTIArg(X86::ecx, 0);
-    emitPutCTIArgConstant(registerOffset, 4);
-    emitPutCTIArgConstant(argCount, 8);
-    emitPutCTIArgFromVirtualRegister(proto, 12, X86::eax);
-    emitPutCTIArgConstant(thisRegister, 16);
+    emitPutJITStubArg(X86::ecx, 1);
+    emitPutJITStubArgConstant(registerOffset, 2);
+    emitPutJITStubArgConstant(argCount, 3);
+    emitPutJITStubArgFromVirtualRegister(proto, 4, X86::eax);
+    emitPutJITStubArgConstant(thisRegister, 5);
 }
 
@@ -233 +233 @@
         int thisRegister = instruction[6].u.operand;
 
-        emitPutCTIArg(X86::ecx, 0);
-        emitPutCTIArgFromVirtualRegister(proto, 12, X86::eax);
+        emitPutJITStubArg(X86::ecx, 1);
+        emitPutJITStubArgFromVirtualRegister(proto, 4, X86::eax);
         emitCTICall(Interpreter::cti_op_construct_JSConstruct);
         emitPutVirtualRegister(thisRegister);