Changeset 165203 in webkit for trunk/Source/JavaScriptCore/jit/AssemblyHelpers.h

Timestamp:

Mar 6, 2014, 12:00:52 PM (11 years ago)

Author:

[email protected]

Message:

Fix write barriers in Repatch.cpp for !ENABLE(DFG_JIT) platforms after r165128
​https://bugs.webkit.org/show_bug.cgi?id=129760

Reviewed by Geoffrey Garen.

r165128 disabled the write barrier fast path for inline caches on !ENABLE(DFG_JIT) platforms.
The fix is to refactor the write barrier code into AssemblyHelpers and use that everywhere.

• dfg/DFGSpeculativeJIT.cpp:

(JSC::DFG::SpeculativeJIT::writeBarrier):

• dfg/DFGSpeculativeJIT.h:
• dfg/DFGSpeculativeJIT32_64.cpp:

(JSC::DFG::SpeculativeJIT::writeBarrier):

• dfg/DFGSpeculativeJIT64.cpp:

(JSC::DFG::SpeculativeJIT::writeBarrier):

• jit/AssemblyHelpers.h:

(JSC::AssemblyHelpers::checkMarkByte):

• jit/JIT.h:
• jit/JITPropertyAccess.cpp:
• jit/Repatch.cpp:

(JSC::writeBarrier):

File:

• trunk/Source/JavaScriptCore/jit/AssemblyHelpers.h (modified) (2 diffs)

trunk/Source/JavaScriptCore/jit/AssemblyHelpers.h

@@ -388 +388 @@
 #endif
 
-    Jump checkMarkByte(GPRReg owner)
-    {
-        return branchTest8(NonZero, Address(owner, JSCell::gcDataOffset()));
-    }
-
     // These methods convert between doubles, and doubles boxed and JSValues.
 #if USE(JSVALUE64)
@@ -621 +616 @@
     }
 
-    void writeBarrier(GPRReg owner, GPRReg scratch1, GPRReg scratch2, WriteBarrierUseKind useKind)
-    {
-        UNUSED_PARAM(owner);
-        UNUSED_PARAM(scratch1);
-        UNUSED_PARAM(scratch2);
-        UNUSED_PARAM(useKind);
-        ASSERT(owner != scratch1);
-        ASSERT(owner != scratch2);
-        ASSERT(scratch1 != scratch2);
-        
-#if ENABLE(WRITE_BARRIER_PROFILING)
-        emitCount(WriteBarrierCounters::jitCounterFor(useKind));
-#endif
+    Jump checkMarkByte(GPRReg cell)
+    {
+        return branchTest8(MacroAssembler::NonZero, MacroAssembler::Address(cell, JSCell::gcDataOffset()));
+    }
+
+    Jump checkMarkByte(JSCell* cell)
+    {
+        uint8_t* address = reinterpret_cast<uint8_t*>(cell) + JSCell::gcDataOffset();
+        return branchTest8(MacroAssembler::NonZero, MacroAssembler::AbsoluteAddress(address));
     }