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

Timestamp:

Nov 10, 2008, 9:09:46 PM (17 years ago)

Author:

[email protected]

Message:

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

Reviewed by Camron Zwarich.

Batch compile the set of static trampolines at the point Machine is constructed, using a single allocation.
Refactor out m_callFrame from CTI, since this is only needed to access the global data (instead store a
pointer to the global data directly, since this is available at the point the Machine is constructed).
Add a method to align the code buffer, to allow JIT generation for multiple trampolines in one block.

• VM/CTI.cpp: (JSC::CTI::getConstant): (JSC::CTI::emitGetArg): (JSC::CTI::emitGetPutArg): (JSC::CTI::getConstantImmediateNumericArg): (JSC::CTI::printOpcodeOperandTypes): (JSC::CTI::CTI): (JSC::CTI::compileBinaryArithOp): (JSC::CTI::privateCompileMainPass): (JSC::CTI::privateCompileGetByIdProto): (JSC::CTI::privateCompileGetByIdChain): (JSC::CTI::privateCompileCTIMachineTrampolines): (JSC::CTI::freeCTIMachineTrampolines):
• VM/CTI.h: (JSC::CTI::compile): (JSC::CTI::compileGetByIdSelf): (JSC::CTI::compileGetByIdProto): (JSC::CTI::compileGetByIdChain): (JSC::CTI::compilePutByIdReplace): (JSC::CTI::compilePutByIdTransition): (JSC::CTI::compileCTIMachineTrampolines): (JSC::CTI::compilePatchGetArrayLength):
• VM/Machine.cpp: (JSC::Machine::initialize): (JSC::Machine::~Machine): (JSC::Machine::execute): (JSC::Machine::tryCTICachePutByID): (JSC::Machine::tryCTICacheGetByID): (JSC::Machine::cti_op_call_JSFunction): (JSC::Machine::cti_vm_lazyLinkCall):
• VM/Machine.h:
• masm/X86Assembler.h: (JSC::JITCodeBuffer::isAligned): (JSC::X86Assembler::): (JSC::X86Assembler::align):
• runtime/JSGlobalData.cpp: (JSC::JSGlobalData::JSGlobalData):

File:

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

trunk/JavaScriptCore/VM/CTI.cpp

@@ -169 +169 @@
 #endif
 
-ALWAYS_INLINE JSValue* CTI::getConstant(CallFrame* callFrame, int src)
-{
-    return m_codeBlock->constantRegisters[src - m_codeBlock->numVars].jsValue(callFrame);
+ALWAYS_INLINE JSValue* CTI::getConstant(int src)
+{
+    return m_codeBlock->constantRegisters[src - m_codeBlock->numVars].getJSValue();
 }
 
@@ -184 +184 @@
     // TODO: we want to reuse values that are already in registers if we can - add a register allocator!
     if (m_codeBlock->isConstant(src)) {
-        JSValue* js = getConstant(m_callFrame, src);
+        JSValue* js = getConstant(src);
         m_jit.movl_i32r(asInteger(js), dst);
     } else
@@ -194 +194 @@
 {
     if (m_codeBlock->isConstant(src)) {
-        JSValue* js = getConstant(m_callFrame, src);
+        JSValue* js = getConstant(src);
         m_jit.movl_i32m(asInteger(js), offset + sizeof(void*), X86::esp);
     } else {
@@ -216 +216 @@
 {
     if (m_codeBlock->isConstant(src)) {
-        JSValue* js = getConstant(m_callFrame, src);
+        JSValue* js = getConstant(src);
         return JSImmediate::isNumber(js) ? js : noValue();
     }
@@ -275 +275 @@
     char which1 = '*';
     if (m_codeBlock->isConstant(src1)) {
-        JSValue* js = getConstant(m_callFrame, src1);
+        JSValue* js = getConstant(src1);
         which1 = 
             JSImmediate::isImmediate(js) ?
@@ -289 +289 @@
     char which2 = '*';
     if (m_codeBlock->isConstant(src2)) {
-        JSValue* js = getConstant(m_callFrame, src2);
+        JSValue* js = getConstant(src2);
         which2 = 
             JSImmediate::isImmediate(js) ?
@@ -547 +547 @@
 }
 
-CTI::CTI(Machine* machine, CallFrame* callFrame, CodeBlock* codeBlock)
-    : m_jit(machine->jitCodeBuffer())
-    , m_machine(machine)
-    , m_callFrame(callFrame)
+CTI::CTI(JSGlobalData* globalData, CodeBlock* codeBlock)
+    : m_jit(globalData->machine->jitCodeBuffer())
+    , m_machine(globalData->machine)
+    , m_globalData(globalData)
     , m_codeBlock(codeBlock)
     , m_labels(codeBlock ? codeBlock->instructions.size() : 0)
@@ -792 +792 @@
 void CTI::compileBinaryArithOp(OpcodeID opcodeID, unsigned dst, unsigned src1, unsigned src2, OperandTypes types, unsigned i)
 {
-    StructureID* numberStructureID = m_callFrame->globalData().numberStructureID.get();
+    StructureID* numberStructureID = m_globalData->numberStructureID.get();
     X86Assembler::JmpSrc wasJSNumberCell1;
     X86Assembler::JmpSrc wasJSNumberCell1b;
@@ -1006 +1006 @@
             unsigned src = instruction[i + 2].u.operand;
             if (m_codeBlock->isConstant(src))
-                m_jit.movl_i32r(asInteger(getConstant(m_callFrame, src)), X86::eax);
+                m_jit.movl_i32r(asInteger(getConstant(src)), X86::eax);
             else
                 emitGetArg(src, X86::eax);
@@ -1531 +1531 @@
                 if (!resultType.definitelyIsNumber()) {
                     emitJumpSlowCaseIfNotJSCell(X86::eax, i);
-                    StructureID* numberStructureID = m_callFrame->globalData().numberStructureID.get();
+                    StructureID* numberStructureID = m_globalData->numberStructureID.get();
                     m_jit.cmpl_i32m(reinterpret_cast<unsigned>(numberStructureID), OBJECT_OFFSET(JSCell, m_structureID), X86::eax);
                     m_slowCases.append(SlowCaseEntry(m_jit.emitUnlinkedJne(), i));
@@ -1541 +1541 @@
                 X86Assembler::JmpSrc wasCell;
                 if (!resultType.isReusableNumber())
-                    emitAllocateNumber(&m_callFrame->globalData(), i);
+                    emitAllocateNumber(m_globalData, i);
 
                 putDoubleResultToJSNumberCellOrJSImmediate(X86::xmm0, X86::eax, instruction[i + 1].u.operand, &wasCell,
@@ -3051 +3051 @@
 }
 
-void CTI::privateCompileGetByIdProto(StructureID* structureID, StructureID* prototypeStructureID, size_t cachedOffset, void* returnAddress)
+void CTI::privateCompileGetByIdProto(StructureID* structureID, StructureID* prototypeStructureID, size_t cachedOffset, void* returnAddress, CallFrame* callFrame)
 {
 #if USE(CTI_REPATCH_PIC)
@@ -3061 +3061 @@
     // The prototype object definitely exists (if this stub exists the CodeBlock is referencing a StructureID that is
     // referencing the prototype object - let's speculatively load it's table nice and early!)
-    JSObject* protoObject = asObject(structureID->prototypeForLookup(m_callFrame));
+    JSObject* protoObject = asObject(structureID->prototypeForLookup(callFrame));
     PropertyStorage* protoPropertyStorage = &protoObject->m_propertyStorage;
     m_jit.movl_mr(static_cast<void*>(protoPropertyStorage), X86::edx);
@@ -3104 +3104 @@
     // The prototype object definitely exists (if this stub exists the CodeBlock is referencing a StructureID that is
     // referencing the prototype object - let's speculatively load it's table nice and early!)
-    JSObject* protoObject = asObject(structureID->prototypeForLookup(m_callFrame));
+    JSObject* protoObject = asObject(structureID->prototypeForLookup(callFrame));
     PropertyStorage* protoPropertyStorage = &protoObject->m_propertyStorage;
     m_jit.movl_mr(static_cast<void*>(protoPropertyStorage), X86::edx);
@@ -3137 +3137 @@
 }
 
-void CTI::privateCompileGetByIdChain(StructureID* structureID, StructureIDChain* chain, size_t count, size_t cachedOffset, void* returnAddress)
+void CTI::privateCompileGetByIdChain(StructureID* structureID, StructureIDChain* chain, size_t count, size_t cachedOffset, void* returnAddress, CallFrame* callFrame)
 {
     ASSERT(count);
@@ -3153 +3153 @@
     JSObject* protoObject = 0;
     for (unsigned i = 0; i<count; ++i) {
-        protoObject = asObject(currStructureID->prototypeForLookup(m_callFrame));
+        protoObject = asObject(currStructureID->prototypeForLookup(callFrame));
         currStructureID = chainEntries[i].get();
 
@@ -3329 +3329 @@
 }
 
-void* CTI::privateCompileArrayLengthTrampoline()
-{
+void CTI::privateCompileCTIMachineTrampolines()
+{
+    // (1) The first function provides fast property access for array length
+    
     // Check eax is an array
     m_jit.testl_i32r(JSImmediate::TagMask, X86::eax);
-    X86Assembler::JmpSrc failureCases1 = m_jit.emitUnlinkedJne();
+    X86Assembler::JmpSrc array_failureCases1 = m_jit.emitUnlinkedJne();
     m_jit.cmpl_i32m(reinterpret_cast<unsigned>(m_machine->m_jsArrayVptr), X86::eax);
-    X86Assembler::JmpSrc failureCases2 = m_jit.emitUnlinkedJne();
+    X86Assembler::JmpSrc array_failureCases2 = m_jit.emitUnlinkedJne();
 
     // Checks out okay! - get the length from the storage
@@ -3342 +3344 @@
 
     m_jit.addl_rr(X86::eax, X86::eax);
-    X86Assembler::JmpSrc failureCases3 = m_jit.emitUnlinkedJo();
+    X86Assembler::JmpSrc array_failureCases3 = m_jit.emitUnlinkedJo();
     m_jit.addl_i8r(1, X86::eax);
     
     m_jit.ret();
 
-    void* code = m_jit.copy();
-    ASSERT(code);
-
-    X86Assembler::link(code, failureCases1, reinterpret_cast<void*>(Machine::cti_op_get_by_id_fail));
-    X86Assembler::link(code, failureCases2, reinterpret_cast<void*>(Machine::cti_op_get_by_id_fail));
-    X86Assembler::link(code, failureCases3, reinterpret_cast<void*>(Machine::cti_op_get_by_id_fail));
+    // (2) The second function provides fast property access for string length
     
-    return code;
-}
-
-void* CTI::privateCompileStringLengthTrampoline()
-{
+    X86Assembler::JmpDst stringLengthBegin = m_jit.align(16);
+
     // Check eax is a string
     m_jit.testl_i32r(JSImmediate::TagMask, X86::eax);
-    X86Assembler::JmpSrc failureCases1 = m_jit.emitUnlinkedJne();
+    X86Assembler::JmpSrc string_failureCases1 = m_jit.emitUnlinkedJne();
     m_jit.cmpl_i32m(reinterpret_cast<unsigned>(m_machine->m_jsStringVptr), X86::eax);
-    X86Assembler::JmpSrc failureCases2 = m_jit.emitUnlinkedJne();
+    X86Assembler::JmpSrc string_failureCases2 = m_jit.emitUnlinkedJne();
 
     // Checks out okay! - get the length from the Ustring.
@@ -3370 +3364 @@
 
     m_jit.addl_rr(X86::eax, X86::eax);
-    X86Assembler::JmpSrc failureCases3 = m_jit.emitUnlinkedJo();
+    X86Assembler::JmpSrc string_failureCases3 = m_jit.emitUnlinkedJo();
     m_jit.addl_i8r(1, X86::eax);
     
     m_jit.ret();
 
+    // All trampolines constructed! copy the code, link up calls, and set the pointers on the Machine object.
+
     void* code = m_jit.copy();
     ASSERT(code);
 
-    X86Assembler::link(code, failureCases1, reinterpret_cast<void*>(Machine::cti_op_get_by_id_fail));
-    X86Assembler::link(code, failureCases2, reinterpret_cast<void*>(Machine::cti_op_get_by_id_fail));
-    X86Assembler::link(code, failureCases3, reinterpret_cast<void*>(Machine::cti_op_get_by_id_fail));
-
-    return code;
+    X86Assembler::link(code, array_failureCases1, reinterpret_cast<void*>(Machine::cti_op_get_by_id_fail));
+    X86Assembler::link(code, array_failureCases2, reinterpret_cast<void*>(Machine::cti_op_get_by_id_fail));
+    X86Assembler::link(code, array_failureCases3, reinterpret_cast<void*>(Machine::cti_op_get_by_id_fail));
+    X86Assembler::link(code, string_failureCases1, reinterpret_cast<void*>(Machine::cti_op_get_by_id_fail));
+    X86Assembler::link(code, string_failureCases2, reinterpret_cast<void*>(Machine::cti_op_get_by_id_fail));
+    X86Assembler::link(code, string_failureCases3, reinterpret_cast<void*>(Machine::cti_op_get_by_id_fail));
+
+    m_machine->m_ctiArrayLengthTrampoline = code;
+    m_machine->m_ctiStringLengthTrampoline = X86Assembler::getRelocatedAddress(code, stringLengthBegin);
+}
+
+void CTI::freeCTIMachineTrampolines(Machine* machine)
+{
+    WTF::fastFreeExecutable(machine->m_ctiArrayLengthTrampoline);
 }