Changeset 115929 in webkit for trunk/Source/JavaScriptCore/assembler/MacroAssemblerARM.h

Timestamp:

May 2, 2012, 7:15:49 PM (13 years ago)

Author:

[email protected]

Message:

ARM_TRADITIONAL build fix
​https://bugs.webkit.org/show_bug.cgi?id=85358

Patch by Hojong Han <​[email protected]> on 2012-05-02
Reviewed by Gavin Barraclough.

• assembler/MacroAssemblerARM.h:

(JSC::MacroAssemblerARM::lshift32):
(MacroAssemblerARM):
(JSC::MacroAssemblerARM::or32):
(JSC::MacroAssemblerARM::urshift32):
(JSC::MacroAssemblerARM::xor32):
(JSC::MacroAssemblerARM::branchSub32):

File:

• trunk/Source/JavaScriptCore/assembler/MacroAssemblerARM.h (modified) (5 diffs)

trunk/Source/JavaScriptCore/assembler/MacroAssemblerARM.h

@@ -151 +151 @@
     }
 
+    void lshift32(RegisterID src, TrustedImm32 imm, RegisterID dest)
+    {
+        m_assembler.movs_r(dest, m_assembler.lsl(src, imm.m_value & 0x1f));
+    }
+
     void mul32(RegisterID src, RegisterID dest)
     {
@@ -181 +186 @@
     }
 
+    void or32(TrustedImm32 imm, RegisterID src, RegisterID dest)
+    {
+        m_assembler.orrs_r(dest, src, m_assembler.getImm(imm.m_value, ARMRegisters::S0));
+    }
+
     void or32(RegisterID op1, RegisterID op2, RegisterID dest)
     {
@@ -218 +228 @@
         m_assembler.movs_r(dest, m_assembler.lsr(dest, imm.m_value & 0x1f));
     }
+    
+    void urshift32(RegisterID src, TrustedImm32 imm, RegisterID dest)
+    {
+        m_assembler.movs_r(dest, m_assembler.lsr(src, imm.m_value & 0x1f));
+    }
 
     void sub32(RegisterID src, RegisterID dest)
@@ -258 +273 @@
         else
             m_assembler.eors_r(dest, dest, m_assembler.getImm(imm.m_value, ARMRegisters::S0));
+    }
+
+    void xor32(TrustedImm32 imm, RegisterID src, RegisterID dest)
+    {
+        if (imm.m_value == -1)
+            m_assembler.mvns_r(dest, src);
+        else    
+            m_assembler.eors_r(dest, src, m_assembler.getImm(imm.m_value, ARMRegisters::S0));
     }
 
@@ -625 +648 @@
         ASSERT((cond == Overflow) || (cond == Signed) || (cond == Zero) || (cond == NonZero));
         sub32(src, imm, dest);
+        return Jump(m_assembler.jmp(ARMCondition(cond)));
+    }
+
+    Jump branchSub32(ResultCondition cond, RegisterID op1, RegisterID op2, RegisterID dest)
+    {
+        ASSERT((cond == Overflow) || (cond == Signed) || (cond == Zero) || (cond == NonZero));
+        m_assembler.subs_r(dest, op1, op2);
         return Jump(m_assembler.jmp(ARMCondition(cond)));
     }