Changeset 95652 in webkit for trunk/Source/JavaScriptCore/assembler/MacroAssemblerSH4.h

Timestamp:

Sep 21, 2011, 11:33:43 AM (14 years ago)

Author:

[email protected]

Message:

MacroAssembler fixes.
​https://bugs.webkit.org/show_bug.cgi?id=68494

Reviewed by Sam Weinig.

Add X86-64's 3 operand or32 to other MacroAssembler, fix load32's [const] void* mismatch

• assembler/MacroAssembler.h:

(JSC::MacroAssembler::orPtr):
(JSC::MacroAssembler::loadPtr):

• assembler/MacroAssemblerARM.h:

(JSC::MacroAssemblerARM::or32):

• assembler/MacroAssemblerARMv7.h:

(JSC::MacroAssemblerARMv7::or32):

• assembler/MacroAssemblerMIPS.h:

(JSC::MacroAssemblerMIPS::or32):

• assembler/MacroAssemblerSH4.h:

(JSC::MacroAssemblerSH4::or32):
(JSC::MacroAssemblerSH4::load32):

• assembler/MacroAssemblerX86.h:

(JSC::MacroAssemblerX86::load32):

• assembler/MacroAssemblerX86_64.h:

(JSC::MacroAssemblerX86_64::load32):

File:

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

trunk/Source/JavaScriptCore/assembler/MacroAssemblerSH4.h

@@ -222 +222 @@
     }
 
+    void or32(RegisterID op1, RegisterID op2, RegisterID dest)
+    {
+        if (op1 == op2)
+            move(op1, dest);
+        else if (op1 == dest)
+            or32(op2, dest);
+        else {
+            move(op2, dest);
+            or32(op1, dest);
+        }
+    }
+
     void rshift32(RegisterID shiftamount, RegisterID dest)
     {
@@ -530 +542 @@
     }
 
-    void load32(void* address, RegisterID dest)
-    {
-        m_assembler.loadConstant(reinterpret_cast<uint32_t>(address), dest);
+    void load32(const void* address, RegisterID dest)
+    {
+        m_assembler.loadConstant(reinterpret_cast<uint32_t>(const_cast<void*>(address)), dest);
         m_assembler.movlMemReg(dest, dest);
     }