Changeset 90687 in webkit

Timestamp:

Jul 9, 2011 1:06:53 PM (13 years ago)

Author:

Patrick Gansterer

Message:

Fix MIPS build due to readInt32 and readPointer
​https://bugs.webkit.org/show_bug.cgi?id=63962

Patch by Chao-ying Fu <​fu@mips.com> on 2011-07-09

• assembler/MIPSAssembler.h:

(JSC::MIPSAssembler::readInt32):
(JSC::MIPSAssembler::readPointer):

• assembler/MacroAssemblerMIPS.h:

(JSC::MacroAssemblerMIPS::rshift32):

Location:

trunk/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• assembler/MIPSAssembler.h (modified) (2 diffs)
• assembler/MacroAssemblerMIPS.h (modified) (1 diff)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2011-07-09  Chao-ying Fu  <fu@mips.com>
+
+        Fix MIPS build due to readInt32 and readPointer
+        https://bugs.webkit.org/show_bug.cgi?id=63962
+
+        * assembler/MIPSAssembler.h:
+        (JSC::MIPSAssembler::readInt32):
+        (JSC::MIPSAssembler::readPointer):
+        * assembler/MacroAssemblerMIPS.h:
+        (JSC::MacroAssemblerMIPS::rshift32):
+
 2011-07-08  Gavin Barraclough  <barraclough@apple.com>
 

trunk/Source/JavaScriptCore/assembler/MIPSAssembler.h

@@ -754 +754 @@
         insn++;
         ASSERT((*insn & 0xfc000000) == 0x34000000); // ori
-        result |= *insn & 0x0000ffff
+        result |= *insn & 0x0000ffff;
+        return result;
     }
     
@@ -769 +770 @@
     static void* readPointer(void* from)
     {
-        return static_cast<void*>(readInt32(from));
+        return reinterpret_cast<void*>(readInt32(from));
     }
 

trunk/Source/JavaScriptCore/assembler/MacroAssemblerMIPS.h

@@ -329 +329 @@
     {
         m_assembler.sra(dest, dest, imm.m_value);
+    }
+
+    void rshift32(RegisterID src, TrustedImm32 imm, RegisterID dest)
+    {
+        m_assembler.sra(dest, src, imm.m_value);
     }