Changeset 44344 in webkit for trunk/JavaScriptCore

Timestamp:

Jun 1, 2009, 10:36:18 PM (16 years ago)

Author:

[email protected]

Message:

2009-06-01 Gavin Barraclough <​[email protected]>

Reviewed by Olliej Hunt.

Change JITStub functions from being static members on the JITStub class to be
global extern "C" functions, and switch their the function signature declaration
in the definition of the functions to be C-macro generated. This makes it easier
to work with the stub functions from assembler code (since the names no longer
require mangling), and by delaring the functions with a macro we can look at
also auto-generating asm thunks to wrap the JITStub functions to perform the
work currently in 'restoreArgumentReference' (as a memory saving).

Making this change also forces us to be a bit more realistic about what is private
on the Register and CallFrame objects. Presently most everything on these classes
is private, and the classes have plenty of friends. We could befriend all the
global functions to perpetuate the delusion of encapsulation, but using friends is
a bit of a sledgehammer solution here - since friends can poke around with all of
the class's privates, and since all the major classes taht operate on Regsiters are
currently friends, right there is currently in practice very little protection at
all. Better to start removing friend delclarations, and exposing just the parts
that need to be exposed.

• interpreter/CallFrame.h: (JSC::ExecState::returnPC): (JSC::ExecState::setCallerFrame): (JSC::ExecState::returnValueRegister): (JSC::ExecState::setArgumentCount): (JSC::ExecState::setCallee): (JSC::ExecState::setCodeBlock):
• interpreter/Interpreter.h:
• interpreter/Register.h: (JSC::Register::Register): (JSC::Register::i):
• jit/JITStubs.cpp: (JSC::): (JSC::JITThunks::JITThunks): (JSC::JITThunks::tryCachePutByID): (JSC::JITThunks::tryCacheGetByID): (JSC::JITStubs::DEFINE_STUB_FUNCTION):
• jit/JITStubs.h: (JSC::JITStubs::):
• runtime/JSFunction.h: (JSC::JSFunction::nativeFunction): (JSC::JSFunction::classInfo):
• runtime/JSGlobalData.h:

Location:

trunk/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• interpreter/CallFrame.h (modified) (3 diffs)
• interpreter/Interpreter.h (modified) (4 diffs)
• interpreter/Register.h (modified) (6 diffs)
• jit/JITStubs.cpp (modified) (123 diffs)
• jit/JITStubs.h (modified) (2 diffs)
• runtime/JSFunction.h (modified) (2 diffs)
• runtime/JSGlobalData.h (modified) (1 diff)

trunk/JavaScriptCore/ChangeLog

@@ +1 @@
+2009-06-01  Gavin Barraclough  <[email protected]>
+
+        Reviewed by Olliej Hunt.
+
+        Change JITStub functions from being static members on the JITStub class to be
+        global extern "C" functions, and switch their the function signature declaration
+        in the definition of the functions to be C-macro generated.  This makes it easier
+        to work with the stub functions from assembler code (since the names no longer
+        require mangling), and by delaring the functions with a macro we can look at
+        also auto-generating asm thunks to wrap the JITStub functions to perform the
+        work currently in 'restoreArgumentReference' (as a memory saving).
+
+        Making this change also forces us to be a bit more realistic about what is private
+        on the Register and CallFrame objects.  Presently most everything on these classes
+        is private, and the classes have plenty of friends.  We could befriend all the
+        global functions to perpetuate the delusion of encapsulation, but using friends is
+        a bit of a sledgehammer solution here - since friends can poke around with all of
+        the class's privates, and since all the major classes taht operate on Regsiters are
+        currently friends, right there is currently in practice very little protection at
+        all.  Better to start removing friend delclarations, and exposing just the parts
+        that need to be exposed.
+
+        * interpreter/CallFrame.h:
+        (JSC::ExecState::returnPC):
+        (JSC::ExecState::setCallerFrame):
+        (JSC::ExecState::returnValueRegister):
+        (JSC::ExecState::setArgumentCount):
+        (JSC::ExecState::setCallee):
+        (JSC::ExecState::setCodeBlock):
+        * interpreter/Interpreter.h:
+        * interpreter/Register.h:
+        (JSC::Register::Register):
+        (JSC::Register::i):
+        * jit/JITStubs.cpp:
+        (JSC::):
+        (JSC::JITThunks::JITThunks):
+        (JSC::JITThunks::tryCachePutByID):
+        (JSC::JITThunks::tryCacheGetByID):
+        (JSC::JITStubs::DEFINE_STUB_FUNCTION):
+        * jit/JITStubs.h:
+        (JSC::JITStubs::):
+        * runtime/JSFunction.h:
+        (JSC::JSFunction::nativeFunction):
+        (JSC::JSFunction::classInfo):
+        * runtime/JSGlobalData.h:
+
 2009-06-01  Oliver Hunt  <[email protected]>
 

trunk/JavaScriptCore/interpreter/CallFrame.h

@@ -96 +96 @@
         static const HashTable* stringTable(CallFrame* callFrame) { return callFrame->globalData().stringTable; }
 
-    private:
-        friend class Arguments;
-        friend class JSActivation;
-        friend class JSGlobalObject;
-        friend class Interpreter;
-        friend class JITStubs;
-        friend struct CallFrameClosure;
-
         static CallFrame* create(Register* callFrameBase) { return static_cast<CallFrame*>(callFrameBase); }
         Register* registers() { return this; }
@@ -112 +104 @@
         Arguments* optionalCalleeArguments() const { return this[RegisterFile::OptionalCalleeArguments].arguments(); }
         Instruction* returnPC() const { return this[RegisterFile::ReturnPC].vPC(); }
-        int returnValueRegister() const { return this[RegisterFile::ReturnValueRegister].i(); }
 
-        void setArgumentCount(int count) { this[RegisterFile::ArgumentCount] = count; }
-        void setCallee(JSFunction* callee) { this[RegisterFile::Callee] = callee; }
         void setCalleeArguments(Arguments* arguments) { this[RegisterFile::OptionalCalleeArguments] = arguments; }
         void setCallerFrame(CallFrame* callerFrame) { this[RegisterFile::CallerFrame] = callerFrame; }
-        void setCodeBlock(CodeBlock* codeBlock) { this[RegisterFile::CodeBlock] = codeBlock; }
         void setScopeChain(ScopeChainNode* scopeChain) { this[RegisterFile::ScopeChain] = scopeChain; }
 
@@ -136 +124 @@
         }
 
+    private:
+        friend class Arguments;
+        friend class JSActivation;
+        friend class JSGlobalObject;
+        friend class Interpreter;
+        friend struct CallFrameClosure;
+
+        int returnValueRegister() const { return this[RegisterFile::ReturnValueRegister].i(); }
+
+        void setArgumentCount(int count) { this[RegisterFile::ArgumentCount] = count; }
+        void setCallee(JSFunction* callee) { this[RegisterFile::Callee] = callee; }
+        void setCodeBlock(CodeBlock* codeBlock) { this[RegisterFile::CodeBlock] = codeBlock; }
+
         static const intptr_t HostCallFrameFlag = 1;
 

trunk/JavaScriptCore/interpreter/Interpreter.h

@@ -68 +68 @@
     class Interpreter : public WTF::FastAllocBase {
         friend class JIT;
-        friend class JITStubs;
         friend class CachedCall;
     public:
@@ -109 +108 @@
         SamplingTool* sampler() { return m_sampler; }
 
+        NEVER_INLINE JSValue callEval(CallFrame*, RegisterFile*, Register* argv, int argc, int registerOffset, JSValue& exceptionValue);
+        NEVER_INLINE HandlerInfo* throwException(CallFrame*&, JSValue&, unsigned bytecodeOffset, bool);
+        NEVER_INLINE void debug(CallFrame*, DebugHookID, int firstLine, int lastLine);
+
     private:
         enum ExecutionFlag { Normal, InitializeAndReturn };
@@ -116 +119 @@
         JSValue execute(CallFrameClosure&, JSValue* exception);
 
-        NEVER_INLINE JSValue callEval(CallFrame*, RegisterFile*, Register* argv, int argc, int registerOffset, JSValue& exceptionValue);
         JSValue execute(EvalNode*, CallFrame*, JSObject* thisObject, int globalRegisterOffset, ScopeChainNode*, JSValue* exception);
 
-        NEVER_INLINE void debug(CallFrame*, DebugHookID, int firstLine, int lastLine);
 #if USE(INTERPRETER)
         NEVER_INLINE bool resolve(CallFrame*, Instruction*, JSValue& exceptionValue);
@@ -136 +137 @@
 
         NEVER_INLINE bool unwindCallFrame(CallFrame*&, JSValue, unsigned& bytecodeOffset, CodeBlock*&);
-        NEVER_INLINE HandlerInfo* throwException(CallFrame*&, JSValue&, unsigned bytecodeOffset, bool);
 
         static ALWAYS_INLINE CallFrame* slideRegisterWindowForCall(CodeBlock*, RegisterFile*, CallFrame*, size_t registerOffset, int argc);

trunk/JavaScriptCore/interpreter/Register.h

@@ -31 +31 @@
 
 #include "JSValue.h"
+#include <wtf/Assertions.h>
 #include <wtf/VectorTraits.h>
 
@@ -51 +52 @@
         Register();
         Register(JSValue);
+        Register(Arguments*);
 
         JSValue jsValue() const;
@@ -57 +59 @@
         void mark();
         
+        int32_t i() const;
+        void* v() const;
+
     private:
         friend class ExecState;
         friend class Interpreter;
-        friend class JITStubs;
 
         // Only CallFrame, Interpreter, and JITStubs should use these functions.
@@ -67 +71 @@
 
         Register(JSActivation*);
-        Register(Arguments*);
         Register(CallFrame*);
         Register(CodeBlock*);
@@ -74 +77 @@
         Register(ScopeChainNode*);
         Register(Instruction*);
-
-        intptr_t i() const;
-        void* v() const;
 
         JSActivation* activation() const;
@@ -174 +174 @@
     ALWAYS_INLINE Register::Register(intptr_t i)
     {
+        // See comment on 'i()' below.
+        ASSERT(i == static_cast<int32_t>(i));
         u.i = i;
     }
 
-    ALWAYS_INLINE intptr_t Register::i() const
-    {
-        return u.i;
+    // Read 'i' as a 32-bit integer; we only use it to hold 32-bit values,
+    // and we only write 32-bits when writing the arg count from JIT code.
+    ALWAYS_INLINE int32_t Register::i() const
+    {
+        return static_cast<int32_t>(u.i);
     }
     

trunk/JavaScriptCore/jit/JITStubs.cpp

@@ -102 +102 @@
 SYMBOL_STRING(ctiVMThrowTrampoline) ":" "\n"
 #if USE(JIT_STUB_ARGUMENT_VA_LIST)
-    "call " SYMBOL_STRING(_ZN3JSC8JITStubs12cti_vm_throwEPvz) "\n"
+    "call " SYMBOL_STRING(cti_vm_throw) "\n"
 #else
 #if USE(JIT_STUB_ARGUMENT_REGISTER)
@@ -109 +109 @@
     "movl %esp, 0(%esp)" "\n"
 #endif
-    "call " SYMBOL_STRING(_ZN3JSC8JITStubs12cti_vm_throwEPPv) "\n"
+    "call " SYMBOL_STRING(cti_vm_throw) "\n"
 #endif
     "addl $0x1c, %esp" "\n"
@@ -164 +164 @@
 #if USE(JIT_STUB_ARGUMENT_REGISTER)
     "movq %rsp, %rdi" "\n"
-    "call " SYMBOL_STRING(_ZN3JSC8JITStubs12cti_vm_throwEPPv) "\n"
+    "call " SYMBOL_STRING(cti_vm_throw) "\n"
 #else // JIT_STUB_ARGUMENT_VA_LIST or JIT_STUB_ARGUMENT_STACK
 #error "JIT_STUB_ARGUMENT configuration not supported."
@@ -218 +218 @@
 #error "JIT_STUB_ARGUMENT configuration not supported."
 #endif
-            call JSC::JITStubs::cti_vm_throw;
+            call cti_vm_throw;
             add esp, 0x1c;
             pop ebx;
@@ -238 +238 @@
 #endif
 
-JITStubs::JITStubs(JSGlobalData* globalData)
+JITThunks::JITThunks(JSGlobalData* globalData)
     : m_ctiArrayLengthTrampoline(0)
     , m_ctiStringLengthTrampoline(0)
@@ -251 +251 @@
 #if ENABLE(JIT_OPTIMIZE_PROPERTY_ACCESS)
 
-NEVER_INLINE void JITStubs::tryCachePutByID(CallFrame* callFrame, CodeBlock* codeBlock, void* returnAddress, JSValue baseValue, const PutPropertySlot& slot)
+NEVER_INLINE void JITThunks::tryCachePutByID(CallFrame* callFrame, CodeBlock* codeBlock, void* returnAddress, JSValue baseValue, const PutPropertySlot& slot)
 {
     // The interpreter checks for recursion here; I do not believe this can occur in CTI.
@@ -295 +295 @@
 }
 
-NEVER_INLINE void JITStubs::tryCacheGetByID(CallFrame* callFrame, CodeBlock* codeBlock, void* returnAddress, JSValue baseValue, const Identifier& propertyName, const PropertySlot& slot)
+NEVER_INLINE void JITThunks::tryCacheGetByID(CallFrame* callFrame, CodeBlock* codeBlock, void* returnAddress, JSValue baseValue, const Identifier& propertyName, const PropertySlot& slot)
 {
     // FIXME: Write a test that proves we need to check for recursion here just
@@ -469 +469 @@
     } while (0)
 
-
-JSObject* JITStubs::cti_op_convert_this(STUB_ARGS_DECLARATION)
+namespace JITStubs {
+
+#define DEFINE_STUB_FUNCTION(rtype, op) rtype cti_##op(STUB_ARGS_DECLARATION)
+
+DEFINE_STUB_FUNCTION(JSObject*, op_convert_this)
 {
     STUB_INIT_STACK_FRAME(stackFrame);
@@ -482 +485 @@
 }
 
-void JITStubs::cti_op_end(STUB_ARGS_DECLARATION)
+DEFINE_STUB_FUNCTION(void, op_end)
 {
     STUB_INIT_STACK_FRAME(stackFrame);
@@ -491 +494 @@
 }
 
-EncodedJSValue JITStubs::cti_op_add(STUB_ARGS_DECLARATION)
+DEFINE_STUB_FUNCTION(EncodedJSValue, op_add)
 {
     STUB_INIT_STACK_FRAME(stackFrame);
@@ -536 +539 @@
 }
 
-EncodedJSValue JITStubs::cti_op_pre_inc(STUB_ARGS_DECLARATION)
+DEFINE_STUB_FUNCTION(EncodedJSValue, op_pre_inc)
 {
     STUB_INIT_STACK_FRAME(stackFrame);
@@ -548 +551 @@
 }
 
-int JITStubs::cti_timeout_check(STUB_ARGS_DECLARATION)
+DEFINE_STUB_FUNCTION(int, timeout_check)
 {
     STUB_INIT_STACK_FRAME(stackFrame);
@@ -563 +566 @@
 }
 
-void JITStubs::cti_register_file_check(STUB_ARGS_DECLARATION)
-{
-    STUB_INIT_STACK_FRAME(stackFrame);
-
-    if (LIKELY(stackFrame.registerFile->grow(stackFrame.callFrame + stackFrame.callFrame->codeBlock()->m_numCalleeRegisters)))
+DEFINE_STUB_FUNCTION(void, register_file_check)
+{
+    STUB_INIT_STACK_FRAME(stackFrame);
+
+    if (LIKELY(stackFrame.registerFile->grow(&stackFrame.callFrame->registers()[stackFrame.callFrame->codeBlock()->m_numCalleeRegisters])))
         return;
 
@@ -577 +580 @@
 }
 
-int JITStubs::cti_op_loop_if_less(STUB_ARGS_DECLARATION)
+DEFINE_STUB_FUNCTION(int, op_loop_if_less)
 {
     STUB_INIT_STACK_FRAME(stackFrame);
@@ -590 +593 @@
 }
 
-int JITStubs::cti_op_loop_if_lesseq(STUB_ARGS_DECLARATION)
+DEFINE_STUB_FUNCTION(int, op_loop_if_lesseq)
 {
     STUB_INIT_STACK_FRAME(stackFrame);
@@ -603 +606 @@
 }
 
-JSObject* JITStubs::cti_op_new_object(STUB_ARGS_DECLARATION)
+DEFINE_STUB_FUNCTION(JSObject*, op_new_object)
 {
     STUB_INIT_STACK_FRAME(stackFrame);
@@ -610 +613 @@
 }
 
-void JITStubs::cti_op_put_by_id_generic(STUB_ARGS_DECLARATION)
+DEFINE_STUB_FUNCTION(void, op_put_by_id_generic)
 {
     STUB_INIT_STACK_FRAME(stackFrame);
@@ -619 +622 @@
 }
 
-EncodedJSValue JITStubs::cti_op_get_by_id_generic(STUB_ARGS_DECLARATION)
+DEFINE_STUB_FUNCTION(EncodedJSValue, op_get_by_id_generic)
 {
     STUB_INIT_STACK_FRAME(stackFrame);
@@ -636 +639 @@
 #if ENABLE(JIT_OPTIMIZE_PROPERTY_ACCESS)
 
-void JITStubs::cti_op_put_by_id(STUB_ARGS_DECLARATION)
+DEFINE_STUB_FUNCTION(void, op_put_by_id)
 {
     STUB_INIT_STACK_FRAME(stackFrame);
@@ -651 +654 @@
 }
 
-void JITStubs::cti_op_put_by_id_second(STUB_ARGS_DECLARATION)
+DEFINE_STUB_FUNCTION(void, op_put_by_id_second)
 {
     STUB_INIT_STACK_FRAME(stackFrame);
@@ -657 +660 @@
     PutPropertySlot slot;
     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)
+    JITThunks::tryCachePutByID(stackFrame.callFrame, stackFrame.callFrame->codeBlock(), STUB_RETURN_ADDRESS, stackFrame.args[0].jsValue(), slot);
+    CHECK_FOR_EXCEPTION_AT_END();
+}
+
+DEFINE_STUB_FUNCTION(void, op_put_by_id_fail)
 {
     STUB_INIT_STACK_FRAME(stackFrame);
@@ -674 +677 @@
 }
 
-EncodedJSValue JITStubs::cti_op_get_by_id(STUB_ARGS_DECLARATION)
+DEFINE_STUB_FUNCTION(EncodedJSValue, op_get_by_id)
 {
     STUB_INIT_STACK_FRAME(stackFrame);
@@ -691 +694 @@
 }
 
-EncodedJSValue JITStubs::cti_op_get_by_id_method_check(STUB_ARGS_DECLARATION)
+DEFINE_STUB_FUNCTION(EncodedJSValue, op_get_by_id_method_check)
 {
     STUB_INIT_STACK_FRAME(stackFrame);
@@ -708 +711 @@
 }
 
-EncodedJSValue JITStubs::cti_op_get_by_id_method_check_second(STUB_ARGS_DECLARATION)
+DEFINE_STUB_FUNCTION(EncodedJSValue, op_get_by_id_method_check_second)
 {
     STUB_INIT_STACK_FRAME(stackFrame);
@@ -773 +776 @@
 }
 
-EncodedJSValue JITStubs::cti_op_get_by_id_second(STUB_ARGS_DECLARATION)
+DEFINE_STUB_FUNCTION(EncodedJSValue, op_get_by_id_second)
 {
     STUB_INIT_STACK_FRAME(stackFrame);
@@ -784 +787 @@
     JSValue result = baseValue.get(callFrame, ident, slot);
 
-    tryCacheGetByID(callFrame, callFrame->codeBlock(), STUB_RETURN_ADDRESS, baseValue, ident, slot);
-
-    CHECK_FOR_EXCEPTION_AT_END();
-    return JSValue::encode(result);
-}
-
-EncodedJSValue JITStubs::cti_op_get_by_id_self_fail(STUB_ARGS_DECLARATION)
+    JITThunks::tryCacheGetByID(callFrame, callFrame->codeBlock(), STUB_RETURN_ADDRESS, baseValue, ident, slot);
+
+    CHECK_FOR_EXCEPTION_AT_END();
+    return JSValue::encode(result);
+}
+
+DEFINE_STUB_FUNCTION(EncodedJSValue, op_get_by_id_self_fail)
 {
     STUB_INIT_STACK_FRAME(stackFrame);
@@ -865 +868 @@
 }
 
-EncodedJSValue JITStubs::cti_op_get_by_id_proto_list(STUB_ARGS_DECLARATION)
+DEFINE_STUB_FUNCTION(EncodedJSValue, op_get_by_id_proto_list)
 {
     STUB_INIT_STACK_FRAME(stackFrame);
@@ -917 +920 @@
 }
 
-EncodedJSValue JITStubs::cti_op_get_by_id_proto_list_full(STUB_ARGS_DECLARATION)
+DEFINE_STUB_FUNCTION(EncodedJSValue, op_get_by_id_proto_list_full)
 {
     STUB_INIT_STACK_FRAME(stackFrame);
@@ -929 +932 @@
 }
 
-EncodedJSValue JITStubs::cti_op_get_by_id_proto_fail(STUB_ARGS_DECLARATION)
+DEFINE_STUB_FUNCTION(EncodedJSValue, op_get_by_id_proto_fail)
 {
     STUB_INIT_STACK_FRAME(stackFrame);
@@ -941 +944 @@
 }
 
-EncodedJSValue JITStubs::cti_op_get_by_id_array_fail(STUB_ARGS_DECLARATION)
+DEFINE_STUB_FUNCTION(EncodedJSValue, op_get_by_id_array_fail)
 {
     STUB_INIT_STACK_FRAME(stackFrame);
@@ -953 +956 @@
 }
 
-EncodedJSValue JITStubs::cti_op_get_by_id_string_fail(STUB_ARGS_DECLARATION)
+DEFINE_STUB_FUNCTION(EncodedJSValue, op_get_by_id_string_fail)
 {
     STUB_INIT_STACK_FRAME(stackFrame);
@@ -967 +970 @@
 #endif
 
-EncodedJSValue JITStubs::cti_op_instanceof(STUB_ARGS_DECLARATION)
+DEFINE_STUB_FUNCTION(EncodedJSValue, op_instanceof)
 {
     STUB_INIT_STACK_FRAME(stackFrame);
@@ -1010 +1013 @@
 }
 
-EncodedJSValue JITStubs::cti_op_del_by_id(STUB_ARGS_DECLARATION)
+DEFINE_STUB_FUNCTION(EncodedJSValue, op_del_by_id)
 {
     STUB_INIT_STACK_FRAME(stackFrame);
@@ -1023 +1026 @@
 }
 
-EncodedJSValue JITStubs::cti_op_mul(STUB_ARGS_DECLARATION)
+DEFINE_STUB_FUNCTION(EncodedJSValue, op_mul)
 {
     STUB_INIT_STACK_FRAME(stackFrame);
@@ -1041 +1044 @@
 }
 
-JSObject* JITStubs::cti_op_new_func(STUB_ARGS_DECLARATION)
+DEFINE_STUB_FUNCTION(JSObject*, op_new_func)
 {
     STUB_INIT_STACK_FRAME(stackFrame);
@@ -1048 +1051 @@
 }
 
-void* JITStubs::cti_op_call_JSFunction(STUB_ARGS_DECLARATION)
+DEFINE_STUB_FUNCTION(void*, op_call_JSFunction)
 {
     STUB_INIT_STACK_FRAME(stackFrame);
@@ -1065 +1068 @@
 }
 
-VoidPtrPair JITStubs::cti_op_call_arityCheck(STUB_ARGS_DECLARATION)
+DEFINE_STUB_FUNCTION(VoidPtrPair, op_call_arityCheck)
 {
     STUB_INIT_STACK_FRAME(stackFrame);
@@ -1110 +1113 @@
 }
 
-void* JITStubs::cti_vm_dontLazyLinkCall(STUB_ARGS_DECLARATION)
+DEFINE_STUB_FUNCTION(void*, vm_dontLazyLinkCall)
 {
     STUB_INIT_STACK_FRAME(stackFrame);
@@ -1122 +1125 @@
 }
 
-void* JITStubs::cti_vm_lazyLinkCall(STUB_ARGS_DECLARATION)
+DEFINE_STUB_FUNCTION(void*, vm_lazyLinkCall)
 {
     STUB_INIT_STACK_FRAME(stackFrame);
@@ -1139 +1142 @@
 }
 
-JSObject* JITStubs::cti_op_push_activation(STUB_ARGS_DECLARATION)
+DEFINE_STUB_FUNCTION(JSObject*, op_push_activation)
 {
     STUB_INIT_STACK_FRAME(stackFrame);
@@ -1148 +1151 @@
 }
 
-EncodedJSValue JITStubs::cti_op_call_NotJSFunction(STUB_ARGS_DECLARATION)
+DEFINE_STUB_FUNCTION(EncodedJSValue, op_call_NotJSFunction)
 {
     STUB_INIT_STACK_FRAME(stackFrame);
@@ -1197 +1200 @@
 }
 
-void JITStubs::cti_op_create_arguments(STUB_ARGS_DECLARATION)
+DEFINE_STUB_FUNCTION(void, op_create_arguments)
 {
     STUB_INIT_STACK_FRAME(stackFrame);
@@ -1206 +1209 @@
 }
 
-void JITStubs::cti_op_create_arguments_no_params(STUB_ARGS_DECLARATION)
+DEFINE_STUB_FUNCTION(void, op_create_arguments_no_params)
 {
     STUB_INIT_STACK_FRAME(stackFrame);
@@ -1215 +1218 @@
 }
 
-void JITStubs::cti_op_tear_off_activation(STUB_ARGS_DECLARATION)
+DEFINE_STUB_FUNCTION(void, op_tear_off_activation)
 {
     STUB_INIT_STACK_FRAME(stackFrame);
@@ -1223 +1226 @@
 }
 
-void JITStubs::cti_op_tear_off_arguments(STUB_ARGS_DECLARATION)
+DEFINE_STUB_FUNCTION(void, op_tear_off_arguments)
 {
     STUB_INIT_STACK_FRAME(stackFrame);
@@ -1232 +1235 @@
 }
 
-void JITStubs::cti_op_profile_will_call(STUB_ARGS_DECLARATION)
+DEFINE_STUB_FUNCTION(void, op_profile_will_call)
 {
     STUB_INIT_STACK_FRAME(stackFrame);
@@ -1240 +1243 @@
 }
 
-void JITStubs::cti_op_profile_did_call(STUB_ARGS_DECLARATION)
+DEFINE_STUB_FUNCTION(void, op_profile_did_call)
 {
     STUB_INIT_STACK_FRAME(stackFrame);
@@ -1248 +1251 @@
 }
 
-void JITStubs::cti_op_ret_scopeChain(STUB_ARGS_DECLARATION)
+DEFINE_STUB_FUNCTION(void, op_ret_scopeChain)
 {
     STUB_INIT_STACK_FRAME(stackFrame);
@@ -1256 +1259 @@
 }
 
-JSObject* JITStubs::cti_op_new_array(STUB_ARGS_DECLARATION)
+DEFINE_STUB_FUNCTION(JSObject*, op_new_array)
 {
     STUB_INIT_STACK_FRAME(stackFrame);
@@ -1264 +1267 @@
 }
 
-EncodedJSValue JITStubs::cti_op_resolve(STUB_ARGS_DECLARATION)
+DEFINE_STUB_FUNCTION(EncodedJSValue, op_resolve)
 {
     STUB_INIT_STACK_FRAME(stackFrame);
@@ -1292 +1295 @@
 }
 
-JSObject* JITStubs::cti_op_construct_JSConstruct(STUB_ARGS_DECLARATION)
+DEFINE_STUB_FUNCTION(JSObject*, op_construct_JSConstruct)
 {
     STUB_INIT_STACK_FRAME(stackFrame);
@@ -1318 +1321 @@
 }
 
-EncodedJSValue JITStubs::cti_op_construct_NotJSConstruct(STUB_ARGS_DECLARATION)
+DEFINE_STUB_FUNCTION(EncodedJSValue, op_construct_NotJSConstruct)
 {
     STUB_INIT_STACK_FRAME(stackFrame);
@@ -1352 +1355 @@
 }
 
-EncodedJSValue JITStubs::cti_op_get_by_val(STUB_ARGS_DECLARATION)
+DEFINE_STUB_FUNCTION(EncodedJSValue, op_get_by_val)
 {
     STUB_INIT_STACK_FRAME(stackFrame);
@@ -1391 +1394 @@
 }
     
-EncodedJSValue JITStubs::cti_op_get_by_val_string(STUB_ARGS_DECLARATION)
+DEFINE_STUB_FUNCTION(EncodedJSValue, op_get_by_val_string)
 {
     STUB_INIT_STACK_FRAME(stackFrame);
@@ -1422 +1425 @@
     
 
-EncodedJSValue JITStubs::cti_op_get_by_val_byte_array(STUB_ARGS_DECLARATION)
+DEFINE_STUB_FUNCTION(EncodedJSValue, op_get_by_val_byte_array)
 {
     STUB_INIT_STACK_FRAME(stackFrame);
@@ -1453 +1456 @@
 }
 
-EncodedJSValue JITStubs::cti_op_resolve_func(STUB_ARGS_DECLARATION)
+DEFINE_STUB_FUNCTION(EncodedJSValue, op_resolve_func)
 {
     STUB_INIT_STACK_FRAME(stackFrame);
@@ -1497 +1500 @@
 }
 
-EncodedJSValue JITStubs::cti_op_sub(STUB_ARGS_DECLARATION)
+DEFINE_STUB_FUNCTION(EncodedJSValue, op_sub)
 {
     STUB_INIT_STACK_FRAME(stackFrame);
@@ -1515 +1518 @@
 }
 
-void JITStubs::cti_op_put_by_val(STUB_ARGS_DECLARATION)
+DEFINE_STUB_FUNCTION(void, op_put_by_val)
 {
     STUB_INIT_STACK_FRAME(stackFrame);
@@ -1563 +1566 @@
 }
 
-void JITStubs::cti_op_put_by_val_array(STUB_ARGS_DECLARATION)
+DEFINE_STUB_FUNCTION(void, op_put_by_val_array)
 {
     STUB_INIT_STACK_FRAME(stackFrame);
@@ -1590 +1593 @@
 }
 
-void JITStubs::cti_op_put_by_val_byte_array(STUB_ARGS_DECLARATION)
+DEFINE_STUB_FUNCTION(void, op_put_by_val_byte_array)
 {
     STUB_INIT_STACK_FRAME(stackFrame);
@@ -1633 +1636 @@
 }
 
-EncodedJSValue JITStubs::cti_op_lesseq(STUB_ARGS_DECLARATION)
+DEFINE_STUB_FUNCTION(EncodedJSValue, op_lesseq)
 {
     STUB_INIT_STACK_FRAME(stackFrame);
@@ -1643 +1646 @@
 }
 
-int JITStubs::cti_op_loop_if_true(STUB_ARGS_DECLARATION)
+DEFINE_STUB_FUNCTION(int, op_loop_if_true)
 {
     STUB_INIT_STACK_FRAME(stackFrame);
@@ -1656 +1659 @@
 }
     
-int JITStubs::cti_op_load_varargs(STUB_ARGS_DECLARATION)
+DEFINE_STUB_FUNCTION(int, op_load_varargs)
 {
     STUB_INIT_STACK_FRAME(stackFrame);
@@ -1662 +1665 @@
     RegisterFile* registerFile = stackFrame.registerFile;
     int argsOffset = stackFrame.args[0].int32();
-    JSValue arguments = callFrame[argsOffset].jsValue();
+    JSValue arguments = callFrame->registers()[argsOffset].jsValue();
     uint32_t argCount = 0;
     if (!arguments) {
-        int providedParams = callFrame[RegisterFile::ArgumentCount].u.i - 1;
+        int providedParams = callFrame->registers()[RegisterFile::ArgumentCount].i() - 1;
         argCount = providedParams;
         int32_t sizeDelta = argsOffset + argCount + RegisterFile::CallFrameHeaderSize;
@@ -1673 +1676 @@
             VM_THROW_EXCEPTION();
         }
-        int32_t expectedParams = asFunction(callFrame[RegisterFile::Callee].jsValue())->body()->parameterCount();
+        int32_t expectedParams = asFunction(callFrame->registers()[RegisterFile::Callee].jsValue())->body()->parameterCount();
         int32_t inplaceArgs = min(providedParams, expectedParams);
         
@@ -1744 +1747 @@
 }
 
-EncodedJSValue JITStubs::cti_op_negate(STUB_ARGS_DECLARATION)
+DEFINE_STUB_FUNCTION(EncodedJSValue, op_negate)
 {
     STUB_INIT_STACK_FRAME(stackFrame);
@@ -1760 +1763 @@
 }
 
-EncodedJSValue JITStubs::cti_op_resolve_base(STUB_ARGS_DECLARATION)
+DEFINE_STUB_FUNCTION(EncodedJSValue, op_resolve_base)
 {
     STUB_INIT_STACK_FRAME(stackFrame);
@@ -1767 +1770 @@
 }
 
-EncodedJSValue JITStubs::cti_op_resolve_skip(STUB_ARGS_DECLARATION)
+DEFINE_STUB_FUNCTION(EncodedJSValue, op_resolve_skip)
 {
     STUB_INIT_STACK_FRAME(stackFrame);
@@ -1800 +1803 @@
 }
 
-EncodedJSValue JITStubs::cti_op_resolve_global(STUB_ARGS_DECLARATION)
+DEFINE_STUB_FUNCTION(EncodedJSValue, op_resolve_global)
 {
     STUB_INIT_STACK_FRAME(stackFrame);
@@ -1832 +1835 @@
 }
 
-EncodedJSValue JITStubs::cti_op_div(STUB_ARGS_DECLARATION)
+DEFINE_STUB_FUNCTION(EncodedJSValue, op_div)
 {
     STUB_INIT_STACK_FRAME(stackFrame);
@@ -1850 +1853 @@
 }
 
-EncodedJSValue JITStubs::cti_op_pre_dec(STUB_ARGS_DECLARATION)
+DEFINE_STUB_FUNCTION(EncodedJSValue, op_pre_dec)
 {
     STUB_INIT_STACK_FRAME(stackFrame);
@@ -1862 +1865 @@
 }
 
-int JITStubs::cti_op_jless(STUB_ARGS_DECLARATION)
+DEFINE_STUB_FUNCTION(int, op_jless)
 {
     STUB_INIT_STACK_FRAME(stackFrame);
@@ -1875 +1878 @@
 }
 
-int JITStubs::cti_op_jlesseq(STUB_ARGS_DECLARATION)
+DEFINE_STUB_FUNCTION(int, op_jlesseq)
 {
     STUB_INIT_STACK_FRAME(stackFrame);
@@ -1888 +1891 @@
 }
 
-EncodedJSValue JITStubs::cti_op_not(STUB_ARGS_DECLARATION)
+DEFINE_STUB_FUNCTION(EncodedJSValue, op_not)
 {
     STUB_INIT_STACK_FRAME(stackFrame);
@@ -1901 +1904 @@
 }
 
-int JITStubs::cti_op_jtrue(STUB_ARGS_DECLARATION)
+DEFINE_STUB_FUNCTION(int, op_jtrue)
 {
     STUB_INIT_STACK_FRAME(stackFrame);
@@ -1914 +1917 @@
 }
 
-EncodedJSValue JITStubs::cti_op_post_inc(STUB_ARGS_DECLARATION)
+DEFINE_STUB_FUNCTION(EncodedJSValue, op_post_inc)
 {
     STUB_INIT_STACK_FRAME(stackFrame);
@@ -1929 +1932 @@
 }
 
-EncodedJSValue JITStubs::cti_op_eq(STUB_ARGS_DECLARATION)
+DEFINE_STUB_FUNCTION(EncodedJSValue, op_eq)
 {
     STUB_INIT_STACK_FRAME(stackFrame);
@@ -1944 +1947 @@
 }
 
-EncodedJSValue JITStubs::cti_op_lshift(STUB_ARGS_DECLARATION)
+DEFINE_STUB_FUNCTION(EncodedJSValue, op_lshift)
 {
     STUB_INIT_STACK_FRAME(stackFrame);
@@ -1964 +1967 @@
 }
 
-EncodedJSValue JITStubs::cti_op_bitand(STUB_ARGS_DECLARATION)
+DEFINE_STUB_FUNCTION(EncodedJSValue, op_bitand)
 {
     STUB_INIT_STACK_FRAME(stackFrame);
@@ -1982 +1985 @@
 }
 
-EncodedJSValue JITStubs::cti_op_rshift(STUB_ARGS_DECLARATION)
+DEFINE_STUB_FUNCTION(EncodedJSValue, op_rshift)
 {
     STUB_INIT_STACK_FRAME(stackFrame);
@@ -2002 +2005 @@
 }
 
-EncodedJSValue JITStubs::cti_op_bitnot(STUB_ARGS_DECLARATION)
+DEFINE_STUB_FUNCTION(EncodedJSValue, op_bitnot)
 {
     STUB_INIT_STACK_FRAME(stackFrame);
@@ -2018 +2021 @@
 }
 
-EncodedJSValue JITStubs::cti_op_resolve_with_base(STUB_ARGS_DECLARATION)
+DEFINE_STUB_FUNCTION(EncodedJSValue, op_resolve_with_base)
 {
     STUB_INIT_STACK_FRAME(stackFrame);
@@ -2054 +2057 @@
 }
 
-JSObject* JITStubs::cti_op_new_func_exp(STUB_ARGS_DECLARATION)
+DEFINE_STUB_FUNCTION(JSObject*, op_new_func_exp)
 {
     STUB_INIT_STACK_FRAME(stackFrame);
@@ -2061 +2064 @@
 }
 
-EncodedJSValue JITStubs::cti_op_mod(STUB_ARGS_DECLARATION)
+DEFINE_STUB_FUNCTION(EncodedJSValue, op_mod)
 {
     STUB_INIT_STACK_FRAME(stackFrame);
@@ -2075 +2078 @@
 }
 
-EncodedJSValue JITStubs::cti_op_less(STUB_ARGS_DECLARATION)
+DEFINE_STUB_FUNCTION(EncodedJSValue, op_less)
 {
     STUB_INIT_STACK_FRAME(stackFrame);
@@ -2085 +2088 @@
 }
 
-EncodedJSValue JITStubs::cti_op_neq(STUB_ARGS_DECLARATION)
+DEFINE_STUB_FUNCTION(EncodedJSValue, op_neq)
 {
     STUB_INIT_STACK_FRAME(stackFrame);
@@ -2100 +2103 @@
 }
 
-EncodedJSValue JITStubs::cti_op_post_dec(STUB_ARGS_DECLARATION)
+DEFINE_STUB_FUNCTION(EncodedJSValue, op_post_dec)
 {
     STUB_INIT_STACK_FRAME(stackFrame);
@@ -2115 +2118 @@
 }
 
-EncodedJSValue JITStubs::cti_op_urshift(STUB_ARGS_DECLARATION)
+DEFINE_STUB_FUNCTION(EncodedJSValue, op_urshift)
 {
     STUB_INIT_STACK_FRAME(stackFrame);
@@ -2133 +2136 @@
 }
 
-EncodedJSValue JITStubs::cti_op_bitxor(STUB_ARGS_DECLARATION)
+DEFINE_STUB_FUNCTION(EncodedJSValue, op_bitxor)
 {
     STUB_INIT_STACK_FRAME(stackFrame);
@@ -2147 +2150 @@
 }
 
-JSObject* JITStubs::cti_op_new_regexp(STUB_ARGS_DECLARATION)
+DEFINE_STUB_FUNCTION(JSObject*, op_new_regexp)
 {
     STUB_INIT_STACK_FRAME(stackFrame);
@@ -2154 +2157 @@
 }
 
-EncodedJSValue JITStubs::cti_op_bitor(STUB_ARGS_DECLARATION)
+DEFINE_STUB_FUNCTION(EncodedJSValue, op_bitor)
 {
     STUB_INIT_STACK_FRAME(stackFrame);
@@ -2168 +2171 @@
 }
 
-EncodedJSValue JITStubs::cti_op_call_eval(STUB_ARGS_DECLARATION)
+DEFINE_STUB_FUNCTION(EncodedJSValue, op_call_eval)
 {
     STUB_INIT_STACK_FRAME(stackFrame);
@@ -2199 +2202 @@
 }
 
-EncodedJSValue JITStubs::cti_op_throw(STUB_ARGS_DECLARATION)
+DEFINE_STUB_FUNCTION(EncodedJSValue, op_throw)
 {
     STUB_INIT_STACK_FRAME(stackFrame);
@@ -2225 +2228 @@
 }
 
-JSPropertyNameIterator* JITStubs::cti_op_get_pnames(STUB_ARGS_DECLARATION)
+DEFINE_STUB_FUNCTION(JSPropertyNameIterator*, op_get_pnames)
 {
     STUB_INIT_STACK_FRAME(stackFrame);
@@ -2232 +2235 @@
 }
 
-EncodedJSValue JITStubs::cti_op_next_pname(STUB_ARGS_DECLARATION)
+DEFINE_STUB_FUNCTION(EncodedJSValue, op_next_pname)
 {
     STUB_INIT_STACK_FRAME(stackFrame);
@@ -2243 +2246 @@
 }
 
-JSObject* JITStubs::cti_op_push_scope(STUB_ARGS_DECLARATION)
+DEFINE_STUB_FUNCTION(JSObject*, op_push_scope)
 {
     STUB_INIT_STACK_FRAME(stackFrame);
@@ -2253 +2256 @@
 }
 
-void JITStubs::cti_op_pop_scope(STUB_ARGS_DECLARATION)
+DEFINE_STUB_FUNCTION(void, op_pop_scope)
 {
     STUB_INIT_STACK_FRAME(stackFrame);
@@ -2260 +2263 @@
 }
 
-EncodedJSValue JITStubs::cti_op_typeof(STUB_ARGS_DECLARATION)
+DEFINE_STUB_FUNCTION(EncodedJSValue, op_typeof)
 {
     STUB_INIT_STACK_FRAME(stackFrame);
@@ -2267 +2270 @@
 }
 
-EncodedJSValue JITStubs::cti_op_is_undefined(STUB_ARGS_DECLARATION)
+DEFINE_STUB_FUNCTION(EncodedJSValue, op_is_undefined)
 {
     STUB_INIT_STACK_FRAME(stackFrame);
@@ -2275 +2278 @@
 }
 
-EncodedJSValue JITStubs::cti_op_is_boolean(STUB_ARGS_DECLARATION)
+DEFINE_STUB_FUNCTION(EncodedJSValue, op_is_boolean)
 {
     STUB_INIT_STACK_FRAME(stackFrame);
@@ -2282 +2285 @@
 }
 
-EncodedJSValue JITStubs::cti_op_is_number(STUB_ARGS_DECLARATION)
+DEFINE_STUB_FUNCTION(EncodedJSValue, op_is_number)
 {
     STUB_INIT_STACK_FRAME(stackFrame);
@@ -2289 +2292 @@
 }
 
-EncodedJSValue JITStubs::cti_op_is_string(STUB_ARGS_DECLARATION)
+DEFINE_STUB_FUNCTION(EncodedJSValue, op_is_string)
 {
     STUB_INIT_STACK_FRAME(stackFrame);
@@ -2296 +2299 @@
 }
 
-EncodedJSValue JITStubs::cti_op_is_object(STUB_ARGS_DECLARATION)
+DEFINE_STUB_FUNCTION(EncodedJSValue, op_is_object)
 {
     STUB_INIT_STACK_FRAME(stackFrame);
@@ -2303 +2306 @@
 }
 
-EncodedJSValue JITStubs::cti_op_is_function(STUB_ARGS_DECLARATION)
+DEFINE_STUB_FUNCTION(EncodedJSValue, op_is_function)
 {
     STUB_INIT_STACK_FRAME(stackFrame);
@@ -2310 +2313 @@
 }
 
-EncodedJSValue JITStubs::cti_op_stricteq(STUB_ARGS_DECLARATION)
+DEFINE_STUB_FUNCTION(EncodedJSValue, op_stricteq)
 {
     STUB_INIT_STACK_FRAME(stackFrame);
@@ -2320 +2323 @@
 }
 
-EncodedJSValue JITStubs::cti_op_to_primitive(STUB_ARGS_DECLARATION)
+DEFINE_STUB_FUNCTION(EncodedJSValue, op_to_primitive)
 {
     STUB_INIT_STACK_FRAME(stackFrame);
@@ -2327 +2330 @@
 }
 
-EncodedJSValue JITStubs::cti_op_strcat(STUB_ARGS_DECLARATION)
+DEFINE_STUB_FUNCTION(EncodedJSValue, op_strcat)
 {
     STUB_INIT_STACK_FRAME(stackFrame);
@@ -2334 +2337 @@
 }
 
-EncodedJSValue JITStubs::cti_op_nstricteq(STUB_ARGS_DECLARATION)
+DEFINE_STUB_FUNCTION(EncodedJSValue, op_nstricteq)
 {
     STUB_INIT_STACK_FRAME(stackFrame);
@@ -2344 +2347 @@
 }
 
-EncodedJSValue JITStubs::cti_op_to_jsnumber(STUB_ARGS_DECLARATION)
+DEFINE_STUB_FUNCTION(EncodedJSValue, op_to_jsnumber)
 {
     STUB_INIT_STACK_FRAME(stackFrame);
@@ -2356 +2359 @@
 }
 
-EncodedJSValue JITStubs::cti_op_in(STUB_ARGS_DECLARATION)
+DEFINE_STUB_FUNCTION(EncodedJSValue, op_in)
 {
     STUB_INIT_STACK_FRAME(stackFrame);
@@ -2383 +2386 @@
 }
 
-JSObject* JITStubs::cti_op_push_new_scope(STUB_ARGS_DECLARATION)
+DEFINE_STUB_FUNCTION(JSObject*, op_push_new_scope)
 {
     STUB_INIT_STACK_FRAME(stackFrame);
@@ -2394 +2397 @@
 }
 
-void JITStubs::cti_op_jmp_scopes(STUB_ARGS_DECLARATION)
+DEFINE_STUB_FUNCTION(void, op_jmp_scopes)
 {
     STUB_INIT_STACK_FRAME(stackFrame);
@@ -2407 +2410 @@
 }
 
-void JITStubs::cti_op_put_by_index(STUB_ARGS_DECLARATION)
+DEFINE_STUB_FUNCTION(void, op_put_by_index)
 {
     STUB_INIT_STACK_FRAME(stackFrame);
@@ -2417 +2420 @@
 }
 
-void* JITStubs::cti_op_switch_imm(STUB_ARGS_DECLARATION)
+DEFINE_STUB_FUNCTION(void*, op_switch_imm)
 {
     STUB_INIT_STACK_FRAME(stackFrame);
@@ -2438 +2441 @@
 }
 
-void* JITStubs::cti_op_switch_char(STUB_ARGS_DECLARATION)
+DEFINE_STUB_FUNCTION(void*, op_switch_char)
 {
     STUB_INIT_STACK_FRAME(stackFrame);
@@ -2458 +2461 @@
 }
 
-void* JITStubs::cti_op_switch_string(STUB_ARGS_DECLARATION)
+DEFINE_STUB_FUNCTION(void*, op_switch_string)
 {
     STUB_INIT_STACK_FRAME(stackFrame);
@@ -2477 +2480 @@
 }
 
-EncodedJSValue JITStubs::cti_op_del_by_val(STUB_ARGS_DECLARATION)
+DEFINE_STUB_FUNCTION(EncodedJSValue, op_del_by_val)
 {
     STUB_INIT_STACK_FRAME(stackFrame);
@@ -2502 +2505 @@
 }
 
-void JITStubs::cti_op_put_getter(STUB_ARGS_DECLARATION)
+DEFINE_STUB_FUNCTION(void, op_put_getter)
 {
     STUB_INIT_STACK_FRAME(stackFrame);
@@ -2514 +2517 @@
 }
 
-void JITStubs::cti_op_put_setter(STUB_ARGS_DECLARATION)
+DEFINE_STUB_FUNCTION(void, op_put_setter)
 {
     STUB_INIT_STACK_FRAME(stackFrame);
@@ -2526 +2529 @@
 }
 
-JSObject* JITStubs::cti_op_new_error(STUB_ARGS_DECLARATION)
+DEFINE_STUB_FUNCTION(JSObject*, op_new_error)
 {
     STUB_INIT_STACK_FRAME(stackFrame);
@@ -2540 +2543 @@
 }
 
-void JITStubs::cti_op_debug(STUB_ARGS_DECLARATION)
+DEFINE_STUB_FUNCTION(void, op_debug)
 {
     STUB_INIT_STACK_FRAME(stackFrame);
@@ -2553 +2556 @@
 }
 
-EncodedJSValue JITStubs::cti_vm_throw(STUB_ARGS_DECLARATION)
+DEFINE_STUB_FUNCTION(EncodedJSValue, vm_throw)
 {
     STUB_INIT_STACK_FRAME(stackFrame);
@@ -2581 +2584 @@
 }
 
+} // namespace JITStubs
+
 } // namespace JSC
 

trunk/JavaScriptCore/jit/JITStubs.h

@@ -168 +168 @@
             void* code, RegisterFile*, CallFrame*, JSValue* exception, Profiler**, JSGlobalData*);
 
-    class JITStubs {
+    class JITThunks {
     public:
-        JITStubs(JSGlobalData*);
-
-        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 int JIT_STUB cti_op_jless(STUB_ARGS_DECLARATION);
-        static int JIT_STUB cti_op_jlesseq(STUB_ARGS_DECLARATION);
-        static int JIT_STUB cti_op_jtrue(STUB_ARGS_DECLARATION);
-        static int JIT_STUB cti_op_load_varargs(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_timeout_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 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_method_check(STUB_ARGS_DECLARATION);
-        static EncodedJSValue JIT_STUB cti_op_get_by_id_method_check_second(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_strcat(STUB_ARGS_DECLARATION);
-        static EncodedJSValue JIT_STUB cti_op_stricteq(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_to_primitive(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 EncodedJSValue JIT_STUB cti_op_post_dec(STUB_ARGS_DECLARATION);
-        static EncodedJSValue JIT_STUB cti_op_post_inc(STUB_ARGS_DECLARATION);
-        static EncodedJSValue JIT_STUB cti_op_resolve_func(STUB_ARGS_DECLARATION);
-        static EncodedJSValue JIT_STUB cti_op_resolve_with_base(STUB_ARGS_DECLARATION);
-        static VoidPtrPair JIT_STUB cti_op_call_arityCheck(STUB_ARGS_DECLARATION);
+        JITThunks(JSGlobalData*);
 
         static void tryCacheGetByID(CallFrame*, CodeBlock*, void* returnAddress, JSValue baseValue, const Identifier& propertyName, const PropertySlot&);
@@ -307 +193 @@
     };
 
+namespace JITStubs { extern "C" {
+
+    void JIT_STUB cti_op_create_arguments(STUB_ARGS_DECLARATION);
+    void JIT_STUB cti_op_create_arguments_no_params(STUB_ARGS_DECLARATION);
+    void JIT_STUB cti_op_debug(STUB_ARGS_DECLARATION);
+    void JIT_STUB cti_op_end(STUB_ARGS_DECLARATION);
+    void JIT_STUB cti_op_jmp_scopes(STUB_ARGS_DECLARATION);
+    void JIT_STUB cti_op_pop_scope(STUB_ARGS_DECLARATION);
+    void JIT_STUB cti_op_profile_did_call(STUB_ARGS_DECLARATION);
+    void JIT_STUB cti_op_profile_will_call(STUB_ARGS_DECLARATION);
+    void JIT_STUB cti_op_put_by_id(STUB_ARGS_DECLARATION);
+    void JIT_STUB cti_op_put_by_id_fail(STUB_ARGS_DECLARATION);
+    void JIT_STUB cti_op_put_by_id_generic(STUB_ARGS_DECLARATION);
+    void JIT_STUB cti_op_put_by_id_second(STUB_ARGS_DECLARATION);
+    void JIT_STUB cti_op_put_by_index(STUB_ARGS_DECLARATION);
+    void JIT_STUB cti_op_put_by_val(STUB_ARGS_DECLARATION);
+    void JIT_STUB cti_op_put_by_val_array(STUB_ARGS_DECLARATION);
+    void JIT_STUB cti_op_put_by_val_byte_array(STUB_ARGS_DECLARATION);
+    void JIT_STUB cti_op_put_getter(STUB_ARGS_DECLARATION);
+    void JIT_STUB cti_op_put_setter(STUB_ARGS_DECLARATION);
+    void JIT_STUB cti_op_ret_scopeChain(STUB_ARGS_DECLARATION);
+    void JIT_STUB cti_op_tear_off_activation(STUB_ARGS_DECLARATION);
+    void JIT_STUB cti_op_tear_off_arguments(STUB_ARGS_DECLARATION);
+    void JIT_STUB cti_register_file_check(STUB_ARGS_DECLARATION);
+    int JIT_STUB cti_op_jless(STUB_ARGS_DECLARATION);
+    int JIT_STUB cti_op_jlesseq(STUB_ARGS_DECLARATION);
+    int JIT_STUB cti_op_jtrue(STUB_ARGS_DECLARATION);
+    int JIT_STUB cti_op_load_varargs(STUB_ARGS_DECLARATION);
+    int JIT_STUB cti_op_loop_if_less(STUB_ARGS_DECLARATION);
+    int JIT_STUB cti_op_loop_if_lesseq(STUB_ARGS_DECLARATION);
+    int JIT_STUB cti_op_loop_if_true(STUB_ARGS_DECLARATION);
+    int JIT_STUB cti_timeout_check(STUB_ARGS_DECLARATION);
+    void* JIT_STUB cti_op_call_JSFunction(STUB_ARGS_DECLARATION);
+    void* JIT_STUB cti_op_switch_char(STUB_ARGS_DECLARATION);
+    void* JIT_STUB cti_op_switch_imm(STUB_ARGS_DECLARATION);
+    void* JIT_STUB cti_op_switch_string(STUB_ARGS_DECLARATION);
+    void* JIT_STUB cti_vm_dontLazyLinkCall(STUB_ARGS_DECLARATION);
+    void* JIT_STUB cti_vm_lazyLinkCall(STUB_ARGS_DECLARATION);
+    JSObject* JIT_STUB cti_op_construct_JSConstruct(STUB_ARGS_DECLARATION);
+    JSObject* JIT_STUB cti_op_convert_this(STUB_ARGS_DECLARATION);
+    JSObject* JIT_STUB cti_op_new_array(STUB_ARGS_DECLARATION);
+    JSObject* JIT_STUB cti_op_new_error(STUB_ARGS_DECLARATION);
+    JSObject* JIT_STUB cti_op_new_func(STUB_ARGS_DECLARATION);
+    JSObject* JIT_STUB cti_op_new_func_exp(STUB_ARGS_DECLARATION);
+    JSObject* JIT_STUB cti_op_new_object(STUB_ARGS_DECLARATION);
+    JSObject* JIT_STUB cti_op_new_regexp(STUB_ARGS_DECLARATION);
+    JSObject* JIT_STUB cti_op_push_activation(STUB_ARGS_DECLARATION);
+    JSObject* JIT_STUB cti_op_push_new_scope(STUB_ARGS_DECLARATION);
+    JSObject* JIT_STUB cti_op_push_scope(STUB_ARGS_DECLARATION);
+    JSPropertyNameIterator* JIT_STUB cti_op_get_pnames(STUB_ARGS_DECLARATION);
+    EncodedJSValue JIT_STUB cti_op_add(STUB_ARGS_DECLARATION);
+    EncodedJSValue JIT_STUB cti_op_bitand(STUB_ARGS_DECLARATION);
+    EncodedJSValue JIT_STUB cti_op_bitnot(STUB_ARGS_DECLARATION);
+    EncodedJSValue JIT_STUB cti_op_bitor(STUB_ARGS_DECLARATION);
+    EncodedJSValue JIT_STUB cti_op_bitxor(STUB_ARGS_DECLARATION);
+    EncodedJSValue JIT_STUB cti_op_call_NotJSFunction(STUB_ARGS_DECLARATION);
+    EncodedJSValue JIT_STUB cti_op_call_eval(STUB_ARGS_DECLARATION);
+    EncodedJSValue JIT_STUB cti_op_construct_NotJSConstruct(STUB_ARGS_DECLARATION);
+    EncodedJSValue JIT_STUB cti_op_del_by_id(STUB_ARGS_DECLARATION);
+    EncodedJSValue JIT_STUB cti_op_del_by_val(STUB_ARGS_DECLARATION);
+    EncodedJSValue JIT_STUB cti_op_div(STUB_ARGS_DECLARATION);
+    EncodedJSValue JIT_STUB cti_op_eq(STUB_ARGS_DECLARATION);
+    EncodedJSValue JIT_STUB cti_op_get_by_id(STUB_ARGS_DECLARATION);
+    EncodedJSValue JIT_STUB cti_op_get_by_id_method_check(STUB_ARGS_DECLARATION);
+    EncodedJSValue JIT_STUB cti_op_get_by_id_method_check_second(STUB_ARGS_DECLARATION);
+    EncodedJSValue JIT_STUB cti_op_get_by_id_array_fail(STUB_ARGS_DECLARATION);
+    EncodedJSValue JIT_STUB cti_op_get_by_id_generic(STUB_ARGS_DECLARATION);
+    EncodedJSValue JIT_STUB cti_op_get_by_id_proto_fail(STUB_ARGS_DECLARATION);
+    EncodedJSValue JIT_STUB cti_op_get_by_id_proto_list(STUB_ARGS_DECLARATION);
+    EncodedJSValue JIT_STUB cti_op_get_by_id_proto_list_full(STUB_ARGS_DECLARATION);
+    EncodedJSValue JIT_STUB cti_op_get_by_id_second(STUB_ARGS_DECLARATION);
+    EncodedJSValue JIT_STUB cti_op_get_by_id_self_fail(STUB_ARGS_DECLARATION);
+    EncodedJSValue JIT_STUB cti_op_get_by_id_string_fail(STUB_ARGS_DECLARATION);
+    EncodedJSValue JIT_STUB cti_op_get_by_val(STUB_ARGS_DECLARATION);
+    EncodedJSValue JIT_STUB cti_op_get_by_val_byte_array(STUB_ARGS_DECLARATION);
+    EncodedJSValue JIT_STUB cti_op_get_by_val_string(STUB_ARGS_DECLARATION);
+    EncodedJSValue JIT_STUB cti_op_in(STUB_ARGS_DECLARATION);
+    EncodedJSValue JIT_STUB cti_op_instanceof(STUB_ARGS_DECLARATION);
+    EncodedJSValue JIT_STUB cti_op_is_boolean(STUB_ARGS_DECLARATION);
+    EncodedJSValue JIT_STUB cti_op_is_function(STUB_ARGS_DECLARATION);
+    EncodedJSValue JIT_STUB cti_op_is_number(STUB_ARGS_DECLARATION);
+    EncodedJSValue JIT_STUB cti_op_is_object(STUB_ARGS_DECLARATION);
+    EncodedJSValue JIT_STUB cti_op_is_string(STUB_ARGS_DECLARATION);
+    EncodedJSValue JIT_STUB cti_op_is_undefined(STUB_ARGS_DECLARATION);
+    EncodedJSValue JIT_STUB cti_op_less(STUB_ARGS_DECLARATION);
+    EncodedJSValue JIT_STUB cti_op_lesseq(STUB_ARGS_DECLARATION);
+    EncodedJSValue JIT_STUB cti_op_lshift(STUB_ARGS_DECLARATION);
+    EncodedJSValue JIT_STUB cti_op_mod(STUB_ARGS_DECLARATION);
+    EncodedJSValue JIT_STUB cti_op_mul(STUB_ARGS_DECLARATION);
+    EncodedJSValue JIT_STUB cti_op_negate(STUB_ARGS_DECLARATION);
+    EncodedJSValue JIT_STUB cti_op_neq(STUB_ARGS_DECLARATION);
+    EncodedJSValue JIT_STUB cti_op_next_pname(STUB_ARGS_DECLARATION);
+    EncodedJSValue JIT_STUB cti_op_not(STUB_ARGS_DECLARATION);
+    EncodedJSValue JIT_STUB cti_op_nstricteq(STUB_ARGS_DECLARATION);
+    EncodedJSValue JIT_STUB cti_op_pre_dec(STUB_ARGS_DECLARATION);
+    EncodedJSValue JIT_STUB cti_op_pre_inc(STUB_ARGS_DECLARATION);
+    EncodedJSValue JIT_STUB cti_op_resolve(STUB_ARGS_DECLARATION);
+    EncodedJSValue JIT_STUB cti_op_resolve_base(STUB_ARGS_DECLARATION);
+    EncodedJSValue JIT_STUB cti_op_resolve_global(STUB_ARGS_DECLARATION);
+    EncodedJSValue JIT_STUB cti_op_resolve_skip(STUB_ARGS_DECLARATION);
+    EncodedJSValue JIT_STUB cti_op_rshift(STUB_ARGS_DECLARATION);
+    EncodedJSValue JIT_STUB cti_op_strcat(STUB_ARGS_DECLARATION);
+    EncodedJSValue JIT_STUB cti_op_stricteq(STUB_ARGS_DECLARATION);
+    EncodedJSValue JIT_STUB cti_op_sub(STUB_ARGS_DECLARATION);
+    EncodedJSValue JIT_STUB cti_op_throw(STUB_ARGS_DECLARATION);
+    EncodedJSValue JIT_STUB cti_op_to_jsnumber(STUB_ARGS_DECLARATION);
+    EncodedJSValue JIT_STUB cti_op_to_primitive(STUB_ARGS_DECLARATION);
+    EncodedJSValue JIT_STUB cti_op_typeof(STUB_ARGS_DECLARATION);
+    EncodedJSValue JIT_STUB cti_op_urshift(STUB_ARGS_DECLARATION);
+    EncodedJSValue JIT_STUB cti_vm_throw(STUB_ARGS_DECLARATION);
+    EncodedJSValue JIT_STUB cti_op_post_dec(STUB_ARGS_DECLARATION);
+    EncodedJSValue JIT_STUB cti_op_post_inc(STUB_ARGS_DECLARATION);
+    EncodedJSValue JIT_STUB cti_op_resolve_func(STUB_ARGS_DECLARATION);
+    EncodedJSValue JIT_STUB cti_op_resolve_with_base(STUB_ARGS_DECLARATION);
+    VoidPtrPair JIT_STUB cti_op_call_arityCheck(STUB_ARGS_DECLARATION);
+
+}; } // extern "C" namespace JITStubs
+
 } // namespace JSC
 

trunk/JavaScriptCore/runtime/JSFunction.h

@@ -40 +40 @@
     class JSFunction : public InternalFunction {
         friend class JIT;
-        friend class JITStubs;
         friend class VPtrSet;
 
@@ -88 +87 @@
             return *reinterpret_cast<NativeFunction*>(m_data);
         }
-    private:
-        virtual const ClassInfo* classInfo() const { return &info; }
 
         virtual ConstructType getConstructData(ConstructData&);
         virtual CallType getCallData(CallData&);
+
+    private:
+        virtual const ClassInfo* classInfo() const { return &info; }
 
         static JSValue argumentsGetter(ExecState*, const Identifier&, const PropertySlot&);

trunk/JavaScriptCore/runtime/JSGlobalData.h

@@ -117 +117 @@
         Interpreter* interpreter;
 #if ENABLE(JIT)
-        JITStubs jitStubs;
+        JITThunks jitStubs;
         FunctionBodyNode* nativeFunctionThunk()
         {