Author: Richard Plangger <planri...@gmail.com> Branch: s390x-backend Changeset: r81844:c0cdd96eb4d2 Date: 2016-01-19 08:41 +0100 http://bitbucket.org/pypy/pypy/changeset/c0cdd96eb4d2/
Log: added nursery_ptr_increment, added lldebug to some tests to debug in gdb diff --git a/rpython/jit/backend/llsupport/test/test_zrpy_gc_direct.py b/rpython/jit/backend/llsupport/test/test_zrpy_gc_direct.py --- a/rpython/jit/backend/llsupport/test/test_zrpy_gc_direct.py +++ b/rpython/jit/backend/llsupport/test/test_zrpy_gc_direct.py @@ -26,6 +26,7 @@ t = TranslationContext() t.config.translation.gc = "minimark" t.config.translation.gcremovetypeptr = gcremovetypeptr + t.config.translation.lldebug = True ann = t.buildannotator() ann.build_types(main, [s_list_of_strings], main_entry_point=True) rtyper = t.buildrtyper() 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 # pretty useful when debugging assembly + 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/zarch/opassembler.py b/rpython/jit/backend/zarch/opassembler.py --- a/rpython/jit/backend/zarch/opassembler.py +++ b/rpython/jit/backend/zarch/opassembler.py @@ -32,6 +32,8 @@ emit_int_add = gen_emit_imm_pool_rr('AGFI','AG','AGR') emit_int_add_ovf = emit_int_add + emit_nursery_ptr_increment = emit_int_add + def emit_int_sub(self, op, arglocs, regalloc): l0, l1 = arglocs if l1.is_imm() and not l1.is_in_pool(): @@ -1030,7 +1032,6 @@ def emit_zero_array(self, op, arglocs, regalloc): base_loc, startindex_loc, length_loc, \ ofs_loc, itemsize_loc, pad_byte_loc = arglocs - print(op, arglocs) if ofs_loc.is_imm(): assert check_imm_value(ofs_loc.value) diff --git a/rpython/jit/backend/zarch/regalloc.py b/rpython/jit/backend/zarch/regalloc.py --- a/rpython/jit/backend/zarch/regalloc.py +++ b/rpython/jit/backend/zarch/regalloc.py @@ -669,6 +669,7 @@ prepare_int_floordiv = helper.prepare_int_div prepare_uint_floordiv = helper.prepare_int_div prepare_int_mod = helper.prepare_int_mod + prepare_nursery_ptr_increment = prepare_int_add prepare_int_and = helper.prepare_int_logic prepare_int_or = helper.prepare_int_logic _______________________________________________ pypy-commit mailing list pypy-commit@python.org https://mail.python.org/mailman/listinfo/pypy-commit