Modified: trunk/Source/_javascript_Core/ChangeLog (125703 => 125704)
--- trunk/Source/_javascript_Core/ChangeLog 2012-08-15 20:51:43 UTC (rev 125703)
+++ trunk/Source/_javascript_Core/ChangeLog 2012-08-15 21:09:00 UTC (rev 125704)
@@ -1,3 +1,16 @@
+2012-08-15 Gabor Ballabas <gab...@inf.u-szeged.hu>
+
+ Buildfix after r125541
+ https://bugs.webkit.org/show_bug.cgi?id=94097
+
+ Reviewed by Filip Pizlo.
+
+ r125541 has broken the traditional ARM port build of JSC.
+
+ * assembler/MacroAssemblerARM.h:
+ (JSC::MacroAssemblerARM::neg32):
+ (JSC::MacroAssemblerARM::xor32):
+
2012-08-14 Mark Hahnenberg <mhahnenb...@apple.com>
Change behavior of MasqueradesAsUndefined to better accommodate DFG changes
Modified: trunk/Source/_javascript_Core/assembler/MacroAssemblerARM.h (125703 => 125704)
--- trunk/Source/_javascript_Core/assembler/MacroAssemblerARM.h 2012-08-15 20:51:43 UTC (rev 125703)
+++ trunk/Source/_javascript_Core/assembler/MacroAssemblerARM.h 2012-08-15 21:09:00 UTC (rev 125704)
@@ -204,7 +204,7 @@
void neg32(RegisterID srcDest)
{
- m_assembler.rsbs_r(srcDest, srcDest, ARMAssembler::getOp2Byte(0));
+ m_assembler.rsbs(srcDest, srcDest, ARMAssembler::getOp2Byte(0));
}
void or32(RegisterID src, RegisterID dest)
@@ -303,12 +303,12 @@
void xor32(RegisterID src, RegisterID dest)
{
- m_assembler.eors_r(dest, dest, src);
+ m_assembler.eors(dest, dest, src);
}
void xor32(RegisterID op1, RegisterID op2, RegisterID dest)
{
- m_assembler.eors_r(dest, op1, op2);
+ m_assembler.eors(dest, op1, op2);
}
void xor32(TrustedImm32 imm, RegisterID dest)
@@ -316,7 +316,7 @@
if (imm.m_value == -1)
m_assembler.mvns(dest, dest);
else
- m_assembler.eors_r(dest, dest, m_assembler.getImm(imm.m_value, ARMRegisters::S0));
+ m_assembler.eors(dest, dest, m_assembler.getImm(imm.m_value, ARMRegisters::S0));
}
void xor32(TrustedImm32 imm, RegisterID src, RegisterID dest)
@@ -324,7 +324,7 @@
if (imm.m_value == -1)
m_assembler.mvns(dest, src);
else
- m_assembler.eors_r(dest, src, m_assembler.getImm(imm.m_value, ARMRegisters::S0));
+ m_assembler.eors(dest, src, m_assembler.getImm(imm.m_value, ARMRegisters::S0));
}
void countLeadingZeros32(RegisterID src, RegisterID dest)
