Changeset 59798 in webkit for trunk/JavaScriptCore/jit/JSInterfaceJIT.h

Timestamp:

May 19, 2010, 5:30:35 PM (15 years ago)

Author:

[email protected]

Message:

2010-05-19 Oliver Hunt <​[email protected]>

Reviewed by Geoffrey Garen.

emitJumpIfNotJSCell should special case constant immediate values
​https://bugs.webkit.org/show_bug.cgi?id=39392
<rdar://problem/8001324>

Make emitJumpSlowCaseIfNotJSCell special case constant immediate
values, in addition to the immediate JSCell optimisation.

Also add assertions to make sure no one else produces code that
attempts to load constants from the register file.

• jit/JITInlineMethods.h: (JSC::JIT::emitJumpSlowCaseIfNotJSCell):
• jit/JSInterfaceJIT.h: (JSC::JSInterfaceJIT::emitJumpIfNotJSCell): (JSC::JSInterfaceJIT::emitLoadInt32): (JSC::JSInterfaceJIT::tagFor): (JSC::JSInterfaceJIT::payloadFor): (JSC::JSInterfaceJIT::emitLoadDouble): (JSC::JSInterfaceJIT::addressFor):
• jit/ThunkGenerators.cpp:

2010-05-19 Oliver Hunt <​[email protected]>

Reviewed by Geoffrey Garen.

emitJumpIfNotJSCell should special case constant immediate values
​https://bugs.webkit.org/show_bug.cgi?id=39392

Add tests for immediate constants being used where cells are expected.

• fast/js/immediate-constant-instead-of-cell-expected.txt: Added.
• fast/js/immediate-constant-instead-of-cell.html: Added.
• fast/js/script-tests/immediate-constant-instead-of-cell.js: Added. ():

File:

• trunk/JavaScriptCore/jit/JSInterfaceJIT.h (modified) (3 diffs)

trunk/JavaScriptCore/jit/JSInterfaceJIT.h

@@ -192 +192 @@
     inline JSInterfaceJIT::Jump JSInterfaceJIT::emitJumpIfNotJSCell(unsigned virtualRegisterIndex)
     {
+        ASSERT(static_cast<int>(virtualRegisterIndex) < FirstConstantRegisterIndex);
         return branch32(NotEqual, tagFor(virtualRegisterIndex), Imm32(JSValue::CellTag));
     }
@@ -197 +198 @@
     inline JSInterfaceJIT::Jump JSInterfaceJIT::emitLoadInt32(unsigned virtualRegisterIndex, RegisterID dst)
     {
+        ASSERT(static_cast<int>(virtualRegisterIndex) < FirstConstantRegisterIndex);
         loadPtr(payloadFor(virtualRegisterIndex), dst);
         return branch32(NotEqual, tagFor(virtualRegisterIndex), Imm32(JSValue::Int32Tag));
     }
     
-    inline JSInterfaceJIT::Address JSInterfaceJIT::tagFor(unsigned index, RegisterID base)
-    {
-        return Address(base, (index * sizeof(Register)) + OBJECT_OFFSETOF(JSValue, u.asBits.tag));
-    }
-    
-    inline JSInterfaceJIT::Address JSInterfaceJIT::payloadFor(unsigned index, RegisterID base)
-    {
-        return Address(base, (index * sizeof(Register)) + OBJECT_OFFSETOF(JSValue, u.asBits.payload));
+    inline JSInterfaceJIT::Address JSInterfaceJIT::tagFor(unsigned virtualRegisterIndex, RegisterID base)
+    {
+        ASSERT(static_cast<int>(virtualRegisterIndex) < FirstConstantRegisterIndex);
+        return Address(base, (virtualRegisterIndex * sizeof(Register)) + OBJECT_OFFSETOF(JSValue, u.asBits.tag));
+    }
+    
+    inline JSInterfaceJIT::Address JSInterfaceJIT::payloadFor(unsigned virtualRegisterIndex, RegisterID base)
+    {
+        ASSERT(static_cast<int>(virtualRegisterIndex) < FirstConstantRegisterIndex);
+        return Address(base, (virtualRegisterIndex * sizeof(Register)) + OBJECT_OFFSETOF(JSValue, u.asBits.payload));
     }
 
     inline JSInterfaceJIT::Jump JSInterfaceJIT::emitLoadDouble(unsigned virtualRegisterIndex, FPRegisterID dst, RegisterID scratch)
     {
+        ASSERT(static_cast<int>(virtualRegisterIndex) < FirstConstantRegisterIndex);
         loadPtr(tagFor(virtualRegisterIndex), scratch);
         Jump isDouble = branch32(Below, scratch, Imm32(JSValue::LowestTag));
@@ -298 +303 @@
 
 #if !USE(JSVALUE32_64)
-    inline JSInterfaceJIT::Address JSInterfaceJIT::payloadFor(unsigned index, RegisterID base)
-    {
-        return addressFor(index, base);
-    }
-#endif
-
-    inline JSInterfaceJIT::Address JSInterfaceJIT::addressFor(unsigned index, RegisterID base)
-    {
-        return Address(base, (index * sizeof(Register)));
+    inline JSInterfaceJIT::Address JSInterfaceJIT::payloadFor(unsigned virtualRegisterIndex, RegisterID base)
+    {
+        ASSERT(static_cast<int>(virtualRegisterIndex) < FirstConstantRegisterIndex);
+        return addressFor(virtualRegisterIndex, base);
+    }
+#endif
+
+    inline JSInterfaceJIT::Address JSInterfaceJIT::addressFor(unsigned virtualRegisterIndex, RegisterID base)
+    {
+        ASSERT(static_cast<int>(virtualRegisterIndex) < FirstConstantRegisterIndex);
+        return Address(base, (virtualRegisterIndex * sizeof(Register)));
     }