Changeset 41089 in webkit for trunk/JavaScriptCore/jit/JITPropertyAccess.cpp

Timestamp:

Feb 19, 2009, 2:51:40 PM (16 years ago)

Author:

[email protected]

Message:

2009-02-19 Gavin Barraclough <​[email protected]>

Reviewed by Oliver Hunt.

Fix for x86-64. Where the JavaScriptCore text segment lies outside
a 2gb range of the heap containing JIT generated code, callbacks
from JIT code to the stub functions in Interpreter will be incorrectly
linked.

No performance impact on Sunspider, 1% regression on v8-tests,
due to a 3% regression on richards.

• assembler/AbstractMacroAssembler.h: (JSC::AbstractMacroAssembler::Call::Call): (JSC::AbstractMacroAssembler::Jump::link): (JSC::AbstractMacroAssembler::Jump::linkTo): (JSC::AbstractMacroAssembler::CodeLocationJump::relink): (JSC::AbstractMacroAssembler::CodeLocationCall::relink): (JSC::AbstractMacroAssembler::ProcessorReturnAddress::relinkCallerToFunction): (JSC::AbstractMacroAssembler::PatchBuffer::link): (JSC::AbstractMacroAssembler::PatchBuffer::linkTailRecursive): (JSC::AbstractMacroAssembler::differenceBetween):
• assembler/MacroAssembler.h: (JSC::MacroAssembler::tailRecursiveCall): (JSC::MacroAssembler::makeTailRecursiveCall):
• assembler/MacroAssemblerX86.h: (JSC::MacroAssemblerX86::call):
• assembler/MacroAssemblerX86Common.h:
• assembler/MacroAssemblerX86_64.h: (JSC::MacroAssemblerX86_64::call): (JSC::MacroAssemblerX86_64::moveWithPatch): (JSC::MacroAssemblerX86_64::branchPtrWithPatch): (JSC::MacroAssemblerX86_64::storePtrWithPatch):
• assembler/X86Assembler.h: (JSC::X86Assembler::jmp_r): (JSC::X86Assembler::linkJump): (JSC::X86Assembler::patchJump): (JSC::X86Assembler::patchCall): (JSC::X86Assembler::linkCall): (JSC::X86Assembler::patchAddress):
• interpreter/Interpreter.cpp: (JSC::Interpreter::tryCTICachePutByID):
• jit/JIT.cpp: (JSC::JIT::privateCompile): (JSC::JIT::privateCompileCTIMachineTrampolines):
• jit/JIT.h:
• jit/JITArithmetic.cpp: (JSC::JIT::putDoubleResultToJSNumberCellOrJSImmediate): (JSC::JIT::compileBinaryArithOp):
• jit/JITPropertyAccess.cpp: (JSC::JIT::privateCompilePutByIdTransition): (JSC::JIT::privateCompileGetByIdSelf): (JSC::JIT::privateCompilePutByIdReplace):

File:

• trunk/JavaScriptCore/jit/JITPropertyAccess.cpp (modified) (4 diffs)

trunk/JavaScriptCore/jit/JITPropertyAccess.cpp

@@ -227 +227 @@
 
     // emit a call only if storage realloc is needed
-    if (transitionWillNeedStorageRealloc(oldStructure, newStructure)) {
+    bool willNeedStorageRealloc = transitionWillNeedStorageRealloc(oldStructure, newStructure);
+    if (willNeedStorageRealloc) {
         pop(X86::ebx);
 #if PLATFORM(X86_64)
@@ -257 +258 @@
     ret();
     
-    Jump failureJump;
-    bool plantedFailureJump = false;
-    if (!failureCases.empty()) {
-        failureCases.link(this);
-        restoreArgumentReferenceForTrampoline();
-        failureJump = jump();
-        plantedFailureJump = true;
-    }
-
-    void* code = m_assembler.executableCopy(m_codeBlock->executablePool());
-    PatchBuffer patchBuffer(code);
-
-    if (plantedFailureJump)
-        patchBuffer.linkTailRecursive(failureJump, Interpreter::cti_op_put_by_id_fail);
-
-    if (transitionWillNeedStorageRealloc(oldStructure, newStructure))
+    ASSERT(!failureCases.empty());
+    failureCases.link(this);
+    restoreArgumentReferenceForTrampoline();
+    Call failureCall = tailRecursiveCall();
+
+    void* code = m_assembler.executableCopy(m_codeBlock->executablePool());
+    PatchBuffer patchBuffer(code);
+
+    patchBuffer.link(failureCall, Interpreter::cti_op_put_by_id_fail);
+
+    if (willNeedStorageRealloc)
         patchBuffer.link(callTarget, resizePropertyStorage);
     
@@ -352 +348 @@
     ret();
 
-    void* code = m_assembler.executableCopy(m_codeBlock->executablePool());
-    PatchBuffer patchBuffer(code);
-
-    patchBuffer.linkTailRecursive(failureCases1, Interpreter::cti_op_get_by_id_self_fail);
-    patchBuffer.linkTailRecursive(failureCases2, Interpreter::cti_op_get_by_id_self_fail);
+    Call failureCases1Call = makeTailRecursiveCall(failureCases1);
+    Call failureCases2Call = makeTailRecursiveCall(failureCases2);
+
+    void* code = m_assembler.executableCopy(m_codeBlock->executablePool());
+    PatchBuffer patchBuffer(code);
+
+    patchBuffer.link(failureCases1Call, Interpreter::cti_op_get_by_id_self_fail);
+    patchBuffer.link(failureCases2Call, Interpreter::cti_op_get_by_id_self_fail);
 
     stubInfo->stubRoutine = patchBuffer.entry();
@@ -684 +683 @@
     ret();
 
+    Call failureCases1Call = makeTailRecursiveCall(failureCases1);
+    Call failureCases2Call = makeTailRecursiveCall(failureCases2);
+
     void* code = m_assembler.executableCopy(m_codeBlock->executablePool());
     PatchBuffer patchBuffer(code);
     
-    patchBuffer.linkTailRecursive(failureCases1, Interpreter::cti_op_put_by_id_fail);
-    patchBuffer.linkTailRecursive(failureCases2, Interpreter::cti_op_put_by_id_fail);
+    patchBuffer.link(failureCases1Call, Interpreter::cti_op_put_by_id_fail);
+    patchBuffer.link(failureCases2Call, Interpreter::cti_op_put_by_id_fail);
 
     stubInfo->stubRoutine = patchBuffer.entry();