Changeset 36566 in webkit for trunk/JavaScriptCore/VM/CTI.cpp

Timestamp:

Sep 17, 2008, 3:40:23 PM (17 years ago)

Author:

[email protected]

Message:

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

Reviewed by Geoff Garen.

Implement JIT generation of CallFrame initialization, for op_call.

1% sunspider 2.5% v8-tests.

• VM/CTI.cpp: (JSC::CTI::compileOpCall):
• VM/Machine.cpp: (JSC::Machine::cti_op_call_JSFunction): (JSC::Machine::cti_op_call_NotJSFunction):

File:

• trunk/JavaScriptCore/VM/CTI.cpp (modified) (3 diffs)

trunk/JavaScriptCore/VM/CTI.cpp

@@ -417 +417 @@
 void CTI::compileOpCall(Instruction* instruction, unsigned i, CompileOpCallType type)
 {
+    int dst = instruction[i + 1].u.operand;
+    int firstArg = instruction[i + 4].u.operand;
+    int argCount = instruction[i + 5].u.operand;
+
     if (type == OpConstruct) {
         emitPutArgConstant(reinterpret_cast<unsigned>(instruction + i), 16);
-        emitPutArgConstant(instruction[i + 5].u.operand, 12);
-        emitPutArgConstant(instruction[i + 4].u.operand, 8);
+        emitPutArgConstant(argCount, 12);
+        emitPutArgConstant(firstArg, 8);
         emitGetPutArg(instruction[i + 3].u.operand, 4, X86::ecx);
     } else {
         emitPutArgConstant(reinterpret_cast<unsigned>(instruction + i), 16);
-        emitPutArgConstant(instruction[i + 5].u.operand, 12);
-        emitPutArgConstant(instruction[i + 4].u.operand, 8);
+        emitPutArgConstant(argCount, 12);
+        emitPutArgConstant(firstArg, 8);
         // FIXME: should this be loaded dynamically off m_exec?
         int thisVal = instruction[i + 3].u.operand;
@@ -452 +456 @@
         emitPutArg(X86::ecx, 0);
     }
+
+    // initializeCallFrame!
+    m_jit.movl_i32m(reinterpret_cast<unsigned>(m_codeBlock), (firstArg - RegisterFile::CallFrameHeaderSize + RegisterFile::CallerCodeBlock) * sizeof(Register), X86::edi);
+    m_jit.movl_i32m(reinterpret_cast<unsigned>(instruction + i), (firstArg - RegisterFile::CallFrameHeaderSize + RegisterFile::ReturnVPC) * sizeof(Register), X86::edi);
+    emitGetCTIParam(CTI_ARGS_scopeChain, X86::edx);
+    m_jit.movl_rm(X86::edx, (firstArg - RegisterFile::CallFrameHeaderSize + RegisterFile::CallerScopeChain) * sizeof(Register), X86::edi);
+    m_jit.movl_rm(X86::edi, (firstArg - RegisterFile::CallFrameHeaderSize + RegisterFile::CallerRegisters) * sizeof(Register), X86::edi);
+    m_jit.movl_i32m(dst, (firstArg - RegisterFile::CallFrameHeaderSize + RegisterFile::ReturnValueRegister) * sizeof(Register), X86::edi);
+    m_jit.movl_i32m(firstArg, (firstArg - RegisterFile::CallFrameHeaderSize + RegisterFile::ArgumentStartRegister) * sizeof(Register), X86::edi);
+    m_jit.movl_i32m(argCount, (firstArg - RegisterFile::CallFrameHeaderSize + RegisterFile::ArgumentCount) * sizeof(Register), X86::edi);
+    m_jit.movl_rm(X86::ecx, (firstArg - RegisterFile::CallFrameHeaderSize + RegisterFile::Callee) * sizeof(Register), X86::edi);
+    m_jit.movl_i32m(0, (firstArg - RegisterFile::CallFrameHeaderSize + RegisterFile::OptionalCalleeActivation) * sizeof(Register), X86::edi);
+    // CTIReturnEIP (set in callee)
 
     // Fast check for JS function.
@@ -491 +508 @@
         m_jit.link(wasEval, end);
 
-    emitPutResult(instruction[i + 1].u.operand);
+    emitPutResult(dst);
 }