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

Timestamp:

Sep 17, 2008, 12:29:19 PM (17 years ago)

Author:

[email protected]

Message:

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

Reviewed by Geoff Garen.

Optimizations for op_call in CTI. Move check for (ctiCode == 0) into JIT code,
move copying of scopeChain for CodeBlocks that needFullScopeChain into head of
functions, instead of checking prior to making the call.

3% on v8-tests (4% on richards, 6% in delta-blue)

• VM/CTI.cpp: (JSC::CTI::compileOpCall): (JSC::CTI::privateCompileSlowCases): (JSC::CTI::privateCompile):
• VM/Machine.cpp: (JSC::Machine::execute): (JSC::Machine::cti_op_call_JSFunction): (JSC::Machine::cti_vm_compile): (JSC::Machine::cti_vm_updateScopeChain): (JSC::Machine::cti_op_construct_JSConstruct):
• VM/Machine.h:

File:

• trunk/JavaScriptCore/VM/Machine.cpp (modified) (4 diffs)

trunk/JavaScriptCore/VM/Machine.cpp

@@ -929 +929 @@
     }
 
-    scopeChain = scopeChainForCall(exec, functionBodyNode, newCodeBlock, scopeChain, r);
-
     ExecState newExec(exec, &m_registerFile, scopeChain, callFrame);
 
@@ -943 +941 @@
     JSValue* result = CTI::execute(newCodeBlock->ctiCode, &newExec, &m_registerFile, r, scopeChain, newCodeBlock, exception);
 #else
+    setScopeChain(scopeChain, scopeChainForCall(exec, functionBodyNode, newCodeBlock, scopeChain, r));
     JSValue* result = privateExecute(Normal, &newExec, &m_registerFile, r, scopeChain, newCodeBlock, exception);
 #endif
@@ -4356 +4355 @@
     JSVALUE_VM_CHECK_EXCEPTION_ARG(exceptionValue);
     
-    codeBlock = newCodeBlock;
-    machine->setScopeChain(exec, scopeChain, scopeChainForCall(exec, functionBodyNode, codeBlock, callDataScopeChain, r));
+    exec->m_scopeChain = callDataScopeChain;
+
+    ARG_setScopeChain(callDataScopeChain);
+    ARG_setCodeBlock(newCodeBlock);
+    ARG_setR(r);
+    return newCodeBlock->ctiCode;
+}
+
+void* Machine::cti_vm_compile(CTI_ARGS)
+{
+    ExecState* exec = ARG_exec;
+    CodeBlock* codeBlock = ARG_codeBlock;
 
     if (!codeBlock->ctiCode)
-        CTI::compile(machine, exec, codeBlock);
+        CTI::compile(exec->machine(), exec, codeBlock);
+
+    return codeBlock->ctiCode;
+}
+
+void Machine::cti_vm_updateScopeChain(CTI_ARGS)
+{
+    ExecState* exec = ARG_exec;
+    CodeBlock* codeBlock = ARG_codeBlock;
+    ScopeChainNode* scopeChain = ARG_scopeChain;
+
+    exec->machine()->setScopeChain(exec, scopeChain, scopeChainForCall(exec, static_cast<FunctionBodyNode*>(codeBlock->ownerNode), codeBlock, scopeChain, ARG_r));
 
     ARG_setScopeChain(scopeChain);
-    ARG_setCodeBlock(codeBlock);
-    ARG_setR(r);
-    return codeBlock->ctiCode;
 }
 
@@ -4533 +4550 @@
     JSVALUE_VM_CHECK_EXCEPTION_ARG(exceptionValue);
 
-    codeBlock = newCodeBlock;
-    machine->setScopeChain(exec, scopeChain, scopeChainForCall(exec, functionBodyNode, codeBlock, callDataScopeChain, r));
-
-    if (!codeBlock->ctiCode)
-        CTI::compile(machine, exec, codeBlock);
-
-    ARG_setScopeChain(scopeChain);
-    ARG_setCodeBlock(codeBlock);
+    exec->m_scopeChain = callDataScopeChain;
+
+    ARG_setScopeChain(callDataScopeChain);
+    ARG_setCodeBlock(newCodeBlock);
     ARG_setR(r);
-    return codeBlock->ctiCode;
+    return newCodeBlock->ctiCode;
 }