Author: Richard Plangger <planri...@gmail.com>
Branch: s390x-backend
Changeset: r81760:1b048c0f98d6
Date: 2016-01-14 14:30 +0100
http://bitbucket.org/pypy/pypy/changeset/1b048c0f98d6/
Log: realloc frame needs new size in the right register, another
zll_stress test passing
diff --git a/rpython/jit/backend/test/test_random.py
b/rpython/jit/backend/test/test_random.py
--- a/rpython/jit/backend/test/test_random.py
+++ b/rpython/jit/backend/test/test_random.py
@@ -786,7 +786,6 @@
arguments.append(box.getfloatstorage())
else:
assert 0, box.type
- #import pdb; pdb.set_trace()
deadframe = cpu.execute_token(self.runjitcelltoken(), *arguments)
fail = cpu.get_latest_descr(deadframe)
print("exited at %s" % (fail, ))
@@ -809,7 +808,6 @@
i)
)
values.append(value)
- #import pdb; pdb.set_trace()
exc = cpu.grab_exc_value(deadframe)
if (self.guard_op is not None and
self.guard_op.is_guard_exception()):
diff --git a/rpython/jit/backend/zarch/assembler.py
b/rpython/jit/backend/zarch/assembler.py
--- a/rpython/jit/backend/zarch/assembler.py
+++ b/rpython/jit/backend/zarch/assembler.py
@@ -587,7 +587,7 @@
mc.write('\x00'*14)
self.mc.push_std_frame()
mc.load_imm(r.RETURN, self._frame_realloc_slowpath)
- self.load_gcmap(mc, r.SCRATCH, gcmap)
+ self.load_gcmap(mc, r.r1, gcmap)
mc.raw_call()
self.mc.pop_std_frame()
@@ -601,7 +601,7 @@
# three traps, so exactly three instructions to patch here
pmc.CGFI(r.SCRATCH2, l.imm(frame_depth))
pmc.BRC(c.EQ, l.imm(jmp_target - (traps_pos + 6)))
- pmc.LGHI(r.SCRATCH, l.imm(frame_depth))
+ pmc.LGHI(r.r0, l.imm(frame_depth))
pmc.overwrite()
@rgc.no_release_gil
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit
