Changeset 39287 in webkit for trunk/JavaScriptCore/assembler/MacroAssembler.h

Timestamp:

Dec 13, 2008, 11:19:40 PM (16 years ago)

Author:

[email protected]

Message:

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

Reviewed by Cameron Zwarich.

Re-enable WREC on 64-bit.
Implements one of the MacroAssembler::jnzPtr methods, previously only implemented for 32-bit x86.

​https://bugs.webkit.org/show_bug.cgi?id=22849

• assembler/MacroAssembler.h: (JSC::MacroAssembler::testImm64): (JSC::MacroAssembler::jnzPtr):
• assembler/X86Assembler.h: (JSC::X86Assembler::testq_i32r): (JSC::X86Assembler::testq_rr):
• wtf/Platform.h:

File:

• trunk/JavaScriptCore/assembler/MacroAssembler.h (modified) (2 diffs)

trunk/JavaScriptCore/assembler/MacroAssembler.h

@@ -849 +849 @@
     }
 
+#if PLATFORM(X86_64)
+    void testImm64(RegisterID reg, Imm32 mask)
+    {
+        // if we are only interested in the low seven bits, this can be tested with a testb
+        if (mask.m_value == -1)
+            m_assembler.testq_rr(reg, reg);
+        else if ((mask.m_value & ~0x7f) == 0)
+            m_assembler.testb_i8r(mask.m_value, reg);
+        else
+            m_assembler.testq_i32r(mask.m_value, reg);
+    }
+#endif
+
 public:
     Jump jae32(RegisterID left, Imm32 right)
@@ -1018 +1031 @@
     }
     
+    Jump jnzPtr(RegisterID reg, Imm32 mask = Imm32(-1))
+    {
+#if PLATFORM(X86_64)
+        testImm64(reg, mask);
+        return Jump(m_assembler.jne());
+#else
+        return jnz32(reg, mask);
+#endif
+    }
+
 #if !PLATFORM(X86_64)
-    Jump jnzPtr(RegisterID reg, Imm32 mask = Imm32(-1))
-    {
-        return jnz32(reg, mask);
-    }
-
     Jump jnzPtr(Address address, Imm32 mask = Imm32(-1))
     {