Changeset 43334 in webkit for trunk/JavaScriptCore/jit

Timestamp:

May 6, 2009, 11:36:35 PM (16 years ago)

Author:

[email protected]

Message:

2009-05-06 Geoffrey Garen <​[email protected]>

Reviewed by Gavin "++" Barraclough.

Added some abstraction around the JIT stub calling convention by creating
a struct to represent the persistent stack frame JIT code shares with
JIT stubs.

SunSpider reports no change.

• jit/JIT.h:
• jit/JITStubs.cpp: (JSC::JITStubs::cti_op_convert_this): (JSC::JITStubs::cti_op_end): (JSC::JITStubs::cti_op_add): (JSC::JITStubs::cti_op_pre_inc): (JSC::JITStubs::cti_timeout_check): (JSC::JITStubs::cti_register_file_check): (JSC::JITStubs::cti_op_loop_if_less): (JSC::JITStubs::cti_op_loop_if_lesseq): (JSC::JITStubs::cti_op_new_object): (JSC::JITStubs::cti_op_put_by_id_generic): (JSC::JITStubs::cti_op_get_by_id_generic): (JSC::JITStubs::cti_op_put_by_id): (JSC::JITStubs::cti_op_put_by_id_second): (JSC::JITStubs::cti_op_put_by_id_fail): (JSC::JITStubs::cti_op_get_by_id): (JSC::JITStubs::cti_op_get_by_id_second): (JSC::JITStubs::cti_op_get_by_id_self_fail): (JSC::JITStubs::cti_op_get_by_id_proto_list): (JSC::JITStubs::cti_op_get_by_id_proto_list_full): (JSC::JITStubs::cti_op_get_by_id_proto_fail): (JSC::JITStubs::cti_op_get_by_id_array_fail): (JSC::JITStubs::cti_op_get_by_id_string_fail): (JSC::JITStubs::cti_op_instanceof): (JSC::JITStubs::cti_op_del_by_id): (JSC::JITStubs::cti_op_mul): (JSC::JITStubs::cti_op_new_func): (JSC::JITStubs::cti_op_call_JSFunction): (JSC::JITStubs::cti_op_call_arityCheck): (JSC::JITStubs::cti_vm_dontLazyLinkCall): (JSC::JITStubs::cti_vm_lazyLinkCall): (JSC::JITStubs::cti_op_push_activation): (JSC::JITStubs::cti_op_call_NotJSFunction): (JSC::JITStubs::cti_op_create_arguments): (JSC::JITStubs::cti_op_create_arguments_no_params): (JSC::JITStubs::cti_op_tear_off_activation): (JSC::JITStubs::cti_op_tear_off_arguments): (JSC::JITStubs::cti_op_profile_will_call): (JSC::JITStubs::cti_op_profile_did_call): (JSC::JITStubs::cti_op_ret_scopeChain): (JSC::JITStubs::cti_op_new_array): (JSC::JITStubs::cti_op_resolve): (JSC::JITStubs::cti_op_construct_JSConstruct): (JSC::JITStubs::cti_op_construct_NotJSConstruct): (JSC::JITStubs::cti_op_get_by_val): (JSC::JITStubs::cti_op_get_by_val_string): (JSC::JITStubs::cti_op_get_by_val_byte_array): (JSC::JITStubs::cti_op_resolve_func): (JSC::JITStubs::cti_op_sub): (JSC::JITStubs::cti_op_put_by_val): (JSC::JITStubs::cti_op_put_by_val_array): (JSC::JITStubs::cti_op_put_by_val_byte_array): (JSC::JITStubs::cti_op_lesseq): (JSC::JITStubs::cti_op_loop_if_true): (JSC::JITStubs::cti_op_load_varargs): (JSC::JITStubs::cti_op_negate): (JSC::JITStubs::cti_op_resolve_base): (JSC::JITStubs::cti_op_resolve_skip): (JSC::JITStubs::cti_op_resolve_global): (JSC::JITStubs::cti_op_div): (JSC::JITStubs::cti_op_pre_dec): (JSC::JITStubs::cti_op_jless): (JSC::JITStubs::cti_op_not): (JSC::JITStubs::cti_op_jtrue): (JSC::JITStubs::cti_op_post_inc): (JSC::JITStubs::cti_op_eq): (JSC::JITStubs::cti_op_lshift): (JSC::JITStubs::cti_op_bitand): (JSC::JITStubs::cti_op_rshift): (JSC::JITStubs::cti_op_bitnot): (JSC::JITStubs::cti_op_resolve_with_base): (JSC::JITStubs::cti_op_new_func_exp): (JSC::JITStubs::cti_op_mod): (JSC::JITStubs::cti_op_less): (JSC::JITStubs::cti_op_neq): (JSC::JITStubs::cti_op_post_dec): (JSC::JITStubs::cti_op_urshift): (JSC::JITStubs::cti_op_bitxor): (JSC::JITStubs::cti_op_new_regexp): (JSC::JITStubs::cti_op_bitor): (JSC::JITStubs::cti_op_call_eval): (JSC::JITStubs::cti_op_throw): (JSC::JITStubs::cti_op_get_pnames): (JSC::JITStubs::cti_op_next_pname): (JSC::JITStubs::cti_op_push_scope): (JSC::JITStubs::cti_op_pop_scope): (JSC::JITStubs::cti_op_typeof): (JSC::JITStubs::cti_op_is_undefined): (JSC::JITStubs::cti_op_is_boolean): (JSC::JITStubs::cti_op_is_number): (JSC::JITStubs::cti_op_is_string): (JSC::JITStubs::cti_op_is_object): (JSC::JITStubs::cti_op_is_function): (JSC::JITStubs::cti_op_stricteq): (JSC::JITStubs::cti_op_to_primitive): (JSC::JITStubs::cti_op_strcat): (JSC::JITStubs::cti_op_nstricteq): (JSC::JITStubs::cti_op_to_jsnumber): (JSC::JITStubs::cti_op_in): (JSC::JITStubs::cti_op_push_new_scope): (JSC::JITStubs::cti_op_jmp_scopes): (JSC::JITStubs::cti_op_put_by_index): (JSC::JITStubs::cti_op_switch_imm): (JSC::JITStubs::cti_op_switch_char): (JSC::JITStubs::cti_op_switch_string): (JSC::JITStubs::cti_op_del_by_val): (JSC::JITStubs::cti_op_put_getter): (JSC::JITStubs::cti_op_put_setter): (JSC::JITStubs::cti_op_new_error): (JSC::JITStubs::cti_op_debug): (JSC::JITStubs::cti_vm_throw):
• jit/JITStubs.h: (JSC::):

Location:

trunk/JavaScriptCore/jit

Files:

• JIT.h (modified) (1 diff)
• JITStubs.cpp (modified) (74 diffs)
• JITStubs.h (modified) (3 diffs)

trunk/JavaScriptCore/jit/JIT.h

@@ -62 +62 @@
     struct StructureStubInfo;
 
-    typedef JSObject* (JIT_STUB *CTIHelper_o)(STUB_ARGS);
-    typedef JSPropertyNameIterator* (JIT_STUB *CTIHelper_p)(STUB_ARGS);
-    typedef void (JIT_STUB *CTIHelper_v)(STUB_ARGS);
-    typedef void* (JIT_STUB *CTIHelper_s)(STUB_ARGS);
-    typedef int (JIT_STUB *CTIHelper_b)(STUB_ARGS);
-    typedef VoidPtrPair (JIT_STUB *CTIHelper_2)(STUB_ARGS);
+    typedef JSObject* (JIT_STUB *CTIHelper_o)(STUB_ARGS_DECLARATION);
+    typedef JSPropertyNameIterator* (JIT_STUB *CTIHelper_p)(STUB_ARGS_DECLARATION);
+    typedef void (JIT_STUB *CTIHelper_v)(STUB_ARGS_DECLARATION);
+    typedef void* (JIT_STUB *CTIHelper_s)(STUB_ARGS_DECLARATION);
+    typedef int (JIT_STUB *CTIHelper_b)(STUB_ARGS_DECLARATION);
+    typedef VoidPtrPair (JIT_STUB *CTIHelper_2)(STUB_ARGS_DECLARATION);
 
     struct CallRecord {

trunk/JavaScriptCore/jit/JITStubs.cpp

@@ -221 +221 @@
 
 #if ENABLE(OPCODE_SAMPLING)
-    #define CTI_SAMPLER ARG_globalData->interpreter->sampler()
+    #define CTI_SAMPLER stackFrame.globalData->interpreter->sampler()
 #else
     #define CTI_SAMPLER 0
@@ -453 +453 @@
     } while (0)
 #define VM_THROW_EXCEPTION_AT_END() \
-    returnToThrowTrampoline(ARG_globalData, STUB_RETURN_ADDRESS, STUB_RETURN_ADDRESS)
+    returnToThrowTrampoline(stackFrame.globalData, STUB_RETURN_ADDRESS, STUB_RETURN_ADDRESS)
 
 #define CHECK_FOR_EXCEPTION() \
     do { \
-        if (UNLIKELY(ARG_globalData->exception != JSValue())) \
+        if (UNLIKELY(stackFrame.globalData->exception != JSValue())) \
             VM_THROW_EXCEPTION(); \
     } while (0)
 #define CHECK_FOR_EXCEPTION_AT_END() \
     do { \
-        if (UNLIKELY(ARG_globalData->exception != JSValue())) \
+        if (UNLIKELY(stackFrame.globalData->exception != JSValue())) \
             VM_THROW_EXCEPTION_AT_END(); \
     } while (0)
 #define CHECK_FOR_EXCEPTION_VOID() \
     do { \
-        if (UNLIKELY(ARG_globalData->exception != JSValue())) { \
+        if (UNLIKELY(stackFrame.globalData->exception != JSValue())) { \
             VM_THROW_EXCEPTION_AT_END(); \
             return; \
@@ -473 +473 @@
     } while (0)
 
-JSObject* JITStubs::cti_op_convert_this(STUB_ARGS)
-{
-    BEGIN_STUB_FUNCTION();
-
-    JSValue v1 = ARG_src1;
-    CallFrame* callFrame = ARG_callFrame;
+JSObject* JITStubs::cti_op_convert_this(STUB_ARGS_DECLARATION)
+{
+    BEGIN_STUB_FUNCTION();
+    JITStackFrame& stackFrame = *reinterpret_cast<JITStackFrame*>(STUB_ARGS);
+
+    JSValue v1 = stackFrame.args[0].jsValue();
+    CallFrame* callFrame = stackFrame.callFrame;
 
     JSObject* result = v1.toThisObject(callFrame);
@@ -485 +486 @@
 }
 
-void JITStubs::cti_op_end(STUB_ARGS)
-{
-    BEGIN_STUB_FUNCTION();
-
-    ScopeChainNode* scopeChain = ARG_callFrame->scopeChain();
+void JITStubs::cti_op_end(STUB_ARGS_DECLARATION)
+{
+    BEGIN_STUB_FUNCTION();
+    JITStackFrame& stackFrame = *reinterpret_cast<JITStackFrame*>(STUB_ARGS);
+
+    ScopeChainNode* scopeChain = stackFrame.callFrame->scopeChain();
     ASSERT(scopeChain->refCount > 1);
     scopeChain->deref();
 }
 
-EncodedJSValue JITStubs::cti_op_add(STUB_ARGS)
-{
-    BEGIN_STUB_FUNCTION();
-
-    JSValue v1 = ARG_src1;
-    JSValue v2 = ARG_src2;
+EncodedJSValue JITStubs::cti_op_add(STUB_ARGS_DECLARATION)
+{
+    BEGIN_STUB_FUNCTION();
+    JITStackFrame& stackFrame = *reinterpret_cast<JITStackFrame*>(STUB_ARGS);
+
+    JSValue v1 = stackFrame.args[0].jsValue();
+    JSValue v2 = stackFrame.args[1].jsValue();
 
     double left;
@@ -506 +509 @@
     bool rightIsNumber = v2.getNumber(right);
     if (rightIsNumber && v1.getNumber(left))
-        return JSValue::encode(jsNumber(ARG_globalData, left + right));
-    
-    CallFrame* callFrame = ARG_callFrame;
+        return JSValue::encode(jsNumber(stackFrame.globalData, left + right));
+    
+    CallFrame* callFrame = stackFrame.callFrame;
 
     bool leftIsString = v1.isString();
@@ -518 +521 @@
         }
 
-        return JSValue::encode(jsString(ARG_globalData, value.release()));
+        return JSValue::encode(jsString(stackFrame.globalData, value.release()));
     }
 
@@ -530 +533 @@
             VM_THROW_EXCEPTION();
         }
-        return JSValue::encode(jsString(ARG_globalData, value.release()));
+        return JSValue::encode(jsString(stackFrame.globalData, value.release()));
     }
 
@@ -539 +542 @@
 }
 
-EncodedJSValue JITStubs::cti_op_pre_inc(STUB_ARGS)
-{
-    BEGIN_STUB_FUNCTION();
-
-    JSValue v = ARG_src1;
-
-    CallFrame* callFrame = ARG_callFrame;
-    JSValue result = jsNumber(ARG_globalData, v.toNumber(callFrame) + 1);
-    CHECK_FOR_EXCEPTION_AT_END();
-    return JSValue::encode(result);
-}
-
-int JITStubs::cti_timeout_check(STUB_ARGS)
-{
-    BEGIN_STUB_FUNCTION();
-    
-    JSGlobalData* globalData = ARG_globalData;
+EncodedJSValue JITStubs::cti_op_pre_inc(STUB_ARGS_DECLARATION)
+{
+    BEGIN_STUB_FUNCTION();
+    JITStackFrame& stackFrame = *reinterpret_cast<JITStackFrame*>(STUB_ARGS);
+
+    JSValue v = stackFrame.args[0].jsValue();
+
+    CallFrame* callFrame = stackFrame.callFrame;
+    JSValue result = jsNumber(stackFrame.globalData, v.toNumber(callFrame) + 1);
+    CHECK_FOR_EXCEPTION_AT_END();
+    return JSValue::encode(result);
+}
+
+int JITStubs::cti_timeout_check(STUB_ARGS_DECLARATION)
+{
+    BEGIN_STUB_FUNCTION();
+    JITStackFrame& stackFrame = *reinterpret_cast<JITStackFrame*>(STUB_ARGS);
+    
+    JSGlobalData* globalData = stackFrame.globalData;
     TimeoutChecker& timeoutChecker = globalData->timeoutChecker;
 
-    if (timeoutChecker.didTimeOut(ARG_callFrame)) {
+    if (timeoutChecker.didTimeOut(stackFrame.callFrame)) {
         globalData->exception = createInterruptedExecutionException(globalData);
         VM_THROW_EXCEPTION_AT_END();
@@ -566 +571 @@
 }
 
-void JITStubs::cti_register_file_check(STUB_ARGS)
-{
-    BEGIN_STUB_FUNCTION();
-
-    if (LIKELY(ARG_registerFile->grow(ARG_callFrame + ARG_callFrame->codeBlock()->m_numCalleeRegisters)))
+void JITStubs::cti_register_file_check(STUB_ARGS_DECLARATION)
+{
+    BEGIN_STUB_FUNCTION();
+    JITStackFrame& stackFrame = *reinterpret_cast<JITStackFrame*>(STUB_ARGS);
+
+    if (LIKELY(stackFrame.registerFile->grow(stackFrame.callFrame + stackFrame.callFrame->codeBlock()->m_numCalleeRegisters)))
         return;
 
     // Rewind to the previous call frame because op_call already optimistically
     // moved the call frame forward.
-    CallFrame* oldCallFrame = ARG_callFrame->callerFrame();
-    ARG_setCallFrame(oldCallFrame);
-    throwStackOverflowError(oldCallFrame, ARG_globalData, oldCallFrame->returnPC(), STUB_RETURN_ADDRESS);
-}
-
-int JITStubs::cti_op_loop_if_less(STUB_ARGS)
-{
-    BEGIN_STUB_FUNCTION();
-
-    JSValue src1 = ARG_src1;
-    JSValue src2 = ARG_src2;
-    CallFrame* callFrame = ARG_callFrame;
+    CallFrame* oldCallFrame = stackFrame.callFrame->callerFrame();
+    stackFrame.callFrame = oldCallFrame;
+    throwStackOverflowError(oldCallFrame, stackFrame.globalData, oldCallFrame->returnPC(), STUB_RETURN_ADDRESS);
+}
+
+int JITStubs::cti_op_loop_if_less(STUB_ARGS_DECLARATION)
+{
+    BEGIN_STUB_FUNCTION();
+    JITStackFrame& stackFrame = *reinterpret_cast<JITStackFrame*>(STUB_ARGS);
+
+    JSValue src1 = stackFrame.args[0].jsValue();
+    JSValue src2 = stackFrame.args[1].jsValue();
+    CallFrame* callFrame = stackFrame.callFrame;
 
     bool result = jsLess(callFrame, src1, src2);
@@ -593 +600 @@
 }
 
-int JITStubs::cti_op_loop_if_lesseq(STUB_ARGS)
-{
-    BEGIN_STUB_FUNCTION();
-
-    JSValue src1 = ARG_src1;
-    JSValue src2 = ARG_src2;
-    CallFrame* callFrame = ARG_callFrame;
+int JITStubs::cti_op_loop_if_lesseq(STUB_ARGS_DECLARATION)
+{
+    BEGIN_STUB_FUNCTION();
+    JITStackFrame& stackFrame = *reinterpret_cast<JITStackFrame*>(STUB_ARGS);
+
+    JSValue src1 = stackFrame.args[0].jsValue();
+    JSValue src2 = stackFrame.args[1].jsValue();
+    CallFrame* callFrame = stackFrame.callFrame;
 
     bool result = jsLessEq(callFrame, src1, src2);
@@ -606 +614 @@
 }
 
-JSObject* JITStubs::cti_op_new_object(STUB_ARGS)
-{
-    BEGIN_STUB_FUNCTION();
-
-    return constructEmptyObject(ARG_callFrame);
-}
-
-void JITStubs::cti_op_put_by_id_generic(STUB_ARGS)
-{
-    BEGIN_STUB_FUNCTION();
+JSObject* JITStubs::cti_op_new_object(STUB_ARGS_DECLARATION)
+{
+    BEGIN_STUB_FUNCTION();
+    JITStackFrame& stackFrame = *reinterpret_cast<JITStackFrame*>(STUB_ARGS);
+
+    return constructEmptyObject(stackFrame.callFrame);
+}
+
+void JITStubs::cti_op_put_by_id_generic(STUB_ARGS_DECLARATION)
+{
+    BEGIN_STUB_FUNCTION();
+    JITStackFrame& stackFrame = *reinterpret_cast<JITStackFrame*>(STUB_ARGS);
 
     PutPropertySlot slot;
-    ARG_src1.put(ARG_callFrame, *ARG_id2, ARG_src3, slot);
-    CHECK_FOR_EXCEPTION_AT_END();
-}
-
-EncodedJSValue JITStubs::cti_op_get_by_id_generic(STUB_ARGS)
-{
-    BEGIN_STUB_FUNCTION();
-
-    CallFrame* callFrame = ARG_callFrame;
-    Identifier& ident = *ARG_id2;
-
-    JSValue baseValue = ARG_src1;
+    stackFrame.args[0].jsValue().put(stackFrame.callFrame, stackFrame.args[1].identifier(), stackFrame.args[2].jsValue(), slot);
+    CHECK_FOR_EXCEPTION_AT_END();
+}
+
+EncodedJSValue JITStubs::cti_op_get_by_id_generic(STUB_ARGS_DECLARATION)
+{
+    BEGIN_STUB_FUNCTION();
+    JITStackFrame& stackFrame = *reinterpret_cast<JITStackFrame*>(STUB_ARGS);
+
+    CallFrame* callFrame = stackFrame.callFrame;
+    Identifier& ident = stackFrame.args[1].identifier();
+
+    JSValue baseValue = stackFrame.args[0].jsValue();
     PropertySlot slot(baseValue);
     JSValue result = baseValue.get(callFrame, ident, slot);
@@ -639 +650 @@
 #if ENABLE(JIT_OPTIMIZE_PROPERTY_ACCESS)
 
-void JITStubs::cti_op_put_by_id(STUB_ARGS)
-{
-    BEGIN_STUB_FUNCTION();
-
-    CallFrame* callFrame = ARG_callFrame;
-    Identifier& ident = *ARG_id2;
+void JITStubs::cti_op_put_by_id(STUB_ARGS_DECLARATION)
+{
+    BEGIN_STUB_FUNCTION();
+    JITStackFrame& stackFrame = *reinterpret_cast<JITStackFrame*>(STUB_ARGS);
+
+    CallFrame* callFrame = stackFrame.callFrame;
+    Identifier& ident = stackFrame.args[1].identifier();
 
     PutPropertySlot slot;
-    ARG_src1.put(callFrame, ident, ARG_src3, slot);
+    stackFrame.args[0].jsValue().put(callFrame, ident, stackFrame.args[2].jsValue(), slot);
 
     ctiPatchCallByReturnAddress(STUB_RETURN_ADDRESS, reinterpret_cast<void*>(cti_op_put_by_id_second));
@@ -654 +666 @@
 }
 
-void JITStubs::cti_op_put_by_id_second(STUB_ARGS)
-{
-    BEGIN_STUB_FUNCTION();
+void JITStubs::cti_op_put_by_id_second(STUB_ARGS_DECLARATION)
+{
+    BEGIN_STUB_FUNCTION();
+    JITStackFrame& stackFrame = *reinterpret_cast<JITStackFrame*>(STUB_ARGS);
 
     PutPropertySlot slot;
-    ARG_src1.put(ARG_callFrame, *ARG_id2, ARG_src3, slot);
-    tryCachePutByID(ARG_callFrame, ARG_callFrame->codeBlock(), STUB_RETURN_ADDRESS, ARG_src1, slot);
-    CHECK_FOR_EXCEPTION_AT_END();
-}
-
-void JITStubs::cti_op_put_by_id_fail(STUB_ARGS)
-{
-    BEGIN_STUB_FUNCTION();
-
-    CallFrame* callFrame = ARG_callFrame;
-    Identifier& ident = *ARG_id2;
+    stackFrame.args[0].jsValue().put(stackFrame.callFrame, stackFrame.args[1].identifier(), stackFrame.args[2].jsValue(), slot);
+    tryCachePutByID(stackFrame.callFrame, stackFrame.callFrame->codeBlock(), STUB_RETURN_ADDRESS, stackFrame.args[0].jsValue(), slot);
+    CHECK_FOR_EXCEPTION_AT_END();
+}
+
+void JITStubs::cti_op_put_by_id_fail(STUB_ARGS_DECLARATION)
+{
+    BEGIN_STUB_FUNCTION();
+    JITStackFrame& stackFrame = *reinterpret_cast<JITStackFrame*>(STUB_ARGS);
+
+    CallFrame* callFrame = stackFrame.callFrame;
+    Identifier& ident = stackFrame.args[1].identifier();
 
     PutPropertySlot slot;
-    ARG_src1.put(callFrame, ident, ARG_src3, slot);
-
-    CHECK_FOR_EXCEPTION_AT_END();
-}
-
-EncodedJSValue JITStubs::cti_op_get_by_id(STUB_ARGS)
-{
-    BEGIN_STUB_FUNCTION();
-
-    CallFrame* callFrame = ARG_callFrame;
-    Identifier& ident = *ARG_id2;
-
-    JSValue baseValue = ARG_src1;
+    stackFrame.args[0].jsValue().put(callFrame, ident, stackFrame.args[2].jsValue(), slot);
+
+    CHECK_FOR_EXCEPTION_AT_END();
+}
+
+EncodedJSValue JITStubs::cti_op_get_by_id(STUB_ARGS_DECLARATION)
+{
+    BEGIN_STUB_FUNCTION();
+    JITStackFrame& stackFrame = *reinterpret_cast<JITStackFrame*>(STUB_ARGS);
+
+    CallFrame* callFrame = stackFrame.callFrame;
+    Identifier& ident = stackFrame.args[1].identifier();
+
+    JSValue baseValue = stackFrame.args[0].jsValue();
     PropertySlot slot(baseValue);
     JSValue result = baseValue.get(callFrame, ident, slot);
@@ -694 +709 @@
 }
 
-EncodedJSValue JITStubs::cti_op_get_by_id_second(STUB_ARGS)
-{
-    BEGIN_STUB_FUNCTION();
-
-    CallFrame* callFrame = ARG_callFrame;
-    Identifier& ident = *ARG_id2;
-
-    JSValue baseValue = ARG_src1;
+EncodedJSValue JITStubs::cti_op_get_by_id_second(STUB_ARGS_DECLARATION)
+{
+    BEGIN_STUB_FUNCTION();
+    JITStackFrame& stackFrame = *reinterpret_cast<JITStackFrame*>(STUB_ARGS);
+
+    CallFrame* callFrame = stackFrame.callFrame;
+    Identifier& ident = stackFrame.args[1].identifier();
+
+    JSValue baseValue = stackFrame.args[0].jsValue();
     PropertySlot slot(baseValue);
     JSValue result = baseValue.get(callFrame, ident, slot);
@@ -711 +727 @@
 }
 
-EncodedJSValue JITStubs::cti_op_get_by_id_self_fail(STUB_ARGS)
-{
-    BEGIN_STUB_FUNCTION();
-
-    CallFrame* callFrame = ARG_callFrame;
-    Identifier& ident = *ARG_id2;
-
-    JSValue baseValue = ARG_src1;
+EncodedJSValue JITStubs::cti_op_get_by_id_self_fail(STUB_ARGS_DECLARATION)
+{
+    BEGIN_STUB_FUNCTION();
+    JITStackFrame& stackFrame = *reinterpret_cast<JITStackFrame*>(STUB_ARGS);
+
+    CallFrame* callFrame = stackFrame.callFrame;
+    Identifier& ident = stackFrame.args[1].identifier();
+
+    JSValue baseValue = stackFrame.args[0].jsValue();
     PropertySlot slot(baseValue);
     JSValue result = baseValue.get(callFrame, ident, slot);
@@ -786 +803 @@
 }
 
-EncodedJSValue JITStubs::cti_op_get_by_id_proto_list(STUB_ARGS)
-{
-    BEGIN_STUB_FUNCTION();
-
-    CallFrame* callFrame = ARG_callFrame;
-
-    JSValue baseValue = ARG_src1;
+EncodedJSValue JITStubs::cti_op_get_by_id_proto_list(STUB_ARGS_DECLARATION)
+{
+    BEGIN_STUB_FUNCTION();
+    JITStackFrame& stackFrame = *reinterpret_cast<JITStackFrame*>(STUB_ARGS);
+
+    CallFrame* callFrame = stackFrame.callFrame;
+
+    JSValue baseValue = stackFrame.args[0].jsValue();
     PropertySlot slot(baseValue);
-    JSValue result = baseValue.get(callFrame, *ARG_id2, slot);
+    JSValue result = baseValue.get(callFrame, stackFrame.args[1].identifier(), slot);
 
     CHECK_FOR_EXCEPTION();
@@ -838 +856 @@
 }
 
-EncodedJSValue JITStubs::cti_op_get_by_id_proto_list_full(STUB_ARGS)
-{
-    BEGIN_STUB_FUNCTION();
-
-    JSValue baseValue = ARG_src1;
+EncodedJSValue JITStubs::cti_op_get_by_id_proto_list_full(STUB_ARGS_DECLARATION)
+{
+    BEGIN_STUB_FUNCTION();
+    JITStackFrame& stackFrame = *reinterpret_cast<JITStackFrame*>(STUB_ARGS);
+
+    JSValue baseValue = stackFrame.args[0].jsValue();
     PropertySlot slot(baseValue);
-    JSValue result = baseValue.get(ARG_callFrame, *ARG_id2, slot);
-
-    CHECK_FOR_EXCEPTION_AT_END();
-    return JSValue::encode(result);
-}
-
-EncodedJSValue JITStubs::cti_op_get_by_id_proto_fail(STUB_ARGS)
-{
-    BEGIN_STUB_FUNCTION();
-
-    JSValue baseValue = ARG_src1;
+    JSValue result = baseValue.get(stackFrame.callFrame, stackFrame.args[1].identifier(), slot);
+
+    CHECK_FOR_EXCEPTION_AT_END();
+    return JSValue::encode(result);
+}
+
+EncodedJSValue JITStubs::cti_op_get_by_id_proto_fail(STUB_ARGS_DECLARATION)
+{
+    BEGIN_STUB_FUNCTION();
+    JITStackFrame& stackFrame = *reinterpret_cast<JITStackFrame*>(STUB_ARGS);
+
+    JSValue baseValue = stackFrame.args[0].jsValue();
     PropertySlot slot(baseValue);
-    JSValue result = baseValue.get(ARG_callFrame, *ARG_id2, slot);
-
-    CHECK_FOR_EXCEPTION_AT_END();
-    return JSValue::encode(result);
-}
-
-EncodedJSValue JITStubs::cti_op_get_by_id_array_fail(STUB_ARGS)
-{
-    BEGIN_STUB_FUNCTION();
-
-    JSValue baseValue = ARG_src1;
+    JSValue result = baseValue.get(stackFrame.callFrame, stackFrame.args[1].identifier(), slot);
+
+    CHECK_FOR_EXCEPTION_AT_END();
+    return JSValue::encode(result);
+}
+
+EncodedJSValue JITStubs::cti_op_get_by_id_array_fail(STUB_ARGS_DECLARATION)
+{
+    BEGIN_STUB_FUNCTION();
+    JITStackFrame& stackFrame = *reinterpret_cast<JITStackFrame*>(STUB_ARGS);
+
+    JSValue baseValue = stackFrame.args[0].jsValue();
     PropertySlot slot(baseValue);
-    JSValue result = baseValue.get(ARG_callFrame, *ARG_id2, slot);
-
-    CHECK_FOR_EXCEPTION_AT_END();
-    return JSValue::encode(result);
-}
-
-EncodedJSValue JITStubs::cti_op_get_by_id_string_fail(STUB_ARGS)
-{
-    BEGIN_STUB_FUNCTION();
-
-    JSValue baseValue = ARG_src1;
+    JSValue result = baseValue.get(stackFrame.callFrame, stackFrame.args[1].identifier(), slot);
+
+    CHECK_FOR_EXCEPTION_AT_END();
+    return JSValue::encode(result);
+}
+
+EncodedJSValue JITStubs::cti_op_get_by_id_string_fail(STUB_ARGS_DECLARATION)
+{
+    BEGIN_STUB_FUNCTION();
+    JITStackFrame& stackFrame = *reinterpret_cast<JITStackFrame*>(STUB_ARGS);
+
+    JSValue baseValue = stackFrame.args[0].jsValue();
     PropertySlot slot(baseValue);
-    JSValue result = baseValue.get(ARG_callFrame, *ARG_id2, slot);
+    JSValue result = baseValue.get(stackFrame.callFrame, stackFrame.args[1].identifier(), slot);
 
     CHECK_FOR_EXCEPTION_AT_END();
@@ -888 +910 @@
 #endif
 
-EncodedJSValue JITStubs::cti_op_instanceof(STUB_ARGS)
-{
-    BEGIN_STUB_FUNCTION();
-
-    CallFrame* callFrame = ARG_callFrame;
-    JSValue value = ARG_src1;
-    JSValue baseVal = ARG_src2;
-    JSValue proto = ARG_src3;
+EncodedJSValue JITStubs::cti_op_instanceof(STUB_ARGS_DECLARATION)
+{
+    BEGIN_STUB_FUNCTION();
+    JITStackFrame& stackFrame = *reinterpret_cast<JITStackFrame*>(STUB_ARGS);
+
+    CallFrame* callFrame = stackFrame.callFrame;
+    JSValue value = stackFrame.args[0].jsValue();
+    JSValue baseVal = stackFrame.args[1].jsValue();
+    JSValue proto = stackFrame.args[2].jsValue();
 
     // at least one of these checks must have failed to get to the slow case
@@ -903 +926 @@
 
     if (!baseVal.isObject()) {
-        CallFrame* callFrame = ARG_callFrame;
+        CallFrame* callFrame = stackFrame.callFrame;
         CodeBlock* codeBlock = callFrame->codeBlock();
         unsigned vPCIndex = codeBlock->getBytecodeIndex(callFrame, STUB_RETURN_ADDRESS);
-        ARG_globalData->exception = createInvalidParamError(callFrame, "instanceof", baseVal, vPCIndex, codeBlock);
+        stackFrame.globalData->exception = createInvalidParamError(callFrame, "instanceof", baseVal, vPCIndex, codeBlock);
         VM_THROW_EXCEPTION();
     }
@@ -931 +954 @@
 }
 
-EncodedJSValue JITStubs::cti_op_del_by_id(STUB_ARGS)
-{
-    BEGIN_STUB_FUNCTION();
-
-    CallFrame* callFrame = ARG_callFrame;
-    
-    JSObject* baseObj = ARG_src1.toObject(callFrame);
-
-    JSValue result = jsBoolean(baseObj->deleteProperty(callFrame, *ARG_id2));
-    CHECK_FOR_EXCEPTION_AT_END();
-    return JSValue::encode(result);
-}
-
-EncodedJSValue JITStubs::cti_op_mul(STUB_ARGS)
-{
-    BEGIN_STUB_FUNCTION();
-
-    JSValue src1 = ARG_src1;
-    JSValue src2 = ARG_src2;
+EncodedJSValue JITStubs::cti_op_del_by_id(STUB_ARGS_DECLARATION)
+{
+    BEGIN_STUB_FUNCTION();
+    JITStackFrame& stackFrame = *reinterpret_cast<JITStackFrame*>(STUB_ARGS);
+
+    CallFrame* callFrame = stackFrame.callFrame;
+    
+    JSObject* baseObj = stackFrame.args[0].jsValue().toObject(callFrame);
+
+    JSValue result = jsBoolean(baseObj->deleteProperty(callFrame, stackFrame.args[1].identifier()));
+    CHECK_FOR_EXCEPTION_AT_END();
+    return JSValue::encode(result);
+}
+
+EncodedJSValue JITStubs::cti_op_mul(STUB_ARGS_DECLARATION)
+{
+    BEGIN_STUB_FUNCTION();
+    JITStackFrame& stackFrame = *reinterpret_cast<JITStackFrame*>(STUB_ARGS);
+
+    JSValue src1 = stackFrame.args[0].jsValue();
+    JSValue src2 = stackFrame.args[1].jsValue();
 
     double left;
     double right;
     if (src1.getNumber(left) && src2.getNumber(right))
-        return JSValue::encode(jsNumber(ARG_globalData, left * right));
-
-    CallFrame* callFrame = ARG_callFrame;
-    JSValue result = jsNumber(ARG_globalData, src1.toNumber(callFrame) * src2.toNumber(callFrame));
-    CHECK_FOR_EXCEPTION_AT_END();
-    return JSValue::encode(result);
-}
-
-JSObject* JITStubs::cti_op_new_func(STUB_ARGS)
-{
-    BEGIN_STUB_FUNCTION();
-
-    return ARG_func1->makeFunction(ARG_callFrame, ARG_callFrame->scopeChain());
-}
-
-void* JITStubs::cti_op_call_JSFunction(STUB_ARGS)
-{
-    BEGIN_STUB_FUNCTION();
+        return JSValue::encode(jsNumber(stackFrame.globalData, left * right));
+
+    CallFrame* callFrame = stackFrame.callFrame;
+    JSValue result = jsNumber(stackFrame.globalData, src1.toNumber(callFrame) * src2.toNumber(callFrame));
+    CHECK_FOR_EXCEPTION_AT_END();
+    return JSValue::encode(result);
+}
+
+JSObject* JITStubs::cti_op_new_func(STUB_ARGS_DECLARATION)
+{
+    BEGIN_STUB_FUNCTION();
+    JITStackFrame& stackFrame = *reinterpret_cast<JITStackFrame*>(STUB_ARGS);
+
+    return stackFrame.args[0].funcDeclNode()->makeFunction(stackFrame.callFrame, stackFrame.callFrame->scopeChain());
+}
+
+void* JITStubs::cti_op_call_JSFunction(STUB_ARGS_DECLARATION)
+{
+    BEGIN_STUB_FUNCTION();
+    JITStackFrame& stackFrame = *reinterpret_cast<JITStackFrame*>(STUB_ARGS);
 
 #ifndef NDEBUG
     CallData callData;
-    ASSERT(ARG_src1.getCallData(callData) == CallTypeJS);
+    ASSERT(stackFrame.args[0].jsValue().getCallData(callData) == CallTypeJS);
 #endif
 
-    JSFunction* function = asFunction(ARG_src1);
+    JSFunction* function = asFunction(stackFrame.args[0].jsValue());
     FunctionBodyNode* body = function->body();
     ScopeChainNode* callDataScopeChain = function->scope().node();
@@ -986 +1013 @@
 }
 
-VoidPtrPair JITStubs::cti_op_call_arityCheck(STUB_ARGS)
-{
-    BEGIN_STUB_FUNCTION();
-
-    CallFrame* callFrame = ARG_callFrame;
-    CodeBlock* newCodeBlock = ARG_codeBlock4;
-    int argCount = ARG_int3;
+VoidPtrPair JITStubs::cti_op_call_arityCheck(STUB_ARGS_DECLARATION)
+{
+    BEGIN_STUB_FUNCTION();
+    JITStackFrame& stackFrame = *reinterpret_cast<JITStackFrame*>(STUB_ARGS);
+
+    CallFrame* callFrame = stackFrame.callFrame;
+    CodeBlock* newCodeBlock = stackFrame.args[3].codeBlock();
+    int argCount = stackFrame.args[2].int32();
 
     ASSERT(argCount != newCodeBlock->m_numParameters);
@@ -1012 +1040 @@
         Register* r = callFrame->registers() + omittedArgCount;
         Register* newEnd = r + newCodeBlock->m_numCalleeRegisters;
-        if (!ARG_registerFile->grow(newEnd)) {
+        if (!stackFrame.registerFile->grow(newEnd)) {
             // Rewind to the previous call frame because op_call already optimistically
             // moved the call frame forward.
-            ARG_setCallFrame(oldCallFrame);
-            throwStackOverflowError(oldCallFrame, ARG_globalData, ARG_returnAddress2, STUB_RETURN_ADDRESS);
+            stackFrame.callFrame = oldCallFrame;
+            throwStackOverflowError(oldCallFrame, stackFrame.globalData, stackFrame.args[1].returnAddress(), STUB_RETURN_ADDRESS);
             RETURN_PAIR(0, 0);
         }
@@ -1031 +1059 @@
 }
 
-void* JITStubs::cti_vm_dontLazyLinkCall(STUB_ARGS)
-{
-    BEGIN_STUB_FUNCTION();
-
-    JSGlobalData* globalData = ARG_globalData;
-    JSFunction* callee = asFunction(ARG_src1);
+void* JITStubs::cti_vm_dontLazyLinkCall(STUB_ARGS_DECLARATION)
+{
+    BEGIN_STUB_FUNCTION();
+    JITStackFrame& stackFrame = *reinterpret_cast<JITStackFrame*>(STUB_ARGS);
+
+    JSGlobalData* globalData = stackFrame.globalData;
+    JSFunction* callee = asFunction(stackFrame.args[0].jsValue());
     JITCode jitCode = callee->body()->generatedJITCode();
     ASSERT(jitCode);
 
-    ctiPatchNearCallByReturnAddress(ARG_returnAddress2, globalData->jitStubs.ctiVirtualCallLink());
+    ctiPatchNearCallByReturnAddress(stackFrame.args[1].returnAddress(), globalData->jitStubs.ctiVirtualCallLink());
 
     return jitCode.addressForCall();
 }
 
-void* JITStubs::cti_vm_lazyLinkCall(STUB_ARGS)
-{
-    BEGIN_STUB_FUNCTION();
-
-    JSFunction* callee = asFunction(ARG_src1);
+void* JITStubs::cti_vm_lazyLinkCall(STUB_ARGS_DECLARATION)
+{
+    BEGIN_STUB_FUNCTION();
+    JITStackFrame& stackFrame = *reinterpret_cast<JITStackFrame*>(STUB_ARGS);
+
+    JSFunction* callee = asFunction(stackFrame.args[0].jsValue());
     JITCode jitCode = callee->body()->generatedJITCode();
     ASSERT(jitCode);
@@ -1057 +1087 @@
         codeBlock = &callee->body()->bytecode(callee->scope().node());
 
-    CallLinkInfo* callLinkInfo = &ARG_callFrame->callerFrame()->codeBlock()->getCallLinkInfo(ARG_returnAddress2);
-    JIT::linkCall(callee, codeBlock, jitCode, callLinkInfo, ARG_int3);
+    CallLinkInfo* callLinkInfo = &stackFrame.callFrame->callerFrame()->codeBlock()->getCallLinkInfo(stackFrame.args[1].returnAddress());
+    JIT::linkCall(callee, codeBlock, jitCode, callLinkInfo, stackFrame.args[2].int32());
 
     return jitCode.addressForCall();
 }
 
-JSObject* JITStubs::cti_op_push_activation(STUB_ARGS)
-{
-    BEGIN_STUB_FUNCTION();
-
-    JSActivation* activation = new (ARG_globalData) JSActivation(ARG_callFrame, static_cast<FunctionBodyNode*>(ARG_callFrame->codeBlock()->ownerNode()));
-    ARG_callFrame->setScopeChain(ARG_callFrame->scopeChain()->copy()->push(activation));
+JSObject* JITStubs::cti_op_push_activation(STUB_ARGS_DECLARATION)
+{
+    BEGIN_STUB_FUNCTION();
+    JITStackFrame& stackFrame = *reinterpret_cast<JITStackFrame*>(STUB_ARGS);
+
+    JSActivation* activation = new (stackFrame.globalData) JSActivation(stackFrame.callFrame, static_cast<FunctionBodyNode*>(stackFrame.callFrame->codeBlock()->ownerNode()));
+    stackFrame.callFrame->setScopeChain(stackFrame.callFrame->scopeChain()->copy()->push(activation));
     return activation;
 }
 
-EncodedJSValue JITStubs::cti_op_call_NotJSFunction(STUB_ARGS)
-{
-    BEGIN_STUB_FUNCTION();
-
-    JSValue funcVal = ARG_src1;
+EncodedJSValue JITStubs::cti_op_call_NotJSFunction(STUB_ARGS_DECLARATION)
+{
+    BEGIN_STUB_FUNCTION();
+    JITStackFrame& stackFrame = *reinterpret_cast<JITStackFrame*>(STUB_ARGS);
+
+    JSValue funcVal = stackFrame.args[0].jsValue();
 
     CallData callData;
@@ -1084 +1116 @@
 
     if (callType == CallTypeHost) {
-        int registerOffset = ARG_int2;
-        int argCount = ARG_int3;
-        CallFrame* previousCallFrame = ARG_callFrame;
+        int registerOffset = stackFrame.args[1].int32();
+        int argCount = stackFrame.args[2].int32();
+        CallFrame* previousCallFrame = stackFrame.callFrame;
         CallFrame* callFrame = CallFrame::create(previousCallFrame->registers() + registerOffset);
 
         callFrame->init(0, static_cast<Instruction*>(STUB_RETURN_ADDRESS), previousCallFrame->scopeChain(), previousCallFrame, 0, argCount, 0);
-        ARG_setCallFrame(callFrame);
-
-        Register* argv = ARG_callFrame->registers() - RegisterFile::CallFrameHeaderSize - argCount;
+        stackFrame.callFrame = callFrame;
+
+        Register* argv = stackFrame.callFrame->registers() - RegisterFile::CallFrameHeaderSize - argCount;
         ArgList argList(argv + 1, argCount - 1);
 
@@ -1106 +1138 @@
             returnValue = callData.native.function(callFrame, asObject(funcVal), thisValue, argList);
         }
-        ARG_setCallFrame(previousCallFrame);
+        stackFrame.callFrame = previousCallFrame;
         CHECK_FOR_EXCEPTION();
 
@@ -1114 +1146 @@
     ASSERT(callType == CallTypeNone);
 
-    CallFrame* callFrame = ARG_callFrame;
+    CallFrame* callFrame = stackFrame.callFrame;
     CodeBlock* codeBlock = callFrame->codeBlock();
     unsigned vPCIndex = codeBlock->getBytecodeIndex(callFrame, STUB_RETURN_ADDRESS);
-    ARG_globalData->exception = createNotAFunctionError(ARG_callFrame, funcVal, vPCIndex, codeBlock);
+    stackFrame.globalData->exception = createNotAFunctionError(stackFrame.callFrame, funcVal, vPCIndex, codeBlock);
     VM_THROW_EXCEPTION();
 }
 
-void JITStubs::cti_op_create_arguments(STUB_ARGS)
-{
-    BEGIN_STUB_FUNCTION();
-
-    Arguments* arguments = new (ARG_globalData) Arguments(ARG_callFrame);
-    ARG_callFrame->setCalleeArguments(arguments);
-    ARG_callFrame[RegisterFile::ArgumentsRegister] = arguments;
-}
-
-void JITStubs::cti_op_create_arguments_no_params(STUB_ARGS)
-{
-    BEGIN_STUB_FUNCTION();
-
-    Arguments* arguments = new (ARG_globalData) Arguments(ARG_callFrame, Arguments::NoParameters);
-    ARG_callFrame->setCalleeArguments(arguments);
-    ARG_callFrame[RegisterFile::ArgumentsRegister] = arguments;
-}
-
-void JITStubs::cti_op_tear_off_activation(STUB_ARGS)
-{
-    BEGIN_STUB_FUNCTION();
-
-    ASSERT(ARG_callFrame->codeBlock()->needsFullScopeChain());
-    asActivation(ARG_src1)->copyRegisters(ARG_callFrame->optionalCalleeArguments());
-}
-
-void JITStubs::cti_op_tear_off_arguments(STUB_ARGS)
-{
-    BEGIN_STUB_FUNCTION();
-
-    ASSERT(ARG_callFrame->codeBlock()->usesArguments() && !ARG_callFrame->codeBlock()->needsFullScopeChain());
-    ARG_callFrame->optionalCalleeArguments()->copyRegisters();
-}
-
-void JITStubs::cti_op_profile_will_call(STUB_ARGS)
-{
-    BEGIN_STUB_FUNCTION();
-
-    ASSERT(*ARG_profilerReference);
-    (*ARG_profilerReference)->willExecute(ARG_callFrame, ARG_src1);
-}
-
-void JITStubs::cti_op_profile_did_call(STUB_ARGS)
-{
-    BEGIN_STUB_FUNCTION();
-
-    ASSERT(*ARG_profilerReference);
-    (*ARG_profilerReference)->didExecute(ARG_callFrame, ARG_src1);
-}
-
-void JITStubs::cti_op_ret_scopeChain(STUB_ARGS)
-{
-    BEGIN_STUB_FUNCTION();
-
-    ASSERT(ARG_callFrame->codeBlock()->needsFullScopeChain());
-    ARG_callFrame->scopeChain()->deref();
-}
-
-JSObject* JITStubs::cti_op_new_array(STUB_ARGS)
-{
-    BEGIN_STUB_FUNCTION();
-
-    ArgList argList(&ARG_callFrame->registers()[ARG_int1], ARG_int2);
-    return constructArray(ARG_callFrame, argList);
-}
-
-EncodedJSValue JITStubs::cti_op_resolve(STUB_ARGS)
-{
-    BEGIN_STUB_FUNCTION();
-
-    CallFrame* callFrame = ARG_callFrame;
+void JITStubs::cti_op_create_arguments(STUB_ARGS_DECLARATION)
+{
+    BEGIN_STUB_FUNCTION();
+    JITStackFrame& stackFrame = *reinterpret_cast<JITStackFrame*>(STUB_ARGS);
+
+    Arguments* arguments = new (stackFrame.globalData) Arguments(stackFrame.callFrame);
+    stackFrame.callFrame->setCalleeArguments(arguments);
+    stackFrame.callFrame[RegisterFile::ArgumentsRegister] = arguments;
+}
+
+void JITStubs::cti_op_create_arguments_no_params(STUB_ARGS_DECLARATION)
+{
+    BEGIN_STUB_FUNCTION();
+    JITStackFrame& stackFrame = *reinterpret_cast<JITStackFrame*>(STUB_ARGS);
+
+    Arguments* arguments = new (stackFrame.globalData) Arguments(stackFrame.callFrame, Arguments::NoParameters);
+    stackFrame.callFrame->setCalleeArguments(arguments);
+    stackFrame.callFrame[RegisterFile::ArgumentsRegister] = arguments;
+}
+
+void JITStubs::cti_op_tear_off_activation(STUB_ARGS_DECLARATION)
+{
+    BEGIN_STUB_FUNCTION();
+    JITStackFrame& stackFrame = *reinterpret_cast<JITStackFrame*>(STUB_ARGS);
+
+    ASSERT(stackFrame.callFrame->codeBlock()->needsFullScopeChain());
+    asActivation(stackFrame.args[0].jsValue())->copyRegisters(stackFrame.callFrame->optionalCalleeArguments());
+}
+
+void JITStubs::cti_op_tear_off_arguments(STUB_ARGS_DECLARATION)
+{
+    BEGIN_STUB_FUNCTION();
+    JITStackFrame& stackFrame = *reinterpret_cast<JITStackFrame*>(STUB_ARGS);
+
+    ASSERT(stackFrame.callFrame->codeBlock()->usesArguments() && !stackFrame.callFrame->codeBlock()->needsFullScopeChain());
+    stackFrame.callFrame->optionalCalleeArguments()->copyRegisters();
+}
+
+void JITStubs::cti_op_profile_will_call(STUB_ARGS_DECLARATION)
+{
+    BEGIN_STUB_FUNCTION();
+    JITStackFrame& stackFrame = *reinterpret_cast<JITStackFrame*>(STUB_ARGS);
+
+    ASSERT(*stackFrame.enabledProfilerReference);
+    (*stackFrame.enabledProfilerReference)->willExecute(stackFrame.callFrame, stackFrame.args[0].jsValue());
+}
+
+void JITStubs::cti_op_profile_did_call(STUB_ARGS_DECLARATION)
+{
+    BEGIN_STUB_FUNCTION();
+    JITStackFrame& stackFrame = *reinterpret_cast<JITStackFrame*>(STUB_ARGS);
+
+    ASSERT(*stackFrame.enabledProfilerReference);
+    (*stackFrame.enabledProfilerReference)->didExecute(stackFrame.callFrame, stackFrame.args[0].jsValue());
+}
+
+void JITStubs::cti_op_ret_scopeChain(STUB_ARGS_DECLARATION)
+{
+    BEGIN_STUB_FUNCTION();
+    JITStackFrame& stackFrame = *reinterpret_cast<JITStackFrame*>(STUB_ARGS);
+
+    ASSERT(stackFrame.callFrame->codeBlock()->needsFullScopeChain());
+    stackFrame.callFrame->scopeChain()->deref();
+}
+
+JSObject* JITStubs::cti_op_new_array(STUB_ARGS_DECLARATION)
+{
+    BEGIN_STUB_FUNCTION();
+    JITStackFrame& stackFrame = *reinterpret_cast<JITStackFrame*>(STUB_ARGS);
+
+    ArgList argList(&stackFrame.callFrame->registers()[stackFrame.args[0].int32()], stackFrame.args[1].int32());
+    return constructArray(stackFrame.callFrame, argList);
+}
+
+EncodedJSValue JITStubs::cti_op_resolve(STUB_ARGS_DECLARATION)
+{
+    BEGIN_STUB_FUNCTION();
+    JITStackFrame& stackFrame = *reinterpret_cast<JITStackFrame*>(STUB_ARGS);
+
+    CallFrame* callFrame = stackFrame.callFrame;
     ScopeChainNode* scopeChain = callFrame->scopeChain();
 
@@ -1198 +1239 @@
     ASSERT(iter != end);
 
-    Identifier& ident = *ARG_id1;
+    Identifier& ident = stackFrame.args[0].identifier();
     do {
         JSObject* o = *iter;
@@ -1211 +1252 @@
     CodeBlock* codeBlock = callFrame->codeBlock();
     unsigned vPCIndex = codeBlock->getBytecodeIndex(callFrame, STUB_RETURN_ADDRESS);
-    ARG_globalData->exception = createUndefinedVariableError(callFrame, ident, vPCIndex, codeBlock);
+    stackFrame.globalData->exception = createUndefinedVariableError(callFrame, ident, vPCIndex, codeBlock);
     VM_THROW_EXCEPTION();
 }
 
-JSObject* JITStubs::cti_op_construct_JSConstruct(STUB_ARGS)
-{
-    BEGIN_STUB_FUNCTION();
-
-    JSFunction* constructor = asFunction(ARG_src1);
+JSObject* JITStubs::cti_op_construct_JSConstruct(STUB_ARGS_DECLARATION)
+{
+    BEGIN_STUB_FUNCTION();
+    JITStackFrame& stackFrame = *reinterpret_cast<JITStackFrame*>(STUB_ARGS);
+
+    JSFunction* constructor = asFunction(stackFrame.args[0].jsValue());
     if (constructor->isHostFunction()) {
-        CallFrame* callFrame = ARG_callFrame;
+        CallFrame* callFrame = stackFrame.callFrame;
         CodeBlock* codeBlock = callFrame->codeBlock();
         unsigned vPCIndex = codeBlock->getBytecodeIndex(callFrame, STUB_RETURN_ADDRESS);
-        ARG_globalData->exception = createNotAConstructorError(callFrame, constructor, vPCIndex, codeBlock);
+        stackFrame.globalData->exception = createNotAConstructorError(callFrame, constructor, vPCIndex, codeBlock);
         VM_THROW_EXCEPTION();
     }
@@ -1234 +1276 @@
 
     Structure* structure;
-    if (ARG_src4.isObject())
-        structure = asObject(ARG_src4)->inheritorID();
+    if (stackFrame.args[3].jsValue().isObject())
+        structure = asObject(stackFrame.args[3].jsValue())->inheritorID();
     else
         structure = constructor->scope().node()->globalObject()->emptyObjectStructure();
-    return new (ARG_globalData) JSObject(structure);
-}
-
-EncodedJSValue JITStubs::cti_op_construct_NotJSConstruct(STUB_ARGS)
-{
-    BEGIN_STUB_FUNCTION();
-
-    CallFrame* callFrame = ARG_callFrame;
-
-    JSValue constrVal = ARG_src1;
-    int argCount = ARG_int3;
-    int thisRegister = ARG_int5;
+    return new (stackFrame.globalData) JSObject(structure);
+}
+
+EncodedJSValue JITStubs::cti_op_construct_NotJSConstruct(STUB_ARGS_DECLARATION)
+{
+    BEGIN_STUB_FUNCTION();
+    JITStackFrame& stackFrame = *reinterpret_cast<JITStackFrame*>(STUB_ARGS);
+
+    CallFrame* callFrame = stackFrame.callFrame;
+
+    JSValue constrVal = stackFrame.args[0].jsValue();
+    int argCount = stackFrame.args[2].int32();
+    int thisRegister = stackFrame.args[4].int32();
 
     ConstructData constructData;
@@ -1271 +1314 @@
     CodeBlock* codeBlock = callFrame->codeBlock();
     unsigned vPCIndex = codeBlock->getBytecodeIndex(callFrame, STUB_RETURN_ADDRESS);
-    ARG_globalData->exception = createNotAConstructorError(callFrame, constrVal, vPCIndex, codeBlock);
+    stackFrame.globalData->exception = createNotAConstructorError(callFrame, constrVal, vPCIndex, codeBlock);
     VM_THROW_EXCEPTION();
 }
 
-EncodedJSValue JITStubs::cti_op_get_by_val(STUB_ARGS)
-{
-    BEGIN_STUB_FUNCTION();
-
-    CallFrame* callFrame = ARG_callFrame;
-    JSGlobalData* globalData = ARG_globalData;
-
-    JSValue baseValue = ARG_src1;
-    JSValue subscript = ARG_src2;
+EncodedJSValue JITStubs::cti_op_get_by_val(STUB_ARGS_DECLARATION)
+{
+    BEGIN_STUB_FUNCTION();
+    JITStackFrame& stackFrame = *reinterpret_cast<JITStackFrame*>(STUB_ARGS);
+
+    CallFrame* callFrame = stackFrame.callFrame;
+    JSGlobalData* globalData = stackFrame.globalData;
+
+    JSValue baseValue = stackFrame.args[0].jsValue();
+    JSValue subscript = stackFrame.args[1].jsValue();
 
     JSValue result;
@@ -1298 +1342 @@
             // All fast byte array accesses are safe from exceptions so return immediately to avoid exception checks.
             ctiPatchCallByReturnAddress(STUB_RETURN_ADDRESS, reinterpret_cast<void*>(cti_op_get_by_val_string));
-            result = asString(baseValue)->getIndex(ARG_globalData, i);
+            result = asString(baseValue)->getIndex(stackFrame.globalData, i);
         } else if (isJSByteArray(globalData, baseValue) && asByteArray(baseValue)->canAccessIndex(i)) {
             // All fast byte array accesses are safe from exceptions so return immediately to avoid exception checks.
@@ -1314 +1358 @@
 }
     
-    EncodedJSValue JITStubs::cti_op_get_by_val_string(STUB_ARGS)
-    {
-        BEGIN_STUB_FUNCTION();
-        
-        CallFrame* callFrame = ARG_callFrame;
-        JSGlobalData* globalData = ARG_globalData;
-        
-        JSValue baseValue = ARG_src1;
-        JSValue subscript = ARG_src2;
-        
-        JSValue result;
-        
-        if (LIKELY(subscript.isUInt32Fast())) {
-            uint32_t i = subscript.getUInt32Fast();
-            if (isJSString(globalData, baseValue) && asString(baseValue)->canGetIndex(i))
-                result = asString(baseValue)->getIndex(ARG_globalData, i);
-            else {
-                result = baseValue.get(callFrame, i);
-                if (!isJSString(globalData, baseValue))
-                    ctiPatchCallByReturnAddress(STUB_RETURN_ADDRESS, reinterpret_cast<void*>(cti_op_get_by_val));
-            }
-        } else {
-            Identifier property(callFrame, subscript.toString(callFrame));
-            result = baseValue.get(callFrame, property);
+EncodedJSValue JITStubs::cti_op_get_by_val_string(STUB_ARGS_DECLARATION)
+{
+    BEGIN_STUB_FUNCTION();
+    JITStackFrame& stackFrame = *reinterpret_cast<JITStackFrame*>(STUB_ARGS);
+    
+    CallFrame* callFrame = stackFrame.callFrame;
+    JSGlobalData* globalData = stackFrame.globalData;
+    
+    JSValue baseValue = stackFrame.args[0].jsValue();
+    JSValue subscript = stackFrame.args[1].jsValue();
+    
+    JSValue result;
+    
+    if (LIKELY(subscript.isUInt32Fast())) {
+        uint32_t i = subscript.getUInt32Fast();
+        if (isJSString(globalData, baseValue) && asString(baseValue)->canGetIndex(i))
+            result = asString(baseValue)->getIndex(stackFrame.globalData, i);
+        else {
+            result = baseValue.get(callFrame, i);
+            if (!isJSString(globalData, baseValue))
+                ctiPatchCallByReturnAddress(STUB_RETURN_ADDRESS, reinterpret_cast<void*>(cti_op_get_by_val));
         }
-        
-        CHECK_FOR_EXCEPTION_AT_END();
-        return JSValue::encode(result);
-    }
-    
-
-EncodedJSValue JITStubs::cti_op_get_by_val_byte_array(STUB_ARGS)
-{
-    BEGIN_STUB_FUNCTION();
-    
-    CallFrame* callFrame = ARG_callFrame;
-    JSGlobalData* globalData = ARG_globalData;
-    
-    JSValue baseValue = ARG_src1;
-    JSValue subscript = ARG_src2;
+    } else {
+        Identifier property(callFrame, subscript.toString(callFrame));
+        result = baseValue.get(callFrame, property);
+    }
+    
+    CHECK_FOR_EXCEPTION_AT_END();
+    return JSValue::encode(result);
+}
+    
+
+EncodedJSValue JITStubs::cti_op_get_by_val_byte_array(STUB_ARGS_DECLARATION)
+{
+    BEGIN_STUB_FUNCTION();
+    JITStackFrame& stackFrame = *reinterpret_cast<JITStackFrame*>(STUB_ARGS);
+    
+    CallFrame* callFrame = stackFrame.callFrame;
+    JSGlobalData* globalData = stackFrame.globalData;
+    
+    JSValue baseValue = stackFrame.args[0].jsValue();
+    JSValue subscript = stackFrame.args[1].jsValue();
     
     JSValue result;
@@ -1376 +1422 @@
 }
 
-VoidPtrPair JITStubs::cti_op_resolve_func(STUB_ARGS)
-{
-    BEGIN_STUB_FUNCTION();
-
-    CallFrame* callFrame = ARG_callFrame;
+VoidPtrPair JITStubs::cti_op_resolve_func(STUB_ARGS_DECLARATION)
+{
+    BEGIN_STUB_FUNCTION();
+    JITStackFrame& stackFrame = *reinterpret_cast<JITStackFrame*>(STUB_ARGS);
+
+    CallFrame* callFrame = stackFrame.callFrame;
     ScopeChainNode* scopeChain = callFrame->scopeChain();
 
@@ -1390 +1437 @@
     ASSERT(iter != end);
 
-    Identifier& ident = *ARG_id1;
+    Identifier& ident = stackFrame.args[0].identifier();
     JSObject* base;
     do {
@@ -1414 +1461 @@
     CodeBlock* codeBlock = callFrame->codeBlock();
     unsigned vPCIndex = codeBlock->getBytecodeIndex(callFrame, STUB_RETURN_ADDRESS);
-    ARG_globalData->exception = createUndefinedVariableError(callFrame, ident, vPCIndex, codeBlock);
+    stackFrame.globalData->exception = createUndefinedVariableError(callFrame, ident, vPCIndex, codeBlock);
     VM_THROW_EXCEPTION_2();
 }
 
-EncodedJSValue JITStubs::cti_op_sub(STUB_ARGS)
-{
-    BEGIN_STUB_FUNCTION();
-
-    JSValue src1 = ARG_src1;
-    JSValue src2 = ARG_src2;
+EncodedJSValue JITStubs::cti_op_sub(STUB_ARGS_DECLARATION)
+{
+    BEGIN_STUB_FUNCTION();
+    JITStackFrame& stackFrame = *reinterpret_cast<JITStackFrame*>(STUB_ARGS);
+
+    JSValue src1 = stackFrame.args[0].jsValue();
+    JSValue src2 = stackFrame.args[1].jsValue();
 
     double left;
     double right;
     if (src1.getNumber(left) && src2.getNumber(right))
-        return JSValue::encode(jsNumber(ARG_globalData, left - right));
-
-    CallFrame* callFrame = ARG_callFrame;
-    JSValue result = jsNumber(ARG_globalData, src1.toNumber(callFrame) - src2.toNumber(callFrame));
-    CHECK_FOR_EXCEPTION_AT_END();
-    return JSValue::encode(result);
-}
-
-void JITStubs::cti_op_put_by_val(STUB_ARGS)
-{
-    BEGIN_STUB_FUNCTION();
-
-    CallFrame* callFrame = ARG_callFrame;
-    JSGlobalData* globalData = ARG_globalData;
-
-    JSValue baseValue = ARG_src1;
-    JSValue subscript = ARG_src2;
-    JSValue value = ARG_src3;
+        return JSValue::encode(jsNumber(stackFrame.globalData, left - right));
+
+    CallFrame* callFrame = stackFrame.callFrame;
+    JSValue result = jsNumber(stackFrame.globalData, src1.toNumber(callFrame) - src2.toNumber(callFrame));
+    CHECK_FOR_EXCEPTION_AT_END();
+    return JSValue::encode(result);
+}
+
+void JITStubs::cti_op_put_by_val(STUB_ARGS_DECLARATION)
+{
+    BEGIN_STUB_FUNCTION();
+    JITStackFrame& stackFrame = *reinterpret_cast<JITStackFrame*>(STUB_ARGS);
+
+    CallFrame* callFrame = stackFrame.callFrame;
+    JSGlobalData* globalData = stackFrame.globalData;
+
+    JSValue baseValue = stackFrame.args[0].jsValue();
+    JSValue subscript = stackFrame.args[1].jsValue();
+    JSValue value = stackFrame.args[2].jsValue();
 
     if (LIKELY(subscript.isUInt32Fast())) {
@@ -1475 +1524 @@
     } else {
         Identifier property(callFrame, subscript.toString(callFrame));
-        if (!ARG_globalData->exception) { // Don't put to an object if toString threw an exception.
+        if (!stackFrame.globalData->exception) { // Don't put to an object if toString threw an exception.
             PutPropertySlot slot;
             baseValue.put(callFrame, property, value, slot);
@@ -1484 +1533 @@
 }
 
-void JITStubs::cti_op_put_by_val_array(STUB_ARGS)
-{
-    BEGIN_STUB_FUNCTION();
-
-    CallFrame* callFrame = ARG_callFrame;
-    JSValue baseValue = ARG_src1;
-    int i = ARG_int2;
-    JSValue value = ARG_src3;
-
-    ASSERT(isJSArray(ARG_globalData, baseValue));
+void JITStubs::cti_op_put_by_val_array(STUB_ARGS_DECLARATION)
+{
+    BEGIN_STUB_FUNCTION();
+    JITStackFrame& stackFrame = *reinterpret_cast<JITStackFrame*>(STUB_ARGS);
+
+    CallFrame* callFrame = stackFrame.callFrame;
+    JSValue baseValue = stackFrame.args[0].jsValue();
+    int i = stackFrame.args[1].int32();
+    JSValue value = stackFrame.args[2].jsValue();
+
+    ASSERT(isJSArray(stackFrame.globalData, baseValue));
 
     if (LIKELY(i >= 0))
@@ -1502 +1552 @@
         Identifier property(callFrame, JSValue::makeInt32Fast(i).toString(callFrame));
         // FIXME: can toString throw an exception here?
-        if (!ARG_globalData->exception) { // Don't put to an object if toString threw an exception.
+        if (!stackFrame.globalData->exception) { // Don't put to an object if toString threw an exception.
             PutPropertySlot slot;
             baseValue.put(callFrame, property, value, slot);
@@ -1511 +1561 @@
 }
 
-void JITStubs::cti_op_put_by_val_byte_array(STUB_ARGS)
-{
-    BEGIN_STUB_FUNCTION();
-    
-    CallFrame* callFrame = ARG_callFrame;
-    JSGlobalData* globalData = ARG_globalData;
-    
-    JSValue baseValue = ARG_src1;
-    JSValue subscript = ARG_src2;
-    JSValue value = ARG_src3;
+void JITStubs::cti_op_put_by_val_byte_array(STUB_ARGS_DECLARATION)
+{
+    BEGIN_STUB_FUNCTION();
+    JITStackFrame& stackFrame = *reinterpret_cast<JITStackFrame*>(STUB_ARGS);
+    
+    CallFrame* callFrame = stackFrame.callFrame;
+    JSGlobalData* globalData = stackFrame.globalData;
+    
+    JSValue baseValue = stackFrame.args[0].jsValue();
+    JSValue subscript = stackFrame.args[1].jsValue();
+    JSValue value = stackFrame.args[2].jsValue();
     
     if (LIKELY(subscript.isUInt32Fast())) {
@@ -1545 +1596 @@
     } else {
         Identifier property(callFrame, subscript.toString(callFrame));
-        if (!ARG_globalData->exception) { // Don't put to an object if toString threw an exception.
+        if (!stackFrame.globalData->exception) { // Don't put to an object if toString threw an exception.
             PutPropertySlot slot;
             baseValue.put(callFrame, property, value, slot);
@@ -1554 +1605 @@
 }
 
-EncodedJSValue JITStubs::cti_op_lesseq(STUB_ARGS)
-{
-    BEGIN_STUB_FUNCTION();
-
-    CallFrame* callFrame = ARG_callFrame;
-    JSValue result = jsBoolean(jsLessEq(callFrame, ARG_src1, ARG_src2));
-    CHECK_FOR_EXCEPTION_AT_END();
-    return JSValue::encode(result);
-}
-
-int JITStubs::cti_op_loop_if_true(STUB_ARGS)
-{
-    BEGIN_STUB_FUNCTION();
-
-    JSValue src1 = ARG_src1;
-
-    CallFrame* callFrame = ARG_callFrame;
+EncodedJSValue JITStubs::cti_op_lesseq(STUB_ARGS_DECLARATION)
+{
+    BEGIN_STUB_FUNCTION();
+    JITStackFrame& stackFrame = *reinterpret_cast<JITStackFrame*>(STUB_ARGS);
+
+    CallFrame* callFrame = stackFrame.callFrame;
+    JSValue result = jsBoolean(jsLessEq(callFrame, stackFrame.args[0].jsValue(), stackFrame.args[1].jsValue()));
+    CHECK_FOR_EXCEPTION_AT_END();
+    return JSValue::encode(result);
+}
+
+int JITStubs::cti_op_loop_if_true(STUB_ARGS_DECLARATION)
+{
+    BEGIN_STUB_FUNCTION();
+    JITStackFrame& stackFrame = *reinterpret_cast<JITStackFrame*>(STUB_ARGS);
+
+    JSValue src1 = stackFrame.args[0].jsValue();
+
+    CallFrame* callFrame = stackFrame.callFrame;
 
     bool result = src1.toBoolean(callFrame);
@@ -1577 +1630 @@
 }
     
-int JITStubs::cti_op_load_varargs(STUB_ARGS)
-{
-    BEGIN_STUB_FUNCTION();
-    CallFrame* callFrame = ARG_callFrame;
-    RegisterFile* registerFile = ARG_registerFile;
-    int argsOffset = ARG_int1;
+int JITStubs::cti_op_load_varargs(STUB_ARGS_DECLARATION)
+{
+    BEGIN_STUB_FUNCTION();
+    JITStackFrame& stackFrame = *reinterpret_cast<JITStackFrame*>(STUB_ARGS);
+    CallFrame* callFrame = stackFrame.callFrame;
+    RegisterFile* registerFile = stackFrame.registerFile;
+    int argsOffset = stackFrame.args[0].int32();
     JSValue arguments = callFrame[argsOffset].jsValue();
     uint32_t argCount = 0;
@@ -1589 +1643 @@
             CodeBlock* codeBlock = callFrame->codeBlock();
             unsigned vPCIndex = codeBlock->getBytecodeIndex(callFrame, STUB_RETURN_ADDRESS);
-            ARG_globalData->exception = createInvalidParamError(callFrame, "Function.prototype.apply", arguments, vPCIndex, codeBlock);
+            stackFrame.globalData->exception = createInvalidParamError(callFrame, "Function.prototype.apply", arguments, vPCIndex, codeBlock);
             VM_THROW_EXCEPTION();
         }
@@ -1598 +1652 @@
             Register* newEnd = callFrame->registers() + sizeDelta;
             if (!registerFile->grow(newEnd) || ((newEnd - callFrame->registers()) != sizeDelta)) {
-                ARG_globalData->exception = createStackOverflowError(callFrame);
+                stackFrame.globalData->exception = createStackOverflowError(callFrame);
                 VM_THROW_EXCEPTION();
             }
@@ -1608 +1662 @@
             Register* newEnd = callFrame->registers() + sizeDelta;
             if (!registerFile->grow(newEnd) || ((newEnd - callFrame->registers()) != sizeDelta)) {
-                ARG_globalData->exception = createStackOverflowError(callFrame);
+                stackFrame.globalData->exception = createStackOverflowError(callFrame);
                 VM_THROW_EXCEPTION();
             }
@@ -1618 +1672 @@
             Register* newEnd = callFrame->registers() + sizeDelta;
             if (!registerFile->grow(newEnd) || ((newEnd - callFrame->registers()) != sizeDelta)) {
-                ARG_globalData->exception = createStackOverflowError(callFrame);
+                stackFrame.globalData->exception = createStackOverflowError(callFrame);
                 VM_THROW_EXCEPTION();
             }
@@ -1629 +1683 @@
             CodeBlock* codeBlock = callFrame->codeBlock();
             unsigned vPCIndex = codeBlock->getBytecodeIndex(callFrame, STUB_RETURN_ADDRESS);
-            ARG_globalData->exception = createInvalidParamError(callFrame, "Function.prototype.apply", arguments, vPCIndex, codeBlock);
+            stackFrame.globalData->exception = createInvalidParamError(callFrame, "Function.prototype.apply", arguments, vPCIndex, codeBlock);
             VM_THROW_EXCEPTION();
         }
@@ -1637 +1691 @@
 }
 
-EncodedJSValue JITStubs::cti_op_negate(STUB_ARGS)
-{
-    BEGIN_STUB_FUNCTION();
-
-    JSValue src = ARG_src1;
+EncodedJSValue JITStubs::cti_op_negate(STUB_ARGS_DECLARATION)
+{
+    BEGIN_STUB_FUNCTION();
+    JITStackFrame& stackFrame = *reinterpret_cast<JITStackFrame*>(STUB_ARGS);
+
+    JSValue src = stackFrame.args[0].jsValue();
 
     double v;
     if (src.getNumber(v))
-        return JSValue::encode(jsNumber(ARG_globalData, -v));
-
-    CallFrame* callFrame = ARG_callFrame;
-    JSValue result = jsNumber(ARG_globalData, -src.toNumber(callFrame));
-    CHECK_FOR_EXCEPTION_AT_END();
-    return JSValue::encode(result);
-}
-
-EncodedJSValue JITStubs::cti_op_resolve_base(STUB_ARGS)
-{
-    BEGIN_STUB_FUNCTION();
-
-    return JSValue::encode(JSC::resolveBase(ARG_callFrame, *ARG_id1, ARG_callFrame->scopeChain()));
-}
-
-EncodedJSValue JITStubs::cti_op_resolve_skip(STUB_ARGS)
-{
-    BEGIN_STUB_FUNCTION();
-
-    CallFrame* callFrame = ARG_callFrame;
+        return JSValue::encode(jsNumber(stackFrame.globalData, -v));
+
+    CallFrame* callFrame = stackFrame.callFrame;
+    JSValue result = jsNumber(stackFrame.globalData, -src.toNumber(callFrame));
+    CHECK_FOR_EXCEPTION_AT_END();
+    return JSValue::encode(result);
+}
+
+EncodedJSValue JITStubs::cti_op_resolve_base(STUB_ARGS_DECLARATION)
+{
+    BEGIN_STUB_FUNCTION();
+    JITStackFrame& stackFrame = *reinterpret_cast<JITStackFrame*>(STUB_ARGS);
+
+    return JSValue::encode(JSC::resolveBase(stackFrame.callFrame, stackFrame.args[0].identifier(), stackFrame.callFrame->scopeChain()));
+}
+
+EncodedJSValue JITStubs::cti_op_resolve_skip(STUB_ARGS_DECLARATION)
+{
+    BEGIN_STUB_FUNCTION();
+    JITStackFrame& stackFrame = *reinterpret_cast<JITStackFrame*>(STUB_ARGS);
+
+    CallFrame* callFrame = stackFrame.callFrame;
     ScopeChainNode* scopeChain = callFrame->scopeChain();
 
-    int skip = ARG_int2;
+    int skip = stackFrame.args[1].int32();
 
     ScopeChainIterator iter = scopeChain->begin();
@@ -1676 +1733 @@
         ASSERT(iter != end);
     }
-    Identifier& ident = *ARG_id1;
+    Identifier& ident = stackFrame.args[0].identifier();
     do {
         JSObject* o = *iter;
@@ -1689 +1746 @@
     CodeBlock* codeBlock = callFrame->codeBlock();
     unsigned vPCIndex = codeBlock->getBytecodeIndex(callFrame, STUB_RETURN_ADDRESS);
-    ARG_globalData->exception = createUndefinedVariableError(callFrame, ident, vPCIndex, codeBlock);
+    stackFrame.globalData->exception = createUndefinedVariableError(callFrame, ident, vPCIndex, codeBlock);
     VM_THROW_EXCEPTION();
 }
 
-EncodedJSValue JITStubs::cti_op_resolve_global(STUB_ARGS)
-{
-    BEGIN_STUB_FUNCTION();
-
-    CallFrame* callFrame = ARG_callFrame;
-    JSGlobalObject* globalObject = asGlobalObject(ARG_src1);
-    Identifier& ident = *ARG_id2;
-    unsigned globalResolveInfoIndex = ARG_int3;
+EncodedJSValue JITStubs::cti_op_resolve_global(STUB_ARGS_DECLARATION)
+{
+    BEGIN_STUB_FUNCTION();
+    JITStackFrame& stackFrame = *reinterpret_cast<JITStackFrame*>(STUB_ARGS);
+
+    CallFrame* callFrame = stackFrame.callFrame;
+    JSGlobalObject* globalObject = asGlobalObject(stackFrame.args[0].jsValue());
+    Identifier& ident = stackFrame.args[1].identifier();
+    unsigned globalResolveInfoIndex = stackFrame.args[2].int32();
     ASSERT(globalObject->isGlobalObject());
 
@@ -1721 +1779 @@
 
     unsigned vPCIndex = callFrame->codeBlock()->getBytecodeIndex(callFrame, STUB_RETURN_ADDRESS);
-    ARG_globalData->exception = createUndefinedVariableError(callFrame, ident, vPCIndex, callFrame->codeBlock());
+    stackFrame.globalData->exception = createUndefinedVariableError(callFrame, ident, vPCIndex, callFrame->codeBlock());
     VM_THROW_EXCEPTION();
 }
 
-EncodedJSValue JITStubs::cti_op_div(STUB_ARGS)
-{
-    BEGIN_STUB_FUNCTION();
-
-    JSValue src1 = ARG_src1;
-    JSValue src2 = ARG_src2;
+EncodedJSValue JITStubs::cti_op_div(STUB_ARGS_DECLARATION)
+{
+    BEGIN_STUB_FUNCTION();
+    JITStackFrame& stackFrame = *reinterpret_cast<JITStackFrame*>(STUB_ARGS);
+
+    JSValue src1 = stackFrame.args[0].jsValue();
+    JSValue src2 = stackFrame.args[1].jsValue();
 
     double left;
     double right;
     if (src1.getNumber(left) && src2.getNumber(right))
-        return JSValue::encode(jsNumber(ARG_globalData, left / right));
-
-    CallFrame* callFrame = ARG_callFrame;
-    JSValue result = jsNumber(ARG_globalData, src1.toNumber(callFrame) / src2.toNumber(callFrame));
-    CHECK_FOR_EXCEPTION_AT_END();
-    return JSValue::encode(result);
-}
-
-EncodedJSValue JITStubs::cti_op_pre_dec(STUB_ARGS)
-{
-    BEGIN_STUB_FUNCTION();
-
-    JSValue v = ARG_src1;
-
-    CallFrame* callFrame = ARG_callFrame;
-    JSValue result = jsNumber(ARG_globalData, v.toNumber(callFrame) - 1);
-    CHECK_FOR_EXCEPTION_AT_END();
-    return JSValue::encode(result);
-}
-
-int JITStubs::cti_op_jless(STUB_ARGS)
-{
-    BEGIN_STUB_FUNCTION();
-
-    JSValue src1 = ARG_src1;
-    JSValue src2 = ARG_src2;
-    CallFrame* callFrame = ARG_callFrame;
+        return JSValue::encode(jsNumber(stackFrame.globalData, left / right));
+
+    CallFrame* callFrame = stackFrame.callFrame;
+    JSValue result = jsNumber(stackFrame.globalData, src1.toNumber(callFrame) / src2.toNumber(callFrame));
+    CHECK_FOR_EXCEPTION_AT_END();
+    return JSValue::encode(result);
+}
+
+EncodedJSValue JITStubs::cti_op_pre_dec(STUB_ARGS_DECLARATION)
+{
+    BEGIN_STUB_FUNCTION();
+    JITStackFrame& stackFrame = *reinterpret_cast<JITStackFrame*>(STUB_ARGS);
+
+    JSValue v = stackFrame.args[0].jsValue();
+
+    CallFrame* callFrame = stackFrame.callFrame;
+    JSValue result = jsNumber(stackFrame.globalData, v.toNumber(callFrame) - 1);
+    CHECK_FOR_EXCEPTION_AT_END();
+    return JSValue::encode(result);
+}
+
+int JITStubs::cti_op_jless(STUB_ARGS_DECLARATION)
+{
+    BEGIN_STUB_FUNCTION();
+    JITStackFrame& stackFrame = *reinterpret_cast<JITStackFrame*>(STUB_ARGS);
+
+    JSValue src1 = stackFrame.args[0].jsValue();
+    JSValue src2 = stackFrame.args[1].jsValue();
+    CallFrame* callFrame = stackFrame.callFrame;
 
     bool result = jsLess(callFrame, src1, src2);
@@ -1768 +1829 @@
 }
 
-EncodedJSValue JITStubs::cti_op_not(STUB_ARGS)
-{
-    BEGIN_STUB_FUNCTION();
-
-    JSValue src = ARG_src1;
-
-    CallFrame* callFrame = ARG_callFrame;
+EncodedJSValue JITStubs::cti_op_not(STUB_ARGS_DECLARATION)
+{
+    BEGIN_STUB_FUNCTION();
+    JITStackFrame& stackFrame = *reinterpret_cast<JITStackFrame*>(STUB_ARGS);
+
+    JSValue src = stackFrame.args[0].jsValue();
+
+    CallFrame* callFrame = stackFrame.callFrame;
 
     JSValue result = jsBoolean(!src.toBoolean(callFrame));
@@ -1781 +1843 @@
 }
 
-int JITStubs::cti_op_jtrue(STUB_ARGS)
-{
-    BEGIN_STUB_FUNCTION();
-
-    JSValue src1 = ARG_src1;
-
-    CallFrame* callFrame = ARG_callFrame;
+int JITStubs::cti_op_jtrue(STUB_ARGS_DECLARATION)
+{
+    BEGIN_STUB_FUNCTION();
+    JITStackFrame& stackFrame = *reinterpret_cast<JITStackFrame*>(STUB_ARGS);
+
+    JSValue src1 = stackFrame.args[0].jsValue();
+
+    CallFrame* callFrame = stackFrame.callFrame;
 
     bool result = src1.toBoolean(callFrame);
@@ -1794 +1857 @@
 }
 
-VoidPtrPair JITStubs::cti_op_post_inc(STUB_ARGS)
-{
-    BEGIN_STUB_FUNCTION();
-
-    JSValue v = ARG_src1;
-
-    CallFrame* callFrame = ARG_callFrame;
+VoidPtrPair JITStubs::cti_op_post_inc(STUB_ARGS_DECLARATION)
+{
+    BEGIN_STUB_FUNCTION();
+    JITStackFrame& stackFrame = *reinterpret_cast<JITStackFrame*>(STUB_ARGS);
+
+    JSValue v = stackFrame.args[0].jsValue();
+
+    CallFrame* callFrame = stackFrame.callFrame;
 
     JSValue number = v.toJSNumber(callFrame);
     CHECK_FOR_EXCEPTION_AT_END();
 
-    RETURN_PAIR(JSValue::encode(number), JSValue::encode(jsNumber(ARG_globalData, number.uncheckedGetNumber() + 1)));
-}
-
-EncodedJSValue JITStubs::cti_op_eq(STUB_ARGS)
-{
-    BEGIN_STUB_FUNCTION();
-
-    JSValue src1 = ARG_src1;
-    JSValue src2 = ARG_src2;
-
-    CallFrame* callFrame = ARG_callFrame;
+    RETURN_PAIR(JSValue::encode(number), JSValue::encode(jsNumber(stackFrame.globalData, number.uncheckedGetNumber() + 1)));
+}
+
+EncodedJSValue JITStubs::cti_op_eq(STUB_ARGS_DECLARATION)
+{
+    BEGIN_STUB_FUNCTION();
+    JITStackFrame& stackFrame = *reinterpret_cast<JITStackFrame*>(STUB_ARGS);
+
+    JSValue src1 = stackFrame.args[0].jsValue();
+    JSValue src2 = stackFrame.args[1].jsValue();
+
+    CallFrame* callFrame = stackFrame.callFrame;
 
     ASSERT(!JSValue::areBothInt32Fast(src1, src2));
@@ -1823 +1888 @@
 }
 
-EncodedJSValue JITStubs::cti_op_lshift(STUB_ARGS)
-{
-    BEGIN_STUB_FUNCTION();
-
-    JSValue val = ARG_src1;
-    JSValue shift = ARG_src2;
+EncodedJSValue JITStubs::cti_op_lshift(STUB_ARGS_DECLARATION)
+{
+    BEGIN_STUB_FUNCTION();
+    JITStackFrame& stackFrame = *reinterpret_cast<JITStackFrame*>(STUB_ARGS);
+
+    JSValue val = stackFrame.args[0].jsValue();
+    JSValue shift = stackFrame.args[1].jsValue();
 
     int32_t left;
     uint32_t right;
     if (JSValue::areBothInt32Fast(val, shift))
-        return JSValue::encode(jsNumber(ARG_globalData, val.getInt32Fast() << (shift.getInt32Fast() & 0x1f)));
+        return JSValue::encode(jsNumber(stackFrame.globalData, val.getInt32Fast() << (shift.getInt32Fast() & 0x1f)));
     if (val.numberToInt32(left) && shift.numberToUInt32(right))
-        return JSValue::encode(jsNumber(ARG_globalData, left << (right & 0x1f)));
-
-    CallFrame* callFrame = ARG_callFrame;
-    JSValue result = jsNumber(ARG_globalData, (val.toInt32(callFrame)) << (shift.toUInt32(callFrame) & 0x1f));
-    CHECK_FOR_EXCEPTION_AT_END();
-    return JSValue::encode(result);
-}
-
-EncodedJSValue JITStubs::cti_op_bitand(STUB_ARGS)
-{
-    BEGIN_STUB_FUNCTION();
-
-    JSValue src1 = ARG_src1;
-    JSValue src2 = ARG_src2;
+        return JSValue::encode(jsNumber(stackFrame.globalData, left << (right & 0x1f)));
+
+    CallFrame* callFrame = stackFrame.callFrame;
+    JSValue result = jsNumber(stackFrame.globalData, (val.toInt32(callFrame)) << (shift.toUInt32(callFrame) & 0x1f));
+    CHECK_FOR_EXCEPTION_AT_END();
+    return JSValue::encode(result);
+}
+
+EncodedJSValue JITStubs::cti_op_bitand(STUB_ARGS_DECLARATION)
+{
+    BEGIN_STUB_FUNCTION();
+    JITStackFrame& stackFrame = *reinterpret_cast<JITStackFrame*>(STUB_ARGS);
+
+    JSValue src1 = stackFrame.args[0].jsValue();
+    JSValue src2 = stackFrame.args[1].jsValue();
 
     int32_t left;
     int32_t right;
     if (src1.numberToInt32(left) && src2.numberToInt32(right))
-        return JSValue::encode(jsNumber(ARG_globalData, left & right));
-
-    CallFrame* callFrame = ARG_callFrame;
-    JSValue result = jsNumber(ARG_globalData, src1.toInt32(callFrame) & src2.toInt32(callFrame));
-    CHECK_FOR_EXCEPTION_AT_END();
-    return JSValue::encode(result);
-}
-
-EncodedJSValue JITStubs::cti_op_rshift(STUB_ARGS)
-{
-    BEGIN_STUB_FUNCTION();
-
-    JSValue val = ARG_src1;
-    JSValue shift = ARG_src2;
+        return JSValue::encode(jsNumber(stackFrame.globalData, left & right));
+
+    CallFrame* callFrame = stackFrame.callFrame;
+    JSValue result = jsNumber(stackFrame.globalData, src1.toInt32(callFrame) & src2.toInt32(callFrame));
+    CHECK_FOR_EXCEPTION_AT_END();
+    return JSValue::encode(result);
+}
+
+EncodedJSValue JITStubs::cti_op_rshift(STUB_ARGS_DECLARATION)
+{
+    BEGIN_STUB_FUNCTION();
+    JITStackFrame& stackFrame = *reinterpret_cast<JITStackFrame*>(STUB_ARGS);
+
+    JSValue val = stackFrame.args[0].jsValue();
+    JSValue shift = stackFrame.args[1].jsValue();
 
     int32_t left;
@@ -1873 +1941 @@
         return JSValue::encode(JSFastMath::rightShiftImmediateNumbers(val, shift));
     if (val.numberToInt32(left) && shift.numberToUInt32(right))
-        return JSValue::encode(jsNumber(ARG_globalData, left >> (right & 0x1f)));
-
-    CallFrame* callFrame = ARG_callFrame;
-    JSValue result = jsNumber(ARG_globalData, (val.toInt32(callFrame)) >> (shift.toUInt32(callFrame) & 0x1f));
-    CHECK_FOR_EXCEPTION_AT_END();
-    return JSValue::encode(result);
-}
-
-EncodedJSValue JITStubs::cti_op_bitnot(STUB_ARGS)
-{
-    BEGIN_STUB_FUNCTION();
-
-    JSValue src = ARG_src1;
+        return JSValue::encode(jsNumber(stackFrame.globalData, left >> (right & 0x1f)));
+
+    CallFrame* callFrame = stackFrame.callFrame;
+    JSValue result = jsNumber(stackFrame.globalData, (val.toInt32(callFrame)) >> (shift.toUInt32(callFrame) & 0x1f));
+    CHECK_FOR_EXCEPTION_AT_END();
+    return JSValue::encode(result);
+}
+
+EncodedJSValue JITStubs::cti_op_bitnot(STUB_ARGS_DECLARATION)
+{
+    BEGIN_STUB_FUNCTION();
+    JITStackFrame& stackFrame = *reinterpret_cast<JITStackFrame*>(STUB_ARGS);
+
+    JSValue src = stackFrame.args[0].jsValue();
 
     int value;
     if (src.numberToInt32(value))
-        return JSValue::encode(jsNumber(ARG_globalData, ~value));
-
-    CallFrame* callFrame = ARG_callFrame;
-    JSValue result = jsNumber(ARG_globalData, ~src.toInt32(callFrame));
-    CHECK_FOR_EXCEPTION_AT_END();
-    return JSValue::encode(result);
-}
-
-VoidPtrPair JITStubs::cti_op_resolve_with_base(STUB_ARGS)
-{
-    BEGIN_STUB_FUNCTION();
-
-    CallFrame* callFrame = ARG_callFrame;
+        return JSValue::encode(jsNumber(stackFrame.globalData, ~value));
+
+    CallFrame* callFrame = stackFrame.callFrame;
+    JSValue result = jsNumber(stackFrame.globalData, ~src.toInt32(callFrame));
+    CHECK_FOR_EXCEPTION_AT_END();
+    return JSValue::encode(result);
+}
+
+VoidPtrPair JITStubs::cti_op_resolve_with_base(STUB_ARGS_DECLARATION)
+{
+    BEGIN_STUB_FUNCTION();
+    JITStackFrame& stackFrame = *reinterpret_cast<JITStackFrame*>(STUB_ARGS);
+
+    CallFrame* callFrame = stackFrame.callFrame;
     ScopeChainNode* scopeChain = callFrame->scopeChain();
 
@@ -1911 +1981 @@
     ASSERT(iter != end);
 
-    Identifier& ident = *ARG_id1;
+    Identifier& ident = stackFrame.args[0].identifier();
     JSObject* base;
     do {
@@ -1927 +1997 @@
     CodeBlock* codeBlock = callFrame->codeBlock();
     unsigned vPCIndex = codeBlock->getBytecodeIndex(callFrame, STUB_RETURN_ADDRESS);
-    ARG_globalData->exception = createUndefinedVariableError(callFrame, ident, vPCIndex, codeBlock);
+    stackFrame.globalData->exception = createUndefinedVariableError(callFrame, ident, vPCIndex, codeBlock);
     VM_THROW_EXCEPTION_2();
 }
 
-JSObject* JITStubs::cti_op_new_func_exp(STUB_ARGS)
-{
-    BEGIN_STUB_FUNCTION();
-
-    return ARG_funcexp1->makeFunction(ARG_callFrame, ARG_callFrame->scopeChain());
-}
-
-EncodedJSValue JITStubs::cti_op_mod(STUB_ARGS)
-{
-    BEGIN_STUB_FUNCTION();
-
-    JSValue dividendValue = ARG_src1;
-    JSValue divisorValue = ARG_src2;
-
-    CallFrame* callFrame = ARG_callFrame;
+JSObject* JITStubs::cti_op_new_func_exp(STUB_ARGS_DECLARATION)
+{
+    BEGIN_STUB_FUNCTION();
+    JITStackFrame& stackFrame = *reinterpret_cast<JITStackFrame*>(STUB_ARGS);
+
+    return stackFrame.args[0].funcExprNode()->makeFunction(stackFrame.callFrame, stackFrame.callFrame->scopeChain());
+}
+
+EncodedJSValue JITStubs::cti_op_mod(STUB_ARGS_DECLARATION)
+{
+    BEGIN_STUB_FUNCTION();
+    JITStackFrame& stackFrame = *reinterpret_cast<JITStackFrame*>(STUB_ARGS);
+
+    JSValue dividendValue = stackFrame.args[0].jsValue();
+    JSValue divisorValue = stackFrame.args[1].jsValue();
+
+    CallFrame* callFrame = stackFrame.callFrame;
     double d = dividendValue.toNumber(callFrame);
-    JSValue result = jsNumber(ARG_globalData, fmod(d, divisorValue.toNumber(callFrame)));
-    CHECK_FOR_EXCEPTION_AT_END();
-    return JSValue::encode(result);
-}
-
-EncodedJSValue JITStubs::cti_op_less(STUB_ARGS)
-{
-    BEGIN_STUB_FUNCTION();
-
-    CallFrame* callFrame = ARG_callFrame;
-    JSValue result = jsBoolean(jsLess(callFrame, ARG_src1, ARG_src2));
-    CHECK_FOR_EXCEPTION_AT_END();
-    return JSValue::encode(result);
-}
-
-EncodedJSValue JITStubs::cti_op_neq(STUB_ARGS)
-{
-    BEGIN_STUB_FUNCTION();
-
-    JSValue src1 = ARG_src1;
-    JSValue src2 = ARG_src2;
+    JSValue result = jsNumber(stackFrame.globalData, fmod(d, divisorValue.toNumber(callFrame)));
+    CHECK_FOR_EXCEPTION_AT_END();
+    return JSValue::encode(result);
+}
+
+EncodedJSValue JITStubs::cti_op_less(STUB_ARGS_DECLARATION)
+{
+    BEGIN_STUB_FUNCTION();
+    JITStackFrame& stackFrame = *reinterpret_cast<JITStackFrame*>(STUB_ARGS);
+
+    CallFrame* callFrame = stackFrame.callFrame;
+    JSValue result = jsBoolean(jsLess(callFrame, stackFrame.args[0].jsValue(), stackFrame.args[1].jsValue()));
+    CHECK_FOR_EXCEPTION_AT_END();
+    return JSValue::encode(result);
+}
+
+EncodedJSValue JITStubs::cti_op_neq(STUB_ARGS_DECLARATION)
+{
+    BEGIN_STUB_FUNCTION();
+    JITStackFrame& stackFrame = *reinterpret_cast<JITStackFrame*>(STUB_ARGS);
+
+    JSValue src1 = stackFrame.args[0].jsValue();
+    JSValue src2 = stackFrame.args[1].jsValue();
 
     ASSERT(!JSValue::areBothInt32Fast(src1, src2));
 
-    CallFrame* callFrame = ARG_callFrame;
+    CallFrame* callFrame = stackFrame.callFrame;
     JSValue result = jsBoolean(!JSValue::equalSlowCaseInline(callFrame, src1, src2));
     CHECK_FOR_EXCEPTION_AT_END();
@@ -1977 +2051 @@
 }
 
-VoidPtrPair JITStubs::cti_op_post_dec(STUB_ARGS)
-{
-    BEGIN_STUB_FUNCTION();
-
-    JSValue v = ARG_src1;
-
-    CallFrame* callFrame = ARG_callFrame;
+VoidPtrPair JITStubs::cti_op_post_dec(STUB_ARGS_DECLARATION)
+{
+    BEGIN_STUB_FUNCTION();
+    JITStackFrame& stackFrame = *reinterpret_cast<JITStackFrame*>(STUB_ARGS);
+
+    JSValue v = stackFrame.args[0].jsValue();
+
+    CallFrame* callFrame = stackFrame.callFrame;
 
     JSValue number = v.toJSNumber(callFrame);
     CHECK_FOR_EXCEPTION_AT_END();
 
-    RETURN_PAIR(JSValue::encode(number), JSValue::encode(jsNumber(ARG_globalData, number.uncheckedGetNumber() - 1)));
-}
-
-EncodedJSValue JITStubs::cti_op_urshift(STUB_ARGS)
-{
-    BEGIN_STUB_FUNCTION();
-
-    JSValue val = ARG_src1;
-    JSValue shift = ARG_src2;
-
-    CallFrame* callFrame = ARG_callFrame;
+    RETURN_PAIR(JSValue::encode(number), JSValue::encode(jsNumber(stackFrame.globalData, number.uncheckedGetNumber() - 1)));
+}
+
+EncodedJSValue JITStubs::cti_op_urshift(STUB_ARGS_DECLARATION)
+{
+    BEGIN_STUB_FUNCTION();
+    JITStackFrame& stackFrame = *reinterpret_cast<JITStackFrame*>(STUB_ARGS);
+
+    JSValue val = stackFrame.args[0].jsValue();
+    JSValue shift = stackFrame.args[1].jsValue();
+
+    CallFrame* callFrame = stackFrame.callFrame;
 
     if (JSFastMath::canDoFastUrshift(val, shift))
         return JSValue::encode(JSFastMath::rightShiftImmediateNumbers(val, shift));
     else {
-        JSValue result = jsNumber(ARG_globalData, (val.toUInt32(callFrame)) >> (shift.toUInt32(callFrame) & 0x1f));
+        JSValue result = jsNumber(stackFrame.globalData, (val.toUInt32(callFrame)) >> (shift.toUInt32(callFrame) & 0x1f));
         CHECK_FOR_EXCEPTION_AT_END();
         return JSValue::encode(result);
@@ -2009 +2085 @@
 }
 
-EncodedJSValue JITStubs::cti_op_bitxor(STUB_ARGS)
-{
-    BEGIN_STUB_FUNCTION();
-
-    JSValue src1 = ARG_src1;
-    JSValue src2 = ARG_src2;
-
-    CallFrame* callFrame = ARG_callFrame;
-
-    JSValue result = jsNumber(ARG_globalData, src1.toInt32(callFrame) ^ src2.toInt32(callFrame));
-    CHECK_FOR_EXCEPTION_AT_END();
-    return JSValue::encode(result);
-}
-
-JSObject* JITStubs::cti_op_new_regexp(STUB_ARGS)
-{
-    BEGIN_STUB_FUNCTION();
-
-    return new (ARG_globalData) RegExpObject(ARG_callFrame->lexicalGlobalObject()->regExpStructure(), ARG_regexp1);
-}
-
-EncodedJSValue JITStubs::cti_op_bitor(STUB_ARGS)
-{
-    BEGIN_STUB_FUNCTION();
-
-    JSValue src1 = ARG_src1;
-    JSValue src2 = ARG_src2;
-
-    CallFrame* callFrame = ARG_callFrame;
-
-    JSValue result = jsNumber(ARG_globalData, src1.toInt32(callFrame) | src2.toInt32(callFrame));
-    CHECK_FOR_EXCEPTION_AT_END();
-    return JSValue::encode(result);
-}
-
-EncodedJSValue JITStubs::cti_op_call_eval(STUB_ARGS)
-{
-    BEGIN_STUB_FUNCTION();
-
-    CallFrame* callFrame = ARG_callFrame;
-    RegisterFile* registerFile = ARG_registerFile;
-
-    Interpreter* interpreter = ARG_globalData->interpreter;
-    
-    JSValue funcVal = ARG_src1;
-    int registerOffset = ARG_int2;
-    int argCount = ARG_int3;
+EncodedJSValue JITStubs::cti_op_bitxor(STUB_ARGS_DECLARATION)
+{
+    BEGIN_STUB_FUNCTION();
+    JITStackFrame& stackFrame = *reinterpret_cast<JITStackFrame*>(STUB_ARGS);
+
+    JSValue src1 = stackFrame.args[0].jsValue();
+    JSValue src2 = stackFrame.args[1].jsValue();
+
+    CallFrame* callFrame = stackFrame.callFrame;
+
+    JSValue result = jsNumber(stackFrame.globalData, src1.toInt32(callFrame) ^ src2.toInt32(callFrame));
+    CHECK_FOR_EXCEPTION_AT_END();
+    return JSValue::encode(result);
+}
+
+JSObject* JITStubs::cti_op_new_regexp(STUB_ARGS_DECLARATION)
+{
+    BEGIN_STUB_FUNCTION();
+    JITStackFrame& stackFrame = *reinterpret_cast<JITStackFrame*>(STUB_ARGS);
+
+    return new (stackFrame.globalData) RegExpObject(stackFrame.callFrame->lexicalGlobalObject()->regExpStructure(), stackFrame.args[0].regExp());
+}
+
+EncodedJSValue JITStubs::cti_op_bitor(STUB_ARGS_DECLARATION)
+{
+    BEGIN_STUB_FUNCTION();
+    JITStackFrame& stackFrame = *reinterpret_cast<JITStackFrame*>(STUB_ARGS);
+
+    JSValue src1 = stackFrame.args[0].jsValue();
+    JSValue src2 = stackFrame.args[1].jsValue();
+
+    CallFrame* callFrame = stackFrame.callFrame;
+
+    JSValue result = jsNumber(stackFrame.globalData, src1.toInt32(callFrame) | src2.toInt32(callFrame));
+    CHECK_FOR_EXCEPTION_AT_END();
+    return JSValue::encode(result);
+}
+
+EncodedJSValue JITStubs::cti_op_call_eval(STUB_ARGS_DECLARATION)
+{
+    BEGIN_STUB_FUNCTION();
+    JITStackFrame& stackFrame = *reinterpret_cast<JITStackFrame*>(STUB_ARGS);
+
+    CallFrame* callFrame = stackFrame.callFrame;
+    RegisterFile* registerFile = stackFrame.registerFile;
+
+    Interpreter* interpreter = stackFrame.globalData->interpreter;
+    
+    JSValue funcVal = stackFrame.args[0].jsValue();
+    int registerOffset = stackFrame.args[1].int32();
+    int argCount = stackFrame.args[2].int32();
 
     Register* newCallFrame = callFrame->registers() + registerOffset;
@@ -2066 +2146 @@
         JSValue result = interpreter->callEval(callFrame, registerFile, argv, argCount, registerOffset, exceptionValue);
         if (UNLIKELY(exceptionValue != JSValue())) {
-            ARG_globalData->exception = exceptionValue;
+            stackFrame.globalData->exception = exceptionValue;
             VM_THROW_EXCEPTION_AT_END();
         }
@@ -2075 +2155 @@
 }
 
-EncodedJSValue JITStubs::cti_op_throw(STUB_ARGS)
-{
-    BEGIN_STUB_FUNCTION();
-
-    CallFrame* callFrame = ARG_callFrame;
+EncodedJSValue JITStubs::cti_op_throw(STUB_ARGS_DECLARATION)
+{
+    BEGIN_STUB_FUNCTION();
+    JITStackFrame& stackFrame = *reinterpret_cast<JITStackFrame*>(STUB_ARGS);
+
+    CallFrame* callFrame = stackFrame.callFrame;
     CodeBlock* codeBlock = callFrame->codeBlock();
 
     unsigned vPCIndex = codeBlock->getBytecodeIndex(callFrame, STUB_RETURN_ADDRESS);
 
-    JSValue exceptionValue = ARG_src1;
+    JSValue exceptionValue = stackFrame.args[0].jsValue();
     ASSERT(exceptionValue);
 
-    HandlerInfo* handler = ARG_globalData->interpreter->throwException(callFrame, exceptionValue, vPCIndex, true);
+    HandlerInfo* handler = stackFrame.globalData->interpreter->throwException(callFrame, exceptionValue, vPCIndex, true);
 
     if (!handler) {
-        *ARG_exception = exceptionValue;
+        *stackFrame.exception = exceptionValue;
         return JSValue::encode(jsNull());
     }
 
-    ARG_setCallFrame(callFrame);
+    stackFrame.callFrame = callFrame;
     void* catchRoutine = handler->nativeCode.addressForExceptionHandler();
     ASSERT(catchRoutine);
@@ -2101 +2182 @@
 }
 
-JSPropertyNameIterator* JITStubs::cti_op_get_pnames(STUB_ARGS)
-{
-    BEGIN_STUB_FUNCTION();
-
-    return JSPropertyNameIterator::create(ARG_callFrame, ARG_src1);
-}
-
-EncodedJSValue JITStubs::cti_op_next_pname(STUB_ARGS)
-{
-    BEGIN_STUB_FUNCTION();
-
-    JSPropertyNameIterator* it = ARG_pni1;
-    JSValue temp = it->next(ARG_callFrame);
+JSPropertyNameIterator* JITStubs::cti_op_get_pnames(STUB_ARGS_DECLARATION)
+{
+    BEGIN_STUB_FUNCTION();
+    JITStackFrame& stackFrame = *reinterpret_cast<JITStackFrame*>(STUB_ARGS);
+
+    return JSPropertyNameIterator::create(stackFrame.callFrame, stackFrame.args[0].jsValue());
+}
+
+EncodedJSValue JITStubs::cti_op_next_pname(STUB_ARGS_DECLARATION)
+{
+    BEGIN_STUB_FUNCTION();
+    JITStackFrame& stackFrame = *reinterpret_cast<JITStackFrame*>(STUB_ARGS);
+
+    JSPropertyNameIterator* it = stackFrame.args[0].propertyNameIterator();
+    JSValue temp = it->next(stackFrame.callFrame);
     if (!temp)
         it->invalidate();
@@ -2119 +2202 @@
 }
 
-JSObject* JITStubs::cti_op_push_scope(STUB_ARGS)
-{
-    BEGIN_STUB_FUNCTION();
-
-    JSObject* o = ARG_src1.toObject(ARG_callFrame);
+JSObject* JITStubs::cti_op_push_scope(STUB_ARGS_DECLARATION)
+{
+    BEGIN_STUB_FUNCTION();
+    JITStackFrame& stackFrame = *reinterpret_cast<JITStackFrame*>(STUB_ARGS);
+
+    JSObject* o = stackFrame.args[0].jsValue().toObject(stackFrame.callFrame);
     CHECK_FOR_EXCEPTION();
-    ARG_callFrame->setScopeChain(ARG_callFrame->scopeChain()->push(o));
+    stackFrame.callFrame->setScopeChain(stackFrame.callFrame->scopeChain()->push(o));
     return o;
 }
 
-void JITStubs::cti_op_pop_scope(STUB_ARGS)
-{
-    BEGIN_STUB_FUNCTION();
-
-    ARG_callFrame->setScopeChain(ARG_callFrame->scopeChain()->pop());
-}
-
-EncodedJSValue JITStubs::cti_op_typeof(STUB_ARGS)
-{
-    BEGIN_STUB_FUNCTION();
-
-    return JSValue::encode(jsTypeStringForValue(ARG_callFrame, ARG_src1));
-}
-
-EncodedJSValue JITStubs::cti_op_is_undefined(STUB_ARGS)
-{
-    BEGIN_STUB_FUNCTION();
-
-    JSValue v = ARG_src1;
+void JITStubs::cti_op_pop_scope(STUB_ARGS_DECLARATION)
+{
+    BEGIN_STUB_FUNCTION();
+    JITStackFrame& stackFrame = *reinterpret_cast<JITStackFrame*>(STUB_ARGS);
+
+    stackFrame.callFrame->setScopeChain(stackFrame.callFrame->scopeChain()->pop());
+}
+
+EncodedJSValue JITStubs::cti_op_typeof(STUB_ARGS_DECLARATION)
+{
+    BEGIN_STUB_FUNCTION();
+    JITStackFrame& stackFrame = *reinterpret_cast<JITStackFrame*>(STUB_ARGS);
+
+    return JSValue::encode(jsTypeStringForValue(stackFrame.callFrame, stackFrame.args[0].jsValue()));
+}
+
+EncodedJSValue JITStubs::cti_op_is_undefined(STUB_ARGS_DECLARATION)
+{
+    BEGIN_STUB_FUNCTION();
+    JITStackFrame& stackFrame = *reinterpret_cast<JITStackFrame*>(STUB_ARGS);
+
+    JSValue v = stackFrame.args[0].jsValue();
     return JSValue::encode(jsBoolean(v.isCell() ? v.asCell()->structure()->typeInfo().masqueradesAsUndefined() : v.isUndefined()));
 }
 
-EncodedJSValue JITStubs::cti_op_is_boolean(STUB_ARGS)
-{
-    BEGIN_STUB_FUNCTION();
-
-    return JSValue::encode(jsBoolean(ARG_src1.isBoolean()));
-}
-
-EncodedJSValue JITStubs::cti_op_is_number(STUB_ARGS)
-{
-    BEGIN_STUB_FUNCTION();
-
-    return JSValue::encode(jsBoolean(ARG_src1.isNumber()));
-}
-
-EncodedJSValue JITStubs::cti_op_is_string(STUB_ARGS)
-{
-    BEGIN_STUB_FUNCTION();
-
-    return JSValue::encode(jsBoolean(isJSString(ARG_globalData, ARG_src1)));
-}
-
-EncodedJSValue JITStubs::cti_op_is_object(STUB_ARGS)
-{
-    BEGIN_STUB_FUNCTION();
-
-    return JSValue::encode(jsBoolean(jsIsObjectType(ARG_src1)));
-}
-
-EncodedJSValue JITStubs::cti_op_is_function(STUB_ARGS)
-{
-    BEGIN_STUB_FUNCTION();
-
-    return JSValue::encode(jsBoolean(jsIsFunctionType(ARG_src1)));
-}
-
-EncodedJSValue JITStubs::cti_op_stricteq(STUB_ARGS)
-{
-    BEGIN_STUB_FUNCTION();
-
-    JSValue src1 = ARG_src1;
-    JSValue src2 = ARG_src2;
+EncodedJSValue JITStubs::cti_op_is_boolean(STUB_ARGS_DECLARATION)
+{
+    BEGIN_STUB_FUNCTION();
+    JITStackFrame& stackFrame = *reinterpret_cast<JITStackFrame*>(STUB_ARGS);
+
+    return JSValue::encode(jsBoolean(stackFrame.args[0].jsValue().isBoolean()));
+}
+
+EncodedJSValue JITStubs::cti_op_is_number(STUB_ARGS_DECLARATION)
+{
+    BEGIN_STUB_FUNCTION();
+    JITStackFrame& stackFrame = *reinterpret_cast<JITStackFrame*>(STUB_ARGS);
+
+    return JSValue::encode(jsBoolean(stackFrame.args[0].jsValue().isNumber()));
+}
+
+EncodedJSValue JITStubs::cti_op_is_string(STUB_ARGS_DECLARATION)
+{
+    BEGIN_STUB_FUNCTION();
+    JITStackFrame& stackFrame = *reinterpret_cast<JITStackFrame*>(STUB_ARGS);
+
+    return JSValue::encode(jsBoolean(isJSString(stackFrame.globalData, stackFrame.args[0].jsValue())));
+}
+
+EncodedJSValue JITStubs::cti_op_is_object(STUB_ARGS_DECLARATION)
+{
+    BEGIN_STUB_FUNCTION();
+    JITStackFrame& stackFrame = *reinterpret_cast<JITStackFrame*>(STUB_ARGS);
+
+    return JSValue::encode(jsBoolean(jsIsObjectType(stackFrame.args[0].jsValue())));
+}
+
+EncodedJSValue JITStubs::cti_op_is_function(STUB_ARGS_DECLARATION)
+{
+    BEGIN_STUB_FUNCTION();
+    JITStackFrame& stackFrame = *reinterpret_cast<JITStackFrame*>(STUB_ARGS);
+
+    return JSValue::encode(jsBoolean(jsIsFunctionType(stackFrame.args[0].jsValue())));
+}
+
+EncodedJSValue JITStubs::cti_op_stricteq(STUB_ARGS_DECLARATION)
+{
+    BEGIN_STUB_FUNCTION();
+    JITStackFrame& stackFrame = *reinterpret_cast<JITStackFrame*>(STUB_ARGS);
+
+    JSValue src1 = stackFrame.args[0].jsValue();
+    JSValue src2 = stackFrame.args[1].jsValue();
 
     return JSValue::encode(jsBoolean(JSValue::strictEqual(src1, src2)));
 }
 
-EncodedJSValue JITStubs::cti_op_to_primitive(STUB_ARGS)
-{
-    BEGIN_STUB_FUNCTION();
-
-    return JSValue::encode(ARG_src1.toPrimitive(ARG_callFrame));
-}
-
-EncodedJSValue JITStubs::cti_op_strcat(STUB_ARGS)
-{
-    BEGIN_STUB_FUNCTION();
-
-    return JSValue::encode(concatenateStrings(ARG_callFrame, &ARG_callFrame->registers()[ARG_int1], ARG_int2));
-}
-
-EncodedJSValue JITStubs::cti_op_nstricteq(STUB_ARGS)
-{
-    BEGIN_STUB_FUNCTION();
-
-    JSValue src1 = ARG_src1;
-    JSValue src2 = ARG_src2;
+EncodedJSValue JITStubs::cti_op_to_primitive(STUB_ARGS_DECLARATION)
+{
+    BEGIN_STUB_FUNCTION();
+    JITStackFrame& stackFrame = *reinterpret_cast<JITStackFrame*>(STUB_ARGS);
+
+    return JSValue::encode(stackFrame.args[0].jsValue().toPrimitive(stackFrame.callFrame));
+}
+
+EncodedJSValue JITStubs::cti_op_strcat(STUB_ARGS_DECLARATION)
+{
+    BEGIN_STUB_FUNCTION();
+    JITStackFrame& stackFrame = *reinterpret_cast<JITStackFrame*>(STUB_ARGS);
+
+    return JSValue::encode(concatenateStrings(stackFrame.callFrame, &stackFrame.callFrame->registers()[stackFrame.args[0].int32()], stackFrame.args[1].int32()));
+}
+
+EncodedJSValue JITStubs::cti_op_nstricteq(STUB_ARGS_DECLARATION)
+{
+    BEGIN_STUB_FUNCTION();
+    JITStackFrame& stackFrame = *reinterpret_cast<JITStackFrame*>(STUB_ARGS);
+
+    JSValue src1 = stackFrame.args[0].jsValue();
+    JSValue src2 = stackFrame.args[1].jsValue();
 
     return JSValue::encode(jsBoolean(!JSValue::strictEqual(src1, src2)));
 }
 
-EncodedJSValue JITStubs::cti_op_to_jsnumber(STUB_ARGS)
-{
-    BEGIN_STUB_FUNCTION();
-
-    JSValue src = ARG_src1;
-    CallFrame* callFrame = ARG_callFrame;
+EncodedJSValue JITStubs::cti_op_to_jsnumber(STUB_ARGS_DECLARATION)
+{
+    BEGIN_STUB_FUNCTION();
+    JITStackFrame& stackFrame = *reinterpret_cast<JITStackFrame*>(STUB_ARGS);
+
+    JSValue src = stackFrame.args[0].jsValue();
+    CallFrame* callFrame = stackFrame.callFrame;
 
     JSValue result = src.toJSNumber(callFrame);
@@ -2232 +2329 @@
 }
 
-EncodedJSValue JITStubs::cti_op_in(STUB_ARGS)
-{
-    BEGIN_STUB_FUNCTION();
-
-    CallFrame* callFrame = ARG_callFrame;
-    JSValue baseVal = ARG_src2;
+EncodedJSValue JITStubs::cti_op_in(STUB_ARGS_DECLARATION)
+{
+    BEGIN_STUB_FUNCTION();
+    JITStackFrame& stackFrame = *reinterpret_cast<JITStackFrame*>(STUB_ARGS);
+
+    CallFrame* callFrame = stackFrame.callFrame;
+    JSValue baseVal = stackFrame.args[1].jsValue();
 
     if (!baseVal.isObject()) {
-        CallFrame* callFrame = ARG_callFrame;
+        CallFrame* callFrame = stackFrame.callFrame;
         CodeBlock* codeBlock = callFrame->codeBlock();
         unsigned vPCIndex = codeBlock->getBytecodeIndex(callFrame, STUB_RETURN_ADDRESS);
-        ARG_globalData->exception = createInvalidParamError(callFrame, "in", baseVal, vPCIndex, codeBlock);
+        stackFrame.globalData->exception = createInvalidParamError(callFrame, "in", baseVal, vPCIndex, codeBlock);
         VM_THROW_EXCEPTION();
     }
 
-    JSValue propName = ARG_src1;
+    JSValue propName = stackFrame.args[0].jsValue();
     JSObject* baseObj = asObject(baseVal);
 
@@ -2259 +2357 @@
 }
 
-JSObject* JITStubs::cti_op_push_new_scope(STUB_ARGS)
-{
-    BEGIN_STUB_FUNCTION();
-
-    JSObject* scope = new (ARG_globalData) JSStaticScopeObject(ARG_callFrame, *ARG_id1, ARG_src2, DontDelete);
-
-    CallFrame* callFrame = ARG_callFrame;
+JSObject* JITStubs::cti_op_push_new_scope(STUB_ARGS_DECLARATION)
+{
+    BEGIN_STUB_FUNCTION();
+    JITStackFrame& stackFrame = *reinterpret_cast<JITStackFrame*>(STUB_ARGS);
+
+    JSObject* scope = new (stackFrame.globalData) JSStaticScopeObject(stackFrame.callFrame, stackFrame.args[0].identifier(), stackFrame.args[1].jsValue(), DontDelete);
+
+    CallFrame* callFrame = stackFrame.callFrame;
     callFrame->setScopeChain(callFrame->scopeChain()->push(scope));
     return scope;
 }
 
-void JITStubs::cti_op_jmp_scopes(STUB_ARGS)
-{
-    BEGIN_STUB_FUNCTION();
-
-    unsigned count = ARG_int1;
-    CallFrame* callFrame = ARG_callFrame;
+void JITStubs::cti_op_jmp_scopes(STUB_ARGS_DECLARATION)
+{
+    BEGIN_STUB_FUNCTION();
+    JITStackFrame& stackFrame = *reinterpret_cast<JITStackFrame*>(STUB_ARGS);
+
+    unsigned count = stackFrame.args[0].int32();
+    CallFrame* callFrame = stackFrame.callFrame;
 
     ScopeChainNode* tmp = callFrame->scopeChain();
@@ -2283 +2383 @@
 }
 
-void JITStubs::cti_op_put_by_index(STUB_ARGS)
-{
-    BEGIN_STUB_FUNCTION();
-
-    CallFrame* callFrame = ARG_callFrame;
-    unsigned property = ARG_int2;
-
-    ARG_src1.put(callFrame, property, ARG_src3);
-}
-
-void* JITStubs::cti_op_switch_imm(STUB_ARGS)
-{
-    BEGIN_STUB_FUNCTION();
-
-    JSValue scrutinee = ARG_src1;
-    unsigned tableIndex = ARG_int2;
-    CallFrame* callFrame = ARG_callFrame;
+void JITStubs::cti_op_put_by_index(STUB_ARGS_DECLARATION)
+{
+    BEGIN_STUB_FUNCTION();
+    JITStackFrame& stackFrame = *reinterpret_cast<JITStackFrame*>(STUB_ARGS);
+
+    CallFrame* callFrame = stackFrame.callFrame;
+    unsigned property = stackFrame.args[1].int32();
+
+    stackFrame.args[0].jsValue().put(callFrame, property, stackFrame.args[2].jsValue());
+}
+
+void* JITStubs::cti_op_switch_imm(STUB_ARGS_DECLARATION)
+{
+    BEGIN_STUB_FUNCTION();
+    JITStackFrame& stackFrame = *reinterpret_cast<JITStackFrame*>(STUB_ARGS);
+
+    JSValue scrutinee = stackFrame.args[0].jsValue();
+    unsigned tableIndex = stackFrame.args[1].int32();
+    CallFrame* callFrame = stackFrame.callFrame;
     CodeBlock* codeBlock = callFrame->codeBlock();
 
@@ -2314 +2416 @@
 }
 
-void* JITStubs::cti_op_switch_char(STUB_ARGS)
-{
-    BEGIN_STUB_FUNCTION();
-
-    JSValue scrutinee = ARG_src1;
-    unsigned tableIndex = ARG_int2;
-    CallFrame* callFrame = ARG_callFrame;
+void* JITStubs::cti_op_switch_char(STUB_ARGS_DECLARATION)
+{
+    BEGIN_STUB_FUNCTION();
+    JITStackFrame& stackFrame = *reinterpret_cast<JITStackFrame*>(STUB_ARGS);
+
+    JSValue scrutinee = stackFrame.args[0].jsValue();
+    unsigned tableIndex = stackFrame.args[1].int32();
+    CallFrame* callFrame = stackFrame.callFrame;
     CodeBlock* codeBlock = callFrame->codeBlock();
 
@@ -2334 +2437 @@
 }
 
-void* JITStubs::cti_op_switch_string(STUB_ARGS)
-{
-    BEGIN_STUB_FUNCTION();
-
-    JSValue scrutinee = ARG_src1;
-    unsigned tableIndex = ARG_int2;
-    CallFrame* callFrame = ARG_callFrame;
+void* JITStubs::cti_op_switch_string(STUB_ARGS_DECLARATION)
+{
+    BEGIN_STUB_FUNCTION();
+    JITStackFrame& stackFrame = *reinterpret_cast<JITStackFrame*>(STUB_ARGS);
+
+    JSValue scrutinee = stackFrame.args[0].jsValue();
+    unsigned tableIndex = stackFrame.args[1].int32();
+    CallFrame* callFrame = stackFrame.callFrame;
     CodeBlock* codeBlock = callFrame->codeBlock();
 
@@ -2353 +2457 @@
 }
 
-EncodedJSValue JITStubs::cti_op_del_by_val(STUB_ARGS)
-{
-    BEGIN_STUB_FUNCTION();
-
-    CallFrame* callFrame = ARG_callFrame;
-
-    JSValue baseValue = ARG_src1;
+EncodedJSValue JITStubs::cti_op_del_by_val(STUB_ARGS_DECLARATION)
+{
+    BEGIN_STUB_FUNCTION();
+    JITStackFrame& stackFrame = *reinterpret_cast<JITStackFrame*>(STUB_ARGS);
+
+    CallFrame* callFrame = stackFrame.callFrame;
+
+    JSValue baseValue = stackFrame.args[0].jsValue();
     JSObject* baseObj = baseValue.toObject(callFrame); // may throw
 
-    JSValue subscript = ARG_src2;
+    JSValue subscript = stackFrame.args[1].jsValue();
     JSValue result;
     uint32_t i;
@@ -2378 +2483 @@
 }
 
-void JITStubs::cti_op_put_getter(STUB_ARGS)
-{
-    BEGIN_STUB_FUNCTION();
-
-    CallFrame* callFrame = ARG_callFrame;
-
-    ASSERT(ARG_src1.isObject());
-    JSObject* baseObj = asObject(ARG_src1);
-    ASSERT(ARG_src3.isObject());
-    baseObj->defineGetter(callFrame, *ARG_id2, asObject(ARG_src3));
-}
-
-void JITStubs::cti_op_put_setter(STUB_ARGS)
-{
-    BEGIN_STUB_FUNCTION();
-
-    CallFrame* callFrame = ARG_callFrame;
-
-    ASSERT(ARG_src1.isObject());
-    JSObject* baseObj = asObject(ARG_src1);
-    ASSERT(ARG_src3.isObject());
-    baseObj->defineSetter(callFrame, *ARG_id2, asObject(ARG_src3));
-}
-
-JSObject* JITStubs::cti_op_new_error(STUB_ARGS)
-{
-    BEGIN_STUB_FUNCTION();
-
-    CallFrame* callFrame = ARG_callFrame;
+void JITStubs::cti_op_put_getter(STUB_ARGS_DECLARATION)
+{
+    BEGIN_STUB_FUNCTION();
+    JITStackFrame& stackFrame = *reinterpret_cast<JITStackFrame*>(STUB_ARGS);
+
+    CallFrame* callFrame = stackFrame.callFrame;
+
+    ASSERT(stackFrame.args[0].jsValue().isObject());
+    JSObject* baseObj = asObject(stackFrame.args[0].jsValue());
+    ASSERT(stackFrame.args[2].jsValue().isObject());
+    baseObj->defineGetter(callFrame, stackFrame.args[1].identifier(), asObject(stackFrame.args[2].jsValue()));
+}
+
+void JITStubs::cti_op_put_setter(STUB_ARGS_DECLARATION)
+{
+    BEGIN_STUB_FUNCTION();
+    JITStackFrame& stackFrame = *reinterpret_cast<JITStackFrame*>(STUB_ARGS);
+
+    CallFrame* callFrame = stackFrame.callFrame;
+
+    ASSERT(stackFrame.args[0].jsValue().isObject());
+    JSObject* baseObj = asObject(stackFrame.args[0].jsValue());
+    ASSERT(stackFrame.args[2].jsValue().isObject());
+    baseObj->defineSetter(callFrame, stackFrame.args[1].identifier(), asObject(stackFrame.args[2].jsValue()));
+}
+
+JSObject* JITStubs::cti_op_new_error(STUB_ARGS_DECLARATION)
+{
+    BEGIN_STUB_FUNCTION();
+    JITStackFrame& stackFrame = *reinterpret_cast<JITStackFrame*>(STUB_ARGS);
+
+    CallFrame* callFrame = stackFrame.callFrame;
     CodeBlock* codeBlock = callFrame->codeBlock();
-    unsigned type = ARG_int1;
-    JSValue message = ARG_src2;
-    unsigned bytecodeOffset = ARG_int3;
+    unsigned type = stackFrame.args[0].int32();
+    JSValue message = stackFrame.args[1].jsValue();
+    unsigned bytecodeOffset = stackFrame.args[2].int32();
 
     unsigned lineNumber = codeBlock->lineNumberForBytecodeOffset(callFrame, bytecodeOffset);
@@ -2416 +2524 @@
 }
 
-void JITStubs::cti_op_debug(STUB_ARGS)
-{
-    BEGIN_STUB_FUNCTION();
-
-    CallFrame* callFrame = ARG_callFrame;
-
-    int debugHookID = ARG_int1;
-    int firstLine = ARG_int2;
-    int lastLine = ARG_int3;
-
-    ARG_globalData->interpreter->debug(callFrame, static_cast<DebugHookID>(debugHookID), firstLine, lastLine);
-}
-
-EncodedJSValue JITStubs::cti_vm_throw(STUB_ARGS)
-{
-    BEGIN_STUB_FUNCTION();
-
-    CallFrame* callFrame = ARG_callFrame;
+void JITStubs::cti_op_debug(STUB_ARGS_DECLARATION)
+{
+    BEGIN_STUB_FUNCTION();
+    JITStackFrame& stackFrame = *reinterpret_cast<JITStackFrame*>(STUB_ARGS);
+
+    CallFrame* callFrame = stackFrame.callFrame;
+
+    int debugHookID = stackFrame.args[0].int32();
+    int firstLine = stackFrame.args[1].int32();
+    int lastLine = stackFrame.args[2].int32();
+
+    stackFrame.globalData->interpreter->debug(callFrame, static_cast<DebugHookID>(debugHookID), firstLine, lastLine);
+}
+
+EncodedJSValue JITStubs::cti_vm_throw(STUB_ARGS_DECLARATION)
+{
+    BEGIN_STUB_FUNCTION();
+    JITStackFrame& stackFrame = *reinterpret_cast<JITStackFrame*>(STUB_ARGS);
+
+    CallFrame* callFrame = stackFrame.callFrame;
     CodeBlock* codeBlock = callFrame->codeBlock();
-    JSGlobalData* globalData = ARG_globalData;
+    JSGlobalData* globalData = stackFrame.globalData;
 
     unsigned vPCIndex = codeBlock->getBytecodeIndex(callFrame, globalData->exceptionLocation);
@@ -2446 +2556 @@
 
     if (!handler) {
-        *ARG_exception = exceptionValue;
+        *stackFrame.exception = exceptionValue;
         return JSValue::encode(jsNull());
     }
 
-    ARG_setCallFrame(callFrame);
+    stackFrame.callFrame = callFrame;
     void* catchRoutine = handler->nativeCode.addressForExceptionHandler();
     ASSERT(catchRoutine);

trunk/JavaScriptCore/jit/JITStubs.h

@@ -50 +50 @@
     class PutPropertySlot;
     class RegisterFile;
+    class FuncDeclNode;
+    class FuncExprNode;
+    class RegExp;
+
+    union JITStubArg {
+        void* asPointer;
+        EncodedJSValue asEncodedJSValue;
+        int32_t asInt32;
+
+        JSValue jsValue() { return JSValue::decode(asEncodedJSValue); }
+        Identifier& identifier() { return *static_cast<Identifier*>(asPointer); }
+        int32_t int32() { return asInt32; }
+        CodeBlock* codeBlock() { return static_cast<CodeBlock*>(asPointer); }
+        FuncDeclNode* funcDeclNode() { return static_cast<FuncDeclNode*>(asPointer); }
+        FuncExprNode* funcExprNode() { return static_cast<FuncExprNode*>(asPointer); }
+        RegExp* regExp() { return static_cast<RegExp*>(asPointer); }
+        JSPropertyNameIterator* propertyNameIterator() { return static_cast<JSPropertyNameIterator*>(asPointer); }
+        void* returnAddress() { return asPointer; }
+    };
+
+#if PLATFORM(X86_64)
+    struct JITStackFrame {
+        JITStubArg padding; // Used by JIT_STUB_ARGUMENT_STACK stub function calling convention
+        JITStubArg args[8];
+
+        void* savedRBX;
+        void* savedR15;
+        void* savedR14;
+        void* savedR13;
+        void* savedR12;
+        void* savedRBP;
+        void* savedRIP;
+
+        void* code;
+        RegisterFile* registerFile;
+        CallFrame* callFrame;
+        JSValue* exception;
+        Profiler** enabledProfilerReference;
+        JSGlobalData* globalData;
+    };
+#else
+    struct JITStackFrame {
+        JITStubArg padding; // Used by JIT_STUB_ARGUMENT_STACK stub function calling convention
+        JITStubArg args[6];
+
+        void* savedEBX;
+        void* savedEDI;
+        void* savedESI;
+        void* savedEBP;
+        void* savedEIP;
+
+        void* code;
+        RegisterFile* registerFile;
+        CallFrame* callFrame;
+        JSValue* exception;
+        Profiler** enabledProfilerReference;
+        JSGlobalData* globalData;
+    };
+#endif
 
 #if USE(JIT_STUB_ARGUMENT_VA_LIST)
-    #define STUB_ARGS void* args, ...
-    #define ARGS (reinterpret_cast<void**>(vl_args) - 1)
+    #define STUB_ARGS_DECLARATION void* args, ...
+    #define STUB_ARGS (reinterpret_cast<void**>(vl_args) - 1)
 #else // JIT_STUB_ARGUMENT_REGISTER or JIT_STUB_ARGUMENT_STACK
-    #define STUB_ARGS void** args
-    #define ARGS (args)
+    #define STUB_ARGS_DECLARATION void** args
+    #define STUB_ARGS (args)
 #endif
 
@@ -90 +149 @@
 #define STUB_ARGS_globalData (STUB_ARGS_offset + 5)
 
-#define ARG_callFrame static_cast<CallFrame*>(ARGS[STUB_ARGS_callFrame])
-#define ARG_registerFile static_cast<RegisterFile*>(ARGS[STUB_ARGS_registerFile])
-#define ARG_exception static_cast<JSValue*>(ARGS[STUB_ARGS_exception])
-#define ARG_profilerReference static_cast<Profiler**>(ARGS[STUB_ARGS_profilerReference])
-#define ARG_globalData static_cast<JSGlobalData*>(ARGS[STUB_ARGS_globalData])
-#define ARG_setCallFrame(newCallFrame) (ARGS[STUB_ARGS_callFrame] = (newCallFrame))
-
-#define ARG_src1 JSValue::decode(static_cast<EncodedJSValue>(ARGS[1]))
-#define ARG_src2 JSValue::decode(static_cast<EncodedJSValue>(ARGS[2]))
-#define ARG_src3 JSValue::decode(static_cast<EncodedJSValue>(ARGS[3]))
-#define ARG_src4 JSValue::decode(static_cast<EncodedJSValue>(ARGS[4]))
-#define ARG_src5 JSValue::decode(static_cast<EncodedJSValue>(ARGS[5]))
-#define ARG_id1 static_cast<Identifier*>(ARGS[1])
-#define ARG_id2 static_cast<Identifier*>(ARGS[2])
-#define ARG_id3 static_cast<Identifier*>(ARGS[3])
-#define ARG_id4 static_cast<Identifier*>(ARGS[4])
-#define ARG_int1 static_cast<int32_t>(reinterpret_cast<intptr_t>(ARGS[1]))
-#define ARG_int2 static_cast<int32_t>(reinterpret_cast<intptr_t>(ARGS[2]))
-#define ARG_int3 static_cast<int32_t>(reinterpret_cast<intptr_t>(ARGS[3]))
-#define ARG_int4 static_cast<int32_t>(reinterpret_cast<intptr_t>(ARGS[4]))
-#define ARG_int5 static_cast<int32_t>(reinterpret_cast<intptr_t>(ARGS[5]))
-#define ARG_int6 static_cast<int32_t>(reinterpret_cast<intptr_t>(ARGS[6]))
-#define ARG_func1 static_cast<FuncDeclNode*>(ARGS[1])
-#define ARG_funcexp1 static_cast<FuncExprNode*>(ARGS[1])
-#define ARG_regexp1 static_cast<RegExp*>(ARGS[1])
-#define ARG_pni1 static_cast<JSPropertyNameIterator*>(ARGS[1])
-#define ARG_returnAddress2 static_cast<void*>(ARGS[2])
-#define ARG_codeBlock4 static_cast<CodeBlock*>(ARGS[4])
-
-#define STUB_RETURN_ADDRESS_SLOT (ARGS[-1])
+#define STUB_RETURN_ADDRESS_SLOT (STUB_ARGS[-1])
 
 // The Mac compilers are fine with this, 
@@ -150 +180 @@
         JITStubs(JSGlobalData*);
 
-        static JSObject* JIT_STUB cti_op_construct_JSConstruct(STUB_ARGS);
-        static JSObject* JIT_STUB cti_op_convert_this(STUB_ARGS);
-        static JSObject* JIT_STUB cti_op_new_array(STUB_ARGS);
-        static JSObject* JIT_STUB cti_op_new_error(STUB_ARGS);
-        static JSObject* JIT_STUB cti_op_new_func(STUB_ARGS);
-        static JSObject* JIT_STUB cti_op_new_func_exp(STUB_ARGS);
-        static JSObject* JIT_STUB cti_op_new_object(STUB_ARGS);
-        static JSObject* JIT_STUB cti_op_new_regexp(STUB_ARGS);
-        static JSObject* JIT_STUB cti_op_push_activation(STUB_ARGS);
-        static JSObject* JIT_STUB cti_op_push_new_scope(STUB_ARGS);
-        static JSObject* JIT_STUB cti_op_push_scope(STUB_ARGS);
-        static JSPropertyNameIterator* JIT_STUB cti_op_get_pnames(STUB_ARGS);
-        static EncodedJSValue JIT_STUB cti_op_add(STUB_ARGS);
-        static EncodedJSValue JIT_STUB cti_op_bitand(STUB_ARGS);
-        static EncodedJSValue JIT_STUB cti_op_bitnot(STUB_ARGS);
-        static EncodedJSValue JIT_STUB cti_op_bitor(STUB_ARGS);
-        static EncodedJSValue JIT_STUB cti_op_bitxor(STUB_ARGS);
-        static EncodedJSValue JIT_STUB cti_op_call_NotJSFunction(STUB_ARGS);
-        static EncodedJSValue JIT_STUB cti_op_call_eval(STUB_ARGS);
-        static EncodedJSValue JIT_STUB cti_op_construct_NotJSConstruct(STUB_ARGS);
-        static EncodedJSValue JIT_STUB cti_op_del_by_id(STUB_ARGS);
-        static EncodedJSValue JIT_STUB cti_op_del_by_val(STUB_ARGS);
-        static EncodedJSValue JIT_STUB cti_op_div(STUB_ARGS);
-        static EncodedJSValue JIT_STUB cti_op_eq(STUB_ARGS);
-        static EncodedJSValue JIT_STUB cti_op_get_by_id(STUB_ARGS);
-        static EncodedJSValue JIT_STUB cti_op_get_by_id_array_fail(STUB_ARGS);
-        static EncodedJSValue JIT_STUB cti_op_get_by_id_generic(STUB_ARGS);
-        static EncodedJSValue JIT_STUB cti_op_get_by_id_proto_fail(STUB_ARGS);
-        static EncodedJSValue JIT_STUB cti_op_get_by_id_proto_list(STUB_ARGS);
-        static EncodedJSValue JIT_STUB cti_op_get_by_id_proto_list_full(STUB_ARGS);
-        static EncodedJSValue JIT_STUB cti_op_get_by_id_second(STUB_ARGS);
-        static EncodedJSValue JIT_STUB cti_op_get_by_id_self_fail(STUB_ARGS);
-        static EncodedJSValue JIT_STUB cti_op_get_by_id_string_fail(STUB_ARGS);
-        static EncodedJSValue JIT_STUB cti_op_get_by_val(STUB_ARGS);
-        static EncodedJSValue JIT_STUB cti_op_get_by_val_byte_array(STUB_ARGS);
-        static EncodedJSValue JIT_STUB cti_op_get_by_val_string(STUB_ARGS);
-        static EncodedJSValue JIT_STUB cti_op_in(STUB_ARGS);
-        static EncodedJSValue JIT_STUB cti_op_instanceof(STUB_ARGS);
-        static EncodedJSValue JIT_STUB cti_op_is_boolean(STUB_ARGS);
-        static EncodedJSValue JIT_STUB cti_op_is_function(STUB_ARGS);
-        static EncodedJSValue JIT_STUB cti_op_is_number(STUB_ARGS);
-        static EncodedJSValue JIT_STUB cti_op_is_object(STUB_ARGS);
-        static EncodedJSValue JIT_STUB cti_op_is_string(STUB_ARGS);
-        static EncodedJSValue JIT_STUB cti_op_is_undefined(STUB_ARGS);
-        static EncodedJSValue JIT_STUB cti_op_less(STUB_ARGS);
-        static EncodedJSValue JIT_STUB cti_op_lesseq(STUB_ARGS);
-        static EncodedJSValue JIT_STUB cti_op_lshift(STUB_ARGS);
-        static EncodedJSValue JIT_STUB cti_op_mod(STUB_ARGS);
-        static EncodedJSValue JIT_STUB cti_op_mul(STUB_ARGS);
-        static EncodedJSValue JIT_STUB cti_op_negate(STUB_ARGS);
-        static EncodedJSValue JIT_STUB cti_op_neq(STUB_ARGS);
-        static EncodedJSValue JIT_STUB cti_op_next_pname(STUB_ARGS);
-        static EncodedJSValue JIT_STUB cti_op_not(STUB_ARGS);
-        static EncodedJSValue JIT_STUB cti_op_nstricteq(STUB_ARGS);
-        static EncodedJSValue JIT_STUB cti_op_pre_dec(STUB_ARGS);
-        static EncodedJSValue JIT_STUB cti_op_pre_inc(STUB_ARGS);
-        static EncodedJSValue JIT_STUB cti_op_resolve(STUB_ARGS);
-        static EncodedJSValue JIT_STUB cti_op_resolve_base(STUB_ARGS);
-        static EncodedJSValue JIT_STUB cti_op_resolve_global(STUB_ARGS);
-        static EncodedJSValue JIT_STUB cti_op_resolve_skip(STUB_ARGS);
-        static EncodedJSValue JIT_STUB cti_op_rshift(STUB_ARGS);
-        static EncodedJSValue JIT_STUB cti_op_stricteq(STUB_ARGS);
-        static EncodedJSValue JIT_STUB cti_op_strcat(STUB_ARGS);
-        static EncodedJSValue JIT_STUB cti_op_to_primitive(STUB_ARGS);
-        static EncodedJSValue JIT_STUB cti_op_sub(STUB_ARGS);
-        static EncodedJSValue JIT_STUB cti_op_throw(STUB_ARGS);
-        static EncodedJSValue JIT_STUB cti_op_to_jsnumber(STUB_ARGS);
-        static EncodedJSValue JIT_STUB cti_op_typeof(STUB_ARGS);
-        static EncodedJSValue JIT_STUB cti_op_urshift(STUB_ARGS);
-        static EncodedJSValue JIT_STUB cti_vm_throw(STUB_ARGS);
-        static VoidPtrPair JIT_STUB cti_op_call_arityCheck(STUB_ARGS);
-        static VoidPtrPair JIT_STUB cti_op_post_dec(STUB_ARGS);
-        static VoidPtrPair JIT_STUB cti_op_post_inc(STUB_ARGS);
-        static VoidPtrPair JIT_STUB cti_op_resolve_func(STUB_ARGS);
-        static VoidPtrPair JIT_STUB cti_op_resolve_with_base(STUB_ARGS);
-        static int JIT_STUB cti_op_jless(STUB_ARGS);
-        static int JIT_STUB cti_op_jtrue(STUB_ARGS);
-        static int JIT_STUB cti_op_loop_if_less(STUB_ARGS);
-        static int JIT_STUB cti_op_loop_if_lesseq(STUB_ARGS);
-        static int JIT_STUB cti_op_loop_if_true(STUB_ARGS);
-        static int JIT_STUB cti_op_load_varargs(STUB_ARGS);
-        static int JIT_STUB cti_timeout_check(STUB_ARGS);
-        static void JIT_STUB cti_op_create_arguments(STUB_ARGS);
-        static void JIT_STUB cti_op_create_arguments_no_params(STUB_ARGS);
-        static void JIT_STUB cti_op_debug(STUB_ARGS);
-        static void JIT_STUB cti_op_end(STUB_ARGS);
-        static void JIT_STUB cti_op_jmp_scopes(STUB_ARGS);
-        static void JIT_STUB cti_op_pop_scope(STUB_ARGS);
-        static void JIT_STUB cti_op_profile_did_call(STUB_ARGS);
-        static void JIT_STUB cti_op_profile_will_call(STUB_ARGS);
-        static void JIT_STUB cti_op_put_by_id(STUB_ARGS);
-        static void JIT_STUB cti_op_put_by_id_fail(STUB_ARGS);
-        static void JIT_STUB cti_op_put_by_id_generic(STUB_ARGS);
-        static void JIT_STUB cti_op_put_by_id_second(STUB_ARGS);
-        static void JIT_STUB cti_op_put_by_index(STUB_ARGS);
-        static void JIT_STUB cti_op_put_by_val(STUB_ARGS);
-        static void JIT_STUB cti_op_put_by_val_array(STUB_ARGS);
-        static void JIT_STUB cti_op_put_by_val_byte_array(STUB_ARGS);
-        static void JIT_STUB cti_op_put_getter(STUB_ARGS);
-        static void JIT_STUB cti_op_put_setter(STUB_ARGS);
-        static void JIT_STUB cti_op_ret_scopeChain(STUB_ARGS);
-        static void JIT_STUB cti_op_tear_off_activation(STUB_ARGS);
-        static void JIT_STUB cti_op_tear_off_arguments(STUB_ARGS);
-        static void JIT_STUB cti_register_file_check(STUB_ARGS);
-        static void* JIT_STUB cti_op_call_JSFunction(STUB_ARGS);
-        static void* JIT_STUB cti_op_switch_char(STUB_ARGS);
-        static void* JIT_STUB cti_op_switch_imm(STUB_ARGS);
-        static void* JIT_STUB cti_op_switch_string(STUB_ARGS);
-        static void* JIT_STUB cti_vm_dontLazyLinkCall(STUB_ARGS);
-        static void* JIT_STUB cti_vm_lazyLinkCall(STUB_ARGS);
+        static JSObject* JIT_STUB cti_op_construct_JSConstruct(STUB_ARGS_DECLARATION);
+        static JSObject* JIT_STUB cti_op_convert_this(STUB_ARGS_DECLARATION);
+        static JSObject* JIT_STUB cti_op_new_array(STUB_ARGS_DECLARATION);
+        static JSObject* JIT_STUB cti_op_new_error(STUB_ARGS_DECLARATION);
+        static JSObject* JIT_STUB cti_op_new_func(STUB_ARGS_DECLARATION);
+        static JSObject* JIT_STUB cti_op_new_func_exp(STUB_ARGS_DECLARATION);
+        static JSObject* JIT_STUB cti_op_new_object(STUB_ARGS_DECLARATION);
+        static JSObject* JIT_STUB cti_op_new_regexp(STUB_ARGS_DECLARATION);
+        static JSObject* JIT_STUB cti_op_push_activation(STUB_ARGS_DECLARATION);
+        static JSObject* JIT_STUB cti_op_push_new_scope(STUB_ARGS_DECLARATION);
+        static JSObject* JIT_STUB cti_op_push_scope(STUB_ARGS_DECLARATION);
+        static JSPropertyNameIterator* JIT_STUB cti_op_get_pnames(STUB_ARGS_DECLARATION);
+        static EncodedJSValue JIT_STUB cti_op_add(STUB_ARGS_DECLARATION);
+        static EncodedJSValue JIT_STUB cti_op_bitand(STUB_ARGS_DECLARATION);
+        static EncodedJSValue JIT_STUB cti_op_bitnot(STUB_ARGS_DECLARATION);
+        static EncodedJSValue JIT_STUB cti_op_bitor(STUB_ARGS_DECLARATION);
+        static EncodedJSValue JIT_STUB cti_op_bitxor(STUB_ARGS_DECLARATION);
+        static EncodedJSValue JIT_STUB cti_op_call_NotJSFunction(STUB_ARGS_DECLARATION);
+        static EncodedJSValue JIT_STUB cti_op_call_eval(STUB_ARGS_DECLARATION);
+        static EncodedJSValue JIT_STUB cti_op_construct_NotJSConstruct(STUB_ARGS_DECLARATION);
+        static EncodedJSValue JIT_STUB cti_op_del_by_id(STUB_ARGS_DECLARATION);
+        static EncodedJSValue JIT_STUB cti_op_del_by_val(STUB_ARGS_DECLARATION);
+        static EncodedJSValue JIT_STUB cti_op_div(STUB_ARGS_DECLARATION);
+        static EncodedJSValue JIT_STUB cti_op_eq(STUB_ARGS_DECLARATION);
+        static EncodedJSValue JIT_STUB cti_op_get_by_id(STUB_ARGS_DECLARATION);
+        static EncodedJSValue JIT_STUB cti_op_get_by_id_array_fail(STUB_ARGS_DECLARATION);
+        static EncodedJSValue JIT_STUB cti_op_get_by_id_generic(STUB_ARGS_DECLARATION);
+        static EncodedJSValue JIT_STUB cti_op_get_by_id_proto_fail(STUB_ARGS_DECLARATION);
+        static EncodedJSValue JIT_STUB cti_op_get_by_id_proto_list(STUB_ARGS_DECLARATION);
+        static EncodedJSValue JIT_STUB cti_op_get_by_id_proto_list_full(STUB_ARGS_DECLARATION);
+        static EncodedJSValue JIT_STUB cti_op_get_by_id_second(STUB_ARGS_DECLARATION);
+        static EncodedJSValue JIT_STUB cti_op_get_by_id_self_fail(STUB_ARGS_DECLARATION);
+        static EncodedJSValue JIT_STUB cti_op_get_by_id_string_fail(STUB_ARGS_DECLARATION);
+        static EncodedJSValue JIT_STUB cti_op_get_by_val(STUB_ARGS_DECLARATION);
+        static EncodedJSValue JIT_STUB cti_op_get_by_val_byte_array(STUB_ARGS_DECLARATION);
+        static EncodedJSValue JIT_STUB cti_op_get_by_val_string(STUB_ARGS_DECLARATION);
+        static EncodedJSValue JIT_STUB cti_op_in(STUB_ARGS_DECLARATION);
+        static EncodedJSValue JIT_STUB cti_op_instanceof(STUB_ARGS_DECLARATION);
+        static EncodedJSValue JIT_STUB cti_op_is_boolean(STUB_ARGS_DECLARATION);
+        static EncodedJSValue JIT_STUB cti_op_is_function(STUB_ARGS_DECLARATION);
+        static EncodedJSValue JIT_STUB cti_op_is_number(STUB_ARGS_DECLARATION);
+        static EncodedJSValue JIT_STUB cti_op_is_object(STUB_ARGS_DECLARATION);
+        static EncodedJSValue JIT_STUB cti_op_is_string(STUB_ARGS_DECLARATION);
+        static EncodedJSValue JIT_STUB cti_op_is_undefined(STUB_ARGS_DECLARATION);
+        static EncodedJSValue JIT_STUB cti_op_less(STUB_ARGS_DECLARATION);
+        static EncodedJSValue JIT_STUB cti_op_lesseq(STUB_ARGS_DECLARATION);
+        static EncodedJSValue JIT_STUB cti_op_lshift(STUB_ARGS_DECLARATION);
+        static EncodedJSValue JIT_STUB cti_op_mod(STUB_ARGS_DECLARATION);
+        static EncodedJSValue JIT_STUB cti_op_mul(STUB_ARGS_DECLARATION);
+        static EncodedJSValue JIT_STUB cti_op_negate(STUB_ARGS_DECLARATION);
+        static EncodedJSValue JIT_STUB cti_op_neq(STUB_ARGS_DECLARATION);
+        static EncodedJSValue JIT_STUB cti_op_next_pname(STUB_ARGS_DECLARATION);
+        static EncodedJSValue JIT_STUB cti_op_not(STUB_ARGS_DECLARATION);
+        static EncodedJSValue JIT_STUB cti_op_nstricteq(STUB_ARGS_DECLARATION);
+        static EncodedJSValue JIT_STUB cti_op_pre_dec(STUB_ARGS_DECLARATION);
+        static EncodedJSValue JIT_STUB cti_op_pre_inc(STUB_ARGS_DECLARATION);
+        static EncodedJSValue JIT_STUB cti_op_resolve(STUB_ARGS_DECLARATION);
+        static EncodedJSValue JIT_STUB cti_op_resolve_base(STUB_ARGS_DECLARATION);
+        static EncodedJSValue JIT_STUB cti_op_resolve_global(STUB_ARGS_DECLARATION);
+        static EncodedJSValue JIT_STUB cti_op_resolve_skip(STUB_ARGS_DECLARATION);
+        static EncodedJSValue JIT_STUB cti_op_rshift(STUB_ARGS_DECLARATION);
+        static EncodedJSValue JIT_STUB cti_op_stricteq(STUB_ARGS_DECLARATION);
+        static EncodedJSValue JIT_STUB cti_op_strcat(STUB_ARGS_DECLARATION);
+        static EncodedJSValue JIT_STUB cti_op_to_primitive(STUB_ARGS_DECLARATION);
+        static EncodedJSValue JIT_STUB cti_op_sub(STUB_ARGS_DECLARATION);
+        static EncodedJSValue JIT_STUB cti_op_throw(STUB_ARGS_DECLARATION);
+        static EncodedJSValue JIT_STUB cti_op_to_jsnumber(STUB_ARGS_DECLARATION);
+        static EncodedJSValue JIT_STUB cti_op_typeof(STUB_ARGS_DECLARATION);
+        static EncodedJSValue JIT_STUB cti_op_urshift(STUB_ARGS_DECLARATION);
+        static EncodedJSValue JIT_STUB cti_vm_throw(STUB_ARGS_DECLARATION);
+        static VoidPtrPair JIT_STUB cti_op_call_arityCheck(STUB_ARGS_DECLARATION);
+        static VoidPtrPair JIT_STUB cti_op_post_dec(STUB_ARGS_DECLARATION);
+        static VoidPtrPair JIT_STUB cti_op_post_inc(STUB_ARGS_DECLARATION);
+        static VoidPtrPair JIT_STUB cti_op_resolve_func(STUB_ARGS_DECLARATION);
+        static VoidPtrPair JIT_STUB cti_op_resolve_with_base(STUB_ARGS_DECLARATION);
+        static int JIT_STUB cti_op_jless(STUB_ARGS_DECLARATION);
+        static int JIT_STUB cti_op_jtrue(STUB_ARGS_DECLARATION);
+        static int JIT_STUB cti_op_loop_if_less(STUB_ARGS_DECLARATION);
+        static int JIT_STUB cti_op_loop_if_lesseq(STUB_ARGS_DECLARATION);
+        static int JIT_STUB cti_op_loop_if_true(STUB_ARGS_DECLARATION);
+        static int JIT_STUB cti_op_load_varargs(STUB_ARGS_DECLARATION);
+        static int JIT_STUB cti_timeout_check(STUB_ARGS_DECLARATION);
+        static void JIT_STUB cti_op_create_arguments(STUB_ARGS_DECLARATION);
+        static void JIT_STUB cti_op_create_arguments_no_params(STUB_ARGS_DECLARATION);
+        static void JIT_STUB cti_op_debug(STUB_ARGS_DECLARATION);
+        static void JIT_STUB cti_op_end(STUB_ARGS_DECLARATION);
+        static void JIT_STUB cti_op_jmp_scopes(STUB_ARGS_DECLARATION);
+        static void JIT_STUB cti_op_pop_scope(STUB_ARGS_DECLARATION);
+        static void JIT_STUB cti_op_profile_did_call(STUB_ARGS_DECLARATION);
+        static void JIT_STUB cti_op_profile_will_call(STUB_ARGS_DECLARATION);
+        static void JIT_STUB cti_op_put_by_id(STUB_ARGS_DECLARATION);
+        static void JIT_STUB cti_op_put_by_id_fail(STUB_ARGS_DECLARATION);
+        static void JIT_STUB cti_op_put_by_id_generic(STUB_ARGS_DECLARATION);
+        static void JIT_STUB cti_op_put_by_id_second(STUB_ARGS_DECLARATION);
+        static void JIT_STUB cti_op_put_by_index(STUB_ARGS_DECLARATION);
+        static void JIT_STUB cti_op_put_by_val(STUB_ARGS_DECLARATION);
+        static void JIT_STUB cti_op_put_by_val_array(STUB_ARGS_DECLARATION);
+        static void JIT_STUB cti_op_put_by_val_byte_array(STUB_ARGS_DECLARATION);
+        static void JIT_STUB cti_op_put_getter(STUB_ARGS_DECLARATION);
+        static void JIT_STUB cti_op_put_setter(STUB_ARGS_DECLARATION);
+        static void JIT_STUB cti_op_ret_scopeChain(STUB_ARGS_DECLARATION);
+        static void JIT_STUB cti_op_tear_off_activation(STUB_ARGS_DECLARATION);
+        static void JIT_STUB cti_op_tear_off_arguments(STUB_ARGS_DECLARATION);
+        static void JIT_STUB cti_register_file_check(STUB_ARGS_DECLARATION);
+        static void* JIT_STUB cti_op_call_JSFunction(STUB_ARGS_DECLARATION);
+        static void* JIT_STUB cti_op_switch_char(STUB_ARGS_DECLARATION);
+        static void* JIT_STUB cti_op_switch_imm(STUB_ARGS_DECLARATION);
+        static void* JIT_STUB cti_op_switch_string(STUB_ARGS_DECLARATION);
+        static void* JIT_STUB cti_vm_dontLazyLinkCall(STUB_ARGS_DECLARATION);
+        static void* JIT_STUB cti_vm_lazyLinkCall(STUB_ARGS_DECLARATION);
 
         static void tryCacheGetByID(CallFrame*, CodeBlock*, void* returnAddress, JSValue baseValue, const Identifier& propertyName, const PropertySlot&);