[pypy-commit] pypy arm-backend-2: test fixes

[bivab]

Author: David Schneider <david.schneider at picle.org>
Branch: arm-backend-2
Changeset: r47344:6fe6f4e2a50d
Date: 2011-09-15 17:11 +0200
http://bitbucket.org/pypy/pypy/changeset/6fe6f4e2a50d/

Log:	test fixes

diff --git a/pypy/jit/backend/arm/assembler.py b/pypy/jit/backend/arm/assembler.py
--- a/pypy/jit/backend/arm/assembler.py
+++ b/pypy/jit/backend/arm/assembler.py
@@ -173,8 +173,7 @@
         mc.gen_load_int(r.ip.value, self.cpu.propagate_exception_v)
         mc.MOV_rr(r.r0.value, r.ip.value)
         self.gen_func_epilog(mc=mc)
-        return mc.materialize(self.cpu.asmmemmgr, [],
-                               self.cpu.gc_ll_descr.gcrootmap)
+        return mc.materialize(self.cpu.asmmemmgr, [])
 
 
     def setup_failure_recovery(self):
@@ -337,6 +336,8 @@
         self.malloc_slowpath = rawstart
 
     def propagate_memoryerror_if_r0_is_null(self):
+        if not self.propagate_exception_path:
+            return
         # see ../x86/assembler.py:propagate_memoryerror_if_eax_is_null
         self.mc.CMP_ri(r.r0.value, 0)
         self.mc.B(self.propagate_exception_path, c=c.EQ)
diff --git a/pypy/jit/backend/arm/test/test_runner.py b/pypy/jit/backend/arm/test/test_runner.py
--- a/pypy/jit/backend/arm/test/test_runner.py
+++ b/pypy/jit/backend/arm/test/test_runner.py
@@ -14,6 +14,7 @@
 from pypy.jit.tool.oparser import parse
 from pypy.rpython.lltypesystem import lltype, llmemory
 from pypy.rpython.annlowlevel import llhelper
+from pypy.jit.codewriter.effectinfo import EffectInfo
 
 skip_unless_arm()
 
@@ -58,7 +59,7 @@
         expected = [3, 7, 11, 15, 19, 23, 27, 3, 7, 11, 15, 19, 23, 27]
         assert output == expected
 
-    def test_redirect_call_assember(self):
+    def test_redirect_call_assember2(self):
         called = []
         def assembler_helper(failindex, virtualizable):
             return self.cpu.get_latest_value_int(0)
@@ -71,7 +72,8 @@
             assembler_helper_adr = llmemory.cast_ptr_to_adr(
                 _assembler_helper_ptr)
         FakeJitDriverSD.portal_calldescr = self.cpu.calldescrof(
-            lltype.Ptr(lltype.FuncType([lltype.Signed], lltype.Signed)), [lltype.Signed], lltype.Signed)
+            lltype.Ptr(lltype.FuncType([lltype.Signed], lltype.Signed)),
+                [lltype.Signed], lltype.Signed, EffectInfo.MOST_GENERAL)
         lt1, lt2, lt3 = [LoopToken() for x in range(3)]
         lt2.outermost_jitdriver_sd = FakeJitDriverSD()
         loop1 = parse('''
diff --git a/pypy/jit/backend/test/runner_test.py b/pypy/jit/backend/test/runner_test.py
--- a/pypy/jit/backend/test/runner_test.py
+++ b/pypy/jit/backend/test/runner_test.py
@@ -521,7 +521,7 @@
             assert res.value == 2 * num
 
             # last, try it with one constant argument
-            calldescr = cpu.calldescrof(FUNC, FUNC.ARGS, FUNC.RESULT)
+            calldescr = cpu.calldescrof(FUNC, FUNC.ARGS, FUNC.RESULT, EffectInfo.MOST_GENERAL)
             res = self.execute_operation(rop.CALL,
                                          [funcbox, ConstInt(num), BoxInt(num)],
                                          'int', descr=calldescr)