Changeset 37386 in webkit for trunk/JavaScriptCore/VM/CTI.h

Timestamp:

Oct 7, 2008, 1:27:50 PM (17 years ago)

Author:

[email protected]

Message:

2008-10-07 Gavin Barraclough <​[email protected]>

Reviewed by Oliver Hunt.

Move callframe initialization into JIT code, again.

As a part of the restructuring the second result from functions is now
returned in edx, allowing the new value of 'r' to be returned via a
register, and stored to the stack from JIT code, too.

4.5% progression on v8-tests. (3% in their harness)

• VM/CTI.cpp: (JSC::): (JSC::CTI::emitCall): (JSC::CTI::compileOpCall): (JSC::CTI::privateCompileMainPass): (JSC::CTI::privateCompileSlowCases): (JSC::CTI::privateCompile):
• VM/CTI.h: (JSC::CallRecord::CallRecord):
• VM/Machine.cpp: (JSC::Machine::cti_op_call_JSFunction): (JSC::Machine::cti_op_construct_JSConstruct): (JSC::Machine::cti_op_resolve_func): (JSC::Machine::cti_op_post_inc): (JSC::Machine::cti_op_resolve_with_base): (JSC::Machine::cti_op_post_dec):
• VM/Machine.h:
• kjs/JSFunction.h:
• kjs/ScopeChain.h:

File:

• trunk/JavaScriptCore/VM/CTI.h (modified) (7 diffs)

trunk/JavaScriptCore/VM/CTI.h

@@ -46 +46 @@
 #endif
 
-#define CTI_ARGS_2ndResult 0x08
-
 #define CTI_ARGS_code 0x0C
 #define CTI_ARGS_registerFile 0x0D
@@ -63 +61 @@
 
 #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]))
@@ -109 +106 @@
     struct OperandTypes;
 
+    struct VoidPtrPair { void* first; void* second; };
+
     typedef JSValue* (*CTIHelper_j)(CTI_ARGS);
     typedef JSPropertyNameIterator* (*CTIHelper_p)(CTI_ARGS);
@@ -114 +113 @@
     typedef void* (*CTIHelper_s)(CTI_ARGS);
     typedef int (*CTIHelper_b)(CTI_ARGS);
+    typedef VoidPtrPair (*CTIHelper_2)(CTI_ARGS);
 
     struct CallRecord {
@@ -153 +153 @@
         
         CallRecord(X86Assembler::JmpSrc f, CTIHelper_b t, unsigned i)
+            : from(f)
+            , to((void*)t)
+            , opcodeIndex(i)
+        {
+        }
+
+        CallRecord(X86Assembler::JmpSrc f, CTIHelper_2 t, unsigned i)
             : from(f)
             , to((void*)t)
@@ -351 +358 @@
         enum CompileOpCallType { OpCallNormal, OpCallEval, OpConstruct };
         void compileOpCall(Instruction* instruction, unsigned i, CompileOpCallType type = OpCallNormal);
+        void compileOpCallInitializeCallFrame(unsigned callee, unsigned argCount);
         enum CompileOpStrictEqType { OpStrictEq, OpNStrictEq };
         void compileOpStrictEq(Instruction* instruction, unsigned i, CompileOpStrictEqType type);
@@ -393 +401 @@
         X86Assembler::JmpSrc emitCall(unsigned opcodeIndex, CTIHelper_j);
         X86Assembler::JmpSrc emitCall(unsigned opcodeIndex, CTIHelper_p);
-        X86Assembler::JmpSrc emitCall(unsigned opcodeIndex, CTIHelper_b);
         X86Assembler::JmpSrc emitCall(unsigned opcodeIndex, CTIHelper_v);
         X86Assembler::JmpSrc emitCall(unsigned opcodeIndex, CTIHelper_s);
-        
+        X86Assembler::JmpSrc emitCall(unsigned opcodeIndex, CTIHelper_b);
+        X86Assembler::JmpSrc emitCall(unsigned opcodeIndex, CTIHelper_2);
+
         void emitGetVariableObjectRegister(X86Assembler::RegisterID variableObject, int index, X86Assembler::RegisterID dst);
         void emitPutVariableObjectRegister(X86Assembler::RegisterID src, X86Assembler::RegisterID variableObject, int index);