Author: Maciej Fijalkowski <[email protected]>
Branch: jitframe-on-heap
Changeset: r62235:5b53a1c77730
Date: 2013-03-08 16:21 +0200
http://bitbucket.org/pypy/pypy/changeset/5b53a1c77730/
Log: random ARM stuff + fix the test for llgraph
diff --git a/rpython/jit/backend/arm/assembler.py
b/rpython/jit/backend/arm/assembler.py
--- a/rpython/jit/backend/arm/assembler.py
+++ b/rpython/jit/backend/arm/assembler.py
@@ -352,7 +352,6 @@
self.wb_slowpath[withcards + 2 * withfloats] = rawstart
def _build_malloc_slowpath(self):
- XXX
mc = ARMv7Builder()
if self.cpu.supports_floats:
vfp_regs = r.all_vfp_regs
@@ -1286,6 +1285,8 @@
# malloc_slowpath in case we called malloc_slowpath, which returns the
# new value of nursery_free_adr in r1 and the adr of the new object in
# r0.
+ XXX # push gcmap
+
self.mc.BL(self.malloc_slowpath, c=c.HI)
self.mc.gen_load_int(r.ip.value, nursery_free_adr)
diff --git a/rpython/jit/backend/test/runner_test.py
b/rpython/jit/backend/test/runner_test.py
--- a/rpython/jit/backend/test/runner_test.py
+++ b/rpython/jit/backend/test/runner_test.py
@@ -3813,7 +3813,7 @@
def raising():
bridge = parse("""
[i1, i2]
- guard_exception(ConstClass(xtp), descr=faildescr2) [i1, i2]
+ px = guard_exception(ConstClass(xtp), descr=faildescr2) [i1, i2]
i3 = int_add(i1, i2)
i4 = int_add(i1, i3)
i5 = int_add(i1, i4)
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
