Changeset 39268 in webkit for trunk/JavaScriptCore/jit

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):

Location:

trunk/JavaScriptCore/jit

Files:

• JIT.cpp (modified) (75 diffs)
• JIT.h (modified) (1 diff)
• JITArithmetic.cpp (modified) (2 diffs)
• JITCall.cpp (modified) (4 diffs)
• JITInlineMethods.h (modified) (2 diffs)
• JITPropertyAccess.cpp (modified) (4 diffs)

trunk/JavaScriptCore/jit/JIT.cpp

@@ -205 +205 @@
 #define CTI_COMPILE_BINARY_OP(name) \
     case name: { \
-        emitPutCTIArgFromVirtualRegister(currentInstruction[2].u.operand, 0, X86::ecx); \
-        emitPutCTIArgFromVirtualRegister(currentInstruction[3].u.operand, 4, X86::ecx); \
+        emitPutJITStubArgFromVirtualRegister(currentInstruction[2].u.operand, 1, X86::ecx); \
+        emitPutJITStubArgFromVirtualRegister(currentInstruction[3].u.operand, 2, X86::ecx); \
         emitCTICall(Interpreter::cti_##name); \
         emitPutVirtualRegister(currentInstruction[1].u.operand); \
@@ -214 +214 @@
 #define CTI_COMPILE_UNARY_OP(name) \
     case name: { \
-        emitPutCTIArgFromVirtualRegister(currentInstruction[2].u.operand, 0, X86::ecx); \
+        emitPutJITStubArgFromVirtualRegister(currentInstruction[2].u.operand, 1, X86::ecx); \
         emitCTICall(Interpreter::cti_##name); \
         emitPutVirtualRegister(currentInstruction[1].u.operand); \
@@ -266 +266 @@
                     compileBinaryArithOp(op_add, currentInstruction[1].u.operand, currentInstruction[2].u.operand, currentInstruction[3].u.operand, OperandTypes::fromInt(currentInstruction[4].u.operand));
                 else {
-                    emitPutCTIArgFromVirtualRegister(currentInstruction[2].u.operand, 0, X86::ecx);
-                    emitPutCTIArgFromVirtualRegister(currentInstruction[3].u.operand, 4, X86::ecx);
+                    emitPutJITStubArgFromVirtualRegister(currentInstruction[2].u.operand, 1, X86::ecx);
+                    emitPutJITStubArgFromVirtualRegister(currentInstruction[3].u.operand, 2, X86::ecx);
                     emitCTICall(Interpreter::cti_op_add);
                     emitPutVirtualRegister(currentInstruction[1].u.operand);
@@ -401 +401 @@
         }
         case op_del_by_id: {
-            emitPutCTIArgFromVirtualRegister(currentInstruction[2].u.operand, 0, X86::ecx);
+            emitPutJITStubArgFromVirtualRegister(currentInstruction[2].u.operand, 1, X86::ecx);
             Identifier* ident = &(m_codeBlock->identifier(currentInstruction[3].u.operand));
-            emitPutCTIArgConstant(reinterpret_cast<unsigned>(ident), 4);
+            emitPutJITStubArgConstant(reinterpret_cast<unsigned>(ident), 2);
             emitCTICall(Interpreter::cti_op_del_by_id);
             emitPutVirtualRegister(currentInstruction[1].u.operand);
@@ -438 +438 @@
         case op_new_func: {
             FuncDeclNode* func = m_codeBlock->function(currentInstruction[2].u.operand);
-            emitPutCTIArgConstant(reinterpret_cast<unsigned>(func), 0);
+            emitPutJITStubArgConstant(reinterpret_cast<unsigned>(func), 1);
             emitCTICall(Interpreter::cti_op_new_func);
             emitPutVirtualRegister(currentInstruction[1].u.operand);
@@ -494 +494 @@
         }
         case op_tear_off_activation: {
-            emitPutCTIArgFromVirtualRegister(currentInstruction[1].u.operand, 0, X86::ecx);
+            emitPutJITStubArgFromVirtualRegister(currentInstruction[1].u.operand, 1, X86::ecx);
             emitCTICall(Interpreter::cti_op_tear_off_activation);
             NEXT_OPCODE(op_tear_off_activation);
@@ -523 +523 @@
         }
         case op_new_array: {
-            emitPutCTIArgConstant(currentInstruction[2].u.operand, 0);
-            emitPutCTIArgConstant(currentInstruction[3].u.operand, 4);
+            emitPutJITStubArgConstant(currentInstruction[2].u.operand, 1);
+            emitPutJITStubArgConstant(currentInstruction[3].u.operand, 2);
             emitCTICall(Interpreter::cti_op_new_array);
             emitPutVirtualRegister(currentInstruction[1].u.operand);
@@ -531 +531 @@
         case op_resolve: {
             Identifier* ident = &(m_codeBlock->identifier(currentInstruction[2].u.operand));
-            emitPutCTIArgConstant(reinterpret_cast<unsigned>(ident), 0);
+            emitPutJITStubArgConstant(reinterpret_cast<unsigned>(ident), 1);
             emitCTICall(Interpreter::cti_op_resolve);
             emitPutVirtualRegister(currentInstruction[1].u.operand);
@@ -563 +563 @@
         case op_resolve_func: {
             Identifier* ident = &(m_codeBlock->identifier(currentInstruction[3].u.operand));
-            emitPutCTIArgConstant(reinterpret_cast<unsigned>(ident), 0);
+            emitPutJITStubArgConstant(reinterpret_cast<unsigned>(ident), 1);
             emitCTICall(Interpreter::cti_op_resolve_func);
             emitPutVirtualRegister(currentInstruction[2].u.operand, X86::edx);
@@ -614 +614 @@
         case op_resolve_base: {
             Identifier* ident = &(m_codeBlock->identifier(currentInstruction[2].u.operand));
-            emitPutCTIArgConstant(reinterpret_cast<unsigned>(ident), 0);
+            emitPutJITStubArgConstant(reinterpret_cast<unsigned>(ident), 1);
             emitCTICall(Interpreter::cti_op_resolve_base);
             emitPutVirtualRegister(currentInstruction[1].u.operand);
@@ -620 +620 @@
         }
         case op_negate: {
-            emitPutCTIArgFromVirtualRegister(currentInstruction[2].u.operand, 0, X86::ecx);
+            emitPutJITStubArgFromVirtualRegister(currentInstruction[2].u.operand, 1, X86::ecx);
             emitCTICall(Interpreter::cti_op_negate);
             emitPutVirtualRegister(currentInstruction[1].u.operand);
@@ -627 +627 @@
         case op_resolve_skip: {
             Identifier* ident = &(m_codeBlock->identifier(currentInstruction[2].u.operand));
-            emitPutCTIArgConstant(reinterpret_cast<unsigned>(ident), 0);
-            emitPutCTIArgConstant(currentInstruction[3].u.operand + m_codeBlock->needsFullScopeChain(), 4);
+            emitPutJITStubArgConstant(reinterpret_cast<unsigned>(ident), 1);
+            emitPutJITStubArgConstant(currentInstruction[3].u.operand + m_codeBlock->needsFullScopeChain(), 2);
             emitCTICall(Interpreter::cti_op_resolve_skip);
             emitPutVirtualRegister(currentInstruction[1].u.operand);
@@ -656 +656 @@
             // Slow case
             noMatch.link(this);
-            emitPutCTIArgConstant(globalObject, 0);
-            emitPutCTIArgConstant(reinterpret_cast<unsigned>(ident), 4);
-            emitPutCTIArgConstant(currentIndex, 8);
+            emitPutJITStubArgConstant(globalObject, 1);
+            emitPutJITStubArgConstant(reinterpret_cast<unsigned>(ident), 2);
+            emitPutJITStubArgConstant(currentIndex, 3);
             emitCTICall(Interpreter::cti_op_resolve_global);
             emitPutVirtualRegister(currentInstruction[1].u.operand);
@@ -848 +848 @@
         case op_resolve_with_base: {
             Identifier* ident = &(m_codeBlock->identifier(currentInstruction[3].u.operand));
-            emitPutCTIArgConstant(reinterpret_cast<unsigned>(ident), 0);
+            emitPutJITStubArgConstant(reinterpret_cast<unsigned>(ident), 1);
             emitCTICall(Interpreter::cti_op_resolve_with_base);
             emitPutVirtualRegister(currentInstruction[2].u.operand, X86::edx);
@@ -856 +856 @@
         case op_new_func_exp: {
             FuncExprNode* func = m_codeBlock->functionExpression(currentInstruction[2].u.operand);
-            emitPutCTIArgConstant(reinterpret_cast<unsigned>(func), 0);
+            emitPutJITStubArgConstant(reinterpret_cast<unsigned>(func), 1);
             emitCTICall(Interpreter::cti_op_new_func_exp);
             emitPutVirtualRegister(currentInstruction[1].u.operand);
@@ -919 +919 @@
         case op_new_regexp: {
             RegExp* regExp = m_codeBlock->regexp(currentInstruction[2].u.operand);
-            emitPutCTIArgConstant(reinterpret_cast<unsigned>(regExp), 0);
+            emitPutJITStubArgConstant(reinterpret_cast<unsigned>(regExp), 1);
             emitCTICall(Interpreter::cti_op_new_regexp);
             emitPutVirtualRegister(currentInstruction[1].u.operand);
@@ -932 +932 @@
         }
         case op_throw: {
-            emitPutCTIArgFromVirtualRegister(currentInstruction[1].u.operand, 0, X86::ecx);
+            emitPutJITStubArgFromVirtualRegister(currentInstruction[1].u.operand, 1, X86::ecx);
             emitCTICall(Interpreter::cti_op_throw);
             __ addl_i8r(0x20, X86::esp);
@@ -942 +942 @@
         }
         case op_get_pnames: {
-            emitPutCTIArgFromVirtualRegister(currentInstruction[2].u.operand, 0, X86::ecx);
+            emitPutJITStubArgFromVirtualRegister(currentInstruction[2].u.operand, 1, X86::ecx);
             emitCTICall(Interpreter::cti_op_get_pnames);
             emitPutVirtualRegister(currentInstruction[1].u.operand);
@@ -948 +948 @@
         }
         case op_next_pname: {
-            emitPutCTIArgFromVirtualRegister(currentInstruction[2].u.operand, 0, X86::ecx);
+            emitPutJITStubArgFromVirtualRegister(currentInstruction[2].u.operand, 1, X86::ecx);
             unsigned target = currentInstruction[3].u.operand;
             emitCTICall(Interpreter::cti_op_next_pname);
@@ -958 +958 @@
         }
         case op_push_scope: {
-            emitPutCTIArgFromVirtualRegister(currentInstruction[1].u.operand, 0, X86::ecx);
+            emitPutJITStubArgFromVirtualRegister(currentInstruction[1].u.operand, 1, X86::ecx);
             emitCTICall(Interpreter::cti_op_push_scope);
             NEXT_OPCODE(op_push_scope);
@@ -999 +999 @@
         case op_push_new_scope: {
             Identifier* ident = &(m_codeBlock->identifier(currentInstruction[2].u.operand));
-            emitPutCTIArgConstant(reinterpret_cast<unsigned>(ident), 0);
-            emitPutCTIArgFromVirtualRegister(currentInstruction[3].u.operand, 4, X86::ecx);
+            emitPutJITStubArgConstant(reinterpret_cast<unsigned>(ident), 1);
+            emitPutJITStubArgFromVirtualRegister(currentInstruction[3].u.operand, 2, X86::ecx);
             emitCTICall(Interpreter::cti_op_push_new_scope);
             emitPutVirtualRegister(currentInstruction[1].u.operand);
@@ -1012 +1012 @@
         case op_jmp_scopes: {
             unsigned count = currentInstruction[1].u.operand;
-            emitPutCTIArgConstant(count, 0);
+            emitPutJITStubArgConstant(count, 1);
             emitCTICall(Interpreter::cti_op_jmp_scopes);
             unsigned target = currentInstruction[2].u.operand;
@@ -1019 +1019 @@
         }
         case op_put_by_index: {
-            emitPutCTIArgFromVirtualRegister(currentInstruction[1].u.operand, 0, X86::ecx);
-            emitPutCTIArgConstant(currentInstruction[2].u.operand, 4);
-            emitPutCTIArgFromVirtualRegister(currentInstruction[3].u.operand, 8, X86::ecx);
+            emitPutJITStubArgFromVirtualRegister(currentInstruction[1].u.operand, 1, X86::ecx);
+            emitPutJITStubArgConstant(currentInstruction[2].u.operand, 2);
+            emitPutJITStubArgFromVirtualRegister(currentInstruction[3].u.operand, 3, X86::ecx);
             emitCTICall(Interpreter::cti_op_put_by_index);
             NEXT_OPCODE(op_put_by_index);
@@ -1035 +1035 @@
             jumpTable->ctiOffsets.grow(jumpTable->branchOffsets.size());
 
-            emitPutCTIArgFromVirtualRegister(scrutinee, 0, X86::ecx);
-            emitPutCTIArgConstant(tableIndex, 4);
+            emitPutJITStubArgFromVirtualRegister(scrutinee, 1, X86::ecx);
+            emitPutJITStubArgConstant(tableIndex, 2);
             emitCTICall(Interpreter::cti_op_switch_imm);
             jump(X86::eax);
@@ -1051 +1051 @@
             jumpTable->ctiOffsets.grow(jumpTable->branchOffsets.size());
 
-            emitPutCTIArgFromVirtualRegister(scrutinee, 0, X86::ecx);
-            emitPutCTIArgConstant(tableIndex, 4);
+            emitPutJITStubArgFromVirtualRegister(scrutinee, 1, X86::ecx);
+            emitPutJITStubArgConstant(tableIndex, 2);
             emitCTICall(Interpreter::cti_op_switch_char);
             jump(X86::eax);
@@ -1066 +1066 @@
             m_switches.append(SwitchRecord(jumpTable, m_bytecodeIndex, defaultOffset));
 
-            emitPutCTIArgFromVirtualRegister(scrutinee, 0, X86::ecx);
-            emitPutCTIArgConstant(tableIndex, 4);
+            emitPutJITStubArgFromVirtualRegister(scrutinee, 1, X86::ecx);
+            emitPutJITStubArgConstant(tableIndex, 2);
             emitCTICall(Interpreter::cti_op_switch_string);
             jump(X86::eax);
@@ -1073 +1073 @@
         }
         case op_del_by_val: {
-            emitPutCTIArgFromVirtualRegister(currentInstruction[2].u.operand, 0, X86::ecx);
-            emitPutCTIArgFromVirtualRegister(currentInstruction[3].u.operand, 4, X86::ecx);
+            emitPutJITStubArgFromVirtualRegister(currentInstruction[2].u.operand, 1, X86::ecx);
+            emitPutJITStubArgFromVirtualRegister(currentInstruction[3].u.operand, 2, X86::ecx);
             emitCTICall(Interpreter::cti_op_del_by_val);
             emitPutVirtualRegister(currentInstruction[1].u.operand);
@@ -1080 +1080 @@
         }
         case op_put_getter: {
-            emitPutCTIArgFromVirtualRegister(currentInstruction[1].u.operand, 0, X86::ecx);
+            emitPutJITStubArgFromVirtualRegister(currentInstruction[1].u.operand, 1, X86::ecx);
             Identifier* ident = &(m_codeBlock->identifier(currentInstruction[2].u.operand));
-            emitPutCTIArgConstant(reinterpret_cast<unsigned>(ident), 4);
-            emitPutCTIArgFromVirtualRegister(currentInstruction[3].u.operand, 8, X86::ecx);
+            emitPutJITStubArgConstant(reinterpret_cast<unsigned>(ident), 2);
+            emitPutJITStubArgFromVirtualRegister(currentInstruction[3].u.operand, 3, X86::ecx);
             emitCTICall(Interpreter::cti_op_put_getter);
             NEXT_OPCODE(op_put_getter);
         }
         case op_put_setter: {
-            emitPutCTIArgFromVirtualRegister(currentInstruction[1].u.operand, 0, X86::ecx);
+            emitPutJITStubArgFromVirtualRegister(currentInstruction[1].u.operand, 1, X86::ecx);
             Identifier* ident = &(m_codeBlock->identifier(currentInstruction[2].u.operand));
-            emitPutCTIArgConstant(reinterpret_cast<unsigned>(ident), 4);
-            emitPutCTIArgFromVirtualRegister(currentInstruction[3].u.operand, 8, X86::ecx);
+            emitPutJITStubArgConstant(reinterpret_cast<unsigned>(ident), 2);
+            emitPutJITStubArgFromVirtualRegister(currentInstruction[3].u.operand, 3, X86::ecx);
             emitCTICall(Interpreter::cti_op_put_setter);
             NEXT_OPCODE(op_put_setter);
@@ -1097 +1097 @@
         case op_new_error: {
             JSValue* message = m_codeBlock->unexpectedConstant(currentInstruction[3].u.operand);
-            emitPutCTIArgConstant(currentInstruction[2].u.operand, 0);
-            emitPutCTIArgConstant(asInteger(message), 4);
-            emitPutCTIArgConstant(m_codeBlock->lineNumberForBytecodeOffset(m_bytecodeIndex), 8);
+            emitPutJITStubArgConstant(currentInstruction[2].u.operand, 1);
+            emitPutJITStubArgConstant(asInteger(message), 2);
+            emitPutJITStubArgConstant(m_codeBlock->lineNumberForBytecodeOffset(m_bytecodeIndex), 3);
             emitCTICall(Interpreter::cti_op_new_error);
             emitPutVirtualRegister(currentInstruction[1].u.operand);
@@ -1105 +1105 @@
         }
         case op_debug: {
-            emitPutCTIArgConstant(currentInstruction[1].u.operand, 0);
-            emitPutCTIArgConstant(currentInstruction[2].u.operand, 4);
-            emitPutCTIArgConstant(currentInstruction[3].u.operand, 8);
+            emitPutJITStubArgConstant(currentInstruction[1].u.operand, 1);
+            emitPutJITStubArgConstant(currentInstruction[2].u.operand, 2);
+            emitPutJITStubArgConstant(currentInstruction[3].u.operand, 3);
             emitCTICall(Interpreter::cti_op_debug);
             NEXT_OPCODE(op_debug);
@@ -1202 +1202 @@
             __ cmpl_i32m(0, X86::eax);
             JmpSrc noProfiler = __ je();
-            emitPutCTIArgFromVirtualRegister(currentInstruction[1].u.operand, 0, X86::eax);
+            emitPutJITStubArgFromVirtualRegister(currentInstruction[1].u.operand, 1, X86::eax);
             emitCTICall(Interpreter::cti_op_profile_will_call);
             __ link(noProfiler, __ label());
@@ -1212 +1212 @@
             __ cmpl_i32m(0, X86::eax);
             JmpSrc noProfiler = __ je();
-            emitPutCTIArgFromVirtualRegister(currentInstruction[1].u.operand, 0, X86::eax);
+            emitPutJITStubArgFromVirtualRegister(currentInstruction[1].u.operand, 1, X86::eax);
             emitCTICall(Interpreter::cti_op_profile_did_call);
             __ link(noProfiler, __ label());
@@ -1271 +1271 @@
             linkSlowCase(iter);
             linkSlowCase(iter);
-            emitPutCTIArg(X86::eax, 0);
+            emitPutJITStubArg(X86::eax, 1);
             emitCTICall(Interpreter::cti_op_convert_this);
             emitPutVirtualRegister(currentInstruction[1].u.operand);
@@ -1285 +1285 @@
                 sub32(Imm32(getDeTaggedConstantImmediate(value)), X86::eax);
                 notImm.link(this);
-                emitPutCTIArgFromVirtualRegister(src1, 0, X86::ecx);
-                emitPutCTIArg(X86::eax, 4);
+                emitPutJITStubArgFromVirtualRegister(src1, 1, X86::ecx);
+                emitPutJITStubArg(X86::eax, 2);
                 emitCTICall(Interpreter::cti_op_add);
                 emitPutVirtualRegister(dst);
@@ -1294 +1294 @@
                 sub32(Imm32(getDeTaggedConstantImmediate(value)), X86::eax);
                 notImm.link(this);
-                emitPutCTIArg(X86::eax, 0);
-                emitPutCTIArgFromVirtualRegister(src2, 4, X86::ecx);
+                emitPutJITStubArg(X86::eax, 1);
+                emitPutJITStubArgFromVirtualRegister(src2, 2, X86::ecx);
                 emitCTICall(Interpreter::cti_op_add);
                 emitPutVirtualRegister(dst);
@@ -1323 +1323 @@
             emitFastArithIntToImmNoCheck(X86::edx);
             notImm.link(this);
-            emitPutCTIArg(X86::eax, 0);
-            emitPutCTIArg(X86::edx, 4);
+            emitPutJITStubArg(X86::eax, 1);
+            emitPutJITStubArg(X86::edx, 2);
             emitCTICall(Interpreter::cti_op_get_by_val);
             emitPutVirtualRegister(currentInstruction[1].u.operand);
@@ -1351 +1351 @@
             linkSlowCase(iter);
             if (getConstantImmediateNumericArg(src2))
-                emitPutCTIArgFromVirtualRegister(src2, 4, X86::ecx);
+                emitPutJITStubArgFromVirtualRegister(src2, 2, X86::ecx);
             else {
                 linkSlowCase(iter);
-                emitPutCTIArg(X86::ecx, 4);
+                emitPutJITStubArg(X86::ecx, 2);
             }
 
-            emitPutCTIArg(X86::eax, 0);
+            emitPutJITStubArg(X86::eax, 1);
             emitCTICall(Interpreter::cti_op_rshift);
             emitPutVirtualRegister(currentInstruction[1].u.operand);
@@ -1369 +1369 @@
             notImm1.link(this);
             notImm2.link(this);
-            emitPutCTIArg(X86::eax, 0);
-            emitPutCTIArg(X86::ecx, 4);
+            emitPutJITStubArg(X86::eax, 1);
+            emitPutJITStubArg(X86::ecx, 2);
             emitCTICall(Interpreter::cti_op_lshift);
             emitPutVirtualRegister(currentInstruction[1].u.operand);
@@ -1380 +1380 @@
             if (src2imm) {
                 linkSlowCase(iter);
-                emitPutCTIArg(X86::eax, 0);
-                emitPutCTIArgFromVirtualRegister(currentInstruction[2].u.operand, 4, X86::ecx);
+                emitPutJITStubArg(X86::eax, 1);
+                emitPutJITStubArgFromVirtualRegister(currentInstruction[2].u.operand, 2, X86::ecx);
                 emitCTICall(Interpreter::cti_op_loop_if_less);
                 emitJumpSlowToHot(jnz32(X86::eax), target + 3);
@@ -1387 +1387 @@
                 linkSlowCase(iter);
                 linkSlowCase(iter);
-                emitPutCTIArg(X86::eax, 0);
-                emitPutCTIArg(X86::edx, 4);
+                emitPutJITStubArg(X86::eax, 1);
+                emitPutJITStubArg(X86::edx, 2);
                 emitCTICall(Interpreter::cti_op_loop_if_less);
                 emitJumpSlowToHot(jnz32(X86::eax), target + 3);
@@ -1407 +1407 @@
             if (src2imm) {
                 linkSlowCase(iter);
-                emitPutCTIArg(X86::eax, 0);
-                emitPutCTIArgFromVirtualRegister(currentInstruction[2].u.operand, 4, X86::ecx);
+                emitPutJITStubArg(X86::eax, 1);
+                emitPutJITStubArgFromVirtualRegister(currentInstruction[2].u.operand, 2, X86::ecx);
                 emitCTICall(Interpreter::cti_op_loop_if_lesseq);
                 emitJumpSlowToHot(jnz32(X86::eax), target + 3);
@@ -1414 +1414 @@
                 linkSlowCase(iter);
                 linkSlowCase(iter);
-                emitPutCTIArg(X86::eax, 0);
-                emitPutCTIArg(X86::edx, 4);
+                emitPutJITStubArg(X86::eax, 1);
+                emitPutJITStubArg(X86::edx, 2);
                 emitCTICall(Interpreter::cti_op_loop_if_lesseq);
                 emitJumpSlowToHot(jnz32(X86::eax), target + 3);
@@ -1427 +1427 @@
             sub32(Imm32(getDeTaggedConstantImmediate(JSImmediate::oneImmediate())), X86::eax);
             notImm.link(this);
-            emitPutCTIArg(X86::eax, 0);
+            emitPutJITStubArg(X86::eax, 1);
             emitCTICall(Interpreter::cti_op_pre_inc);
             emitPutVirtualRegister(srcDst);
@@ -1440 +1440 @@
             notImm.link(this);
             emitGetVirtualRegister(currentInstruction[3].u.operand, X86::ecx);
-            emitPutCTIArg(X86::eax, 0);
-            emitPutCTIArg(X86::edx, 4);
-            emitPutCTIArg(X86::ecx, 8);
+            emitPutJITStubArg(X86::eax, 1);
+            emitPutJITStubArg(X86::edx, 2);
+            emitPutJITStubArg(X86::ecx, 3);
             emitCTICall(Interpreter::cti_op_put_by_val);
             emitJumpSlowToHot(jump(), OPCODE_LENGTH(op_put_by_val));
@@ -1450 +1450 @@
             linkSlowCase(iter);
             emitGetVirtualRegister(currentInstruction[3].u.operand, X86::ecx);
-            emitPutCTIArg(X86::eax, 0);
-            emitPutCTIArg(X86::edx, 4);
-            emitPutCTIArg(X86::ecx, 8);
+            emitPutJITStubArg(X86::eax, 1);
+            emitPutJITStubArg(X86::edx, 2);
+            emitPutJITStubArg(X86::ecx, 3);
             emitCTICall(Interpreter::cti_op_put_by_val_array);
 
@@ -1459 +1459 @@
         case op_loop_if_true: {
             linkSlowCase(iter);
-            emitPutCTIArg(X86::eax, 0);
+            emitPutJITStubArg(X86::eax, 1);
             emitCTICall(Interpreter::cti_op_jtrue);
             unsigned target = currentInstruction[2].u.operand;
@@ -1471 +1471 @@
             add32(Imm32(getDeTaggedConstantImmediate(JSImmediate::oneImmediate())), X86::eax);
             notImm.link(this);
-            emitPutCTIArg(X86::eax, 0);
+            emitPutJITStubArg(X86::eax, 1);
             emitCTICall(Interpreter::cti_op_pre_dec);
             emitPutVirtualRegister(srcDst);
@@ -1481 +1481 @@
             if (src2imm) {
                 linkSlowCase(iter);
-                emitPutCTIArg(X86::edx, 0);
-                emitPutCTIArgFromVirtualRegister(currentInstruction[2].u.operand, 4, X86::ecx);
+                emitPutJITStubArg(X86::edx, 1);
+                emitPutJITStubArgFromVirtualRegister(currentInstruction[2].u.operand, 2, X86::ecx);
                 emitCTICall(Interpreter::cti_op_jless);
                 emitJumpSlowToHot(jz32(X86::eax), target + 3);
@@ -1488 +1488 @@
                 linkSlowCase(iter);
                 linkSlowCase(iter);
-                emitPutCTIArg(X86::eax, 0);
-                emitPutCTIArg(X86::edx, 4);
+                emitPutJITStubArg(X86::eax, 1);
+                emitPutJITStubArg(X86::edx, 2);
                 emitCTICall(Interpreter::cti_op_jless);
                 emitJumpSlowToHot(jz32(X86::eax), target + 3);
@@ -1498 +1498 @@
             linkSlowCase(iter);
             xor32(Imm32(JSImmediate::FullTagTypeBool), X86::eax);
-            emitPutCTIArg(X86::eax, 0);
+            emitPutJITStubArg(X86::eax, 1);
             emitCTICall(Interpreter::cti_op_not);
             emitPutVirtualRegister(currentInstruction[1].u.operand);
@@ -1505 +1505 @@
         case op_jfalse: {
             linkSlowCase(iter);
-            emitPutCTIArg(X86::eax, 0);
+            emitPutJITStubArg(X86::eax, 1);
             emitCTICall(Interpreter::cti_op_jtrue);
             unsigned target = currentInstruction[2].u.operand;
@@ -1515 +1515 @@
             linkSlowCase(iter);
             linkSlowCase(iter);
-            emitPutCTIArg(X86::eax, 0);
+            emitPutJITStubArg(X86::eax, 1);
             emitCTICall(Interpreter::cti_op_post_inc);
             emitPutVirtualRegister(srcDst, X86::edx);
@@ -1523 +1523 @@
         case op_bitnot: {
             linkSlowCase(iter);
-            emitPutCTIArg(X86::eax, 0);
+            emitPutJITStubArg(X86::eax, 1);
             emitCTICall(Interpreter::cti_op_bitnot);
             emitPutVirtualRegister(currentInstruction[1].u.operand);
@@ -1534 +1534 @@
             unsigned dst = currentInstruction[1].u.operand;
             if (getConstantImmediateNumericArg(src1)) {
-                emitPutCTIArgFromVirtualRegister(src1, 0, X86::ecx);
-                emitPutCTIArg(X86::eax, 4);
+                emitPutJITStubArgFromVirtualRegister(src1, 1, X86::ecx);
+                emitPutJITStubArg(X86::eax, 2);
                 emitCTICall(Interpreter::cti_op_bitand);
                 emitPutVirtualRegister(dst);
             } else if (getConstantImmediateNumericArg(src2)) {
-                emitPutCTIArg(X86::eax, 0);
-                emitPutCTIArgFromVirtualRegister(src2, 4, X86::ecx);
+                emitPutJITStubArg(X86::eax, 1);
+                emitPutJITStubArgFromVirtualRegister(src2, 2, X86::ecx);
                 emitCTICall(Interpreter::cti_op_bitand);
                 emitPutVirtualRegister(dst);
             } else {
-                emitPutCTIArgFromVirtualRegister(src1, 0, X86::ecx);
-                emitPutCTIArg(X86::edx, 4);
+                emitPutJITStubArgFromVirtualRegister(src1, 1, X86::ecx);
+                emitPutJITStubArg(X86::edx, 2);
                 emitCTICall(Interpreter::cti_op_bitand);
                 emitPutVirtualRegister(dst);
@@ -1553 +1553 @@
         case op_jtrue: {
             linkSlowCase(iter);
-            emitPutCTIArg(X86::eax, 0);
+            emitPutJITStubArg(X86::eax, 1);
             emitCTICall(Interpreter::cti_op_jtrue);
             unsigned target = currentInstruction[2].u.operand;
@@ -1563 +1563 @@
             linkSlowCase(iter);
             linkSlowCase(iter);
-            emitPutCTIArg(X86::eax, 0);
+            emitPutJITStubArg(X86::eax, 1);
             emitCTICall(Interpreter::cti_op_post_dec);
             emitPutVirtualRegister(srcDst, X86::edx);
@@ -1571 +1571 @@
         case op_bitxor: {
             linkSlowCase(iter);
-            emitPutCTIArg(X86::eax, 0);
-            emitPutCTIArg(X86::edx, 4);
+            emitPutJITStubArg(X86::eax, 1);
+            emitPutJITStubArg(X86::edx, 2);
             emitCTICall(Interpreter::cti_op_bitxor);
             emitPutVirtualRegister(currentInstruction[1].u.operand);
@@ -1579 +1579 @@
         case op_bitor: {
             linkSlowCase(iter);
-            emitPutCTIArg(X86::eax, 0);
-            emitPutCTIArg(X86::edx, 4);
+            emitPutJITStubArg(X86::eax, 1);
+            emitPutJITStubArg(X86::edx, 2);
             emitCTICall(Interpreter::cti_op_bitor);
             emitPutVirtualRegister(currentInstruction[1].u.operand);
@@ -1587 +1587 @@
         case op_eq: {
             linkSlowCase(iter);
-            emitPutCTIArg(X86::eax, 0);
-            emitPutCTIArg(X86::edx, 4);
+            emitPutJITStubArg(X86::eax, 1);
+            emitPutJITStubArg(X86::edx, 2);
             emitCTICall(Interpreter::cti_op_eq);
             emitPutVirtualRegister(currentInstruction[1].u.operand);
@@ -1595 +1595 @@
         case op_neq: {
             linkSlowCase(iter);
-            emitPutCTIArg(X86::eax, 0);
-            emitPutCTIArg(X86::edx, 4);
+            emitPutJITStubArg(X86::eax, 1);
+            emitPutJITStubArg(X86::edx, 2);
             emitCTICall(Interpreter::cti_op_neq);
             emitPutVirtualRegister(currentInstruction[1].u.operand);
@@ -1605 +1605 @@
             linkSlowCase(iter);
             linkSlowCase(iter);
-            emitPutCTIArg(X86::eax, 0);
-            emitPutCTIArg(X86::edx, 4);
+            emitPutJITStubArg(X86::eax, 1);
+            emitPutJITStubArg(X86::edx, 2);
             emitCTICall(Interpreter::cti_op_stricteq);
             emitPutVirtualRegister(currentInstruction[1].u.operand);
@@ -1615 +1615 @@
             linkSlowCase(iter);
             linkSlowCase(iter);
-            emitPutCTIArg(X86::eax, 0);
-            emitPutCTIArg(X86::edx, 4);
+            emitPutJITStubArg(X86::eax, 1);
+            emitPutJITStubArg(X86::edx, 2);
             emitCTICall(Interpreter::cti_op_nstricteq);
             emitPutVirtualRegister(currentInstruction[1].u.operand);
@@ -1625 +1625 @@
             linkSlowCase(iter);
             linkSlowCase(iter);
-            emitPutCTIArgFromVirtualRegister(currentInstruction[2].u.operand, 0, X86::ecx);
-            emitPutCTIArgFromVirtualRegister(currentInstruction[3].u.operand, 4, X86::ecx);
-            emitPutCTIArgFromVirtualRegister(currentInstruction[4].u.operand, 8, X86::ecx);
+            emitPutJITStubArgFromVirtualRegister(currentInstruction[2].u.operand, 1, X86::ecx);
+            emitPutJITStubArgFromVirtualRegister(currentInstruction[3].u.operand, 2, X86::ecx);
+            emitPutJITStubArgFromVirtualRegister(currentInstruction[4].u.operand, 3, X86::ecx);
             emitCTICall(Interpreter::cti_op_instanceof);
             emitPutVirtualRegister(currentInstruction[1].u.operand);
@@ -1640 +1640 @@
             notImm1.link(this);
             notImm2.link(this);
-            emitPutCTIArg(X86::eax, 0);
-            emitPutCTIArg(X86::ecx, 4);
+            emitPutJITStubArg(X86::eax, 1);
+            emitPutJITStubArg(X86::ecx, 2);
             emitCTICall(Interpreter::cti_op_mod);
             emitPutVirtualRegister(currentInstruction[1].u.operand);
@@ -1657 +1657 @@
                 linkSlowCase(iter);
                 // There is an extra slow case for (op1 * -N) or (-N * op2), to check for 0 since this should produce a result of -0.
-                emitPutCTIArgFromVirtualRegister(src1, 0, X86::ecx);
-                emitPutCTIArgFromVirtualRegister(src2, 4, X86::ecx);
+                emitPutJITStubArgFromVirtualRegister(src1, 1, X86::ecx);
+                emitPutJITStubArgFromVirtualRegister(src2, 2, X86::ecx);
                 emitCTICall(Interpreter::cti_op_mul);
                 emitPutVirtualRegister(dst);
@@ -1665 +1665 @@
                 linkSlowCase(iter);
                 // There is an extra slow case for (op1 * -N) or (-N * op2), to check for 0 since this should produce a result of -0.
-                emitPutCTIArgFromVirtualRegister(src1, 0, X86::ecx);
-                emitPutCTIArgFromVirtualRegister(src2, 4, X86::ecx);
+                emitPutJITStubArgFromVirtualRegister(src1, 1, X86::ecx);
+                emitPutJITStubArgFromVirtualRegister(src2, 2, X86::ecx);
                 emitCTICall(Interpreter::cti_op_mul);
                 emitPutVirtualRegister(dst);
@@ -1690 +1690 @@
             linkSlowCase(iter);
 
-            emitPutCTIArg(X86::eax, 0);
+            emitPutJITStubArg(X86::eax, 1);
             emitCTICall(Interpreter::cti_op_to_jsnumber);
 
@@ -1878 +1878 @@
     emitPutCTIParam(X86::edi, CTI_ARGS_callFrame);
     JmpSrc callJSFunction1 = __ call();
-    emitGetCTIArg(0, X86::ecx);
-    emitGetCTIArg(8, X86::edx);
+    emitGetJITStubArg(1, X86::ecx);
+    emitGetJITStubArg(3, X86::edx);
     __ pushl_r(X86::ebx);
     __ link(hasCodeBlock1, __ label());
@@ -1887 +1887 @@
     JmpSrc arityCheckOkay1 = __ je();
     __ popl_r(X86::ebx);
-    emitPutCTIArg(X86::ebx, 4);
-    emitPutCTIArg(X86::eax, 12);
+    emitPutJITStubArg(X86::ebx, 2);
+    emitPutJITStubArg(X86::eax, 4);
     emitPutCTIParam(X86::edi, CTI_ARGS_callFrame);
     JmpSrc callArityCheck1 = __ call();
     __ movl_rr(X86::edx, X86::edi);
-    emitGetCTIArg(0, X86::ecx);
-    emitGetCTIArg(8, X86::edx);
+    emitGetJITStubArg(1, X86::ecx);
+    emitGetJITStubArg(3, X86::edx);
     __ pushl_r(X86::ebx);
     __ link(arityCheckOkay1, __ label());
@@ -1900 +1900 @@
 
     __ popl_r(X86::ebx);
-    emitPutCTIArg(X86::ebx, 4);
+    emitPutJITStubArg(X86::ebx, 2);
     emitPutCTIParam(X86::edi, CTI_ARGS_callFrame);
     JmpSrc callDontLazyLinkCall = __ call();
@@ -1917 +1917 @@
     emitPutCTIParam(X86::edi, CTI_ARGS_callFrame);
     JmpSrc callJSFunction2 = __ call();
-    emitGetCTIArg(0, X86::ecx);
-    emitGetCTIArg(8, X86::edx);
+    emitGetJITStubArg(1, X86::ecx);
+    emitGetJITStubArg(3, X86::edx);
     __ pushl_r(X86::ebx);
     __ link(hasCodeBlock2, __ label());
@@ -1926 +1926 @@
     JmpSrc arityCheckOkay2 = __ je();
     __ popl_r(X86::ebx);
-    emitPutCTIArg(X86::ebx, 4);
-    emitPutCTIArg(X86::eax, 12);
+    emitPutJITStubArg(X86::ebx, 2);
+    emitPutJITStubArg(X86::eax, 4);
     emitPutCTIParam(X86::edi, CTI_ARGS_callFrame);
     JmpSrc callArityCheck2 = __ call();
     __ movl_rr(X86::edx, X86::edi);
-    emitGetCTIArg(0, X86::ecx);
-    emitGetCTIArg(8, X86::edx);
+    emitGetJITStubArg(1, X86::ecx);
+    emitGetJITStubArg(3, X86::edx);
     __ pushl_r(X86::ebx);
     __ link(arityCheckOkay2, __ label());
@@ -1939 +1939 @@
 
     __ popl_r(X86::ebx);
-    emitPutCTIArg(X86::ebx, 4);
+    emitPutJITStubArg(X86::ebx, 2);
     emitPutCTIParam(X86::edi, CTI_ARGS_callFrame);
     JmpSrc callLazyLinkCall = __ call();
@@ -1956 +1956 @@
     emitPutCTIParam(X86::edi, CTI_ARGS_callFrame);
     JmpSrc callJSFunction3 = __ call();
-    emitGetCTIArg(0, X86::ecx);
-    emitGetCTIArg(8, X86::edx);
+    emitGetJITStubArg(1, X86::ecx);
+    emitGetJITStubArg(3, X86::edx);
     __ pushl_r(X86::ebx);
     __ link(hasCodeBlock3, __ label());
@@ -1965 +1965 @@
     JmpSrc arityCheckOkay3 = __ je();
     __ popl_r(X86::ebx);
-    emitPutCTIArg(X86::ebx, 4);
-    emitPutCTIArg(X86::eax, 12);
+    emitPutJITStubArg(X86::ebx, 2);
+    emitPutJITStubArg(X86::eax, 4);
     emitPutCTIParam(X86::edi, CTI_ARGS_callFrame);
     JmpSrc callArityCheck3 = __ call();
     __ movl_rr(X86::edx, X86::edi);
-    emitGetCTIArg(0, X86::ecx);
-    emitGetCTIArg(8, X86::edx);
+    emitGetJITStubArg(1, X86::ecx);
+    emitGetJITStubArg(3, X86::edx);
     __ pushl_r(X86::ebx);
     __ link(arityCheckOkay3, __ label());

trunk/JavaScriptCore/jit/JIT.h

@@ -354 +354 @@
         void emitPutVirtualRegister(unsigned dst, RegisterID from = X86::eax);
 
-        void emitPutCTIArg(RegisterID src, unsigned offset);
-        void emitPutCTIArgFromVirtualRegister(unsigned src, unsigned offset, RegisterID scratch);
-        void emitPutCTIArgConstant(unsigned value, unsigned offset);
-        void emitPutCTIArgConstant(void* value, unsigned offset);
-        void emitGetCTIArg(unsigned offset, RegisterID dst);
+        void emitPutJITStubArg(RegisterID src, unsigned argumentNumber);
+        void emitPutJITStubArgFromVirtualRegister(unsigned src, unsigned argumentNumber, RegisterID scratch);
+        void emitPutJITStubArgConstant(unsigned value, unsigned argumentNumber);
+        void emitPutJITStubArgConstant(void* value, unsigned argumentNumber);
+        void emitGetJITStubArg(unsigned argumentNumber, RegisterID dst);
 
         void emitInitRegister(unsigned dst);

trunk/JavaScriptCore/jit/JITArithmetic.cpp

@@ -49 +49 @@
 void JIT::compileBinaryArithOp(OpcodeID opcodeID, unsigned dst, unsigned src1, unsigned src2, OperandTypes)
 {
-    emitPutCTIArgFromVirtualRegister(src1, 0, X86::ecx);
-    emitPutCTIArgFromVirtualRegister(src2, 4, X86::ecx);
+    emitPutJITStubArgFromVirtualRegister(src1, 1, X86::ecx);
+    emitPutJITStubArgFromVirtualRegister(src2, 2, X86::ecx);
     if (opcodeID == op_add)
         emitCTICall(Interpreter::cti_op_add);
@@ -324 +324 @@
         linkSlowCase(iter);
 
-    emitPutCTIArgFromVirtualRegister(src1, 0, X86::ecx);
-    emitPutCTIArgFromVirtualRegister(src2, 4, X86::ecx);
+    emitPutJITStubArgFromVirtualRegister(src1, 1, X86::ecx);
+    emitPutJITStubArgFromVirtualRegister(src2, 2, X86::ecx);
     if (opcodeID == op_add)
         emitCTICall(Interpreter::cti_op_add);

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);

trunk/JavaScriptCore/jit/JITInlineMethods.h

@@ -102 +102 @@
 
 // puts an arg onto the stack, as an arg to a context threaded function.
-ALWAYS_INLINE void JIT::emitPutCTIArg(RegisterID src, unsigned offset)
-{
-    poke(src, (offset / sizeof(void*)) + 1);
-}
-
-ALWAYS_INLINE void JIT::emitPutCTIArgConstant(unsigned value, unsigned offset)
-{
-    poke(Imm32(value), (offset / sizeof(void*)) + 1);
-}
-
-ALWAYS_INLINE void JIT::emitPutCTIArgConstant(void* value, unsigned offset)
-{
-    poke(ImmPtr(value), (offset / sizeof(void*)) + 1);
-}
-
-ALWAYS_INLINE void JIT::emitGetCTIArg(unsigned offset, RegisterID dst)
-{
-    peek(dst, (offset / sizeof(void*)) + 1);
+ALWAYS_INLINE void JIT::emitPutJITStubArg(RegisterID src, unsigned argumentNumber)
+{
+    poke(src, argumentNumber);
+}
+
+ALWAYS_INLINE void JIT::emitPutJITStubArgConstant(unsigned value, unsigned argumentNumber)
+{
+    poke(Imm32(value), argumentNumber);
+}
+
+ALWAYS_INLINE void JIT::emitPutJITStubArgConstant(void* value, unsigned argumentNumber)
+{
+    poke(ImmPtr(value), argumentNumber);
+}
+
+ALWAYS_INLINE void JIT::emitGetJITStubArg(unsigned argumentNumber, RegisterID dst)
+{
+    peek(dst, argumentNumber);
 }
 
@@ -132 +132 @@
 
 // get arg puts an arg from the SF register array onto the stack, as an arg to a context threaded function.
-ALWAYS_INLINE void JIT::emitPutCTIArgFromVirtualRegister(unsigned src, unsigned offset, RegisterID scratch)
+ALWAYS_INLINE void JIT::emitPutJITStubArgFromVirtualRegister(unsigned src, unsigned argumentNumber, RegisterID scratch)
 {
     if (m_codeBlock->isConstantRegisterIndex(src)) {
         JSValue* value = m_codeBlock->getConstant(src);
-        emitPutCTIArgConstant(value, offset);
+        emitPutJITStubArgConstant(value, argumentNumber);
     } else {
         loadPtr(Address(callFrameRegister, src * sizeof(Register)), scratch);
-        emitPutCTIArg(scratch, offset);
+        emitPutJITStubArg(scratch, argumentNumber);
     }
 

trunk/JavaScriptCore/jit/JITPropertyAccess.cpp

@@ -56 +56 @@
     emitGetVirtualRegister(baseVReg, X86::eax);
 
-    emitPutCTIArg(X86::eax, 0);
-    emitPutCTIArgConstant(reinterpret_cast<unsigned>(ident), 4);
+    emitPutJITStubArg(X86::eax, 1);
+    emitPutJITStubArgConstant(reinterpret_cast<unsigned>(ident), 2);
     emitCTICall(Interpreter::cti_op_get_by_id_generic);
     emitPutVirtualRegister(resultVReg);
@@ -76 +76 @@
     emitGetVirtualRegisters(baseVReg, X86::eax, valueVReg, X86::edx);
 
-    emitPutCTIArgConstant(reinterpret_cast<unsigned>(ident), 4);
-    emitPutCTIArg(X86::eax, 0);
-    emitPutCTIArg(X86::edx, 8);
+    emitPutJITStubArgConstant(reinterpret_cast<unsigned>(ident), 2);
+    emitPutJITStubArg(X86::eax, 1);
+    emitPutJITStubArg(X86::edx, 3);
     emitCTICall(Interpreter::cti_op_put_by_id_generic);
 }
@@ -129 +129 @@
     JmpDst coldPathBegin = __ label();
 #endif
-    emitPutCTIArg(X86::eax, 0);
-    emitPutCTIArgConstant(reinterpret_cast<unsigned>(ident), 4);
+    emitPutJITStubArg(X86::eax, 1);
+    emitPutJITStubArgConstant(reinterpret_cast<unsigned>(ident), 2);
     JmpSrc call = emitCTICall(Interpreter::cti_op_get_by_id);
     ASSERT(X86Assembler::getDifferenceBetweenLabels(coldPathBegin, call) == repatchOffsetGetByIdSlowCaseCall);
@@ -169 +169 @@
     linkSlowCase(iter);
 
-    emitPutCTIArgConstant(reinterpret_cast<unsigned>(ident), 4);
-    emitPutCTIArg(X86::eax, 0);
-    emitPutCTIArg(X86::edx, 8);
+    emitPutJITStubArgConstant(reinterpret_cast<unsigned>(ident), 2);
+    emitPutJITStubArg(X86::eax, 1);
+    emitPutJITStubArg(X86::edx, 3);
     JmpSrc call = emitCTICall(Interpreter::cti_op_put_by_id);