[pypy-svn] r78571 - pypy/branch/arm-backend/pypy/jit/backend/arm/test

[david at codespeak.net]

Author: david
Date: Sat Oct 30 23:10:09 2010
New Revision: 78571

Modified:
   pypy/branch/arm-backend/pypy/jit/backend/arm/test/test_assembler.py
   pypy/branch/arm-backend/pypy/jit/backend/arm/test/test_instr_codebuilder.py
Log:
Update tests after removing CMP method

Modified: pypy/branch/arm-backend/pypy/jit/backend/arm/test/test_assembler.py
==============================================================================
--- pypy/branch/arm-backend/pypy/jit/backend/arm/test/test_assembler.py	(original)
+++ pypy/branch/arm-backend/pypy/jit/backend/arm/test/test_assembler.py	Sat Oct 30 23:10:09 2010
@@ -69,7 +69,7 @@
     def test_cmp(self):
         self.a.gen_func_prolog()
         self.a.mc.gen_load_int(r.r1.value, 22)
-        self.a.mc.CMP(r.r1.value, 123)
+        self.a.mc.CMP_ri(r.r1.value, 123)
         self.a.mc.MOV_ri(r.r0.value, 1, c.LE)
         self.a.mc.MOV_ri(r.r0.value, 0, c.GT)
         self.a.gen_func_epilog()
@@ -78,7 +78,7 @@
     def test_int_le_false(self):
         self.a.gen_func_prolog()
         self.a.mc.gen_load_int(r.r1.value, 2222)
-        self.a.mc.CMP(r.r1.value, 123)
+        self.a.mc.CMP_ri(r.r1.value, 123)
         self.a.mc.MOV_ri(r.r0.value, 1, c.LE)
         self.a.mc.MOV_ri(r.r0.value, 0, c.GT)
         self.a.gen_func_epilog()
@@ -88,7 +88,7 @@
         self.a.gen_func_prolog()
         self.a.mc.MOV_ri(r.r1.value, 1)
         loop_head = self.a.mc.curraddr()
-        self.a.mc.CMP(r.r1.value, 0) # z=0, z=1
+        self.a.mc.CMP_ri(r.r1.value, 0) # z=0, z=1
         self.a.mc.MOV_ri(r.r1.value, 0, cond=c.NE)
         self.a.mc.MOV_ri(r.r1.value, 7, cond=c.EQ)
         self.a.mc.gen_load_int(r.r4.value, loop_head, cond=c.NE)
@@ -102,7 +102,7 @@
         self.a.mc.MOV_ri(r.r1.value, 1)
         loop_head = self.a.mc.curraddr()
         self.a.mc.ADD_ri(r.r1.value, r.r1.value, 1)
-        self.a.mc.CMP(r.r1.value, 9)
+        self.a.mc.CMP_ri(r.r1.value, 9)
         self.a.mc.gen_load_int(r.r4.value, loop_head, cond=c.NE)
         self.a.mc.MOV_rr(r.pc.value, r.r4.value, cond=c.NE)
         self.a.mc.MOV_rr(r.r0.value, r.r1.value)

Modified: pypy/branch/arm-backend/pypy/jit/backend/arm/test/test_instr_codebuilder.py
==============================================================================
--- pypy/branch/arm-backend/pypy/jit/backend/arm/test/test_instr_codebuilder.py	(original)
+++ pypy/branch/arm-backend/pypy/jit/backend/arm/test/test_instr_codebuilder.py	Sat Oct 30 23:10:09 2010
@@ -113,7 +113,7 @@
         self.assert_equal('SUB r3, r7, #4095')
 
     def test_cmp_ri(self):
-        self.cb.CMP(r.r3.value, 123)
+        self.cb.CMP_ri(r.r3.value, 123)
         self.assert_equal('CMP r3, #123')
 
     def test_mcr(self):