Author: Richard Plangger <planri...@gmail.com> Branch: s390x-backend Changeset: r81767:6e2a46f9f524 Date: 2016-01-14 19:54 +0100 http://bitbucket.org/pypy/pypy/changeset/6e2a46f9f524/
Log: removed debugging lines scattered along several places outside of the zarch backend dir diff --git a/rpython/jit/backend/llsupport/test/zrpy_gc_test.py b/rpython/jit/backend/llsupport/test/zrpy_gc_test.py --- a/rpython/jit/backend/llsupport/test/zrpy_gc_test.py +++ b/rpython/jit/backend/llsupport/test/zrpy_gc_test.py @@ -84,7 +84,7 @@ # t = TranslationContext() t.config.translation.gc = gc - t.config.translation.lldebug = True # XXX debug + # t.config.translation.lldebug = True # pretty useful when debugging assembly if gc != 'boehm': t.config.translation.gcremovetypeptr = True for name, value in kwds.items(): diff --git a/rpython/jit/backend/ppc/ppc_assembler.py b/rpython/jit/backend/ppc/ppc_assembler.py --- a/rpython/jit/backend/ppc/ppc_assembler.py +++ b/rpython/jit/backend/ppc/ppc_assembler.py @@ -820,7 +820,7 @@ frame_depth = regalloc.get_final_frame_depth() jump_target_descr = regalloc.jump_target_descr if jump_target_descr is not None: - tgt_depth = jump_target_descr._zarch_clt.frame_info.jfi_frame_depth + tgt_depth = jump_target_descr._ppc_clt.frame_info.jfi_frame_depth target_frame_depth = tgt_depth - JITFRAME_FIXED_SIZE frame_depth = max(frame_depth, target_frame_depth) return frame_depth 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 @@ -788,11 +788,9 @@ assert 0, box.type deadframe = cpu.execute_token(self.runjitcelltoken(), *arguments) fail = cpu.get_latest_descr(deadframe) - print("exited at %s" % (fail, )) do_assert(fail is self.should_fail_by.getdescr(), "Got %r, expected %r" % (fail, self.should_fail_by.getdescr())) - values = [] for i, v in enumerate(self.get_fail_args()): if v not in self.expected: assert v.getopnum() == rop.SAME_AS_I # special case @@ -807,7 +805,6 @@ self.expected[v], i) ) - values.append(value) exc = cpu.grab_exc_value(deadframe) if (self.guard_op is not None and self.guard_op.is_guard_exception()): @@ -842,7 +839,6 @@ _fail_box.set_forwarded(None) # generate the branch: a sequence of operations that ends in a FINISH subloop = DummyLoop([]) - subloop.inputargs = op.getfailargs()[:] self.subloops.append(subloop) # keep around for debugging if guard_op.is_guard_exception(): subloop.operations.append(exc_handling(guard_op)) diff --git a/rpython/jit/metainterp/test/test_ajit.py b/rpython/jit/metainterp/test/test_ajit.py --- a/rpython/jit/metainterp/test/test_ajit.py +++ b/rpython/jit/metainterp/test/test_ajit.py @@ -2117,8 +2117,8 @@ return l[-2] # not the blackholed version res = self.meta_interp(f, [5, 8]) assert 14 < res < 42 - #res = self.meta_interp(f, [5, 2]) - #assert 4 < res < 14 + res = self.meta_interp(f, [5, 2]) + assert 4 < res < 14 def test_compute_identity_hash(self): from rpython.rlib.objectmodel import compute_identity_hash diff --git a/rpython/jit/metainterp/test/test_executor.py b/rpython/jit/metainterp/test/test_executor.py --- a/rpython/jit/metainterp/test/test_executor.py +++ b/rpython/jit/metainterp/test/test_executor.py @@ -281,8 +281,8 @@ yield (rop.FLOAT_NEG, [15.9], 'float', -15.9) yield (rop.FLOAT_ABS, [-5.9], 'float', 5.9) yield (rop.FLOAT_ABS, [15.9], 'float', 15.9) + yield (rop.CAST_FLOAT_TO_INT, [-5.9], 'int', -5) yield (rop.CAST_FLOAT_TO_INT, [5.9], 'int', 5) - yield (rop.CAST_FLOAT_TO_INT, [-5.9], 'int', -5) yield (rop.CAST_INT_TO_FLOAT, [123], 'float', 123.0) yield (rop.CAST_INT_TO_FLOAT, [-123], 'float', -123.0) _______________________________________________ pypy-commit mailing list pypy-commit@python.org https://mail.python.org/mailman/listinfo/pypy-commit