Changeset 125704 in webkit

Timestamp:

Aug 15, 2012 2:09:00 PM (12 years ago)

Author:

commit-queue@webkit.org

Message:

Buildfix after r125541
​https://bugs.webkit.org/show_bug.cgi?id=94097

Patch by Gabor Ballabas <​gaborb@inf.u-szeged.hu> on 2012-08-15
Reviewed by Filip Pizlo.

r125541 has broken the traditional ARM port build of JSC.

• assembler/MacroAssemblerARM.h:

(JSC::MacroAssemblerARM::neg32):
(JSC::MacroAssemblerARM::xor32):

Location:

trunk/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• assembler/MacroAssemblerARM.h (modified) (4 diffs)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2012-08-15  Gabor Ballabas  <gaborb@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  <mhahnenberg@apple.com>
 

trunk/Source/JavaScriptCore/assembler/MacroAssemblerARM.h

@@ -205 +205 @@
     void neg32(RegisterID srcDest)
     {
-        m_assembler.rsbs_r(srcDest, srcDest, ARMAssembler::getOp2Byte(0));
+        m_assembler.rsbs(srcDest, srcDest, ARMAssembler::getOp2Byte(0));
     }
 
@@ -304 +304 @@
     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);
     }
 
@@ -317 +317 @@
             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));
     }
 
@@ -325 +325 @@
             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));
     }