Author: David Schneider <david.schnei...@picle.org>
Branch: arm-backend-2
Changeset: r47345:632b54e14e28
Date: 2011-09-19 10:19 +0200
http://bitbucket.org/pypy/pypy/changeset/632b54e14e28/
Log: small 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
@@ -105,7 +105,7 @@
gc_ll_descr.initialize()
ll_new = gc_ll_descr.get_funcptr_for_new()
self.malloc_func_addr = rffi.cast(lltype.Signed, ll_new)
- self.propagate_exception_path = self._build_propagate_exception_path()
+ self._build_propagate_exception_path()
if gc_ll_descr.get_funcptr_for_newarray is not None:
ll_new_array = gc_ll_descr.get_funcptr_for_newarray()
self.malloc_array_func_addr = rffi.cast(lltype.Signed,
@@ -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.propagate_exception_path = mc.materialize(self.cpu.asmmemmgr, [])
def setup_failure_recovery(self):
@@ -321,8 +320,8 @@
mc.LDR_ri(reg.value, r.fp.value, imm=ofs)
mc.CMP_ri(r.r0.value, 0)
- jmp_pos = self.mc.currpos()
- self.mc.NOP()
+ jmp_pos = mc.currpos()
+ mc.NOP()
nursery_free_adr = self.cpu.gc_ll_descr.get_nursery_free_addr()
mc.gen_load_int(r.r1.value, nursery_free_adr)
mc.LDR_ri(r.r1.value, r.r1.value)
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
http://mail.python.org/mailman/listinfo/pypy-commit
