Changeset 36514 in webkit for trunk/JavaScriptCore/VM/Machine.cpp

Timestamp:

Sep 16, 2008, 10:40:01 AM (17 years ago)

Author:

[email protected]

Message:

2008-09-16 Gavin Barraclough <​[email protected]>

Reviewed by Geoff Garen.

CTI code generation for op_ret. The majority of the work
(updating variables on the stack & on exec) can be performed
directly in generated code.

We still need to check, & to call out to C-code to handle
activation records, profiling, and full scope chains.

+1.5% Sunspider, +5/6% v8 tests.

• VM/CTI.cpp: (JSC::CTI::emitPutCTIParam): (JSC::CTI::compileOpCall): (JSC::CTI::privateCompileMainPass):
• VM/CTI.h:
• VM/Machine.cpp: (JSC::Machine::cti_op_ret_activation): (JSC::Machine::cti_op_ret_profiler): (JSC::Machine::cti_op_ret_scopeChain):
• VM/Machine.h:

File:

• trunk/JavaScriptCore/VM/Machine.cpp (modified) (1 diff)

trunk/JavaScriptCore/VM/Machine.cpp

@@ -4418 +4418 @@
 }
 
-JSValue* Machine::cti_op_ret(CTI_ARGS)
-{
-    ExecState* exec = ARG_exec;
-    Register* r = ARG_r;
-    CodeBlock* codeBlock = ARG_codeBlock;
-    ScopeChainNode* scopeChain = ARG_scopeChain;
-
-    Machine* machine = exec->machine();
-
-    Register* callFrame = r - codeBlock->numLocals - RegisterFile::CallFrameHeaderSize;
-    if (JSActivation* activation = static_cast<JSActivation*>(callFrame[RegisterFile::OptionalCalleeActivation].jsValue(exec))) {
-        ASSERT(!codeBlock->needsFullScopeChain || scopeChain->object == activation);
-        ASSERT(activation->isActivationObject());
-        activation->copyRegisters();
-    }
-
-    if (*ARG_profilerReference)
-        (*ARG_profilerReference)->didExecute(exec, static_cast<JSObject*>(callFrame[RegisterFile::Callee].jsValue(exec)));
-
-    if (codeBlock->needsFullScopeChain)
-        scopeChain->deref();
-
-    codeBlock = callFrame[RegisterFile::CallerCodeBlock].codeBlock();
-    if (codeBlock) {
-        machine->setScopeChain(exec, scopeChain, callFrame[RegisterFile::CallerScopeChain].scopeChain());
-        r = callFrame[RegisterFile::CallerRegisters].r();
-        exec->m_callFrame = r - codeBlock->numLocals - RegisterFile::CallFrameHeaderSize;
-    }
-
-    ARG_setScopeChain(scopeChain);
-    ARG_setCodeBlock(codeBlock);
-    ARG_setR(r);
-
-    return ARG_src1;
+void Machine::cti_op_ret_activation(CTI_ARGS)
+{
+    ExecState* exec = ARG_exec;
+    Register* callFrame = ARG_r - ARG_codeBlock->numLocals - RegisterFile::CallFrameHeaderSize;
+
+    JSActivation* activation = static_cast<JSActivation*>(callFrame[RegisterFile::OptionalCalleeActivation].jsValue(exec));
+    ASSERT(activation);
+
+    ASSERT(!ARG_codeBlock->needsFullScopeChain || ARG_scopeChain->object == activation);
+    ASSERT(activation->isActivationObject());
+    activation->copyRegisters();
+}
+
+void Machine::cti_op_ret_profiler(CTI_ARGS)
+{
+    ExecState* exec = ARG_exec;
+
+    Register* callFrame = ARG_r - ARG_codeBlock->numLocals - RegisterFile::CallFrameHeaderSize;
+    ASSERT(*ARG_profilerReference);
+    (*ARG_profilerReference)->didExecute(exec, static_cast<JSObject*>(callFrame[RegisterFile::Callee].jsValue(exec)));
+}
+
+void Machine::cti_op_ret_scopeChain(CTI_ARGS)
+{
+    ASSERT(ARG_codeBlock->needsFullScopeChain);
+    ARG_scopeChain->deref();
 }