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

Timestamp:

Dec 12, 2008, 5:39:38 PM (16 years ago)

Author:

[email protected]

Message:

2008-12-12 Gavin Barraclough <​[email protected]>

Reviewed by Geoff Garen.

Move slow-cases of JIT code generation over to the MacroAssembler interface.

• assembler/MacroAssembler.h: (JSC::MacroAssembler::Label::Label): (JSC::MacroAssembler::jae32): (JSC::MacroAssembler::jg32): (JSC::MacroAssembler::jzPtr):
• jit/JIT.cpp: (JSC::JIT::privateCompileSlowCases): (JSC::JIT::privateCompile): (JSC::JIT::emitGetVariableObjectRegister): (JSC::JIT::emitPutVariableObjectRegister):
• jit/JIT.h: (JSC::SlowCaseEntry::SlowCaseEntry): (JSC::JIT::getSlowCase): (JSC::JIT::linkSlowCase):
• jit/JITArithmetic.cpp: (JSC::JIT::compileBinaryArithOpSlowCase):
• jit/JITCall.cpp: (JSC::JIT::compileOpCallInitializeCallFrame): (JSC::JIT::compileOpCall): (JSC::JIT::compileOpCallSlowCase):
• jit/JITInlineMethods.h: (JSC::JIT::emitJumpSlowCaseIfNotJSCell): (JSC::JIT::linkSlowCaseIfNotJSCell):
• jit/JITPropertyAccess.cpp: (JSC::JIT::compileGetByIdHotPath): (JSC::JIT::compilePutByIdHotPath): (JSC::JIT::compileGetByIdSlowCase): (JSC::JIT::compilePutByIdSlowCase):

File:

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

trunk/JavaScriptCore/jit/JITPropertyAccess.cpp

@@ -47 +47 @@
 #if !ENABLE(JIT_OPTIMIZE_PROPERTY_ACCESS)
 
-void JIT::compileGetByIdHotPath(int resultVReg, int baseVReg, Identifier* ident, unsigned i, unsigned propertyAccessInstructionIndex)
+void JIT::compileGetByIdHotPath(int resultVReg, int baseVReg, Identifier* ident, unsigned i, unsigned)
 {
     // As for put_by_id, get_by_id requires the offset of the Structure and the offset of the access to be repatched.
@@ -56 +56 @@
     emitGetVirtualRegister(baseVReg, X86::eax, i);
 
-#ifdef NDEBUG
-    UNUSED_PARAM(propertyAccessInstructionIndex);
-#endif
-
-#ifndef NDEBUG
-    JmpDst coldPathBegin = __ label();
-#endif        
     emitPutCTIArg(X86::eax, 0);
     emitPutCTIArgConstant(reinterpret_cast<unsigned>(ident), 4);
-    JmpSrc call = emitCTICall(i, Interpreter::cti_op_get_by_id_generic);
-    ASSERT(X86Assembler::getDifferenceBetweenLabels(coldPathBegin, call) == repatchOffsetGetByIdSlowCaseCall);
+    emitCTICall(i, Interpreter::cti_op_get_by_id_generic);
     emitPutVirtualRegister(resultVReg);
-
-    // Track the location of the call; this will be used to recover repatch information.
-    m_propertyAccessCompilationInfo[propertyAccessInstructionIndex].callReturnLocation = call;
 }
 
@@ -79 +68 @@
 }
 
-void JIT::compilePutByIdHotPath(int baseVReg, Identifier* ident, int valueVReg, unsigned i, unsigned propertyAccessInstructionIndex)
+void JIT::compilePutByIdHotPath(int baseVReg, Identifier* ident, int valueVReg, unsigned i, unsigned)
 {
     // In order to be able to repatch both the Structure, and the object offset, we store one pointer,
@@ -90 +79 @@
     emitPutCTIArg(X86::eax, 0);
     emitPutCTIArg(X86::edx, 8);
-    JmpSrc call = emitCTICall(i, Interpreter::cti_op_put_by_id_generic);
-
-    // Track the location of the call; this will be used to recover repatch information.
-    m_propertyAccessCompilationInfo[propertyAccessInstructionIndex].callReturnLocation = call;
+    emitCTICall(i, Interpreter::cti_op_put_by_id_generic);
 }
 
@@ -137 +123 @@
     // the distance from the call to the head of the slow case.
 
-    if (linkSlowCaseIfNotJSCell(iter, baseVReg))
-        ++iter;
-    __ link(iter->from, __ label());
+    linkSlowCaseIfNotJSCell(iter, baseVReg);
+    linkSlowCase(iter);
 
 #ifndef NDEBUG
@@ -181 +166 @@
 void JIT::compilePutByIdSlowCase(int baseVReg, Identifier* ident, int, unsigned i, Vector<SlowCaseEntry>::iterator& iter, unsigned propertyAccessInstructionIndex)
 {
-    if (linkSlowCaseIfNotJSCell(iter, baseVReg))
-        ++iter;
-    __ link(iter->from, __ label());
+    linkSlowCaseIfNotJSCell(iter, baseVReg);
+    linkSlowCase(iter);
 
     emitPutCTIArgConstant(reinterpret_cast<unsigned>(ident), 4);