Changeset 36997 in webkit for trunk/JavaScriptCore

Timestamp:

Sep 27, 2008, 10:19:39 AM (17 years ago)

Author:

[email protected]

Message:

2008-09-27 Geoffrey Garen <​[email protected]>

Reviewed by Cameron Zwarich.

Store the callee CodeBlock, not the caller CodeBlock, in the call frame
header. Nix the "codeBlock" local variable, and access the callee
CodeBlock through the call frame header instead.

Profit: call + return are simpler, because they don't have to update the
"codeBlock" local variable.

Because CTI keeps "r" in a register, reading the callee CodeBlock relative
to "r" can be very fast, in any cases we care to optimize. Presently,
no such cases seem important.

Also, stop writing "dst" to the call frame header. CTI doesn't use it.

21.6% speedup on empty function call benchmark.
3.8% speedup on SunSpider --v8.
2.1% speedup on v8 benchmark.
0.7% speedup on SunSpider (6% speedup on controlflow-recursive).

Small regression in bytecode, because currently every op_ret reads the
callee CodeBlock to check needsFullScopeChain, and bytecode does not
keep "r" in a register. On-balance, this is probably OK, since CTI is
our high-performance execution model. Also, this should go away once
we make needsFullScopeChain statically determinable at parse time.

• VM/CTI.cpp: (JSC::CTI::compileOpCall): The speedup! (JSC::CTI::privateCompileSlowCases): ditto

• VM/CTI.h: (JSC::): Fixed up magic trampoline constants to account for the nixed "codeBlock" argument. (JSC::CTI::execute): Changed trampoline function not to take a "codeBlock" argument, since codeBlock is now stored in the call frame header.

• VM/Machine.cpp: Read the callee CodeBlock from the register file. Use a NULL CallerRegisters in the call frame header to signal a built-in caller, since CodeBlock is now never NULL.

• VM/Machine.h: Made some stand-alone functions Machine member functions so they could call the private codeBlock() accessor in the Register class, of which Machine is a friend. Renamed "CallerCodeBlock" to "CodeBlock", since it's no longer the caller's CodeBlock.

• VM/RegisterFile.h: Marked some methods const to accommodate a const RegisterFile* being passed around in Machine.cpp.

Location:

trunk/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• VM/CTI.cpp (modified) (3 diffs)
• VM/CTI.h (modified) (3 diffs)
• VM/Machine.cpp (modified) (123 diffs)
• VM/Machine.h (modified) (2 diffs)
• VM/RegisterFile.h (modified) (2 diffs)

trunk/JavaScriptCore/ChangeLog

@@ +1 @@
+2008-09-27  Geoffrey Garen  <[email protected]>
+
+        Reviewed by Cameron Zwarich.
+        
+        Store the callee CodeBlock, not the caller CodeBlock, in the call frame
+        header. Nix the "codeBlock" local variable, and access the callee
+        CodeBlock through the call frame header instead.
+        
+        Profit: call + return are simpler, because they don't have to update the
+        "codeBlock" local variable.
+        
+        Because CTI keeps "r" in a register, reading the callee CodeBlock relative
+        to "r" can be very fast, in any cases we care to optimize. Presently,
+        no such cases seem important.
+        
+        Also, stop writing "dst" to the call frame header. CTI doesn't use it.
+        
+        21.6% speedup on empty function call benchmark.
+        3.8% speedup on SunSpider --v8.
+        2.1% speedup on v8 benchmark.
+        0.7% speedup on SunSpider (6% speedup on controlflow-recursive).
+        
+        Small regression in bytecode, because currently every op_ret reads the
+        callee CodeBlock to check needsFullScopeChain, and bytecode does not
+        keep "r" in a register. On-balance, this is probably OK, since CTI is
+        our high-performance execution model. Also, this should go away once
+        we make needsFullScopeChain statically determinable at parse time.
+
+        * VM/CTI.cpp:
+        (JSC::CTI::compileOpCall): The speedup!
+        (JSC::CTI::privateCompileSlowCases): ditto
+
+        * VM/CTI.h:
+        (JSC::): Fixed up magic trampoline constants to account for the nixed
+        "codeBlock" argument.
+        (JSC::CTI::execute): Changed trampoline function not to take a "codeBlock"
+        argument, since codeBlock is now stored in the call frame header.
+        
+        * VM/Machine.cpp: Read the callee CodeBlock from the register file. Use
+        a NULL CallerRegisters in the call frame header to signal a built-in
+        caller, since CodeBlock is now never NULL.
+
+        * VM/Machine.h: Made some stand-alone functions Machine member functions
+        so they could call the private codeBlock() accessor in the Register
+        class, of which Machine is a friend. Renamed "CallerCodeBlock" to
+        "CodeBlock", since it's no longer the caller's CodeBlock.
+
+        * VM/RegisterFile.h: Marked some methods const to accommodate a 
+        const RegisterFile* being passed around in Machine.cpp.
+
 2008-09-26  Jan Michael Alonzo  <[email protected]>
 

trunk/JavaScriptCore/VM/CTI.cpp

@@ -538 +538 @@
     emitCall(i, ((type == OpConstruct) ? Machine::cti_op_construct_JSConstruct : Machine::cti_op_call_JSFunction));
 
-    // Initialize the parts of the call frame that have not already been initialized.
-    emitGetCTIParam(CTI_ARGS_r, X86::edi);
-    m_jit.movl_i32m(reinterpret_cast<unsigned>(m_codeBlock), RegisterFile::CallerCodeBlock * static_cast<int>(sizeof(Register)), X86::edi);
-    m_jit.movl_i32m(dst, RegisterFile::ReturnValueRegister * static_cast<int>(sizeof(Register)), X86::edi);
-
     // Check the ctiCode has been generated - if not, this is handled in a slow case.
     m_jit.testl_rr(X86::eax, X86::eax);
@@ -548 +543 @@
     emitCall(i, X86::eax);
     
-    // Restore CTI_ARGS_codeBlock. In the interpreter, op_ret does this.
-    emitPutCTIParam(m_codeBlock, CTI_ARGS_codeBlock);
-
     X86Assembler::JmpDst end = m_jit.label();
     m_jit.link(wasNotJSFunction, end);
@@ -2489 +2481 @@
             // Instead of checking for 0 we could initialize the CodeBlock::ctiCode to point to a trampoline that would trigger the translation.
 
-            // Restore CTI_ARGS_codeBlock. In the interpreter, op_ret does this.
-            emitPutCTIParam(m_codeBlock, CTI_ARGS_codeBlock);
-
             // Put the return value in dst. In the interpreter, op_ret does this.
             emitPutResult(instruction[i + 1].u.operand);

trunk/JavaScriptCore/VM/CTI.h

@@ -57 +57 @@
 #define CTI_ARGS_r 0x0F
 #define CTI_ARGS_scopeChain 0x10
-#define CTI_ARGS_codeBlock 0x11
-#define CTI_ARGS_exception 0x12
-#define CTI_ARGS_profilerReference 0x13
+#define CTI_ARGS_exception 0x11
+#define CTI_ARGS_profilerReference 0x12
 #define ARG_exec ((ExecState*)(ARGS)[CTI_ARGS_exec])
 #define ARG_registerFile ((RegisterFile*)(ARGS)[CTI_ARGS_registerFile])
 #define ARG_r ((Register*)(ARGS)[CTI_ARGS_r])
 #define ARG_scopeChain ((ScopeChainNode*)(ARGS)[CTI_ARGS_scopeChain])
-#define ARG_codeBlock ((CodeBlock*)(ARGS)[CTI_ARGS_codeBlock])
 #define ARG_exception ((JSValue**)(ARGS)[CTI_ARGS_exception])
 #define ARG_profilerReference ((Profiler**)(ARGS)[CTI_ARGS_profilerReference])
 
 #define ARG_setScopeChain(newScopeChain) (*(volatile ScopeChainNode**)&(ARGS)[CTI_ARGS_scopeChain] = newScopeChain)
-#define ARG_setCodeBlock(newCodeBlock) (*(volatile CodeBlock**)&(ARGS)[CTI_ARGS_codeBlock] = newCodeBlock)
 #define ARG_setR(newR) (*(volatile Register**)&(ARGS)[CTI_ARGS_r] = newR)
 #define ARG_set2ndResult(new2ndResult) (*(volatile JSValue**)&(ARGS)[CTI_ARGS_2ndResult] = new2ndResult)
@@ -239 +236 @@
 
     extern "C" {
-        JSValue* ctiTrampoline(void* code, ExecState* exec, RegisterFile* registerFile, Register* r, ScopeChainNode* scopeChain, CodeBlock* codeBlock, JSValue** exception, Profiler**);
+        JSValue* ctiTrampoline(void* code, ExecState* exec, RegisterFile* registerFile, Register* r, ScopeChainNode* scopeChain, JSValue** exception, Profiler**);
         void ctiVMThrowTrampoline();
     };
@@ -323 +320 @@
         }
 
-        inline static JSValue* execute(void* code, ExecState* exec, RegisterFile* registerFile, Register* r, ScopeChainNode* scopeChain, CodeBlock* codeBlock, JSValue** exception)
-        {
-            JSValue* value = ctiTrampoline(code, exec, registerFile, r, scopeChain, codeBlock, exception, Profiler::enabledProfilerReference());
+        inline static JSValue* execute(void* code, ExecState* exec, RegisterFile* registerFile, Register* r, ScopeChainNode* scopeChain, JSValue** exception)
+        {
+            JSValue* value = ctiTrampoline(code, exec, registerFile, r, scopeChain, exception, Profiler::enabledProfilerReference());
 #if ENABLE(SAMPLING_TOOL)
             currentOpcodeID = static_cast<OpcodeID>(-1);

trunk/JavaScriptCore/VM/Machine.cpp

@@ -305 +305 @@
 }
 
-static bool NEVER_INLINE resolve(ExecState* exec, Instruction* vPC, Register* r, ScopeChainNode* scopeChain, CodeBlock* codeBlock, JSValue*& exceptionValue)
+NEVER_INLINE bool Machine::resolve(ExecState* exec, Instruction* vPC, Register* r, ScopeChainNode* scopeChain, JSValue*& exceptionValue)
 {
     int dst = (vPC + 1)->u.operand;
@@ -314 +314 @@
     ASSERT(iter != end);
 
+    CodeBlock* codeBlock = r[RegisterFile::CodeBlock].codeBlock();
     Identifier& ident = codeBlock->identifiers[property];
     do {
@@ -331 +332 @@
 }
 
-static bool NEVER_INLINE resolveSkip(ExecState* exec, Instruction* vPC, Register* r, ScopeChainNode* scopeChain, CodeBlock* codeBlock, JSValue*& exceptionValue)
-{
+NEVER_INLINE bool Machine::resolveSkip(ExecState* exec, Instruction* vPC, Register* r, ScopeChainNode* scopeChain, JSValue*& exceptionValue)
+{
+    CodeBlock* codeBlock = r[RegisterFile::CodeBlock].codeBlock();
+
     int dst = (vPC + 1)->u.operand;
     int property = (vPC + 2)->u.operand;
@@ -361 +364 @@
 }
 
-static bool NEVER_INLINE resolveGlobal(ExecState* exec, Instruction* vPC, Register* r, CodeBlock* codeBlock, JSValue*& exceptionValue)
+NEVER_INLINE bool Machine::resolveGlobal(ExecState* exec, Instruction* vPC, Register* r, JSValue*& exceptionValue)
 {
     int dst = (vPC + 1)->u.operand;
@@ -375 +378 @@
     }
 
+    CodeBlock* codeBlock = r[RegisterFile::CodeBlock].codeBlock();
     Identifier& ident = codeBlock->identifiers[property];
     PropertySlot slot(globalObject);
@@ -423 +427 @@
 }
 
-NEVER_INLINE static void resolveBase(ExecState* exec, Instruction* vPC, Register* r, ScopeChainNode* scopeChain, CodeBlock* codeBlock)
+NEVER_INLINE void Machine::resolveBase(ExecState* exec, Instruction* vPC, Register* r, ScopeChainNode* scopeChain)
 {
     int dst = (vPC + 1)->u.operand;
     int property = (vPC + 2)->u.operand;
+    CodeBlock* codeBlock = r[RegisterFile::CodeBlock].codeBlock();
     r[dst] = inlineResolveBase(exec, codeBlock->identifiers[property], scopeChain);
 }
 
-static bool NEVER_INLINE resolveBaseAndProperty(ExecState* exec, Instruction* vPC, Register* r, ScopeChainNode* scopeChain, CodeBlock* codeBlock, JSValue*& exceptionValue)
+NEVER_INLINE bool Machine::resolveBaseAndProperty(ExecState* exec, Instruction* vPC, Register* r, ScopeChainNode* scopeChain, JSValue*& exceptionValue)
 {
     int baseDst = (vPC + 1)->u.operand;
@@ -443 +448 @@
     ASSERT(iter != end);
 
+    CodeBlock* codeBlock = r[RegisterFile::CodeBlock].codeBlock();
     Identifier& ident = codeBlock->identifiers[property];
     JSObject* base;
@@ -464 +470 @@
 }
 
-static bool NEVER_INLINE resolveBaseAndFunc(ExecState* exec, Instruction* vPC, Register* r, ScopeChainNode* scopeChain, CodeBlock* codeBlock, JSValue*& exceptionValue)
+NEVER_INLINE bool Machine::resolveBaseAndFunc(ExecState* exec, Instruction* vPC, Register* r, ScopeChainNode* scopeChain, JSValue*& exceptionValue)
 {
     int baseDst = (vPC + 1)->u.operand;
@@ -477 +483 @@
     ASSERT(iter != end);
 
+    CodeBlock* codeBlock = r[RegisterFile::CodeBlock].codeBlock();
     Identifier& ident = codeBlock->identifiers[property];
     JSObject* base;
@@ -509 +516 @@
 ALWAYS_INLINE void Machine::initializeCallFrame(Register* callFrame, CodeBlock* codeBlock, Instruction* vPC, ScopeChainNode* scopeChain, Register* r, int returnValueRegister, int argc, JSValue* function)
 {
-    callFrame[RegisterFile::CallerCodeBlock] = codeBlock;
+    callFrame[RegisterFile::CodeBlock] = codeBlock;
     callFrame[RegisterFile::CallerScopeChain] = scopeChain;
     callFrame[RegisterFile::CallerRegisters] = r;
@@ -581 +588 @@
 }
 
-NEVER_INLINE JSValue* Machine::callEval(ExecState* exec, CodeBlock* callingCodeBlock, JSObject* thisObj, ScopeChainNode* scopeChain, RegisterFile* registerFile, Register* r, int argv, int argc, JSValue*& exceptionValue)
+NEVER_INLINE JSValue* Machine::callEval(ExecState* exec, JSObject* thisObj, ScopeChainNode* scopeChain, RegisterFile* registerFile, Register* r, int argv, int argc, JSValue*& exceptionValue)
 {
     if (argc < 2)
@@ -597 +604 @@
     UString programSource = static_cast<JSString*>(program)->value();
 
-    RefPtr<EvalNode> evalNode = callingCodeBlock->evalCodeCache.get(exec, programSource, scopeChain, exceptionValue);
+    CodeBlock* codeBlock = r[RegisterFile::CodeBlock].codeBlock();
+    RefPtr<EvalNode> evalNode = codeBlock->evalCodeCache.get(exec, programSource, scopeChain, exceptionValue);
 
     JSValue* result = 0;
@@ -656 +664 @@
 #ifndef NDEBUG
 
-void Machine::dumpCallFrame(const CodeBlock* codeBlock, ScopeChainNode* scopeChain, RegisterFile* registerFile, const Register* r)
+void Machine::dumpCallFrame(ScopeChainNode* scopeChain, const RegisterFile* registerFile, const Register* r)
 {
     ScopeChain sc(scopeChain);
     JSGlobalObject* globalObject = sc.globalObject();
+
+    CodeBlock* codeBlock = r[RegisterFile::CodeBlock].codeBlock();
     codeBlock->dump(globalObject->globalExec());
-    dumpRegisters(codeBlock, registerFile, r);
-}
-
-void Machine::dumpRegisters(const CodeBlock* codeBlock, RegisterFile* registerFile, const Register* r)
+
+    dumpRegisters(registerFile, r);
+}
+
+void Machine::dumpRegisters(const RegisterFile* registerFile, const Register* r)
 {
     printf("Register frame: \n\n");
@@ -671 +682 @@
     printf("----------------------------------------------------\n");
 
+    CodeBlock* codeBlock = r[RegisterFile::CodeBlock].codeBlock();
     const Register* it;
     const Register* end;
@@ -695 +707 @@
     printf("----------------------------------------------------\n");
 
-    printf("[CallerCodeBlock]          | %10p | %10p \n", it, (*it).v()); ++it;
+    printf("[CodeBlock]                | %10p | %10p \n", it, (*it).v()); ++it;
     printf("[CallerScopeChain]         | %10p | %10p \n", it, (*it).v()); ++it;
     printf("[CallerRegisters]          | %10p | %10p \n", it, (*it).v()); ++it;
@@ -783 +795 @@
     }
     
-    codeBlock = r[RegisterFile::CallerCodeBlock].codeBlock();
-    if (!codeBlock)
+    void* returnPC = r[RegisterFile::ReturnPC].v();
+    scopeChain = r[RegisterFile::CallerScopeChain].scopeChain();
+    r = r[RegisterFile::CallerRegisters].r();
+    if (!r)
         return false;
 
-    scopeChain = r[RegisterFile::CallerScopeChain].scopeChain();
-    vPC = vPCForPC(codeBlock, r[RegisterFile::ReturnPC].v());
-    r = r[RegisterFile::CallerRegisters].r();
     exec->m_callFrame = r;
-
+    codeBlock = r[RegisterFile::CodeBlock].codeBlock();
+    vPC = vPCForPC(codeBlock, returnPC);
     return true;
 }
 
-NEVER_INLINE Instruction* Machine::throwException(ExecState* exec, JSValue*& exceptionValue, const Instruction* vPC, CodeBlock*& codeBlock, ScopeChainNode*& scopeChain, Register*& r, bool explicitThrow)
+NEVER_INLINE Instruction* Machine::throwException(ExecState* exec, JSValue*& exceptionValue, const Instruction* vPC, ScopeChainNode*& scopeChain, Register*& r, bool explicitThrow)
 {
     // Set up the exception object
     
+    CodeBlock* codeBlock = r[RegisterFile::CodeBlock].codeBlock();
     if (exceptionValue->isObject()) {
         JSObject* exception = static_cast<JSObject*>(exceptionValue);
@@ -888 +901 @@
     Register* r = m_registerFile.base() + oldSize + codeBlock->numParameters + RegisterFile::CallFrameHeaderSize;
     r[codeBlock->thisRegister] = thisObj;
-    initializeCallFrame(r, 0, 0, 0, 0, 0, 0, 0);
+    initializeCallFrame(r, codeBlock, 0, 0, 0, 0, 0, 0);
 
     if (codeBlock->needsFullScopeChain)
@@ -903 +916 @@
     if (!codeBlock->ctiCode)
         CTI::compile(this, exec, codeBlock);
-    JSValue* result = CTI::execute(codeBlock->ctiCode, &newExec, &m_registerFile, r, scopeChain, codeBlock, exception);
+    JSValue* result = CTI::execute(codeBlock->ctiCode, &newExec, &m_registerFile, r, scopeChain, exception);
 #else
-    JSValue* result = privateExecute(Normal, &newExec, &m_registerFile, r, scopeChain, codeBlock, exception);
+    JSValue* result = privateExecute(Normal, &newExec, &m_registerFile, r, scopeChain, exception);
 #endif
     m_reentryDepth--;
@@ -946 +959 @@
         argv[++dst] = *it;
 
-    CodeBlock* newCodeBlock = &functionBodyNode->byteCode(scopeChain);
-    Register* r = slideRegisterWindowForCall(exec, newCodeBlock, &m_registerFile, m_registerFile.base(), argv, argc + RegisterFile::CallFrameHeaderSize, argc, *exception);
+    CodeBlock* codeBlock = &functionBodyNode->byteCode(scopeChain);
+    Register* r = slideRegisterWindowForCall(exec, codeBlock, &m_registerFile, m_registerFile.base(), argv, argc + RegisterFile::CallFrameHeaderSize, argc, *exception);
     if (UNLIKELY(*exception != 0)) {
         m_registerFile.shrink(oldSize);
@@ -953 +966 @@
     }
     // a 0 codeBlock indicates a built-in caller
-    initializeCallFrame(r, 0, 0, 0, argv, 0, argc, function);
+    initializeCallFrame(r, codeBlock, 0, 0, 0, 0, argc, function);
 
     ExecState newExec(exec, &m_registerFile, scopeChain, r);
@@ -963 +976 @@
     m_reentryDepth++;
 #if ENABLE(CTI)
-    if (!newCodeBlock->ctiCode)
-        CTI::compile(this, exec, newCodeBlock);
-    JSValue* result = CTI::execute(newCodeBlock->ctiCode, &newExec, &m_registerFile, r, scopeChain, newCodeBlock, exception);
+    if (!codeBlock->ctiCode)
+        CTI::compile(this, exec, codeBlock);
+    JSValue* result = CTI::execute(codeBlock->ctiCode, &newExec, &m_registerFile, r, scopeChain, exception);
 #else
     setScopeChain(&newExec, scopeChain, scopeChain);
-    JSValue* result = privateExecute(Normal, &newExec, &m_registerFile, r, scopeChain, newCodeBlock, exception);
+    JSValue* result = privateExecute(Normal, &newExec, &m_registerFile, r, scopeChain, exception);
 #endif
     m_reentryDepth--;
@@ -1037 +1050 @@
     // a 0 codeBlock indicates a built-in caller
     r[codeBlock->thisRegister] = thisObj;
-    initializeCallFrame(r, 0, 0, 0, 0, 0, 0, 0);
+    initializeCallFrame(r, codeBlock, 0, 0, 0, 0, 0, 0);
 
     if (codeBlock->needsFullScopeChain)
@@ -1052 +1065 @@
     if (!codeBlock->ctiCode)
         CTI::compile(this, exec, codeBlock);
-    JSValue* result = CTI::execute(codeBlock->ctiCode, &newExec, &m_registerFile, r, scopeChain, codeBlock, exception);
+    JSValue* result = CTI::execute(codeBlock->ctiCode, &newExec, &m_registerFile, r, scopeChain, exception);
 #else
-    JSValue* result = privateExecute(Normal, &newExec, &m_registerFile, r, scopeChain, codeBlock, exception);
+    JSValue* result = privateExecute(Normal, &newExec, &m_registerFile, r, scopeChain, exception);
 #endif
     m_reentryDepth--;
@@ -1073 +1086 @@
 }
 
-NEVER_INLINE void Machine::debug(ExecState* exec, const CodeBlock* codeBlock, ScopeChainNode* scopeChain, Register* r, DebugHookID debugHookID, int firstLine, int lastLine)
+NEVER_INLINE void Machine::debug(ExecState* exec, ScopeChainNode* scopeChain, Register* r, DebugHookID debugHookID, int firstLine, int lastLine)
 {
     Debugger* debugger = exec->dynamicGlobalObject()->debugger();
@@ -1079 +1092 @@
         return;
 
+    CodeBlock* codeBlock = r[RegisterFile::CodeBlock].codeBlock();
     DebuggerCallFrame debuggerCallFrame(exec, exec->dynamicGlobalObject(), codeBlock, scopeChain, r, 0);
 
@@ -1188 +1202 @@
 }
 
-static NEVER_INLINE ScopeChainNode* createExceptionScope(ExecState* exec, CodeBlock* codeBlock, const Instruction* vPC, Register* r, ScopeChainNode* scopeChain)
+NEVER_INLINE ScopeChainNode* Machine::createExceptionScope(ExecState* exec, const Instruction* vPC, Register* r, ScopeChainNode* scopeChain)
 {
     int dst = (++vPC)->u.operand;
+    CodeBlock* codeBlock = r[RegisterFile::CodeBlock].codeBlock();
     Identifier& property = codeBlock->identifiers[(++vPC)->u.operand];
     JSValue* value = r[(++vPC)->u.operand].jsValue(exec);
@@ -1410 +1425 @@
 }
 
-JSValue* Machine::privateExecute(ExecutionFlag flag, ExecState* exec, RegisterFile* registerFile, Register* r, ScopeChainNode* scopeChain, CodeBlock* codeBlock, JSValue** exception)
+JSValue* Machine::privateExecute(ExecutionFlag flag, ExecState* exec, RegisterFile* registerFile, Register* r, ScopeChainNode* scopeChain, JSValue** exception)
 {
     // One-time initialization of our address tables. We have to put this code
@@ -1439 +1454 @@
 
     Register* registerBase = registerFile->base();
-    Instruction* vPC = codeBlock->instructions.begin();
+    Instruction* vPC = r[RegisterFile::CodeBlock].codeBlock()->instructions.begin();
     Profiler** enabledProfilerReference = Profiler::enabledProfilerReference();
     unsigned tickCount = m_ticksUntilNextTimeoutCheck + 1;
@@ -1463 +1478 @@
 
 #if HAVE(COMPUTED_GOTO)
-    #define NEXT_OPCODE MACHINE_SAMPLING_sample(codeBlock, vPC); goto *vPC->u.opcode
+    #define NEXT_OPCODE MACHINE_SAMPLING_sample(r[RegisterFile::CodeBlock].codeBlock(), vPC); goto *vPC->u.opcode
 #if DUMP_OPCODE_STATS
     #define BEGIN_OPCODE(opcode) opcode: OpcodeStats::recordInstruction(opcode);
@@ -1471 +1486 @@
     NEXT_OPCODE;
 #else
-    #define NEXT_OPCODE MACHINE_SAMPLING_sample(codeBlock, vPC); continue
+    #define NEXT_OPCODE MACHINE_SAMPLING_sample(r[RegisterFile::CodeBlock].codeBlock(), vPC); continue
 #if DUMP_OPCODE_STATS
     #define BEGIN_OPCODE(opcode) case opcode: OpcodeStats::recordInstruction(opcode);
@@ -1519 +1534 @@
         int dst = (++vPC)->u.operand;
         int regExp = (++vPC)->u.operand;
-        r[dst] = new (exec) RegExpObject(scopeChain->globalObject()->regExpStructure(), codeBlock->regexps[regExp]);
+        r[dst] = new (exec) RegExpObject(scopeChain->globalObject()->regExpStructure(), r[RegisterFile::CodeBlock].codeBlock()->regexps[regExp]);
 
         ++vPC;
@@ -2126 +2141 @@
         JSValue* baseVal = r[base].jsValue(exec);
 
-        if (isNotObject(exec, true, codeBlock, vPC, baseVal, exceptionValue))
+        if (isNotObject(exec, true, r[RegisterFile::CodeBlock].codeBlock(), vPC, baseVal, exceptionValue))
             goto vm_throw;
 
@@ -2247 +2262 @@
 
         JSValue* baseVal = r[base].jsValue(exec);
-        if (isNotObject(exec, false, codeBlock, vPC, baseVal, exceptionValue))
+        if (isNotObject(exec, false, r[RegisterFile::CodeBlock].codeBlock(), vPC, baseVal, exceptionValue))
             goto vm_throw;
 
@@ -2273 +2288 @@
            dst. If the property is not found, raises an exception.
         */
-        if (UNLIKELY(!resolve(exec, vPC, r, scopeChain, codeBlock, exceptionValue)))
+        if (UNLIKELY(!resolve(exec, vPC, r, scopeChain, exceptionValue)))
             goto vm_throw;
 
@@ -2286 +2301 @@
          value to register dst. If the property is not found, raises an exception.
          */
-        if (UNLIKELY(!resolveSkip(exec, vPC, r, scopeChain, codeBlock, exceptionValue)))
+        if (UNLIKELY(!resolveSkip(exec, vPC, r, scopeChain, exceptionValue)))
             goto vm_throw;
 
@@ -2301 +2316 @@
            cache the new structureID and offset
          */
-        if (UNLIKELY(!resolveGlobal(exec, vPC, r,  codeBlock, exceptionValue)))
+        if (UNLIKELY(!resolveGlobal(exec, vPC, r,  exceptionValue)))
             goto vm_throw;
         
@@ -2344 +2359 @@
         int dst = (++vPC)->u.operand;
         int index = (++vPC)->u.operand;
-        int skip = (++vPC)->u.operand + codeBlock->needsFullScopeChain;
+        int skip = (++vPC)->u.operand + r[RegisterFile::CodeBlock].codeBlock()->needsFullScopeChain;
 
         ScopeChainIterator iter = scopeChain->begin();
@@ -2365 +2380 @@
          */
         int index = (++vPC)->u.operand;
-        int skip = (++vPC)->u.operand + codeBlock->needsFullScopeChain;
+        int skip = (++vPC)->u.operand + r[RegisterFile::CodeBlock].codeBlock()->needsFullScopeChain;
         int value = (++vPC)->u.operand;
 
@@ -2390 +2405 @@
            will be the global object) is stored in register dst.
         */
-        resolveBase(exec, vPC, r, scopeChain, codeBlock);
+        resolveBase(exec, vPC, r, scopeChain);
 
         vPC += 3;
@@ -2407 +2422 @@
            avoids duplicate hash lookups.
         */
-        if (UNLIKELY(!resolveBaseAndProperty(exec, vPC, r, scopeChain, codeBlock, exceptionValue)))
+        if (UNLIKELY(!resolveBaseAndProperty(exec, vPC, r, scopeChain, exceptionValue)))
             goto vm_throw;
 
@@ -2428 +2443 @@
            calls but not for other property lookup.
         */
-        if (UNLIKELY(!resolveBaseAndFunc(exec, vPC, r, scopeChain, codeBlock, exceptionValue)))
+        if (UNLIKELY(!resolveBaseAndFunc(exec, vPC, r, scopeChain, exceptionValue)))
             goto vm_throw;
 
@@ -2444 +2459 @@
         int property = vPC[3].u.operand;
 
-        Identifier& ident = codeBlock->identifiers[property];
+        Identifier& ident = r[RegisterFile::CodeBlock].codeBlock()->identifiers[property];
         JSValue* baseValue = r[base].jsValue(exec);
         PropertySlot slot(baseValue);
@@ -2450 +2465 @@
         VM_CHECK_EXCEPTION();
 
-        tryCacheGetByID(exec, codeBlock, vPC, baseValue, ident, slot);
+        tryCacheGetByID(exec, r[RegisterFile::CodeBlock].codeBlock(), vPC, baseValue, ident, slot);
 
         r[dst] = result;
@@ -2476 +2491 @@
                 int offset = vPC[5].u.operand;
 
-                ASSERT(baseObject->get(exec, codeBlock->identifiers[vPC[3].u.operand]) == baseObject->getDirectOffset(offset));
+                ASSERT(baseObject->get(exec, r[RegisterFile::CodeBlock].codeBlock()->identifiers[vPC[3].u.operand]) == baseObject->getDirectOffset(offset));
                 r[dst] = baseObject->getDirectOffset(offset);
 
@@ -2484 +2499 @@
         }
 
-        uncacheGetByID(codeBlock, vPC);
+        uncacheGetByID(r[RegisterFile::CodeBlock].codeBlock(), vPC);
         NEXT_OPCODE;
     }
@@ -2510 +2525 @@
                     int offset = vPC[6].u.operand;
 
-                    ASSERT(protoObject->get(exec, codeBlock->identifiers[vPC[3].u.operand]) == protoObject->getDirectOffset(offset));
+                    ASSERT(protoObject->get(exec, r[RegisterFile::CodeBlock].codeBlock()->identifiers[vPC[3].u.operand]) == protoObject->getDirectOffset(offset));
                     r[dst] = protoObject->getDirectOffset(offset);
 
@@ -2519 +2534 @@
         }
 
-        uncacheGetByID(codeBlock, vPC);
+        uncacheGetByID(r[RegisterFile::CodeBlock].codeBlock(), vPC);
         NEXT_OPCODE;
     }
@@ -2551 +2566 @@
                         int offset = vPC[7].u.operand;
 
-                        ASSERT(baseObject->get(exec, codeBlock->identifiers[vPC[3].u.operand]) == baseObject->getDirectOffset(offset));
+                        ASSERT(baseObject->get(exec, r[RegisterFile::CodeBlock].codeBlock()->identifiers[vPC[3].u.operand]) == baseObject->getDirectOffset(offset));
                         r[dst] = baseObject->getDirectOffset(offset);
 
@@ -2561 +2576 @@
         }
 
-        uncacheGetByID(codeBlock, vPC);
+        uncacheGetByID(r[RegisterFile::CodeBlock].codeBlock(), vPC);
         NEXT_OPCODE;
     }
@@ -2574 +2589 @@
         int property = vPC[3].u.operand;
 
-        Identifier& ident = codeBlock->identifiers[property];
+        Identifier& ident = r[RegisterFile::CodeBlock].codeBlock()->identifiers[property];
 
         JSValue* baseValue = r[base].jsValue(exec);
@@ -2602 +2617 @@
         }
 
-        uncacheGetByID(codeBlock, vPC);
+        uncacheGetByID(r[RegisterFile::CodeBlock].codeBlock(), vPC);
         NEXT_OPCODE;
     }
@@ -2622 +2637 @@
         }
 
-        uncacheGetByID(codeBlock, vPC);
+        uncacheGetByID(r[RegisterFile::CodeBlock].codeBlock(), vPC);
         NEXT_OPCODE;
     }
@@ -2642 +2657 @@
 
         PutPropertySlot slot;
-        Identifier& ident = codeBlock->identifiers[property];
+        Identifier& ident = r[RegisterFile::CodeBlock].codeBlock()->identifiers[property];
         baseValue->put(exec, ident, r[value].jsValue(exec), slot);
         VM_CHECK_EXCEPTION();
 
-        tryCachePutByID(exec, codeBlock, vPC, baseValue, slot);
+        tryCachePutByID(exec, r[RegisterFile::CodeBlock].codeBlock(), vPC, baseValue, slot);
 
         vPC += 8;
@@ -2679 +2694 @@
                 while (!proto->isNull()) {
                     if (UNLIKELY(proto->structureID() != (*it).get())) {
-                        uncachePutByID(codeBlock, vPC);
+                        uncachePutByID(r[RegisterFile::CodeBlock].codeBlock(), vPC);
                         NEXT_OPCODE;
                     }
@@ -2692 +2707 @@
                 int value = vPC[3].u.operand;
                 unsigned offset = vPC[7].u.operand;
-                ASSERT(baseObject->offsetForLocation(baseObject->getDirectLocation(codeBlock->identifiers[vPC[2].u.operand])) == offset);
+                ASSERT(baseObject->offsetForLocation(baseObject->getDirectLocation(r[RegisterFile::CodeBlock].codeBlock()->identifiers[vPC[2].u.operand])) == offset);
                 baseObject->putDirectOffset(offset, r[value].jsValue(exec));
 
@@ -2700 +2715 @@
         }
         
-        uncachePutByID(codeBlock, vPC);
+        uncachePutByID(r[RegisterFile::CodeBlock].codeBlock(), vPC);
         NEXT_OPCODE;
     }
@@ -2727 +2742 @@
                 unsigned offset = vPC[5].u.operand;
                 
-                ASSERT(baseObject->offsetForLocation(baseObject->getDirectLocation(codeBlock->identifiers[vPC[2].u.operand])) == offset);
+                ASSERT(baseObject->offsetForLocation(baseObject->getDirectLocation(r[RegisterFile::CodeBlock].codeBlock()->identifiers[vPC[2].u.operand])) == offset);
                 baseObject->putDirectOffset(offset, r[value].jsValue(exec));
 
@@ -2735 +2750 @@
         }
 
-        uncachePutByID(codeBlock, vPC);
+        uncachePutByID(r[RegisterFile::CodeBlock].codeBlock(), vPC);
         NEXT_OPCODE;
     }
@@ -2754 +2769 @@
 
         PutPropertySlot slot;
-        Identifier& ident = codeBlock->identifiers[property];
+        Identifier& ident = r[RegisterFile::CodeBlock].codeBlock()->identifiers[property];
         baseValue->put(exec, ident, r[value].jsValue(exec), slot);
         VM_CHECK_EXCEPTION();
@@ -2775 +2790 @@
         JSObject* baseObj = r[base].jsValue(exec)->toObject(exec);
 
-        Identifier& ident = codeBlock->identifiers[property];
+        Identifier& ident = r[RegisterFile::CodeBlock].codeBlock()->identifiers[property];
         JSValue* result = jsBoolean(baseObj->deleteProperty(exec, ident));
         VM_CHECK_EXCEPTION();
@@ -3092 +3107 @@
         else {
             int32_t value = JSImmediate::getTruncatedInt32(scrutinee);
-            vPC += codeBlock->immediateSwitchJumpTables[tableIndex].offsetForValue(value, defaultOffset);
+            vPC += r[RegisterFile::CodeBlock].codeBlock()->immediateSwitchJumpTables[tableIndex].offsetForValue(value, defaultOffset);
         }
         NEXT_OPCODE;
@@ -3115 +3130 @@
                 vPC += defaultOffset;
             else
-                vPC += codeBlock->characterSwitchJumpTables[tableIndex].offsetForValue(value->data()[0], defaultOffset);
+                vPC += r[RegisterFile::CodeBlock].codeBlock()->characterSwitchJumpTables[tableIndex].offsetForValue(value->data()[0], defaultOffset);
         }
         NEXT_OPCODE;
@@ -3134 +3149 @@
             vPC += defaultOffset;
         else 
-            vPC += codeBlock->stringSwitchJumpTables[tableIndex].offsetForValue(static_cast<JSString*>(scrutinee)->value().rep(), defaultOffset);
+            vPC += r[RegisterFile::CodeBlock].codeBlock()->stringSwitchJumpTables[tableIndex].offsetForValue(static_cast<JSString*>(scrutinee)->value().rep(), defaultOffset);
         NEXT_OPCODE;
     }
@@ -3148 +3163 @@
         int func = (++vPC)->u.operand;
 
-        r[dst] = codeBlock->functions[func]->makeFunction(exec, scopeChain);
+        r[dst] = r[RegisterFile::CodeBlock].codeBlock()->functions[func]->makeFunction(exec, scopeChain);
 
         ++vPC;
@@ -3164 +3179 @@
         int func = (++vPC)->u.operand;
 
-        r[dst] = codeBlock->functionExpressions[func]->makeFunction(exec, scopeChain);
+        r[dst] = r[RegisterFile::CodeBlock].codeBlock()->functionExpressions[func]->makeFunction(exec, scopeChain);
 
         ++vPC;
@@ -3192 +3207 @@
 
         if (baseVal == scopeChain->globalObject() && funcVal == scopeChain->globalObject()->evalFunction()) {
-            JSObject* thisObject = static_cast<JSObject*>(r[codeBlock->thisRegister].jsValue(exec));
-            JSValue* result = callEval(exec, codeBlock, thisObject, scopeChain, registerFile, r, firstArg, argCount, exceptionValue);
+            JSObject* thisObject = static_cast<JSObject*>(r[r[RegisterFile::CodeBlock].codeBlock()->thisRegister].jsValue(exec));
+            JSValue* result = callEval(exec, thisObject, scopeChain, registerFile, r, firstArg, argCount, exceptionValue);
             if (exceptionValue)
                 goto vm_throw;
@@ -3279 +3294 @@
                 goto vm_throw;
 
-            initializeCallFrame(r, codeBlock, vPC, scopeChain, savedR, dst, argCount, v);
+            initializeCallFrame(r, newCodeBlock, vPC, scopeChain, savedR, dst, argCount, v);
             exec->m_callFrame = r;
     
@@ -3285 +3300 @@
                 (*enabledProfilerReference)->willExecute(exec, static_cast<JSObject*>(v));
 
-            codeBlock = newCodeBlock;
             setScopeChain(exec, scopeChain, callDataScopeChain);
-            vPC = codeBlock->instructions.begin();
+            vPC = newCodeBlock->instructions.begin();
 
 #if DUMP_OPCODE_STATS
@@ -3300 +3314 @@
             ArgList args(r + firstArg + 1, argCount - 1);
 
-            initializeCallFrame(r + registerOffset, codeBlock, vPC, scopeChain, r, dst, argCount, v);
+            initializeCallFrame(r + registerOffset, 0, vPC, scopeChain, r, dst, argCount, v);
             exec->m_callFrame = r + registerOffset;
 
@@ -3323 +3337 @@
         ASSERT(callType == CallTypeNone);
 
-        exceptionValue = createNotAFunctionError(exec, v, vPC, codeBlock);
+        exceptionValue = createNotAFunctionError(exec, v, vPC, r[RegisterFile::CodeBlock].codeBlock());
         goto vm_throw;
     }
@@ -3339 +3353 @@
 
         if (JSActivation* activation = static_cast<JSActivation*>(r[RegisterFile::OptionalCalleeActivation].jsValue(exec))) {
-            ASSERT(!codeBlock->needsFullScopeChain || scopeChain->object == activation);
+            ASSERT(!r[RegisterFile::CodeBlock].codeBlock()->needsFullScopeChain || scopeChain->object == activation);
             ASSERT(activation->isActivationObject());
             activation->copyRegisters();
@@ -3347 +3361 @@
             (*enabledProfilerReference)->didExecute(exec, static_cast<JSObject*>(r[RegisterFile::Callee].jsValue(exec)));
 
-        if (codeBlock->needsFullScopeChain)
+        if (r[RegisterFile::CodeBlock].codeBlock()->needsFullScopeChain)
             scopeChain->deref();
 
         JSValue* returnValue = r[result].jsValue(exec);
-
-        codeBlock = r[RegisterFile::CallerCodeBlock].codeBlock();
-        if (!codeBlock)
-            return returnValue;
 
         vPC = r[RegisterFile::ReturnPC].vPC();
@@ -3361 +3371 @@
         r = r[RegisterFile::CallerRegisters].r();
         exec->m_callFrame = r;
+        
+        if (!r)
+            return returnValue;
+
         r[dst] = returnValue;
 
@@ -3367 +3381 @@
     BEGIN_OPCODE(op_init) {
         size_t i = 0;
-
+        CodeBlock* codeBlock = r[RegisterFile::CodeBlock].codeBlock();
+        
         for (size_t count = codeBlock->numVars; i < count; ++i)
             r[i] = jsUndefined();
@@ -3379 +3394 @@
     BEGIN_OPCODE(op_init_activation) {
         size_t i = 0;
+        CodeBlock* codeBlock = r[RegisterFile::CodeBlock].codeBlock();
 
         for (size_t count = codeBlock->numVars; i < count; ++i)
@@ -3444 +3460 @@
                 goto vm_throw;
 
-            initializeCallFrame(r, codeBlock, vPC, scopeChain, savedR, dst, argCount, v);
+            initializeCallFrame(r, newCodeBlock, vPC, scopeChain, savedR, dst, argCount, v);
             exec->m_callFrame = r;
     
@@ -3450 +3466 @@
                 (*enabledProfilerReference)->didExecute(exec, static_cast<JSObject*>(v));
 
-            codeBlock = newCodeBlock;
             setScopeChain(exec, scopeChain, callDataScopeChain);
-            vPC = codeBlock->instructions.begin();
+            vPC = newCodeBlock->instructions.begin();
 
 #if DUMP_OPCODE_STATS
@@ -3464 +3479 @@
             ArgList args(r + firstArg + 1, argCount - 1);
 
-            initializeCallFrame(r + registerOffset, codeBlock, vPC, scopeChain, r, dst, argCount, v);
+            initializeCallFrame(r + registerOffset, 0, vPC, scopeChain, r, dst, argCount, v);
             exec->m_callFrame = r + registerOffset;
 
@@ -3487 +3502 @@
         ASSERT(constructType == ConstructTypeNone);
 
-        exceptionValue = createNotAConstructorError(exec, v, vPC, codeBlock);
+        exceptionValue = createNotAConstructorError(exec, v, vPC, r[RegisterFile::CodeBlock].codeBlock());
         goto vm_throw;
     }
@@ -3604 +3619 @@
            in dst for GC.
          */
-        setScopeChain(exec, scopeChain, createExceptionScope(exec, codeBlock, vPC, r, scopeChain));
+        setScopeChain(exec, scopeChain, createExceptionScope(exec, vPC, r, scopeChain));
         vPC += 4;
         NEXT_OPCODE;
@@ -3641 +3656 @@
         exceptionValue = r[ex].jsValue(exec);
 
-        handlerVPC = throwException(exec, exceptionValue, vPC, codeBlock, scopeChain, r, true);
+        handlerVPC = throwException(exec, exceptionValue, vPC, scopeChain, r, true);
         if (!handlerVPC) {
             *exception = exceptionValue;
@@ -3666 +3681 @@
         int dst = (++vPC)->u.operand;
         int src = (++vPC)->u.operand;
-        r[dst] = codeBlock->unexpectedConstants[src];
+        r[dst] = r[RegisterFile::CodeBlock].codeBlock()->unexpectedConstants[src];
 
         ++vPC;
@@ -3683 +3698 @@
         int message = (++vPC)->u.operand;
 
+        CodeBlock* codeBlock = r[RegisterFile::CodeBlock].codeBlock();
         r[dst] = Error::create(exec, (ErrorType)type, codeBlock->unexpectedConstants[message]->toString(exec), codeBlock->lineNumberForVPC(vPC), codeBlock->ownerNode->sourceId(), codeBlock->ownerNode->sourceURL());
 
@@ -3695 +3711 @@
         */
 
-        if (codeBlock->needsFullScopeChain) {
+        if (r[RegisterFile::CodeBlock].codeBlock()->needsFullScopeChain) {
             ASSERT(scopeChain->refCount > 1);
             scopeChain->deref();
@@ -3719 +3735 @@
         ASSERT(r[base].jsValue(exec)->isObject());
         JSObject* baseObj = static_cast<JSObject*>(r[base].jsValue(exec));
-        Identifier& ident = codeBlock->identifiers[property];
+        Identifier& ident = r[RegisterFile::CodeBlock].codeBlock()->identifiers[property];
         ASSERT(r[function].jsValue(exec)->isObject());
         baseObj->defineGetter(exec, ident, static_cast<JSObject*>(r[function].jsValue(exec)));
@@ -3743 +3759 @@
         ASSERT(r[base].jsValue(exec)->isObject());
         JSObject* baseObj = static_cast<JSObject*>(r[base].jsValue(exec));
-        Identifier& ident = codeBlock->identifiers[property];
+        Identifier& ident = r[RegisterFile::CodeBlock].codeBlock()->identifiers[property];
         ASSERT(r[function].jsValue(exec)->isObject());
         baseObj->defineSetter(exec, ident, static_cast<JSObject*>(r[function].jsValue(exec)));
@@ -3784 +3800 @@
         int lastLine = (++vPC)->u.operand;
 
-        debug(exec, codeBlock, scopeChain, r, static_cast<DebugHookID>(debugHookID), firstLine, lastLine);
+        debug(exec, scopeChain, r, static_cast<DebugHookID>(debugHookID), firstLine, lastLine);
 
         ++vPC;
@@ -3796 +3812 @@
             exceptionValue = createInterruptedExecutionException(exec);
         }
-        handlerVPC = throwException(exec, exceptionValue, vPC, codeBlock, scopeChain, r, false);
+        handlerVPC = throwException(exec, exceptionValue, vPC, scopeChain, r, false);
         if (!handlerVPC) {
             *exception = exceptionValue;
@@ -3828 +3844 @@
 JSValue* Machine::retrieveCaller(ExecState* exec, InternalFunction* function) const
 {
-    Register* callFrame = this->callFrame(exec, function);
-    if (!callFrame)
+    Register* r = this->callFrame(exec, function);
+    if (!r)
         return jsNull();
 
-    CodeBlock* callerCodeBlock = callFrame[RegisterFile::CallerCodeBlock].codeBlock();
-    if (!callerCodeBlock)
+    Register* callerR = r[RegisterFile::CallerRegisters].r();
+    if (!callerR)
         return jsNull();
 
-    Register* callerCallFrame = callFrame[RegisterFile::CallerRegisters].r();
-    if (JSValue* caller = callerCallFrame[RegisterFile::Callee].jsValue(exec))
-        return caller;
-
-    return jsNull();
+    JSValue* caller = callerR[RegisterFile::Callee].jsValue(exec);
+    if (!caller)
+        return jsNull();
+
+    return caller;
 }
 
@@ -3849 +3865 @@
     sourceURL = UString();
 
-    Register* callFrame = exec->m_callFrame;
-    if (!callFrame)
+    Register* r = exec->m_callFrame;
+    if (!r)
         return;
 
-    CodeBlock* callerCodeBlock = callFrame[RegisterFile::CallerCodeBlock].codeBlock();
-    if (!callerCodeBlock)
+    Register* callerR = r[RegisterFile::CallerRegisters].r();
+    if (!callerR)
         return;
 
-    Instruction* vPC = vPCForPC(callerCodeBlock, callFrame[RegisterFile::ReturnPC].v());
+    CodeBlock* callerCodeBlock = callerR[RegisterFile::CodeBlock].codeBlock();
+    Instruction* vPC = vPCForPC(callerCodeBlock, r[RegisterFile::ReturnPC].v());
     lineNumber = callerCodeBlock->lineNumberForVPC(vPC - 1);
     sourceId = callerCodeBlock->ownerNode->sourceId();
     sourceURL = callerCodeBlock->ownerNode->sourceURL();
 
-    JSValue* callee = callFrame[RegisterFile::Callee].getJSValue();
-    if (callee->toThisObject(exec)->inherits(&InternalFunction::info))
-        function = retrieveCaller(exec, static_cast<InternalFunction*>(callee));
+    JSValue* caller = callerR[RegisterFile::Callee].getJSValue();
+    if (!caller)
+        return;
+
+    function = caller;
 }
 
@@ -3882 +3901 @@
             return callFrame;
 
-        CodeBlock* callerCodeBlock = callFrame[RegisterFile::CallerCodeBlock].codeBlock();
-        if (!callerCodeBlock) {
-            callFrame = 0;
-            continue;
-        }
-        
         callFrame = callFrame[RegisterFile::CallerRegisters].r();
     }
@@ -4251 +4264 @@
     baseValue->put(exec, ident, ARG_src3, slot);
 
-    exec->machine()->tryCTICachePutByID(exec, ARG_codeBlock, CTI_RETURN_ADDRESS, baseValue, slot);
+    exec->machine()->tryCTICachePutByID(exec, ARG_r[RegisterFile::CodeBlock].codeBlock(), CTI_RETURN_ADDRESS, baseValue, slot);
 
     VM_CHECK_EXCEPTION_AT_END();
@@ -4305 +4318 @@
     JSValue* result = baseValue->get(exec, ident, slot);
 
-    exec->machine()->tryCTICacheGetByID(exec, ARG_codeBlock, CTI_RETURN_ADDRESS, baseValue, ident, slot);
+    exec->machine()->tryCTICacheGetByID(exec, ARG_r[RegisterFile::CodeBlock].codeBlock(), CTI_RETURN_ADDRESS, baseValue, ident, slot);
 
     VM_CHECK_EXCEPTION_AT_END();
@@ -4356 +4369 @@
 
     if (!baseVal->isObject()) {
-        CodeBlock* codeBlock = ARG_codeBlock;
+        CodeBlock* codeBlock = ARG_r[RegisterFile::CodeBlock].codeBlock();
         ASSERT(codeBlock->ctiReturnAddressVPCMap.contains(CTI_RETURN_ADDRESS));
         unsigned vPCIndex = codeBlock->ctiReturnAddressVPCMap.get(CTI_RETURN_ADDRESS);
@@ -4445 +4458 @@
     JSVALUE_VM_CHECK_EXCEPTION_ARG(exceptionValue);
 
-    // RegisterFile::CallerCodeBlock is set by caller
+    r[RegisterFile::CodeBlock] = newCodeBlock;
     r[RegisterFile::CallerScopeChain] = ARG_scopeChain;
     r[RegisterFile::CallerRegisters] = savedR;
@@ -4458 +4471 @@
 
     ARG_setScopeChain(callDataScopeChain);
-    ARG_setCodeBlock(newCodeBlock);
     ARG_setR(r);
     return newCodeBlock->ctiCode;
@@ -4466 +4478 @@
 {
     ExecState* exec = ARG_exec;
-    CodeBlock* codeBlock = ARG_codeBlock;
+    CodeBlock* codeBlock = ARG_r[RegisterFile::CodeBlock].codeBlock();
 
     if (!codeBlock->ctiCode)
@@ -4477 +4489 @@
 {
     ExecState* exec = ARG_exec;
-    CodeBlock* codeBlock = ARG_codeBlock;
+    CodeBlock* codeBlock = ARG_r[RegisterFile::CodeBlock].codeBlock();
     ScopeChainNode* scopeChain = ARG_scopeChain;
     Register* r = ARG_r;
@@ -4504 +4516 @@
         Register* r = ARG_r + registerOffset;
         
-        initializeCallFrame(r, ARG_codeBlock, ARG_instr4, ARG_scopeChain, ARG_r, 0, argCount, funcVal);
+        initializeCallFrame(r, 0, ARG_instr4, ARG_scopeChain, ARG_r, 0, argCount, funcVal);
         exec->m_callFrame = r;
 
@@ -4527 +4539 @@
     ASSERT(callType == CallTypeNone);
 
-    exec->setException(createNotAFunctionError(exec, funcVal, ARG_instr4, ARG_codeBlock));
+    exec->setException(createNotAFunctionError(exec, funcVal, ARG_instr4, ARG_r[RegisterFile::CodeBlock].codeBlock()));
     VM_CHECK_EXCEPTION_AT_END();
     return 0;
@@ -4540 +4552 @@
     ASSERT(activation);
 
-    ASSERT(!ARG_codeBlock->needsFullScopeChain || ARG_scopeChain->object == activation);
+    ASSERT(!ARG_r[RegisterFile::CodeBlock].codeBlock()->needsFullScopeChain || ARG_scopeChain->object == activation);
     ASSERT(activation->isActivationObject());
     activation->copyRegisters();
@@ -4556 +4568 @@
 void Machine::cti_op_ret_scopeChain(CTI_ARGS)
 {
-    ASSERT(ARG_codeBlock->needsFullScopeChain);
+    ASSERT(ARG_r[RegisterFile::CodeBlock].codeBlock()->needsFullScopeChain);
     ARG_scopeChain->deref();
 }
@@ -4586 +4598 @@
     } while (++iter != end);
 
-    CodeBlock* codeBlock = ARG_codeBlock;
+    CodeBlock* codeBlock = ARG_r[RegisterFile::CodeBlock].codeBlock();
     ASSERT(codeBlock->ctiReturnAddressVPCMap.contains(CTI_RETURN_ADDRESS));
     unsigned vPCIndex = codeBlock->ctiReturnAddressVPCMap.get(CTI_RETURN_ADDRESS);
@@ -4638 +4650 @@
     JSVALUE_VM_CHECK_EXCEPTION_ARG(exceptionValue);
 
-    // RegisterFile::CallerCodeBlock is set by caller
+    r[RegisterFile::CodeBlock] = newCodeBlock;
     r[RegisterFile::CallerScopeChain] = ARG_scopeChain;
     r[RegisterFile::CallerRegisters] = savedR;
@@ -4651 +4663 @@
 
     ARG_setScopeChain(callDataScopeChain);
-    ARG_setCodeBlock(newCodeBlock);
     ARG_setR(r);
     return newCodeBlock->ctiCode;
@@ -4689 +4700 @@
     ASSERT(constructType == ConstructTypeNone);
 
-    exec->setException(createNotAConstructorError(exec, constrVal, ARG_instr6, ARG_codeBlock));
+    exec->setException(createNotAConstructorError(exec, constrVal, ARG_instr6, r[RegisterFile::CodeBlock].codeBlock()));
     VM_CHECK_EXCEPTION_AT_END();
     return 0;
@@ -4761 +4772 @@
     } while (iter != end);
 
-    CodeBlock* codeBlock = ARG_codeBlock;
+    CodeBlock* codeBlock = ARG_r[RegisterFile::CodeBlock].codeBlock();
     ASSERT(codeBlock->ctiReturnAddressVPCMap.contains(CTI_RETURN_ADDRESS));
     unsigned vPCIndex = codeBlock->ctiReturnAddressVPCMap.get(CTI_RETURN_ADDRESS);
@@ -4908 +4919 @@
     } while (++iter != end);
 
-    CodeBlock* codeBlock = ARG_codeBlock;
+    CodeBlock* codeBlock = ARG_r[RegisterFile::CodeBlock].codeBlock();
     ASSERT(codeBlock->ctiReturnAddressVPCMap.contains(CTI_RETURN_ADDRESS));
     unsigned vPCIndex = codeBlock->ctiReturnAddressVPCMap.get(CTI_RETURN_ADDRESS);
@@ -4941 +4952 @@
     }
     
-    exec->setException(createUndefinedVariableError(exec, ident, vPC, ARG_codeBlock));
+    exec->setException(createUndefinedVariableError(exec, ident, vPC, ARG_r[RegisterFile::CodeBlock].codeBlock()));
     
     VM_CHECK_EXCEPTION_AT_END();
@@ -5131 +5142 @@
     } while (iter != end);
 
-    CodeBlock* codeBlock = ARG_codeBlock;
+    CodeBlock* codeBlock = ARG_r[RegisterFile::CodeBlock].codeBlock();
     ASSERT(codeBlock->ctiReturnAddressVPCMap.contains(CTI_RETURN_ADDRESS));
     unsigned vPCIndex = codeBlock->ctiReturnAddressVPCMap.get(CTI_RETURN_ADDRESS);
@@ -5241 +5252 @@
     RegisterFile* registerFile = ARG_registerFile;
     Register* r = ARG_r;
-    CodeBlock* codeBlock = ARG_codeBlock;
+    CodeBlock* codeBlock = r[RegisterFile::CodeBlock].codeBlock();
     ScopeChainNode* scopeChain = ARG_scopeChain;
 
@@ -5254 +5265 @@
         JSObject* thisObject = static_cast<JSObject*>(r[codeBlock->thisRegister].jsValue(exec));
         JSValue* exceptionValue = 0;
-        JSValue* result = machine->callEval(exec, codeBlock, thisObject, scopeChain, registerFile,  r, registerOffset - RegisterFile::CallFrameHeaderSize - argCount, argCount, exceptionValue);
+        JSValue* result = machine->callEval(exec, thisObject, scopeChain, registerFile,  r, registerOffset - RegisterFile::CallFrameHeaderSize - argCount, argCount, exceptionValue);
         JSVALUE_VM_CHECK_EXCEPTION_ARG(exceptionValue);
         return result;
@@ -5265 +5276 @@
 {
     ExecState* exec = ARG_exec;
-    CodeBlock* codeBlock = ARG_codeBlock;
     ScopeChainNode* scopeChain = ARG_scopeChain;
     Register* r = ARG_r;
+    CodeBlock* codeBlock = r[RegisterFile::CodeBlock].codeBlock();
 
     ASSERT(codeBlock->ctiReturnAddressVPCMap.contains(CTI_RETURN_ADDRESS));
@@ -5273 +5284 @@
 
     JSValue* exceptionValue = ARG_src1;
-    Instruction* handlerVPC = ARG_exec->machine()->throwException(exec, exceptionValue, codeBlock->instructions.begin() + vPCIndex, codeBlock, scopeChain, r, true);
+    Instruction* handlerVPC = ARG_exec->machine()->throwException(exec, exceptionValue, codeBlock->instructions.begin() + vPCIndex, scopeChain, r, true);
 
     if (handlerVPC) {
         exec->setException(exceptionValue);
         ARG_setScopeChain(scopeChain);
-        ARG_setCodeBlock(codeBlock);
         ARG_setR(r);
 
-        void* catchRoutine = codeBlock->nativeExceptionCodeForHandlerVPC(handlerVPC);
+        void* catchRoutine = r[RegisterFile::CodeBlock].codeBlock()->nativeExceptionCodeForHandlerVPC(handlerVPC);
         ASSERT(catchRoutine);
         ctiSetReturnAddress(&CTI_RETURN_ADDRESS, catchRoutine);
@@ -5404 +5414 @@
 
     if (!baseVal->isObject()) {
-        CodeBlock* codeBlock = ARG_codeBlock;
+        CodeBlock* codeBlock = ARG_r[RegisterFile::CodeBlock].codeBlock();
         ASSERT(codeBlock->ctiReturnAddressVPCMap.contains(CTI_RETURN_ADDRESS));
         unsigned vPCIndex = codeBlock->ctiReturnAddressVPCMap.get(CTI_RETURN_ADDRESS);
@@ -5461 +5471 @@
     unsigned tableIndex = ARG_int2;
 
-    CodeBlock* codeBlock = ARG_codeBlock;
+    CodeBlock* codeBlock = ARG_r[RegisterFile::CodeBlock].codeBlock();
 
     if (JSImmediate::isNumber(scrutinee)) {
@@ -5476 +5486 @@
     unsigned tableIndex = ARG_int2;
 
-    CodeBlock* codeBlock = ARG_codeBlock;
+    CodeBlock* codeBlock = ARG_r[RegisterFile::CodeBlock].codeBlock();
 
     void* result = codeBlock->characterSwitchJumpTables[tableIndex].ctiDefault;
@@ -5494 +5504 @@
     unsigned tableIndex = ARG_int2;
 
-    CodeBlock* codeBlock = ARG_codeBlock;
+    CodeBlock* codeBlock = ARG_r[RegisterFile::CodeBlock].codeBlock();
 
     void* result = codeBlock->stringSwitchJumpTables[tableIndex].ctiDefault;
@@ -5554 +5564 @@
 {
     ExecState* exec = ARG_exec;
-    CodeBlock* codeBlock = ARG_codeBlock;
+    CodeBlock* codeBlock = ARG_r[RegisterFile::CodeBlock].codeBlock();
     unsigned type = ARG_int1;
     JSValue* message = ARG_src2;
@@ -5565 +5575 @@
 {
     ExecState* exec = ARG_exec;
-    CodeBlock* codeBlock = ARG_codeBlock;
     ScopeChainNode* scopeChain = ARG_scopeChain;
     Register* r = ARG_r;
@@ -5573 +5582 @@
     int lastLine = ARG_int3;
 
-    exec->machine()->debug(exec, codeBlock, scopeChain, r, static_cast<DebugHookID>(debugHookID), firstLine, lastLine);
+    exec->machine()->debug(exec, scopeChain, r, static_cast<DebugHookID>(debugHookID), firstLine, lastLine);
 }
 
@@ -5579 +5588 @@
 {
     ExecState* exec = ARG_exec;
-    CodeBlock* codeBlock = ARG_codeBlock;
     ScopeChainNode* scopeChain = ARG_scopeChain;
     Register* r = ARG_r;
+    CodeBlock* codeBlock = r[RegisterFile::CodeBlock].codeBlock();
 
     ASSERT(codeBlock->ctiReturnAddressVPCMap.contains(exec->ctiReturnAddress()));
@@ -5590 +5599 @@
     JSValue* exceptionValue = exec->exception();
 
-    Instruction* handlerVPC = ARG_exec->machine()->throwException(exec, exceptionValue, codeBlock->instructions.begin() + vPCIndex, codeBlock, scopeChain, r, false);
+    Instruction* handlerVPC = ARG_exec->machine()->throwException(exec, exceptionValue, codeBlock->instructions.begin() + vPCIndex, scopeChain, r, false);
 
     if (handlerVPC) {
         exec->setException(exceptionValue);
         ARG_setScopeChain(scopeChain);
-        ARG_setCodeBlock(codeBlock);
         ARG_setR(r);
 
-        void* catchRoutine = codeBlock->nativeExceptionCodeForHandlerVPC(handlerVPC);
+        void* catchRoutine = r[RegisterFile::CodeBlock].codeBlock()->nativeExceptionCodeForHandlerVPC(handlerVPC);
         ASSERT(catchRoutine);
         ctiSetReturnAddress(&CTI_RETURN_ADDRESS, catchRoutine);

trunk/JavaScriptCore/VM/Machine.h

@@ -243 +243 @@
         enum ExecutionFlag { Normal, InitializeAndReturn };
 
-        NEVER_INLINE JSValue* callEval(ExecState* exec, CodeBlock* callingCodeBlock, JSObject* thisObj, ScopeChainNode* scopeChain, RegisterFile*, Register* r, int argv, int argc, JSValue*& exceptionValue);
+        NEVER_INLINE JSValue* callEval(ExecState* exec, JSObject* thisObj, ScopeChainNode* scopeChain, RegisterFile*, Register* r, int argv, int argc, JSValue*& exceptionValue);
         JSValue* execute(EvalNode*, ExecState*, JSObject* thisObj, int registerOffset, ScopeChainNode*, JSValue** exception);
 
@@ -249 +249 @@
 
         ALWAYS_INLINE static void setScopeChain(ExecState* exec, ScopeChainNode*&, ScopeChainNode*);
-        NEVER_INLINE void debug(ExecState*, const CodeBlock*, ScopeChainNode*, Register*, DebugHookID, int firstLine, int lastLine);
+        NEVER_INLINE void debug(ExecState*, ScopeChainNode*, Register*, DebugHookID, int firstLine, int lastLine);
+
+        NEVER_INLINE bool resolve(ExecState* exec, Instruction* vPC, Register* r, ScopeChainNode* scopeChain, JSValue*& exceptionValue);
+        NEVER_INLINE bool resolveSkip(ExecState* exec, Instruction* vPC, Register* r, ScopeChainNode* scopeChain, JSValue*& exceptionValue);
+        NEVER_INLINE bool resolveGlobal(ExecState* exec, Instruction* vPC, Register* r, JSValue*& exceptionValue);
+        NEVER_INLINE void resolveBase(ExecState* exec, Instruction* vPC, Register* r, ScopeChainNode* scopeChain);
+        NEVER_INLINE bool resolveBaseAndProperty(ExecState* exec, Instruction* vPC, Register* r, ScopeChainNode* scopeChain, JSValue*& exceptionValue);
+        NEVER_INLINE ScopeChainNode* createExceptionScope(ExecState* exec, const Instruction* vPC, Register* r, ScopeChainNode* scopeChain);
 
         NEVER_INLINE bool unwindCallFrame(ExecState*, JSValue*, const Instruction*&, CodeBlock*&, ScopeChainNode*&, Register*&);
-        NEVER_INLINE Instruction* throwException(ExecState*, JSValue*&, const Instruction*, CodeBlock*&, ScopeChainNode*&, Register*&, bool);
+        NEVER_INLINE Instruction* throwException(ExecState*, JSValue*&, const Instruction*, ScopeChainNode*&, Register*&, bool);
+        NEVER_INLINE bool resolveBaseAndFunc(ExecState* exec, Instruction* vPC, Register* r, ScopeChainNode* scopeChain, JSValue*& exceptionValue);
 
         Register* callFrame(ExecState*, InternalFunction*) const;
 
-        JSValue* privateExecute(ExecutionFlag, ExecState* = 0, RegisterFile* = 0, Register* = 0, ScopeChainNode* = 0, CodeBlock* = 0, JSValue** exception = 0);
-
-        void dumpCallFrame(const CodeBlock*, ScopeChainNode*, RegisterFile*, const Register*);
-        void dumpRegisters(const CodeBlock*, RegisterFile*, const Register*);
+        JSValue* privateExecute(ExecutionFlag, ExecState* = 0, RegisterFile* = 0, Register* = 0, ScopeChainNode* = 0, JSValue** exception = 0);
+
+        void dumpCallFrame(ScopeChainNode*, const RegisterFile*, const Register*);
+        void dumpRegisters(const RegisterFile*, const Register*);
 
         JSValue* checkTimeout(JSGlobalObject*);

trunk/JavaScriptCore/VM/RegisterFile.h

@@ -93 +93 @@
             CallFrameHeaderSize = 8,
 
-            CallerCodeBlock = -8,
+            CodeBlock = -8,
             CallerScopeChain = -7,
             CallerRegisters = -6,
@@ -156 +156 @@
         }
 
-        size_t size() { return m_size; }
+        size_t size() const { return m_size; }
         
         void setNumGlobals(size_t numGlobals) { m_numGlobals = numGlobals; }
-        int numGlobals() { return m_numGlobals; }
-        size_t maxGlobals() { return m_maxGlobals; }
+        int numGlobals() const { return m_numGlobals; }
+        size_t maxGlobals() const { return m_maxGlobals; }
 
-        Register* lastGlobal() { return m_base - m_numGlobals; }
+        Register* lastGlobal() const { return m_base - m_numGlobals; }
         
         void markGlobals(Heap* heap) { heap->markConservatively(lastGlobal(), m_base); }