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

Timestamp:

Mar 7, 2012, 3:30:29 AM (13 years ago)

Author:

Simon Hausmann

Message:

ARM build fix.

Reviewed by Zoltan Herczeg.

Implement three-argument branch(Add,Sub)32.

• assembler/MacroAssemblerARM.h:

(JSC::MacroAssemblerARM::add32):
(MacroAssemblerARM):
(JSC::MacroAssemblerARM::sub32):
(JSC::MacroAssemblerARM::branchAdd32):
(JSC::MacroAssemblerARM::branchSub32):

File:

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

trunk/Source/JavaScriptCore/assembler/MacroAssemblerARM.h

@@ -109 +109 @@
     }
 
+    void add32(RegisterID src, TrustedImm32 imm, RegisterID dest)
+    {
+        m_assembler.adds_r(dest, src, m_assembler.getImm(imm.m_value, ARMRegisters::S0));
+    }
+
     void and32(RegisterID src, RegisterID dest)
     {
@@ -235 +240 @@
         load32(src, ARMRegisters::S1);
         sub32(ARMRegisters::S1, dest);
+    }
+
+    void sub32(RegisterID src, TrustedImm32 imm, RegisterID dest)
+    {
+        m_assembler.subs_r(dest, src, m_assembler.getImm(imm.m_value, ARMRegisters::S0));
     }
 
@@ -555 +565 @@
     }
 
+    Jump branchAdd32(ResultCondition cond, RegisterID src, TrustedImm32 imm, RegisterID dest)
+    {
+        ASSERT((cond == Overflow) || (cond == Signed) || (cond == Zero) || (cond == NonZero));
+        add32(src, imm, dest);
+        return Jump(m_assembler.jmp(ARMCondition(cond)));
+    }
+
     void mull32(RegisterID src1, RegisterID src2, RegisterID dest)
     {
@@ -601 +618 @@
         ASSERT((cond == Overflow) || (cond == Signed) || (cond == Zero) || (cond == NonZero));
         sub32(imm, dest);
+        return Jump(m_assembler.jmp(ARMCondition(cond)));
+    }
+
+    Jump branchSub32(ResultCondition cond, RegisterID src, TrustedImm32 imm, RegisterID dest)
+    {
+        ASSERT((cond == Overflow) || (cond == Signed) || (cond == Zero) || (cond == NonZero));
+        sub32(src, imm, dest);
         return Jump(m_assembler.jmp(ARMCondition(cond)));
     }