Changeset 90060 in webkit

Timestamp:

Jun 29, 2011 4:11:59 PM (13 years ago)

Author:

ggaren@apple.com

Message:

2011-06-29 Geoffrey Garen <​ggaren@apple.com>

Reviewed by Oliver Hunt.

Added a dummy write barrier emitting function in all the right places in the old JIT
​https://bugs.webkit.org/show_bug.cgi?id=63667

SunSpider reports no change.

• jit/JIT.h:
• jit/JITPropertyAccess.cpp: (JSC::JIT::emit_op_put_by_id): (JSC::JIT::emit_op_put_scoped_var): Do it.

(JSC::JIT::emit_op_put_global_var): Global object needs to be in a register
for the sake of the write barrier.

(JSC::JIT::emitWriteBarrier): Empty for now. Not for long!

• jit/JITPropertyAccess32_64.cpp: (JSC::JIT::emit_op_put_by_val): (JSC::JIT::emit_op_put_by_id): (JSC::JIT::emit_op_put_scoped_var): Do it.

(JSC::JIT::emit_op_put_global_var): Global object needs to be in a register
for the sake of the write barrier.

(JSC::JIT::emitWriteBarrier): Empty for now. Not for long!

Location:

trunk/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• jit/JIT.h (modified) (1 diff)
• jit/JITPropertyAccess.cpp (modified) (4 diffs)
• jit/JITPropertyAccess32_64.cpp (modified) (4 diffs)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2011-06-29  Geoffrey Garen  <ggaren@apple.com>
+
+        Reviewed by Oliver Hunt.
+
+        Added a dummy write barrier emitting function in all the right places in the old JIT
+        https://bugs.webkit.org/show_bug.cgi?id=63667
+        
+        SunSpider reports no change.
+
+        * jit/JIT.h:
+        * jit/JITPropertyAccess.cpp:
+        (JSC::JIT::emit_op_put_by_id):
+        (JSC::JIT::emit_op_put_scoped_var): Do it.
+
+        (JSC::JIT::emit_op_put_global_var): Global object needs to be in a register
+        for the sake of the write barrier.
+
+        (JSC::JIT::emitWriteBarrier): Empty for now. Not for long!
+
+        * jit/JITPropertyAccess32_64.cpp:
+        (JSC::JIT::emit_op_put_by_val):
+        (JSC::JIT::emit_op_put_by_id):
+        (JSC::JIT::emit_op_put_scoped_var): Do it.
+
+        (JSC::JIT::emit_op_put_global_var): Global object needs to be in a register
+        for the sake of the write barrier.
+
+        (JSC::JIT::emitWriteBarrier): Empty for now. Not for long!
+
 2011-06-29  Filip Pizlo  <fpizlo@apple.com>
 

trunk/Source/JavaScriptCore/jit/JIT.h

@@ -299 +299 @@
 
         void testPrototype(JSValue, JumpList& failureCases);
+
+        void emitWriteBarrier(RegisterID owner, RegisterID scratch);
 
 #if USE(JSVALUE32_64)

trunk/Source/JavaScriptCore/jit/JITPropertyAccess.cpp

@@ -433 +433 @@
     emitJumpSlowCaseIfNotJSCell(regT0, baseVReg);
 
+    emitWriteBarrier(regT0, regT2);
+
     BEGIN_UNINTERRUPTED_SEQUENCE(sequencePutById);
 
@@ -973 +975 @@
     int skip = currentInstruction[2].u.operand;
 
+    emitGetVirtualRegister(currentInstruction[3].u.operand, regT0);
+
     emitGetFromCallFrameHeaderPtr(RegisterFile::ScopeChain, regT1);
-    emitGetVirtualRegister(currentInstruction[3].u.operand, regT0);
     bool checkTopLevel = m_codeBlock->codeType() == FunctionCode && m_codeBlock->needsFullScopeChain();
     ASSERT(skip || !checkTopLevel);
@@ -986 +989 @@
     while (skip--)
         loadPtr(Address(regT1, OBJECT_OFFSETOF(ScopeChainNode, next)), regT1);
-
     loadPtr(Address(regT1, OBJECT_OFFSETOF(ScopeChainNode, object)), regT1);
+
+    emitWriteBarrier(regT1, regT2);
+
     loadPtr(Address(regT1, OBJECT_OFFSETOF(JSVariableObject, m_registers)), regT1);
     storePtr(regT0, Address(regT1, currentInstruction[1].u.operand * sizeof(Register)));
@@ -1002 +1007 @@
 void JIT::emit_op_put_global_var(Instruction* currentInstruction)
 {
-    emitGetVirtualRegister(currentInstruction[2].u.operand, regT1);
-    JSVariableObject* globalObject = m_codeBlock->globalObject();
-    loadPtr(&globalObject->m_registers, regT0);
-    storePtr(regT1, Address(regT0, currentInstruction[1].u.operand * sizeof(Register)));
+    JSGlobalObject* globalObject = m_codeBlock->globalObject();
+
+    emitGetVirtualRegister(currentInstruction[2].u.operand, regT0);
+    move(TrustedImmPtr(globalObject), regT1);
+    
+    emitWriteBarrier(regT1, regT2);
+
+    loadPtr(Address(regT1, OBJECT_OFFSETOF(JSVariableObject, m_registers)), regT1);
+    storePtr(regT0, Address(regT1, currentInstruction[1].u.operand * sizeof(Register)));
+}
+
+void JIT::emitWriteBarrier(RegisterID owner, RegisterID scratch)
+{
+    UNUSED_PARAM(owner);
+    UNUSED_PARAM(scratch);
 }
 

trunk/Source/JavaScriptCore/jit/JITPropertyAccess32_64.cpp

@@ -260 +260 @@
     addSlowCase(branch32(NotEqual, regT3, TrustedImm32(JSValue::Int32Tag)));
     emitJumpSlowCaseIfNotJSCell(base, regT1);
+    emitWriteBarrier(regT0, regT1);
     addSlowCase(branchPtr(NotEqual, Address(regT0), TrustedImmPtr(m_globalData->jsArrayVPtr)));
     addSlowCase(branch32(AboveOrEqual, regT2, Address(regT0, JSArray::vectorLengthOffset())));
@@ -394 +395 @@
     
     emitJumpSlowCaseIfNotJSCell(base, regT1);
+    
+    emitWriteBarrier(regT0, regT1);
     
     BEGIN_UNINTERRUPTED_SEQUENCE(sequencePutById);
@@ -1029 +1032 @@
     while (skip--)
         loadPtr(Address(regT2, OBJECT_OFFSETOF(ScopeChainNode, next)), regT2);
-
     loadPtr(Address(regT2, OBJECT_OFFSETOF(ScopeChainNode, object)), regT2);
+
+    emitWriteBarrier(regT2, regT3);
+
     loadPtr(Address(regT2, OBJECT_OFFSETOF(JSVariableObject, m_registers)), regT2);
-
     emitStore(index, regT1, regT0, regT2);
     map(m_bytecodeOffset + OPCODE_LENGTH(op_put_scoped_var), value, regT1, regT0);
@@ -1053 +1057 @@
 void JIT::emit_op_put_global_var(Instruction* currentInstruction)
 {
-    JSGlobalObject* globalObject = m_codeBlock->globalObject();
-    ASSERT(globalObject->isGlobalObject());
     int index = currentInstruction[1].u.operand;
     int value = currentInstruction[2].u.operand;
 
+    JSGlobalObject* globalObject = m_codeBlock->globalObject();
+
     emitLoad(value, regT1, regT0);
-
-    loadPtr(&globalObject->m_registers, regT2);
+    move(TrustedImmPtr(globalObject), regT2);
+
+    emitWriteBarrier(regT2, regT3);
+
+    loadPtr(Address(regT2, OBJECT_OFFSETOF(JSVariableObject, m_registers)), regT2);
     emitStore(index, regT1, regT0, regT2);
     map(m_bytecodeOffset + OPCODE_LENGTH(op_put_global_var), value, regT1, regT0);
 }
 
+void JIT::emitWriteBarrier(RegisterID owner, RegisterID scratch)
+{
+    UNUSED_PARAM(owner);
+    UNUSED_PARAM(scratch);
+}
+
 } // namespace JSC