Title: [90687] trunk/Source/_javascript_Core
- Revision
- 90687
- Author
- [email protected]
- Date
- 2011-07-09 13:06:53 -0700 (Sat, 09 Jul 2011)
Log Message
Fix MIPS build due to readInt32 and readPointer
https://bugs.webkit.org/show_bug.cgi?id=63962
Patch by Chao-ying Fu <[email protected]> on 2011-07-09
* assembler/MIPSAssembler.h:
(JSC::MIPSAssembler::readInt32):
(JSC::MIPSAssembler::readPointer):
* assembler/MacroAssemblerMIPS.h:
(JSC::MacroAssemblerMIPS::rshift32):
Modified Paths
Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (90686 => 90687)
--- trunk/Source/_javascript_Core/ChangeLog 2011-07-09 19:47:10 UTC (rev 90686)
+++ trunk/Source/_javascript_Core/ChangeLog 2011-07-09 20:06:53 UTC (rev 90687)
@@ -1,3 +1,14 @@
+2011-07-09 Chao-ying Fu <[email protected]>
+
+ 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 <[email protected]>
https://bugs.webkit.org/show_bug.cgi?id=64181
Modified: trunk/Source/_javascript_Core/assembler/MIPSAssembler.h (90686 => 90687)
--- trunk/Source/_javascript_Core/assembler/MIPSAssembler.h 2011-07-09 19:47:10 UTC (rev 90686)
+++ trunk/Source/_javascript_Core/assembler/MIPSAssembler.h 2011-07-09 20:06:53 UTC (rev 90687)
@@ -753,7 +753,8 @@
int32_t result = (*insn & 0x0000ffff) << 16;
insn++;
ASSERT((*insn & 0xfc000000) == 0x34000000); // ori
- result |= *insn & 0x0000ffff
+ result |= *insn & 0x0000ffff;
+ return result;
}
static void repatchCompact(void* where, int32_t value)
@@ -768,7 +769,7 @@
static void* readPointer(void* from)
{
- return static_cast<void*>(readInt32(from));
+ return reinterpret_cast<void*>(readInt32(from));
}
private:
Modified: trunk/Source/_javascript_Core/assembler/MacroAssemblerMIPS.h (90686 => 90687)
--- trunk/Source/_javascript_Core/assembler/MacroAssemblerMIPS.h 2011-07-09 19:47:10 UTC (rev 90686)
+++ trunk/Source/_javascript_Core/assembler/MacroAssemblerMIPS.h 2011-07-09 20:06:53 UTC (rev 90687)
@@ -330,6 +330,11 @@
m_assembler.sra(dest, dest, imm.m_value);
}
+ void rshift32(RegisterID src, TrustedImm32 imm, RegisterID dest)
+ {
+ m_assembler.sra(dest, src, imm.m_value);
+ }
+
void urshift32(RegisterID shiftAmount, RegisterID dest)
{
m_assembler.srlv(dest, dest, shiftAmount);
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
