Changeset 37297 in webkit for trunk/JavaScriptCore

Timestamp:

Oct 4, 2008, 2:12:54 PM (17 years ago)

Author:

Darin Adler

Message:

JavaScriptCore:

2008-10-04 Darin Adler <Darin Adler>

Reviewed by Cameron Zwarich.

• ​https://bugs.webkit.org/show_bug.cgi?id=21295 Bug 21295: Replace ExecState with a call frame Register pointer

10% faster on Richards; other v8 benchmarks faster too.
A wash on SunSpider.

This does the minimum necessary to get the speedup. Next step in
cleaning this up is to replace ExecState with a CallFrame class,
and be more judicious about when to pass a call frame and when
to pass a global data pointer, global object pointer, or perhaps
something else entirely.

• VM/CTI.cpp: Remove the debug-only check of the exception in ctiVMThrowTrampoline -- already checked in the code the trampoline jumps to, so not all that useful. Removed the exec argument from ctiTrampoline. Removed emitDebugExceptionCheck -- no longer needed. (JSC::CTI::emitCall): Removed code to set ExecState::m_callFrame. (JSC::CTI::privateCompileMainPass): Removed code in catch to extract the exception from ExecState::m_exception; instead, the code that jumps into catch will make sure the exception is already in eax.
• VM/CTI.h: Removed exec from the ctiTrampoline. Also removed the non-helpful "volatile". Temporarily left ARG_exec in as a synonym for ARG_r; I'll change that on a future cleanup pass when introducing more use of the CallFrame type. (JSC::CTI::execute): Removed the ExecState* argument.

• VM/ExceptionHelpers.cpp: (JSC::InterruptedExecutionError::InterruptedExecutionError): Take JSGlobalData* instead of ExecState*. (JSC::createInterruptedExecutionException): Ditto.
• VM/ExceptionHelpers.h: Ditto. Also removed an unneeded include.

• VM/Machine.cpp: (JSC::slideRegisterWindowForCall): Removed the exec and exceptionValue arguments. Changed to return 0 when there's a stack overflow rather than using a separate exception argument to cut down on memory accesses in the calling convention. (JSC::Machine::unwindCallFrame): Removed the exec argument when constructing a DebuggerCallFrame. Also removed code to set ExecState::m_callFrame. (JSC::Machine::throwException): Removed the exec argument when construction a DebuggerCallFrame. (JSC::Machine::execute): Updated to use the register instead of ExecState and also removed various uses of ExecState. (JSC::Machine::debug): (JSC::Machine::privateExecute): Put globalData into a local variable so it can be used throughout the interpreter. Changed the VM_CHECK_EXCEPTION to get the exception in globalData instead of through ExecState. (JSC::Machine::retrieveLastCaller): Turn exec into a registers pointer by calling registers() instead of by getting m_callFrame. (JSC::Machine::callFrame): Ditto. Tweaked exception macros. Made new versions for when you know you have an exception. Get at global exception with ARG_globalData. Got rid of the need to pass in the return value type. (JSC::Machine::cti_op_add): Update to use new version of exception macros. (JSC::Machine::cti_op_pre_inc): Ditto. (JSC::Machine::cti_timeout_check): Ditto. (JSC::Machine::cti_op_instanceof): Ditto. (JSC::Machine::cti_op_new_func): Ditto. (JSC::Machine::cti_op_call_JSFunction): Optimized by using the ARG values directly instead of through local variables -- this gets rid of code that just shuffles things around in the stack frame. Also get rid of ExecState and update for the new way exceptions are handled in slideRegisterWindowForCall. (JSC::Machine::cti_vm_compile): Update to make exec out of r since they are both the same thing now. (JSC::Machine::cti_op_call_NotJSFunction): Ditto. (JSC::Machine::cti_op_init_arguments): Ditto. (JSC::Machine::cti_op_resolve): Ditto. (JSC::Machine::cti_op_construct_JSConstruct): Ditto. (JSC::Machine::cti_op_construct_NotJSConstruct): Ditto. (JSC::Machine::cti_op_resolve_func): Ditto. (JSC::Machine::cti_op_put_by_val): Ditto. (JSC::Machine::cti_op_put_by_val_array): Ditto. (JSC::Machine::cti_op_resolve_skip): Ditto. (JSC::Machine::cti_op_resolve_global): Ditto. (JSC::Machine::cti_op_post_inc): Ditto. (JSC::Machine::cti_op_resolve_with_base): Ditto. (JSC::Machine::cti_op_post_dec): Ditto. (JSC::Machine::cti_op_call_eval): Ditto. (JSC::Machine::cti_op_throw): Ditto. Also rearranged to return the exception value as the return value so it can be used by op_catch. (JSC::Machine::cti_op_push_scope): Ditto. (JSC::Machine::cti_op_in): Ditto. (JSC::Machine::cti_op_del_by_val): Ditto. (JSC::Machine::cti_vm_throw): Ditto. Also rearranged to return the exception value as the return value so it can be used by op_catch.

• kjs/DebuggerCallFrame.cpp: (JSC::DebuggerCallFrame::functionName): Pass globalData. (JSC::DebuggerCallFrame::evaluate): Eliminated code to make a new ExecState.
• kjs/DebuggerCallFrame.h: Removed ExecState argument from constructor.

• kjs/ExecState.h: Eliminated all data members and made ExecState inherit privately from Register instead. Also added a typedef to the future name for this class, which is CallFrame. It's just a Register* that knows it's a pointer at a call frame. The new class can't be constructed or copied. Changed all functions to use the this pointer instead of m_callFrame. Changed exception-related functions to access an exception in JSGlobalData. Removed functions used by CTI to pass the return address to the throw machinery -- this is now done directly with a global in the global data.

• kjs/FunctionPrototype.cpp: (JSC::functionProtoFuncToString): Pass globalData instead of exec.

• kjs/InternalFunction.cpp: (JSC::InternalFunction::name): Take globalData instead of exec.
• kjs/InternalFunction.h: Ditto.

• kjs/JSGlobalData.cpp: Initialize the new exception global to 0.
• kjs/JSGlobalData.h: Declare two new globals. One for the current exception and another for the return address used by CTI to implement the throw operation.

• kjs/JSGlobalObject.cpp: (JSC::JSGlobalObject::init): Removed code to set up globalExec, which is now the same thing as globalCallFrame. (JSC::JSGlobalObject::reset): Get globalExec from our globalExec function so we don't have to repeat the logic twice. (JSC::JSGlobalObject::mark): Removed code to mark the exception; the exception is now stored in JSGlobalData and marked there. (JSC::JSGlobalObject::globalExec): Return a pointer to the end of the global call frame.
• kjs/JSGlobalObject.h: Removed the globalExec data member.

• kjs/JSObject.cpp: (JSC::JSObject::putDirectFunction): Pass globalData instead of exec.

• kjs/collector.cpp: (JSC::Heap::collect): Mark the global exception.

• profiler/ProfileGenerator.cpp: (JSC::ProfileGenerator::addParentForConsoleStart): Pass globalData instead of exec to createCallIdentifier.

• profiler/Profiler.cpp: (JSC::Profiler::willExecute): Pass globalData instead of exec to createCallIdentifier. (JSC::Profiler::didExecute): Ditto. (JSC::Profiler::createCallIdentifier): Take globalData instead of exec. (JSC::createCallIdentifierFromFunctionImp): Ditto.
• profiler/Profiler.h: Change interface to take a JSGlobalData instead of an ExecState.

WebKit/mac:

2008-10-04 Darin Adler <Darin Adler>

Reviewed by Cameron Zwarich.

• ​https://bugs.webkit.org/show_bug.cgi?id=21295 Bug 21295: Replace ExecState with a call frame Register pointer

• WebView/WebScriptDebugger.mm: (WebScriptDebugger::WebScriptDebugger): Remove 0 passed for ExecState.

Location:

trunk/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• VM/CTI.cpp (modified) (14 diffs)
• VM/CTI.h (modified) (5 diffs)
• VM/ExceptionHelpers.cpp (modified) (2 diffs)
• VM/ExceptionHelpers.h (modified) (1 diff)
• VM/Machine.cpp (modified) (71 diffs)
• VM/Machine.h (modified) (1 diff)
• kjs/DebuggerCallFrame.cpp (modified) (2 diffs)
• kjs/DebuggerCallFrame.h (modified) (3 diffs)
• kjs/ExecState.h (modified) (1 diff)
• kjs/FunctionPrototype.cpp (modified) (1 diff)
• kjs/InternalFunction.cpp (modified) (1 diff)
• kjs/InternalFunction.h (modified) (1 diff)
• kjs/JSGlobalData.cpp (modified) (1 diff)
• kjs/JSGlobalData.h (modified) (1 diff)
• kjs/JSGlobalObject.cpp (modified) (4 diffs)
• kjs/JSGlobalObject.h (modified) (1 diff)
• kjs/JSObject.cpp (modified) (1 diff)
• kjs/collector.cpp (modified) (1 diff)
• profiler/ProfileGenerator.cpp (modified) (1 diff)
• profiler/Profiler.cpp (modified) (7 diffs)
• profiler/Profiler.h (modified) (2 diffs)

trunk/JavaScriptCore/ChangeLog

@@ +1 @@
+2008-10-04  Darin Adler  <[email protected]>
+
+        Reviewed by Cameron Zwarich.
+
+        - https://bugs.webkit.org/show_bug.cgi?id=21295
+          Bug 21295: Replace ExecState with a call frame Register pointer
+
+        10% faster on Richards; other v8 benchmarks faster too.
+        A wash on SunSpider.
+
+        This does the minimum necessary to get the speedup. Next step in
+        cleaning this up is to replace ExecState with a CallFrame class,
+        and be more judicious about when to pass a call frame and when
+        to pass a global data pointer, global object pointer, or perhaps
+        something else entirely.
+
+        * VM/CTI.cpp: Remove the debug-only check of the exception in
+        ctiVMThrowTrampoline -- already checked in the code the trampoline
+        jumps to, so not all that useful. Removed the exec argument from
+        ctiTrampoline. Removed emitDebugExceptionCheck -- no longer needed.
+        (JSC::CTI::emitCall): Removed code to set ExecState::m_callFrame.
+        (JSC::CTI::privateCompileMainPass): Removed code in catch to extract
+        the exception from ExecState::m_exception; instead, the code that
+        jumps into catch will make sure the exception is already in eax.
+        * VM/CTI.h: Removed exec from the ctiTrampoline. Also removed the
+        non-helpful "volatile". Temporarily left ARG_exec in as a synonym
+        for ARG_r; I'll change that on a future cleanup pass when introducing
+        more use of the CallFrame type.
+        (JSC::CTI::execute): Removed the ExecState* argument.
+
+        * VM/ExceptionHelpers.cpp:
+        (JSC::InterruptedExecutionError::InterruptedExecutionError): Take
+        JSGlobalData* instead of ExecState*.
+        (JSC::createInterruptedExecutionException): Ditto.
+        * VM/ExceptionHelpers.h: Ditto. Also removed an unneeded include.
+
+        * VM/Machine.cpp:
+        (JSC::slideRegisterWindowForCall): Removed the exec and
+        exceptionValue arguments. Changed to return 0 when there's a stack
+        overflow rather than using a separate exception argument to cut
+        down on memory accesses in the calling convention.
+        (JSC::Machine::unwindCallFrame): Removed the exec argument when
+        constructing a DebuggerCallFrame. Also removed code to set
+        ExecState::m_callFrame.
+        (JSC::Machine::throwException): Removed the exec argument when
+        construction a DebuggerCallFrame.
+        (JSC::Machine::execute): Updated to use the register instead of
+        ExecState and also removed various uses of ExecState.
+        (JSC::Machine::debug):
+        (JSC::Machine::privateExecute): Put globalData into a local
+        variable so it can be used throughout the interpreter. Changed
+        the VM_CHECK_EXCEPTION to get the exception in globalData instead
+        of through ExecState.
+        (JSC::Machine::retrieveLastCaller): Turn exec into a registers
+        pointer by calling registers() instead of by getting m_callFrame.
+        (JSC::Machine::callFrame): Ditto.
+        Tweaked exception macros. Made new versions for when you know
+        you have an exception. Get at global exception with ARG_globalData.
+        Got rid of the need to pass in the return value type.
+        (JSC::Machine::cti_op_add): Update to use new version of exception
+        macros.
+        (JSC::Machine::cti_op_pre_inc): Ditto.
+        (JSC::Machine::cti_timeout_check): Ditto.
+        (JSC::Machine::cti_op_instanceof): Ditto.
+        (JSC::Machine::cti_op_new_func): Ditto.
+        (JSC::Machine::cti_op_call_JSFunction): Optimized by using the
+        ARG values directly instead of through local variables -- this gets
+        rid of code that just shuffles things around in the stack frame.
+        Also get rid of ExecState and update for the new way exceptions are
+        handled in slideRegisterWindowForCall.
+        (JSC::Machine::cti_vm_compile): Update to make exec out of r since
+        they are both the same thing now.
+        (JSC::Machine::cti_op_call_NotJSFunction): Ditto.
+        (JSC::Machine::cti_op_init_arguments): Ditto.
+        (JSC::Machine::cti_op_resolve): Ditto.
+        (JSC::Machine::cti_op_construct_JSConstruct): Ditto.
+        (JSC::Machine::cti_op_construct_NotJSConstruct): Ditto.
+        (JSC::Machine::cti_op_resolve_func): Ditto.
+        (JSC::Machine::cti_op_put_by_val): Ditto.
+        (JSC::Machine::cti_op_put_by_val_array): Ditto.
+        (JSC::Machine::cti_op_resolve_skip): Ditto.
+        (JSC::Machine::cti_op_resolve_global): Ditto.
+        (JSC::Machine::cti_op_post_inc): Ditto.
+        (JSC::Machine::cti_op_resolve_with_base): Ditto.
+        (JSC::Machine::cti_op_post_dec): Ditto.
+        (JSC::Machine::cti_op_call_eval): Ditto.
+        (JSC::Machine::cti_op_throw): Ditto. Also rearranged to return
+        the exception value as the return value so it can be used by
+        op_catch.
+        (JSC::Machine::cti_op_push_scope): Ditto.
+        (JSC::Machine::cti_op_in): Ditto.
+        (JSC::Machine::cti_op_del_by_val): Ditto.
+        (JSC::Machine::cti_vm_throw): Ditto. Also rearranged to return
+        the exception value as the return value so it can be used by
+        op_catch.
+
+        * kjs/DebuggerCallFrame.cpp:
+        (JSC::DebuggerCallFrame::functionName): Pass globalData.
+        (JSC::DebuggerCallFrame::evaluate): Eliminated code to make a
+        new ExecState.
+        * kjs/DebuggerCallFrame.h: Removed ExecState argument from
+        constructor.
+
+        * kjs/ExecState.h: Eliminated all data members and made ExecState
+        inherit privately from Register instead. Also added a typedef to
+        the future name for this class, which is CallFrame. It's just a
+        Register* that knows it's a pointer at a call frame. The new class
+        can't be constructed or copied. Changed all functions to use
+        the this pointer instead of m_callFrame. Changed exception-related
+        functions to access an exception in JSGlobalData. Removed functions
+        used by CTI to pass the return address to the throw machinery --
+        this is now done directly with a global in the global data.
+
+        * kjs/FunctionPrototype.cpp:
+        (JSC::functionProtoFuncToString): Pass globalData instead of exec.
+
+        * kjs/InternalFunction.cpp:
+        (JSC::InternalFunction::name): Take globalData instead of exec.
+        * kjs/InternalFunction.h: Ditto.
+
+        * kjs/JSGlobalData.cpp: Initialize the new exception global to 0.
+        * kjs/JSGlobalData.h: Declare two new globals. One for the current
+        exception and another for the return address used by CTI to
+        implement the throw operation.
+
+        * kjs/JSGlobalObject.cpp:
+        (JSC::JSGlobalObject::init): Removed code to set up globalExec,
+        which is now the same thing as globalCallFrame.
+        (JSC::JSGlobalObject::reset): Get globalExec from our globalExec
+        function so we don't have to repeat the logic twice.
+        (JSC::JSGlobalObject::mark): Removed code to mark the exception;
+        the exception is now stored in JSGlobalData and marked there.
+        (JSC::JSGlobalObject::globalExec): Return a pointer to the end
+        of the global call frame.
+        * kjs/JSGlobalObject.h: Removed the globalExec data member.
+
+        * kjs/JSObject.cpp:
+        (JSC::JSObject::putDirectFunction): Pass globalData instead of exec.
+
+        * kjs/collector.cpp:
+        (JSC::Heap::collect): Mark the global exception.
+
+        * profiler/ProfileGenerator.cpp:
+        (JSC::ProfileGenerator::addParentForConsoleStart): Pass globalData
+        instead of exec to createCallIdentifier.
+
+        * profiler/Profiler.cpp:
+        (JSC::Profiler::willExecute): Pass globalData instead of exec to
+        createCallIdentifier.
+        (JSC::Profiler::didExecute): Ditto.
+        (JSC::Profiler::createCallIdentifier): Take globalData instead of
+        exec.
+        (JSC::createCallIdentifierFromFunctionImp): Ditto.
+        * profiler/Profiler.h: Change interface to take a JSGlobalData
+        instead of an ExecState.
+
 2008-10-04  Cameron Zwarich  <[email protected]>
 

trunk/JavaScriptCore/VM/CTI.cpp

@@ -75 +75 @@
 
 #if COMPILER(GCC) && PLATFORM(X86)
+
 asm(
 ".globl _ctiTrampoline" "\n"
@@ -82 +83 @@
     "subl $0x24, %esp" "\n"
     "movl $512, %esi" "\n"
-    "call *0x30(%esp)" "\n" //Ox30 = 0x0C * 4, 0x0C = CTI_ARGS_code
+    "call *0x30(%esp)" "\n" // Ox30 = 0x0C * 4, 0x0C = CTI_ARGS_code
     "addl $0x24, %esp" "\n"
     "popl %edi" "\n"
@@ -92 +93 @@
 ".globl _ctiVMThrowTrampoline" "\n"
 "_ctiVMThrowTrampoline:" "\n"
-#ifndef NDEBUG
-    "movl 0x34(%esp), %ecx" "\n" //Ox34 = 0x0D * 4, 0x0D = CTI_ARGS_exec
-    "cmpl $0, 8(%ecx)" "\n"
-    "jne 1f" "\n"
-    "int3" "\n"
-    "1:" "\n"
-#endif
     "call __ZN3JSC7Machine12cti_vm_throwEPv" "\n"
     "addl $0x24, %esp" "\n"
@@ -107 +101 @@
     
 #elif COMPILER(MSVC)
-extern "C"
-{
+
+extern "C" {
     
-    __declspec(naked) JSValue* ctiTrampoline(void* code, ExecState* exec, RegisterFile* registerFile, Register* r, JSValue** exception, Profiler**, JSGlobalData*)
+    __declspec(naked) JSValue* ctiTrampoline(void* code, RegisterFile*, Register*, JSValue** exception, Profiler**, JSGlobalData*)
     {
         __asm {
@@ -129 +123 @@
     {
         __asm {
-           mov [esp], esp;
+            mov [esp], esp;
             call JSC::Machine::cti_vm_throw;
             add esp, 0x24;
@@ -247 +241 @@
 }
 
-#ifdef NDEBUG
-
-ALWAYS_INLINE void CTI::emitDebugExceptionCheck()
-{
-}
-
-#else
-
-ALWAYS_INLINE void CTI::emitDebugExceptionCheck()
-{
-    emitGetCTIParam(CTI_ARGS_exec, X86::ecx);
-    m_jit.cmpl_i32m(0, OBJECT_OFFSET(ExecState, m_exception), X86::ecx);
-    X86Assembler::JmpSrc noException = m_jit.emitUnlinkedJe();
-    m_jit.emitInt3();
-    m_jit.link(noException, m_jit.label());
-}
+#ifndef NDEBUG
 
 void CTI::printOpcodeOperandTypes(unsigned src1, unsigned src2)
@@ -305 +284 @@
     X86Assembler::JmpSrc call = m_jit.emitCall(r);
     m_calls.append(CallRecord(call, opcodeIndex));
-    emitDebugExceptionCheck();
 
     return call;
@@ -318 +296 @@
     X86Assembler::JmpSrc call = m_jit.emitCall();
     m_calls.append(CallRecord(call, helper, opcodeIndex));
-    emitDebugExceptionCheck();
 #if ENABLE(SAMPLING_TOOL)
     m_jit.movl_i32m(0, &inCalledCode);
@@ -334 +311 @@
     X86Assembler::JmpSrc call = m_jit.emitCall();
     m_calls.append(CallRecord(call, helper, opcodeIndex));
-    emitDebugExceptionCheck();
 #if ENABLE(SAMPLING_TOOL)
     m_jit.movl_i32m(0, &inCalledCode);
@@ -350 +326 @@
     X86Assembler::JmpSrc call = m_jit.emitCall();
     m_calls.append(CallRecord(call, helper, opcodeIndex));
-    emitDebugExceptionCheck();
 #if ENABLE(SAMPLING_TOOL)
     m_jit.movl_i32m(0, &inCalledCode);
@@ -366 +341 @@
     X86Assembler::JmpSrc call = m_jit.emitCall();
     m_calls.append(CallRecord(call, helper, opcodeIndex));
-    emitDebugExceptionCheck();
 #if ENABLE(SAMPLING_TOOL)
     m_jit.movl_i32m(0, &inCalledCode);
@@ -382 +356 @@
     X86Assembler::JmpSrc call = m_jit.emitCall();
     m_calls.append(CallRecord(call, helper, opcodeIndex));
-    emitDebugExceptionCheck();
 #if ENABLE(SAMPLING_TOOL)
     m_jit.movl_i32m(0, &inCalledCode);
@@ -1224 +1197 @@
 
             // Restore our caller's "r".
-            emitGetCTIParam(CTI_ARGS_exec, X86::ecx);
             emitGetArg(RegisterFile::CallerRegisters, X86::edi);
             emitPutCTIParam(X86::edi, CTI_ARGS_r);
-            m_jit.movl_rm(X86::edi, OBJECT_OFFSET(ExecState, m_callFrame), X86::ecx);
 
             // Return.
@@ -1787 +1758 @@
         case op_catch: {
             emitGetCTIParam(CTI_ARGS_r, X86::edi); // edi := r
-            emitGetCTIParam(CTI_ARGS_exec, X86::ecx);
-            m_jit.movl_mr(OBJECT_OFFSET(ExecState, m_exception), X86::ecx, X86::eax);
-            m_jit.movl_i32m(0, OBJECT_OFFSET(ExecState, m_exception), X86::ecx);
             emitPutResult(instruction[i + 1].u.operand);
             i += 2;

trunk/JavaScriptCore/VM/CTI.h

@@ -53 +53 @@
 
 #define CTI_ARGS_code 0x0C
-#define CTI_ARGS_exec 0x0D
-#define CTI_ARGS_registerFile 0x0E
-#define CTI_ARGS_r 0x0F
-#define CTI_ARGS_exception 0x10
-#define CTI_ARGS_profilerReference 0x11
-#define CTI_ARGS_globalData 0x12
-#define ARG_exec ((ExecState*)(ARGS)[CTI_ARGS_exec])
+#define CTI_ARGS_registerFile 0x0D
+#define CTI_ARGS_r 0x0E
+#define CTI_ARGS_exception 0x0F
+#define CTI_ARGS_profilerReference 0x10
+#define CTI_ARGS_globalData 0x11
 #define ARG_registerFile ((RegisterFile*)(ARGS)[CTI_ARGS_registerFile])
 #define ARG_r ((Register*)(ARGS)[CTI_ARGS_r])
@@ -66 +64 @@
 #define ARG_globalData ((JSGlobalData*)(ARGS)[CTI_ARGS_globalData])
 
-#define ARG_setR(newR) (*(volatile Register**)&(ARGS)[CTI_ARGS_r] = newR)
-#define ARG_set2ndResult(new2ndResult) (*(volatile JSValue**)&(ARGS)[CTI_ARGS_2ndResult] = new2ndResult)
+#define ARG_exec CallFrame::create(ARG_r)
+
+#define ARG_setR(newR) (*(Register**)&(ARGS)[CTI_ARGS_r] = newR)
+#define ARG_set2ndResult(new2ndResult) (*(JSValue**)&(ARGS)[CTI_ARGS_2ndResult] = new2ndResult)
 
 #define ARG_src1 ((JSValue*)((ARGS)[1]))
@@ -235 +235 @@
 
     extern "C" {
-        JSValue* ctiTrampoline(void* code, ExecState*, RegisterFile*, Register* callFrame, JSValue** exception, Profiler**, JSGlobalData*);
+        JSValue* ctiTrampoline(void* code, RegisterFile*, Register* callFrame, JSValue** exception, Profiler**, JSGlobalData*);
         void ctiVMThrowTrampoline();
     };
@@ -324 +324 @@
         }
 
-        inline static JSValue* execute(void* code, ExecState* exec, RegisterFile* registerFile, Register* r, JSGlobalData* globalData, JSValue** exception)
-        {
-            JSValue* value = ctiTrampoline(code, exec, registerFile, r, exception, Profiler::enabledProfilerReference(), globalData);
+        inline static JSValue* execute(void* code, RegisterFile* registerFile, Register* r, JSGlobalData* globalData, JSValue** exception)
+        {
+            JSValue* value = ctiTrampoline(code, registerFile, r, exception, Profiler::enabledProfilerReference(), globalData);
 #if ENABLE(SAMPLING_TOOL)
             currentOpcodeID = static_cast<OpcodeID>(-1);
@@ -394 +394 @@
         void emitTagAsBoolImmediate(X86Assembler::RegisterID reg);
 
-        void emitDebugExceptionCheck();
-
         X86Assembler::JmpSrc emitCall(unsigned opcodeIndex, X86::RegisterID);
         X86Assembler::JmpSrc emitCall(unsigned opcodeIndex, CTIHelper_j);

trunk/JavaScriptCore/VM/ExceptionHelpers.cpp

@@ -51 +51 @@
 class InterruptedExecutionError : public JSObject {
 public:
-    InterruptedExecutionError(ExecState* exec)
-        : JSObject(exec->globalData().nullProtoStructureID)
+    InterruptedExecutionError(JSGlobalData* globalData)
+        : JSObject(globalData->nullProtoStructureID)
     {
     }
@@ -59 +59 @@
 };
 
-JSValue* createInterruptedExecutionException(ExecState* exec)
-{
-    return new (exec) InterruptedExecutionError(exec);
+JSValue* createInterruptedExecutionException(JSGlobalData* globalData)
+{
+    return new (globalData) InterruptedExecutionError(globalData);
 }
 

trunk/JavaScriptCore/VM/ExceptionHelpers.h

@@ -30 +30 @@
 #define ExceptionHelpers_h
 
-#include "JSObject.h"
-
 namespace JSC {
 
+    class CodeBlock;
+    class ExecState;
+    class Identifier;
+    class Instruction;
+    class JSGlobalData;
+    class JSNotAnObjectErrorStub;
+    class JSObject;
+    class JSValue;
     class Node;
-    class CodeBlock;
-    class Instruction;
-    class JSNotAnObjectErrorStub;
 
-    JSValue* createInterruptedExecutionException(ExecState* exec);
+    JSValue* createInterruptedExecutionException(JSGlobalData*);
     JSValue* createStackOverflowError(ExecState*);
     JSValue* createUndefinedVariableError(ExecState*, const Identifier&, const Instruction*, CodeBlock*);

trunk/JavaScriptCore/VM/Machine.cpp

@@ -533 +533 @@
 }
 
-ALWAYS_INLINE Register* slideRegisterWindowForCall(ExecState* exec, CodeBlock* newCodeBlock, RegisterFile* registerFile, Register* r, size_t registerOffset, int argc, JSValue*& exceptionValue)
+ALWAYS_INLINE Register* slideRegisterWindowForCall(CodeBlock* newCodeBlock, RegisterFile* registerFile, Register* r, size_t registerOffset, int argc)
 {
     Register* newEnd = r + registerOffset + newCodeBlock->numCalleeRegisters;
 
-    if (argc == newCodeBlock->numParameters) { // correct number of arguments
-        if (!registerFile->grow(newEnd)) {
-            exceptionValue = createStackOverflowError(exec);
-            return r;
-        }
+    if (LIKELY(argc == newCodeBlock->numParameters)) { // correct number of arguments
+        if (UNLIKELY(!registerFile->grow(newEnd)))
+            return 0;
         r += registerOffset;
     } else if (argc < newCodeBlock->numParameters) { // too few arguments -- fill in the blanks
@@ -547 +545 @@
         registerOffset += omittedArgCount;
         newEnd += omittedArgCount;
-        if (!registerFile->grow(newEnd)) {
-            exceptionValue = createStackOverflowError(exec);
-            return r;
-        }
+        if (!registerFile->grow(newEnd))
+            return 0;
         r += registerOffset;
 
@@ -561 +557 @@
         newEnd += numParameters;
 
-        if (!registerFile->grow(newEnd)) {
-            exceptionValue = createStackOverflowError(exec);
-            return r;
-        }
+        if (!registerFile->grow(newEnd))
+            return 0;
         r += registerOffset;
 
@@ -627 +621 @@
 {
     initTimeout();
-    privateExecute(InitializeAndReturn);
+    privateExecute(InitializeAndReturn, 0, 0, 0);
     
     // Bizarrely, calling fastMalloc here is faster than allocating space on the stack.
@@ -768 +762 @@
 
     if (Debugger* debugger = exec->dynamicGlobalObject()->debugger()) {
-        DebuggerCallFrame debuggerCallFrame(exec, exec->dynamicGlobalObject(), codeBlock, scopeChain, r, exceptionValue);
+        DebuggerCallFrame debuggerCallFrame(exec->dynamicGlobalObject(), codeBlock, scopeChain, r, exceptionValue);
         if (r[RegisterFile::Callee].jsValue(exec))
             debugger->returnEvent(debuggerCallFrame, codeBlock->ownerNode->sourceID(), codeBlock->ownerNode->lastLine());
@@ -799 +793 @@
         return false;
 
-    exec->m_callFrame = r;
     codeBlock = this->codeBlock(r);
     vPC = vPCForPC(codeBlock, returnPC);
@@ -850 +843 @@
     if (Debugger* debugger = exec->dynamicGlobalObject()->debugger()) {
         ScopeChainNode* scopeChain = this->scopeChain(r);
-        DebuggerCallFrame debuggerCallFrame(exec, exec->dynamicGlobalObject(), codeBlock, scopeChain, r, exceptionValue);
+        DebuggerCallFrame debuggerCallFrame(exec->dynamicGlobalObject(), codeBlock, scopeChain, r, exceptionValue);
         debugger->exception(debuggerCallFrame, codeBlock->ownerNode->sourceID(), codeBlock->lineNumberForVPC(vPC));
     }
@@ -905 +898 @@
         scopeChain = scopeChain->copy();
 
-    ExecState newExec(r);
-
     Profiler** profiler = Profiler::enabledProfilerReference();
     if (*profiler)
@@ -915 +906 @@
     if (!codeBlock->ctiCode)
         CTI::compile(this, exec, codeBlock);
-    JSValue* result = CTI::execute(codeBlock->ctiCode, &newExec, &m_registerFile, r, &newExec.globalData(), exception);
+    JSValue* result = CTI::execute(codeBlock->ctiCode, &m_registerFile, r, scopeChain->globalData, exception);
 #else
-    JSValue* result = privateExecute(Normal, &newExec, &m_registerFile, r, exception);
+    JSValue* result = privateExecute(Normal, &m_registerFile, r, exception);
 #endif
     m_reentryDepth--;
@@ -959 +950 @@
 
     CodeBlock* codeBlock = &functionBodyNode->byteCode(scopeChain);
-    Register* r = slideRegisterWindowForCall(exec, codeBlock, &m_registerFile, argv, argc + RegisterFile::CallFrameHeaderSize, argc, *exception);
-    if (UNLIKELY(*exception != 0)) {
+    Register* r = slideRegisterWindowForCall(codeBlock, &m_registerFile, argv, argc + RegisterFile::CallFrameHeaderSize, argc);
+    if (UNLIKELY(!r)) {
+        *exception = createStackOverflowError(exec);
         m_registerFile.shrink(oldEnd);
         return jsNull();
     }
     // a 0 codeBlock indicates a built-in caller
-    initializeCallFrame(r, codeBlock, 0, scopeChain, makeHostCallFramePointer(exec->m_callFrame), 0, argc, function);
-
-    ExecState newExec(r);
+    initializeCallFrame(r, codeBlock, 0, scopeChain, makeHostCallFramePointer(exec->registers()), 0, argc, function);
 
     Profiler** profiler = Profiler::enabledProfilerReference();
@@ -977 +967 @@
     if (!codeBlock->ctiCode)
         CTI::compile(this, exec, codeBlock);
-    JSValue* result = CTI::execute(codeBlock->ctiCode, &newExec, &m_registerFile, r, &newExec.globalData(), exception);
+    JSValue* result = CTI::execute(codeBlock->ctiCode, &m_registerFile, r, scopeChain->globalData, exception);
 #else
-    JSValue* result = privateExecute(Normal, &newExec, &m_registerFile, r, exception);
+    JSValue* result = privateExecute(Normal, &m_registerFile, r, exception);
 #endif
     m_reentryDepth--;
@@ -1048 +1038 @@
     // a 0 codeBlock indicates a built-in caller
     r[codeBlock->thisRegister] = thisObj;
-    initializeCallFrame(r, codeBlock, 0, scopeChain, makeHostCallFramePointer(exec->m_callFrame), 0, 0, 0);
+    initializeCallFrame(r, codeBlock, 0, scopeChain, makeHostCallFramePointer(exec->registers()), 0, 0, 0);
 
     if (codeBlock->needsFullScopeChain)
         scopeChain = scopeChain->copy();
-
-    ExecState newExec(r);
 
     Profiler** profiler = Profiler::enabledProfilerReference();
@@ -1063 +1051 @@
     if (!codeBlock->ctiCode)
         CTI::compile(this, exec, codeBlock);
-    JSValue* result = CTI::execute(codeBlock->ctiCode, &newExec, &m_registerFile, r, &newExec.globalData(), exception);
+    JSValue* result = CTI::execute(codeBlock->ctiCode, &m_registerFile, r, scopeChain->globalData, exception);
 #else
-    JSValue* result = privateExecute(Normal, &newExec, &m_registerFile, r, exception);
+    JSValue* result = privateExecute(Normal, &m_registerFile, r, exception);
 #endif
     m_reentryDepth--;
@@ -1086 +1074 @@
     CodeBlock* codeBlock = this->codeBlock(r);
     ScopeChainNode* scopeChain = this->scopeChain(r);
-    DebuggerCallFrame debuggerCallFrame(exec, exec->dynamicGlobalObject(), codeBlock, scopeChain, r, 0);
+    DebuggerCallFrame debuggerCallFrame(exec->dynamicGlobalObject(), codeBlock, scopeChain, r, 0);
 
     switch (debugHookID) {
@@ -1419 +1407 @@
 }
 
-JSValue* Machine::privateExecute(ExecutionFlag flag, ExecState* exec, RegisterFile* registerFile, Register* r, JSValue** exception)
+JSValue* Machine::privateExecute(ExecutionFlag flag, RegisterFile* registerFile, Register* r, JSValue** exception)
 {
     // One-time initialization of our address tables. We have to put this code
@@ -1444 +1432 @@
 #endif
 
+#define exec CallFrame::create(r)
+
+    JSGlobalData* globalData = &exec->globalData();
     JSValue* exceptionValue = 0;
     Instruction* handlerVPC = 0;
@@ -1453 +1444 @@
 #define VM_CHECK_EXCEPTION() \
     do { \
-        if (UNLIKELY(exec->hadException())) { \
-            exceptionValue = exec->exception(); \
+        if (UNLIKELY(globalData->exception != 0)) { \
+            exceptionValue = globalData->exception; \
             goto vm_throw; \
         } \
@@ -1527 +1518 @@
         int dst = (++vPC)->u.operand;
         int regExp = (++vPC)->u.operand;
-        r[dst] = new (exec) RegExpObject(scopeChain(r)->globalObject()->regExpStructure(), codeBlock(r)->regexps[regExp]);
+        r[dst] = new (globalData) RegExpObject(scopeChain(r)->globalObject()->regExpStructure(), codeBlock(r)->regexps[regExp]);
 
         ++vPC;
@@ -3284 +3275 @@
             Register* savedR = r;
 
-            r = slideRegisterWindowForCall(exec, newCodeBlock, registerFile, r, registerOffset, argCount, exceptionValue);
-            exec->m_callFrame = r;
-            if (UNLIKELY(exceptionValue != 0))
+            r = slideRegisterWindowForCall(newCodeBlock, registerFile, r, registerOffset, argCount);
+            if (UNLIKELY(!r)) {
+                r = savedR;
+                exceptionValue = createStackOverflowError(CallFrame::create(r));
                 goto vm_throw;
+            }
 
             initializeCallFrame(r, newCodeBlock, vPC + 1, callDataScopeChain, savedR, dst, argCount, v);
@@ -3309 +3302 @@
             ScopeChainNode* scopeChain = this->scopeChain(r);
             initializeCallFrame(r + registerOffset, 0, vPC + 1, scopeChain, r, dst, argCount, v);
-            exec->m_callFrame = r + registerOffset;
+            ExecState* callFrame = CallFrame::create(r + registerOffset);
 
             if (*enabledProfilerReference)
-                (*enabledProfilerReference)->willExecute(exec, static_cast<JSObject*>(v));
+                (*enabledProfilerReference)->willExecute(callFrame, static_cast<JSObject*>(v));
 
             MACHINE_SAMPLING_callingHostFunction();
 
-            JSValue* returnValue = callData.native.function(exec, static_cast<JSObject*>(v), thisValue, args);
-            exec->m_callFrame = r;
+            JSValue* returnValue = callData.native.function(callFrame, static_cast<JSObject*>(v), thisValue, args);
             VM_CHECK_EXCEPTION();
 
@@ -3323 +3315 @@
 
             if (*enabledProfilerReference)
-                (*enabledProfilerReference)->didExecute(exec, static_cast<JSObject*>(v));
+                (*enabledProfilerReference)->didExecute(CallFrame::create(r), static_cast<JSObject*>(v));
 
             ++vPC;
@@ -3367 +3359 @@
         int dst = r[RegisterFile::ReturnValueRegister].i();
         r = r[RegisterFile::CallerRegisters].r();
-        exec->m_callFrame = r;
         
         if (isHostCallFrame(r))
@@ -3422 +3413 @@
             r[i] = codeBlock->constantRegisters[j];
 
-        JSActivation* activation = new (exec) JSActivation(exec, static_cast<FunctionBodyNode*>(codeBlock->ownerNode), r);
+        JSActivation* activation = new (globalData) JSActivation(exec, static_cast<FunctionBodyNode*>(codeBlock->ownerNode), r);
         r[RegisterFile::OptionalCalleeActivation] = activation;
         r[RegisterFile::ScopeChain] = scopeChain(r)->copy()->push(activation);
@@ -3453 +3444 @@
         if (activation) {
             ASSERT(activation->isObject(&JSActivation::info));
-            arguments = new (exec) Arguments(exec, static_cast<JSActivation*>(activation));
+            arguments = new (globalData) Arguments(exec, static_cast<JSActivation*>(activation));
         } else
-            arguments = new (exec) Arguments(exec, r);
+            arguments = new (globalData) Arguments(exec, r);
         r[RegisterFile::OptionalCalleeArguments] = arguments;
         r[RegisterFile::ArgumentsRegister] = arguments;
@@ -3503 +3494 @@
             else
                 structure = callDataScopeChain->globalObject()->emptyObjectStructure();
-            JSObject* newObject = new (exec) JSObject(structure);
+            JSObject* newObject = new (globalData) JSObject(structure);
 
             r[firstArg] = newObject; // "this" value
@@ -3509 +3500 @@
             Register* savedR = r;
 
-            r = slideRegisterWindowForCall(exec, newCodeBlock, registerFile, r, registerOffset, argCount, exceptionValue);
-            exec->m_callFrame = r;
-            if (UNLIKELY(exceptionValue != 0))
+            r = slideRegisterWindowForCall(newCodeBlock, registerFile, r, registerOffset, argCount);
+            if (UNLIKELY(!r)) {
+                r = savedR;
+                exceptionValue = createStackOverflowError(CallFrame::create(r));
                 goto vm_throw;
+            }
 
             initializeCallFrame(r, newCodeBlock, vPC + 1, callDataScopeChain, savedR, dst, argCount, v);
@@ -3533 +3526 @@
             ScopeChainNode* scopeChain = this->scopeChain(r);
             initializeCallFrame(r + registerOffset, 0, vPC + 1, scopeChain, r, dst, argCount, v);
-            exec->m_callFrame = r + registerOffset;
+            r += registerOffset;
 
             if (*enabledProfilerReference)
@@ -3541 +3534 @@
 
             JSValue* returnValue = constructData.native.function(exec, static_cast<JSObject*>(v), args);
-            exec->m_callFrame = r;
+            r -= registerOffset;
 
             VM_CHECK_EXCEPTION();
@@ -3861 +3854 @@
     }
     vm_throw: {
-        exec->clearException();
+        globalData->exception = 0;
         if (!tickCount) {
             // The exceptionValue is a lie! (GCC produces bad code for reasons I 
             // cannot fathom if we don't assign to the exceptionValue before branching)
-            exceptionValue = createInterruptedExecutionException(exec);
+            exceptionValue = createInterruptedExecutionException(globalData);
         }
         handlerVPC = throwException(exec, exceptionValue, vPC, r, false);
@@ -3880 +3873 @@
     #undef VM_CHECK_EXCEPTION
     #undef CHECK_FOR_TIMEOUT
+    #undef exec
 }
 
@@ -3934 +3928 @@
     sourceURL = UString();
 
-    Register* r = exec->m_callFrame;
+    Register* r = exec->registers();
     Register* callerR = r[RegisterFile::CallerRegisters].r();
     if (isHostCallFrame(callerR))
@@ -3965 +3959 @@
 Register* Machine::callFrame(ExecState* exec, InternalFunction* function) const
 {
-    for (Register* r = exec->m_callFrame; r; r = stripHostCallFrameBit(r[RegisterFile::CallerRegisters].r()))
+    for (Register* r = exec->registers(); r; r = stripHostCallFrameBit(r[RegisterFile::CallerRegisters].r()))
         if (r[RegisterFile::Callee].getJSValue() == function)
             return r;
@@ -3993 +3987 @@
 NEVER_INLINE static void doSetReturnAddressVMThrowTrampoline(void** returnAddress)
 {
-    ctiSetReturnAddress(returnAddress, (void*)ctiVMThrowTrampoline);
+    ctiSetReturnAddress(returnAddress, reinterpret_cast<void*>(ctiVMThrowTrampoline));
 }
 
@@ -4208 +4202 @@
 }
 
-
-#define JSVALUE_VM_CHECK_EXCEPTION_ARG(exception) \
+#define VM_THROW_EXCEPTION() \
     do { \
-        if (UNLIKELY(exception != 0)) { \
-            exec->setException(exception); \
-            exec->setCTIReturnAddress(CTI_RETURN_ADDRESS); \
-            doSetReturnAddressVMThrowTrampoline(&CTI_RETURN_ADDRESS); \
-            return 0; \
-        } \
+        VM_THROW_EXCEPTION_AT_END(); \
+        return 0; \
     } while (0)
-#define VM_CHECK_EXCEPTION_v() \
+#define VM_THROW_EXCEPTION_AT_END() \
     do { \
-        if (UNLIKELY(exec->hadException())) { \
-            exec->setCTIReturnAddress(CTI_RETURN_ADDRESS); \
-            doSetReturnAddressVMThrowTrampoline(&CTI_RETURN_ADDRESS); \
-            return; \
-        } \
+        ASSERT(ARG_globalData->exception); \
+        ARG_globalData->throwReturnAddress = CTI_RETURN_ADDRESS; \
+        doSetReturnAddressVMThrowTrampoline(&CTI_RETURN_ADDRESS); \
     } while (0)
-#define VM_CHECK_EXCEPTION(type) \
+
+#define VM_CHECK_EXCEPTION() \
     do { \
-        if (UNLIKELY(exec->hadException())) { \
-            exec->setCTIReturnAddress(CTI_RETURN_ADDRESS); \
-            doSetReturnAddressVMThrowTrampoline(&CTI_RETURN_ADDRESS); \
-            return (type)0; \
+        if (UNLIKELY(ARG_globalData->exception != 0)) \
+            VM_THROW_EXCEPTION(); \
+    } while (0)
+#define VM_CHECK_EXCEPTION_ARG(exceptionValue) \
+    do { \
+        if (UNLIKELY((exceptionValue) != 0)) { \
+            ARG_globalData->exception = (exceptionValue); \
+            VM_THROW_EXCEPTION(); \
         } \
     } while (0)
 #define VM_CHECK_EXCEPTION_AT_END() \
     do { \
-        if (UNLIKELY(exec->hadException())) { \
-            /*printf("VM_CHECK_EXCEPTION_AT_END()\n");*/ \
-            exec->setCTIReturnAddress(CTI_RETURN_ADDRESS); \
-            doSetReturnAddressVMThrowTrampoline(&CTI_RETURN_ADDRESS); \
+        if (UNLIKELY(ARG_globalData->exception != 0)) \
+            VM_THROW_EXCEPTION_AT_END(); \
+    } while (0)
+#define VM_CHECK_EXCEPTION_VOID() \
+    do { \
+        if (UNLIKELY(ARG_globalData->exception != 0)) { \
+            VM_THROW_EXCEPTION_AT_END(); \
+            return; \
         } \
     } while (0)
-
 
 JSValue* Machine::cti_op_convert_this(CTI_ARGS)
@@ -4280 +4275 @@
         RefPtr<UString::Rep> value = concatenate(static_cast<JSString*>(v1)->value().rep(), static_cast<JSString*>(v2)->value().rep());
         if (UNLIKELY(!value)) {
-            JSValue* result = throwOutOfMemoryError(exec);
-            VM_CHECK_EXCEPTION_AT_END();
-            return result;
+            throwOutOfMemoryError(exec);
+            VM_THROW_EXCEPTION();
         }
 
@@ -4294 +4288 @@
 
         if (UNLIKELY(!value)) {
-            JSValue* result = throwOutOfMemoryError(exec);
-            VM_CHECK_EXCEPTION_AT_END();
-            return result;
+            throwOutOfMemoryError(exec);
+            VM_THROW_EXCEPTION();
         }
         return jsString(ARG_globalData, value.release());
@@ -4312 +4305 @@
 
     ExecState* exec = ARG_exec;
-    JSValue* result = jsNumber(exec, v->toNumber(exec) + 1);
+    JSValue* result = jsNumber(ARG_globalData, v->toNumber(exec) + 1);
     VM_CHECK_EXCEPTION_AT_END();
     return result;
@@ -4319 +4312 @@
 void Machine::cti_timeout_check(CTI_ARGS)
 {
-    ExecState* exec = ARG_exec;
-
-    if (ARG_globalData->machine->checkTimeout(exec->dynamicGlobalObject()))
-        exec->setException(createInterruptedExecutionException(exec));
-
-    VM_CHECK_EXCEPTION_AT_END();
+    if (ARG_globalData->machine->checkTimeout(ARG_exec->dynamicGlobalObject())) {
+        ARG_globalData->exception = createInterruptedExecutionException(ARG_globalData);
+        VM_THROW_EXCEPTION_AT_END();
+    }
 }
 
@@ -4487 +4478 @@
         ASSERT(codeBlock->ctiReturnAddressVPCMap.contains(CTI_RETURN_ADDRESS));
         unsigned vPCIndex = codeBlock->ctiReturnAddressVPCMap.get(CTI_RETURN_ADDRESS);
-        exec->setException(createInvalidParamError(exec, "instanceof", baseVal, codeBlock->instructions.begin() + vPCIndex, codeBlock));
-        VM_CHECK_EXCEPTION(JSValue*);
+        ARG_globalData->exception = createInvalidParamError(exec, "instanceof", baseVal, codeBlock->instructions.begin() + vPCIndex, codeBlock);
+        VM_THROW_EXCEPTION();
     }
 
@@ -4496 +4487 @@
     if (!proto->isObject()) {
         throwError(exec, TypeError, "instanceof called on an object with an invalid prototype property.");
-        VM_CHECK_EXCEPTION(JSValue*);
+        VM_THROW_EXCEPTION();
     }
         
@@ -4538 +4529 @@
 JSValue* Machine::cti_op_new_func(CTI_ARGS)
 {
-    Register* r = ARG_r;
-    ScopeChainNode* scopeChain = Machine::scopeChain(r);
-    return ARG_func1->makeFunction(ARG_exec, scopeChain);
+    return ARG_func1->makeFunction(ARG_exec, Machine::scopeChain(ARG_r));
 }
 
 void* Machine::cti_op_call_JSFunction(CTI_ARGS)
 {
-    ExecState* exec = ARG_exec;
-    RegisterFile* registerFile = ARG_registerFile;
-    Register* r = ARG_r;
-
-    JSValue* funcVal = ARG_src1;
-    int registerOffset = ARG_int2;
-    int argCount = ARG_int3;
-
 #ifndef NDEBUG
     CallData callData;
-    ASSERT(funcVal->getCallData(callData) == CallTypeJS);
+    ASSERT(ARG_src1->getCallData(callData) == CallTypeJS);
 #endif
 
-    if (*ARG_profilerReference)
-        (*ARG_profilerReference)->willExecute(exec, static_cast<JSObject*>(funcVal));
-
-    ScopeChainNode* callDataScopeChain = static_cast<JSFunction*>(funcVal)->m_scopeChain.node();
-    FunctionBodyNode* functionBodyNode = static_cast<JSFunction*>(funcVal)->m_body.get();
-
-    CodeBlock* newCodeBlock = &functionBodyNode->byteCode(callDataScopeChain);
-    
-    Register* savedR = r;
-
-    JSValue* exceptionValue = 0;
-    r = slideRegisterWindowForCall(exec, newCodeBlock, registerFile, r, registerOffset, argCount, exceptionValue);
-    JSVALUE_VM_CHECK_EXCEPTION_ARG(exceptionValue);
+    if (UNLIKELY(*ARG_profilerReference != 0))
+        (*ARG_profilerReference)->willExecute(CallFrame::create(ARG_r), static_cast<JSObject*>(ARG_src1));
+
+    ScopeChainNode* callDataScopeChain = static_cast<JSFunction*>(ARG_src1)->m_scopeChain.node();
+    CodeBlock* newCodeBlock = &static_cast<JSFunction*>(ARG_src1)->m_body->byteCode(callDataScopeChain);
+
+    Register* r = slideRegisterWindowForCall(newCodeBlock, ARG_registerFile, ARG_r, ARG_int2, ARG_int3);
+    if (UNLIKELY(!r)) {
+        ARG_globalData->exception = createStackOverflowError(CallFrame::create(ARG_r));
+        VM_THROW_EXCEPTION();
+    }
 
     r[RegisterFile::CodeBlock] = newCodeBlock;
     r[RegisterFile::ScopeChain] = callDataScopeChain;
-    r[RegisterFile::CallerRegisters] = savedR;
+    r[RegisterFile::CallerRegisters] = ARG_r;
     // RegisterFile::ReturnPC is set by callee
     // RegisterFile::ReturnValueRegister is set by caller
-    r[RegisterFile::ArgumentCount] = argCount; // original argument count (for the sake of the "arguments" object)
-    r[RegisterFile::Callee] = funcVal;
+    r[RegisterFile::ArgumentCount] = ARG_int3; // original argument count (for the sake of the "arguments" object)
+    r[RegisterFile::Callee] = ARG_src1;
     r[RegisterFile::OptionalCalleeActivation] = nullJSValue;
     r[RegisterFile::OptionalCalleeArguments] = nullJSValue;
 
-    exec->m_callFrame = r;
     ARG_setR(r);
 
@@ -4590 +4568 @@
 void* Machine::cti_vm_compile(CTI_ARGS)
 {
-    ExecState* exec = ARG_exec;
     Register* r = ARG_r;
     CodeBlock* codeBlock = Machine::codeBlock(r);
 
     if (!codeBlock->ctiCode)
-        CTI::compile(ARG_globalData->machine, exec, codeBlock);
+        CTI::compile(ARG_globalData->machine, CallFrame::create(r), codeBlock);
 
     return codeBlock->ctiCode;
@@ -4607 +4584 @@
     ScopeChainNode* scopeChain = Machine::scopeChain(r);
 
-    JSActivation* activation = new (exec) JSActivation(exec, static_cast<FunctionBodyNode*>(codeBlock->ownerNode), r);
+    JSActivation* activation = new (ARG_globalData) JSActivation(exec, static_cast<FunctionBodyNode*>(codeBlock->ownerNode), r);
     r[RegisterFile::OptionalCalleeActivation] = activation;
     r[RegisterFile::ScopeChain] = scopeChain->copy()->push(activation);
@@ -4614 +4591 @@
 JSValue* Machine::cti_op_call_NotJSFunction(CTI_ARGS)
 {
-    ExecState* exec = ARG_exec;
     JSValue* funcVal = ARG_src1;
 
@@ -4629 +4605 @@
 
         initializeCallFrame(r, 0, ARG_instr4 + 1, scopeChain(savedR), savedR, 0, argCount, funcVal);
-        exec->m_callFrame = r;
         ARG_setR(r);
 
         if (*ARG_profilerReference)
-            (*ARG_profilerReference)->willExecute(exec, static_cast<JSObject*>(funcVal));
+            (*ARG_profilerReference)->willExecute(CallFrame::create(r), static_cast<JSObject*>(funcVal));
 
         Register* argv = r - RegisterFile::CallFrameHeaderSize - argCount;
@@ -4640 +4615 @@
         CTI_MACHINE_SAMPLING_callingHostFunction();
 
-        JSValue* returnValue = callData.native.function(exec, static_cast<JSObject*>(funcVal), argv[0].jsValue(exec), argList);
-        exec->m_callFrame = savedR;
+        JSValue* returnValue = callData.native.function(CallFrame::create(r), static_cast<JSObject*>(funcVal), argv[0].jsValue(CallFrame::create(r)), argList);
         ARG_setR(savedR);
-        VM_CHECK_EXCEPTION(JSValue*);
+        VM_CHECK_EXCEPTION();
 
         if (*ARG_profilerReference)
-            (*ARG_profilerReference)->didExecute(exec, static_cast<JSObject*>(funcVal));
+            (*ARG_profilerReference)->didExecute(CallFrame::create(savedR), static_cast<JSObject*>(funcVal));
 
         return returnValue;
@@ -4653 +4627 @@
     ASSERT(callType == CallTypeNone);
 
-    Register* r = ARG_r;
-    exec->setException(createNotAFunctionError(exec, funcVal, ARG_instr4, codeBlock(r)));
-    VM_CHECK_EXCEPTION_AT_END();
-    return 0;
+    ARG_globalData->exception = createNotAFunctionError(CallFrame::create(ARG_r), funcVal, ARG_instr4, codeBlock(ARG_r));
+    VM_THROW_EXCEPTION();
 }
 
@@ -4668 +4640 @@
     if (activation) {
         ASSERT(activation->isObject(&JSActivation::info));
-        arguments = new (exec) Arguments(exec, static_cast<JSActivation*>(activation));
+        arguments = new (ARG_globalData) Arguments(exec, static_cast<JSActivation*>(activation));
     } else
-        arguments = new (exec) Arguments(exec, r);
+        arguments = new (ARG_globalData) Arguments(exec, r);
     r[RegisterFile::OptionalCalleeArguments] = arguments;
     r[RegisterFile::ArgumentsRegister] = arguments;
@@ -4737 +4709 @@
     unsigned vPCIndex = codeBlock->ctiReturnAddressVPCMap.get(CTI_RETURN_ADDRESS);
     exec->setException(createUndefinedVariableError(exec, ident, codeBlock->instructions.begin() + vPCIndex, codeBlock));
-
-    VM_CHECK_EXCEPTION_AT_END();
-    return 0;
+    VM_THROW_EXCEPTION();
 }
 
 void* Machine::cti_op_construct_JSConstruct(CTI_ARGS)
 {
-    ExecState* exec = ARG_exec;
     RegisterFile* registerFile = ARG_registerFile;
     Register* r = ARG_r;
@@ -4762 +4731 @@
 
     if (*ARG_profilerReference)
-        (*ARG_profilerReference)->willExecute(exec, constructor);
+        (*ARG_profilerReference)->willExecute(CallFrame::create(r), constructor);
 
     ScopeChainNode* callDataScopeChain = constructor->m_scopeChain.node();
@@ -4773 +4742 @@
     else
         structure = callDataScopeChain->globalObject()->emptyObjectStructure();
-    JSObject* newObject = new (exec) JSObject(structure);
+    JSObject* newObject = new (ARG_globalData) JSObject(structure);
 
     r[firstArg] = newObject; // "this" value
 
-    Register* savedR = r;
-
-    JSValue* exceptionValue = 0;
-    r = slideRegisterWindowForCall(exec, newCodeBlock, registerFile, r, registerOffset, argCount, exceptionValue);
-    JSVALUE_VM_CHECK_EXCEPTION_ARG(exceptionValue);
+    r = slideRegisterWindowForCall(newCodeBlock, registerFile, r, registerOffset, argCount);
+    if (UNLIKELY(!r)) {
+        ARG_globalData->exception = createStackOverflowError(CallFrame::create(ARG_r));
+        VM_THROW_EXCEPTION();
+    }
 
     r[RegisterFile::CodeBlock] = newCodeBlock;
     r[RegisterFile::ScopeChain] = callDataScopeChain;
-    r[RegisterFile::CallerRegisters] = savedR;
+    r[RegisterFile::CallerRegisters] = ARG_r;
     // RegisterFile::ReturnPC is set by callee
     // RegisterFile::ReturnValueRegister is set by caller
@@ -4793 +4762 @@
     r[RegisterFile::OptionalCalleeArguments] = nullJSValue;
 
-    exec->m_callFrame = r;
-
     ARG_setR(r);
     return newCodeBlock->ctiCode;
@@ -4822 +4789 @@
 
         JSValue* returnValue = constructData.native.function(exec, constructor, argList);
-        VM_CHECK_EXCEPTION(JSValue*);
+        VM_CHECK_EXCEPTION();
 
         if (*ARG_profilerReference)
@@ -4833 +4800 @@
 
     exec->setException(createNotAConstructorError(exec, constrVal, ARG_instr6, codeBlock(r)));
-    VM_CHECK_EXCEPTION_AT_END();
-    return 0;
+    VM_THROW_EXCEPTION();
 }
 
@@ -4909 +4875 @@
     unsigned vPCIndex = codeBlock->ctiReturnAddressVPCMap.get(CTI_RETURN_ADDRESS);
     exec->setException(createUndefinedVariableError(exec, ident, codeBlock->instructions.begin() + vPCIndex, codeBlock));
-
-    VM_CHECK_EXCEPTION_AT_END();
-    return 0;
+    VM_THROW_EXCEPTION();
 }
 
@@ -4953 +4917 @@
     } else {
         Identifier property(exec, subscript->toString(exec));
-        if (!exec->hadException()) { // Don't put to an object if toString threw an exception.
+        if (!ARG_globalData->exception) { // Don't put to an object if toString threw an exception.
             PutPropertySlot slot;
             baseValue->put(exec, property, value, slot);
@@ -4977 +4941 @@
         Identifier property(exec, JSImmediate::from(i)->toString(exec));
         // FIXME: can toString throw an exception here?
-        if (!exec->hadException()) { // Don't put to an object if toString threw an exception.
+        if (!ARG_globalData->exception) { // Don't put to an object if toString threw an exception.
             PutPropertySlot slot;
             baseValue->put(exec, property, value, slot);
@@ -5054 +5018 @@
     unsigned vPCIndex = codeBlock->ctiReturnAddressVPCMap.get(CTI_RETURN_ADDRESS);
     exec->setException(createUndefinedVariableError(exec, ident, codeBlock->instructions.begin() + vPCIndex, codeBlock));
-
-    VM_CHECK_EXCEPTION_AT_END();
-    return 0;
+    VM_THROW_EXCEPTION();
 }
 
@@ -5084 +5046 @@
     
     Register* r = ARG_r;
-    exec->setException(createUndefinedVariableError(exec, ident, vPC, codeBlock(r)));
-    
-    VM_CHECK_EXCEPTION_AT_END();
-    return 0;
+    exec->setException(createUndefinedVariableError(exec, ident, vPC, codeBlock(r)));    
+    VM_THROW_EXCEPTION();
 }
 
@@ -5156 +5116 @@
 
     JSValue* number = v->toJSNumber(exec);
-    VM_CHECK_EXCEPTION(JSValue*);
+    VM_CHECK_EXCEPTION();
     ARG_set2ndResult(jsNumber(ARG_globalData, number->uncheckedGetNumber() + 1));
     return number;
@@ -5271 +5231 @@
     unsigned vPCIndex = codeBlock->ctiReturnAddressVPCMap.get(CTI_RETURN_ADDRESS);
     exec->setException(createUndefinedVariableError(exec, ident, codeBlock->instructions.begin() + vPCIndex, codeBlock));
-
-    VM_CHECK_EXCEPTION_AT_END();
-    return 0;
+    VM_THROW_EXCEPTION();
 }
 
@@ -5321 +5279 @@
 
     JSValue* number = v->toJSNumber(exec);
-    VM_CHECK_EXCEPTION(JSValue*);
+    VM_CHECK_EXCEPTION();
 
     ARG_set2ndResult(jsNumber(ARG_globalData, number->uncheckedGetNumber() - 1));
@@ -5357 +5315 @@
 JSValue* Machine::cti_op_new_regexp(CTI_ARGS)
 {
-    return new (ARG_exec) RegExpObject(scopeChain(ARG_r)->globalObject()->regExpStructure(), ARG_regexp1);
+    return new (ARG_globalData) RegExpObject(scopeChain(ARG_r)->globalObject()->regExpStructure(), ARG_regexp1);
 }
 
@@ -5391 +5349 @@
         JSValue* exceptionValue = 0;
         JSValue* result = machine->callEval(exec, thisObject, scopeChain, registerFile,  r, registerOffset - RegisterFile::CallFrameHeaderSize - argCount, argCount, exceptionValue);
-        JSVALUE_VM_CHECK_EXCEPTION_ARG(exceptionValue);
+        VM_CHECK_EXCEPTION_ARG(exceptionValue);
         return result;
     }
@@ -5408 +5366 @@
 
     JSValue* exceptionValue = ARG_src1;
+    ASSERT(exceptionValue);
+
     Instruction* handlerVPC = ARG_globalData->machine->throwException(exec, exceptionValue, codeBlock->instructions.begin() + vPCIndex, r, true);
 
-    if (handlerVPC) {
-        exec->setException(exceptionValue);
-        ARG_setR(r);
-
-        void* catchRoutine = Machine::codeBlock(r)->nativeExceptionCodeForHandlerVPC(handlerVPC);
-        ASSERT(catchRoutine);
-        ctiSetReturnAddress(&CTI_RETURN_ADDRESS, catchRoutine);
-        return catchRoutine;
-    } else {
-        exec->clearException();
+    if (!handlerVPC) {
         *ARG_exception = exceptionValue;
         return JSImmediate::nullImmediate();
     }
+
+    ARG_setR(r);
+    void* catchRoutine = Machine::codeBlock(r)->nativeExceptionCodeForHandlerVPC(handlerVPC);
+    ASSERT(catchRoutine);
+    ctiSetReturnAddress(&CTI_RETURN_ADDRESS, catchRoutine);
+    return exceptionValue;
 }
 
@@ -5445 +5402 @@
 
     JSObject* o = v->toObject(exec);
-    VM_CHECK_EXCEPTION_v();
+    VM_CHECK_EXCEPTION_VOID();
 
     Register* r = ARG_r;
@@ -5538 +5495 @@
         unsigned vPCIndex = codeBlock->ctiReturnAddressVPCMap.get(CTI_RETURN_ADDRESS);
         exec->setException(createInvalidParamError(exec, "in", baseVal, codeBlock->instructions.begin() + vPCIndex, codeBlock));
-        VM_CHECK_EXCEPTION(JSValue*);
+        VM_THROW_EXCEPTION();
     }
 
@@ -5549 +5506 @@
 
     Identifier property(exec, propName->toString(exec));
-    VM_CHECK_EXCEPTION(JSValue*);
+    VM_CHECK_EXCEPTION();
     return jsBoolean(baseObj->hasProperty(exec, property));
 }
@@ -5555 +5512 @@
 JSValue* Machine::cti_op_push_new_scope(CTI_ARGS)
 {
-    ExecState* exec = ARG_exec;
-    JSObject* scope = new (exec) JSStaticScopeObject(exec, *ARG_id1, ARG_src2, DontDelete);
+    JSObject* scope = new (ARG_globalData) JSStaticScopeObject(ARG_exec, *ARG_id1, ARG_src2, DontDelete);
 
     Register* r = ARG_r;
@@ -5645 +5601 @@
         result = jsBoolean(baseObj->deleteProperty(exec, i));
     else {
-        VM_CHECK_EXCEPTION(JSValue*);
+        VM_CHECK_EXCEPTION();
         Identifier property(exec, subscript->toString(exec));
-        VM_CHECK_EXCEPTION(JSValue*);
+        VM_CHECK_EXCEPTION();
         result = jsBoolean(baseObj->deleteProperty(exec, property));
     }
@@ -5707 +5663 @@
     CodeBlock* codeBlock = Machine::codeBlock(r);
 
-    ASSERT(codeBlock->ctiReturnAddressVPCMap.contains(exec->ctiReturnAddress()));
-    unsigned vPCIndex = codeBlock->ctiReturnAddressVPCMap.get(exec->ctiReturnAddress());
-
-    ASSERT(exec->hadException());
-
-    JSValue* exceptionValue = exec->exception();
+    ASSERT(codeBlock->ctiReturnAddressVPCMap.contains(ARG_globalData->throwReturnAddress));
+    unsigned vPCIndex = codeBlock->ctiReturnAddressVPCMap.get(ARG_globalData->throwReturnAddress);
+
+    JSValue* exceptionValue = ARG_globalData->exception;
+    ASSERT(exceptionValue);
+    ARG_globalData->exception = 0;
 
     Instruction* handlerVPC = ARG_globalData->machine->throwException(exec, exceptionValue, codeBlock->instructions.begin() + vPCIndex, r, false);
 
-    if (handlerVPC) {
-        exec->setException(exceptionValue);
-        ARG_setR(r);
-
-        void* catchRoutine = Machine::codeBlock(r)->nativeExceptionCodeForHandlerVPC(handlerVPC);
-        ASSERT(catchRoutine);
-        ctiSetReturnAddress(&CTI_RETURN_ADDRESS, catchRoutine);
-        return catchRoutine;
-    } else {
-        exec->clearException();
+    if (!handlerVPC) {
         *ARG_exception = exceptionValue;
         return JSImmediate::nullImmediate();
     }
+
+    ARG_setR(r);
+    void* catchRoutine = Machine::codeBlock(r)->nativeExceptionCodeForHandlerVPC(handlerVPC);
+    ASSERT(catchRoutine);
+    ctiSetReturnAddress(&CTI_RETURN_ADDRESS, catchRoutine);
+    return exceptionValue;
 }
 
 #undef VM_CHECK_EXCEPTION
-#undef VM_CHECK_EXCEPTION_v
+#undef VM_CHECK_EXCEPTION_ARG
 #undef VM_CHECK_EXCEPTION_AT_END
+#undef VM_CHECK_EXCEPTION_VOID
 
 #endif // ENABLE(CTI)

trunk/JavaScriptCore/VM/Machine.h

@@ -269 +269 @@
         Register* callFrame(ExecState*, InternalFunction*) const;
 
-        JSValue* privateExecute(ExecutionFlag, ExecState* = 0, RegisterFile* = 0, Register* = 0, JSValue** exception = 0);
+        JSValue* privateExecute(ExecutionFlag, RegisterFile*, Register*, JSValue** exception);
 
         void dumpCallFrame(const RegisterFile*, const Register*);

trunk/JavaScriptCore/kjs/DebuggerCallFrame.cpp

@@ -45 +45 @@
     if (!function)
         return 0;
-    return &function->name(m_exec);
+    return &function->name(m_scopeChain->globalData);
 }
 
@@ -69 +69 @@
         return 0;
 
-    ExecState newExec(m_registers);
-
     int errLine;
     UString errMsg;
     SourceCode source = makeSource(script);
-    RefPtr<EvalNode> evalNode = newExec.parser()->parse<EvalNode>(&newExec, source, &errLine, &errMsg);
+    RefPtr<EvalNode> evalNode = m_scopeChain->globalData->parser->parse<EvalNode>(CallFrame::create(m_registers), source, &errLine, &errMsg);
     if (!evalNode)
-        return Error::create(&newExec, SyntaxError, errMsg, errLine, source.provider()->asID(), source.provider()->url());
+        return Error::create(CallFrame::create(m_registers), SyntaxError, errMsg, errLine, source.provider()->asID(), source.provider()->url());
 
-    return newExec.machine()->execute(evalNode.get(), &newExec, thisObject(), m_scopeChain, &exception);
+    return m_scopeChain->globalData->machine->execute(evalNode.get(), CallFrame::create(m_registers), thisObject(), m_scopeChain, &exception);
 }
 

trunk/JavaScriptCore/kjs/DebuggerCallFrame.h

@@ -49 +49 @@
         };
 
-        DebuggerCallFrame(ExecState* exec, JSGlobalObject* dynamicGlobalObject, const CodeBlock* codeBlock, ScopeChainNode* scopeChain, Register* r, JSValue* exception)
-            : m_exec(exec)
-            , m_dynamicGlobalObject(dynamicGlobalObject)
+        DebuggerCallFrame(JSGlobalObject* dynamicGlobalObject, const CodeBlock* codeBlock, ScopeChainNode* scopeChain, Register* r, JSValue* exception)
+            : m_dynamicGlobalObject(dynamicGlobalObject)
             , m_codeBlock(codeBlock)
             , m_scopeChain(scopeChain)
@@ -62 +61 @@
         const ScopeChainNode* scopeChain() const { return m_scopeChain; }
         const UString* functionName() const;
-        DebuggerCallFrame::Type type() const;
+        Type type() const;
         JSObject* thisObject() const;
         JSValue* evaluate(const UString&, JSValue*& exception) const;
@@ -68 +67 @@
 
     private:
-        ExecState* m_exec;
         JSGlobalObject* m_dynamicGlobalObject;
         const CodeBlock* m_codeBlock;

trunk/JavaScriptCore/kjs/ExecState.h

@@ -30 +30 @@
 namespace JSC  {
 
+    class ExecState;
     class JSValue;
     class Register;
 
+    typedef ExecState CallFrame;
+
     // Represents the current state of script execution.
     // Passed as the first argument to most functions.
-    class ExecState : Noncopyable {
-#if ENABLE(CTI)
-        friend class CTI;
-#endif
-        friend class Machine;
-        friend class DebuggerCallFrame;
+    class ExecState : private Register, Noncopyable {
     public:
-        explicit ExecState(Register* callFrame)
-            : m_exception(0)
-            , m_callFrame(callFrame)
+        static CallFrame* create(Register* callFrameBase) { return static_cast<CallFrame*>(callFrameBase); }
+        Register* registers() { return this; }
+
+        // Global object in which execution began.
+        JSGlobalObject* dynamicGlobalObject()
         {
+            return Machine::scopeChain(Machine::firstCallFrame(this))->globalObject();
         }
 
-        // Global object in which execution began.
-        JSGlobalObject* dynamicGlobalObject() const
+        // Global object in which the currently executing code was defined.
+        // Differs from dynamicGlobalObject() during function calls across web browser frames.
+        JSGlobalObject* lexicalGlobalObject()
         {
-            return Machine::scopeChain(Machine::firstCallFrame(m_callFrame))->globalObject();
+            return Machine::scopeChain(this)->globalObject();
         }
 
-        // Global object in which the current script was defined. (Can differ
-        // from dynamicGlobalObject() during function calls across frames.)
-        JSGlobalObject* lexicalGlobalObject() const
+        // Differs from lexicalGlobalObject because this will have DOM window shell rather than
+        // the actual DOM window.
+        JSObject* globalThisValue()
         {
-            return Machine::scopeChain(m_callFrame)->globalObject();
+            return Machine::scopeChain(this)->globalThisObject();
         }
 
-        JSObject* globalThisValue() const
+        JSGlobalData& globalData()
         {
-            return Machine::scopeChain(m_callFrame)->globalThisObject();
+            return *Machine::scopeChain(this)->globalData;
         }
 
-        // Exception propogation.
-        void setException(JSValue* exception) { m_exception = exception; }
-        void clearException() { m_exception = 0; }
-        JSValue* exception() const { return m_exception; }
-        JSValue** exceptionSlot() { return &m_exception; }
-        bool hadException() const { return !!m_exception; }
-#if ENABLE(CTI)
-        void setCTIReturnAddress(void* ctiRA) { m_ctiReturnAddress = ctiRA; }
-        void* ctiReturnAddress() const { return m_ctiReturnAddress; }
-#endif
+        // Convenience functions for access to global data.
 
-        JSGlobalData& globalData() const
-        {
-            return *Machine::scopeChain(m_callFrame)->globalData;
-        }
+        void setException(JSValue* exception) { globalData().exception = exception; }
+        void clearException() { globalData().exception = 0; }
+        JSValue* exception() { return globalData().exception; }
+        JSValue** exceptionSlot() { return &globalData().exception; }
+        bool hadException() { return !!globalData().exception; }
 
         IdentifierTable* identifierTable() { return globalData().identifierTable; }
-        const CommonIdentifiers& propertyNames() const { return *globalData().propertyNames; }
-        const ArgList& emptyList() const { return *globalData().emptyList; }
+        const CommonIdentifiers& propertyNames() { return *globalData().propertyNames; }
+        const ArgList& emptyList() { return *globalData().emptyList; }
         Lexer* lexer() { return globalData().lexer; }
         Parser* parser() { return globalData().parser; }
-        Machine* machine() const { return globalData().machine; }
-        static const HashTable* arrayTable(ExecState* exec) { return exec->globalData().arrayTable; }
-        static const HashTable* dateTable(ExecState* exec) { return exec->globalData().dateTable; }
-        static const HashTable* mathTable(ExecState* exec) { return exec->globalData().mathTable; }
-        static const HashTable* numberTable(ExecState* exec) { return exec->globalData().numberTable; }
-        static const HashTable* regExpTable(ExecState* exec) { return exec->globalData().regExpTable; }
-        static const HashTable* regExpConstructorTable(ExecState* exec) { return exec->globalData().regExpConstructorTable; }
-        static const HashTable* stringTable(ExecState* exec) { return exec->globalData().stringTable; }
+        Machine* machine() { return globalData().machine; }
+        Heap* heap() { return &globalData().heap; }
 
-        Heap* heap() const { return &globalData().heap; }
+        static const HashTable* arrayTable(CallFrame* callFrame) { return callFrame->globalData().arrayTable; }
+        static const HashTable* dateTable(CallFrame* callFrame) { return callFrame->globalData().dateTable; }
+        static const HashTable* mathTable(CallFrame* callFrame) { return callFrame->globalData().mathTable; }
+        static const HashTable* numberTable(CallFrame* callFrame) { return callFrame->globalData().numberTable; }
+        static const HashTable* regExpTable(CallFrame* callFrame) { return callFrame->globalData().regExpTable; }
+        static const HashTable* regExpConstructorTable(CallFrame* callFrame) { return callFrame->globalData().regExpConstructorTable; }
+        static const HashTable* stringTable(CallFrame* callFrame) { return callFrame->globalData().stringTable; }
 
     private:
-        // Default constructor required for gcc 3.
-        ExecState() { }
-
-        bool isGlobalObject(JSObject*) const;
-
-        JSValue* m_exception;
-#if ENABLE(CTI)
-        void* m_ctiReturnAddress;
-#endif
-        Register* m_callFrame; // The most recent call frame.
+        ExecState();
+        ~ExecState();
     };
 

trunk/JavaScriptCore/kjs/FunctionPrototype.cpp

@@ -68 +68 @@
     if (thisValue->isObject(&JSFunction::info)) {
         JSFunction* function = static_cast<JSFunction*>(thisValue);
-        return jsString(exec, "function " + function->name(exec) + "(" + function->m_body->paramString() + ") " + function->m_body->toSourceString());
+        return jsString(exec, "function " + function->name(&exec->globalData()) + "(" + function->m_body->paramString() + ") " + function->m_body->toSourceString());
     }
 
     if (thisValue->isObject(&InternalFunction::info)) {
         InternalFunction* function = static_cast<InternalFunction*>(thisValue);
-        return jsString(exec, "function " + function->name(exec) + "() {\n    [native code]\n}");
+        return jsString(exec, "function " + function->name(&exec->globalData()) + "() {\n    [native code]\n}");
     }
 

trunk/JavaScriptCore/kjs/InternalFunction.cpp

@@ -50 +50 @@
 }
 
-const UString& InternalFunction::name(ExecState* exec)
+const UString& InternalFunction::name(JSGlobalData* globalData)
 {
-    JSValue* v = getDirect(exec->propertyNames().name);
+    JSValue* v = getDirect(globalData->propertyNames->name);
     ASSERT(v->isString());
     return static_cast<JSString*>(v)->value();

trunk/JavaScriptCore/kjs/InternalFunction.h

@@ -37 +37 @@
         static const ClassInfo info;
 
-        const UString& name(ExecState*);
+        const UString& name(JSGlobalData*);
 
         static PassRefPtr<StructureID> createStructureID(JSValue* proto) 

trunk/JavaScriptCore/kjs/JSGlobalData.cpp

@@ -61 +61 @@
 JSGlobalData::JSGlobalData(bool isShared)
     : machine(new Machine)
+    , exception(0)
 #if ENABLE(JSC_MULTIPLE_THREADS)
     , arrayTable(new HashTable(JSC::arrayTable))

trunk/JavaScriptCore/kjs/JSGlobalData.h

@@ -65 +65 @@
         Machine* machine;
 
+        JSValue* exception;
+#if ENABLE(CTI)
+        void* throwReturnAddress;
+#endif
+
         const HashTable* arrayTable;
         const HashTable* dateTable;

trunk/JavaScriptCore/kjs/JSGlobalObject.cpp

@@ -143 +143 @@
     d()->debugger = 0;
 
-    d()->globalExec.set(new ExecState(d()->globalCallFrame + RegisterFile::CallFrameHeaderSize));
-
     d()->profileGroup = 0;
 
@@ -199 +197 @@
 void JSGlobalObject::reset(JSValue* prototype)
 {
-    ExecState* exec = d()->globalExec.get();
+    ExecState* exec = JSGlobalObject::globalExec();
 
     // Prototypes
@@ -365 +363 @@
         registerFile.markGlobals(&globalData()->heap);
 
-    markIfNeeded(d()->globalExec->exception());
-
     markIfNeeded(d()->regExpConstructor);
     markIfNeeded(d()->errorConstructor);
@@ -411 +407 @@
 ExecState* JSGlobalObject::globalExec()
 {
-    return d()->globalExec.get();
+    return CallFrame::create(d()->globalCallFrame + RegisterFile::CallFrameHeaderSize);
 }
 

trunk/JavaScriptCore/kjs/JSGlobalObject.h

@@ -92 +92 @@
             ScopeChain globalScopeChain;
             Register globalCallFrame[RegisterFile::CallFrameHeaderSize];
-            OwnPtr<ExecState> globalExec;
 
             int recursion;

trunk/JavaScriptCore/kjs/JSObject.cpp

@@ -482 +482 @@
 void JSObject::putDirectFunction(ExecState* exec, InternalFunction* function, unsigned attr)
 {
-    putDirect(Identifier(exec, function->name(exec)), function, attr);
+    putDirect(Identifier(exec, function->name(&exec->globalData())), function, attr);
 }
 

trunk/JavaScriptCore/kjs/collector.cpp

@@ -982 +982 @@
     if (m_markListSet && m_markListSet->size())
         ArgList::markLists(*m_markListSet);
+    if (m_globalData->exception && !m_globalData->exception->marked())
+        m_globalData->exception->mark();
     m_globalData->machine->registerFile().markCallFrames(this);
     m_globalData->smallStrings.mark();

trunk/JavaScriptCore/profiler/ProfileGenerator.cpp

@@ -63 +63 @@
 
     exec->machine()->retrieveLastCaller(exec, lineNumber, sourceID, sourceURL, function);
-    m_currentNode = ProfileNode::create(Profiler::createCallIdentifier(exec, function ? function->toThisObject(exec) : 0, sourceURL, lineNumber), m_head.get(), m_head.get());
+    m_currentNode = ProfileNode::create(Profiler::createCallIdentifier(&exec->globalData(), function ? function->toThisObject(exec) : 0, sourceURL, lineNumber), m_head.get(), m_head.get());
     m_head->insertNode(m_currentNode.get());
 }

trunk/JavaScriptCore/profiler/Profiler.cpp

@@ -45 +45 @@
 static unsigned ProfilesUID = 0;
 
-static CallIdentifier createCallIdentifierFromFunctionImp(ExecState*, JSFunction*);
+static CallIdentifier createCallIdentifierFromFunctionImp(JSGlobalData*, JSFunction*);
 
 Profiler* Profiler::s_sharedProfiler = 0;
@@ -106 +106 @@
     ASSERT(!m_currentProfiles.isEmpty());
 
-    dispatchFunctionToProfiles(m_currentProfiles, &ProfileGenerator::willExecute, createCallIdentifier(exec, calledFunction, "", 0), exec->lexicalGlobalObject()->profileGroup());
+    dispatchFunctionToProfiles(m_currentProfiles, &ProfileGenerator::willExecute, createCallIdentifier(&exec->globalData(), calledFunction, "", 0), exec->lexicalGlobalObject()->profileGroup());
 }
 
@@ -113 +113 @@
     ASSERT(!m_currentProfiles.isEmpty());
 
-    CallIdentifier callIdentifier = createCallIdentifier(exec, 0, sourceURL, startingLineNumber);
+    CallIdentifier callIdentifier = createCallIdentifier(&exec->globalData(), 0, sourceURL, startingLineNumber);
 
     dispatchFunctionToProfiles(m_currentProfiles, &ProfileGenerator::willExecute, callIdentifier, exec->lexicalGlobalObject()->profileGroup());
@@ -122 +122 @@
     ASSERT(!m_currentProfiles.isEmpty());
 
-    dispatchFunctionToProfiles(m_currentProfiles, &ProfileGenerator::didExecute, createCallIdentifier(exec, calledFunction, "", 0), exec->lexicalGlobalObject()->profileGroup());
+    dispatchFunctionToProfiles(m_currentProfiles, &ProfileGenerator::didExecute, createCallIdentifier(&exec->globalData(), calledFunction, "", 0), exec->lexicalGlobalObject()->profileGroup());
 }
 
@@ -129 +129 @@
     ASSERT(!m_currentProfiles.isEmpty());
 
-    dispatchFunctionToProfiles(m_currentProfiles, &ProfileGenerator::didExecute, createCallIdentifier(exec, 0, sourceURL, startingLineNumber), exec->lexicalGlobalObject()->profileGroup());
+    dispatchFunctionToProfiles(m_currentProfiles, &ProfileGenerator::didExecute, createCallIdentifier(&exec->globalData(), 0, sourceURL, startingLineNumber), exec->lexicalGlobalObject()->profileGroup());
 }
 
-CallIdentifier Profiler::createCallIdentifier(ExecState* exec, JSObject* calledFunction, const UString& defaultSourceURL, int defaultLineNumber)
+CallIdentifier Profiler::createCallIdentifier(JSGlobalData* globalData, JSObject* calledFunction, const UString& defaultSourceURL, int defaultLineNumber)
 {
     if (!calledFunction)
@@ -138 +138 @@
 
     if (calledFunction->inherits(&JSFunction::info))
-        return createCallIdentifierFromFunctionImp(exec, static_cast<JSFunction*>(calledFunction));
+        return createCallIdentifierFromFunctionImp(globalData, static_cast<JSFunction*>(calledFunction));
     if (calledFunction->inherits(&InternalFunction::info))
-        return CallIdentifier(static_cast<InternalFunction*>(calledFunction)->name(exec), defaultSourceURL, defaultLineNumber);
+        return CallIdentifier(static_cast<InternalFunction*>(calledFunction)->name(globalData), defaultSourceURL, defaultLineNumber);
 
     UString name = "(" + calledFunction->className() + " object)";
@@ -146 +146 @@
 }
 
-CallIdentifier createCallIdentifierFromFunctionImp(ExecState* exec, JSFunction* function)
+CallIdentifier createCallIdentifierFromFunctionImp(JSGlobalData* globalData, JSFunction* function)
 {
-    const UString& name = function->name(exec);
+    const UString& name = function->name(globalData);
     return CallIdentifier(name.isEmpty() ? AnonymousFunction : name, function->m_body->sourceURL(), function->m_body->lineNo());
 }

trunk/JavaScriptCore/profiler/Profiler.h

@@ -39 +39 @@
     class CallIdentifier;
     class ExecState;
+    class JSGlobalData;
     class JSObject;
     class ProfileGenerator;
@@ -51 +52 @@
 
         static Profiler* profiler(); 
-        static CallIdentifier createCallIdentifier(ExecState*, JSObject*, const UString& sourceURL, int lineNumber);
+        static CallIdentifier createCallIdentifier(JSGlobalData*, JSObject*, const UString& sourceURL, int lineNumber);
 
         void startProfiling(ExecState*, const UString& title);