Changeset 47834 in webkit for trunk/JavaScriptCore

Timestamp:

Aug 27, 2009, 1:45:14 PM (16 years ago)

Author:

[email protected]

Message:

x86-64 GTK broken due to code offsets changing, pointers sometimes packed into immediates.
​https://bugs.webkit.org/show_bug.cgi?id=28317

Reviewed by Oliver Hunt.

Missed one, fix part II.

• assembler/MacroAssemblerX86Common.h:

(JSC::MacroAssemblerX86Common::move):

• assembler/X86Assembler.h:

(JSC::CAN_SIGN_EXTEND_8_32):

Location:

trunk/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• assembler/MacroAssemblerX86Common.h (modified) (1 diff)
• assembler/X86Assembler.h (modified) (1 diff)

trunk/JavaScriptCore/ChangeLog

@@ +1 @@
+2009-08-27  Gavin Barraclough  <[email protected]>
+
+        Reviewed by Oliver Hunt.
+
+        x86-64 GTK broken due to code offsets changing, pointers sometimes packed into immediates.
+        https://bugs.webkit.org/show_bug.cgi?id=28317
+
+        Missed one, fix part II.
+
+        * assembler/MacroAssemblerX86Common.h:
+        (JSC::MacroAssemblerX86Common::move):
+        * assembler/X86Assembler.h:
+        (JSC::CAN_SIGN_EXTEND_8_32):
+
 2009-08-27  Oliver Hunt  <[email protected]>
 

trunk/JavaScriptCore/assembler/MacroAssemblerX86Common.h

@@ -500 +500 @@
     void move(ImmPtr imm, RegisterID dest)
     {
-        if (CAN_SIGN_EXTEND_U32_64(imm.asIntptr()))
-            m_assembler.movl_i32r(static_cast<int32_t>(imm.asIntptr()), dest);
-        else
-            m_assembler.movq_i64r(imm.asIntptr(), dest);
+        m_assembler.movq_i64r(imm.asIntptr(), dest);
     }
 

trunk/JavaScriptCore/assembler/X86Assembler.h

@@ -39 +39 @@
 
 inline bool CAN_SIGN_EXTEND_8_32(int32_t value) { return value == (int32_t)(signed char)value; }
-#if PLATFORM(X86_64)
-inline bool CAN_SIGN_EXTEND_32_64(intptr_t value) { return value == (intptr_t)(int32_t)value; }
-inline bool CAN_SIGN_EXTEND_U32_64(intptr_t value) { return value == (intptr_t)(uint32_t)value; }
-#endif
 
 namespace X86Registers {