Author: Armin Rigo <ar...@tunes.org> Branch: Changeset: r83667:d072c237452a Date: 2016-04-14 12:26 +0200 http://bitbucket.org/pypy/pypy/changeset/d072c237452a/
Log: oops. probable fix. will try to make a unit test 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 @@ -783,12 +783,15 @@ # get_max_size_of_gen_load_int() instructions. No point # in optimizing in case we get less. Just in case though, # we check and pad with nops. - extra_bytes = mc.get_max_size_of_gen_load_int() * 2 + extra_bytes = mc.get_max_size_of_gen_load_int() * 4 offset -= extra_bytes start = mc.get_relative_pos() mc.gen_load_int(regnum, offset) - while mc.get_relative_pos() != start + extra_bytes: + missing = start + extra_bytes - mc.get_relative_pos() + while missing > 0: mc.NOP() + missing = start + extra_bytes - mc.get_relative_pos() + assert missing == 0 mc.LDR_rr(regnum, r.pc.value, regnum) def new_stack_loc(self, i, tp): _______________________________________________ pypy-commit mailing list pypy-commit@python.org https://mail.python.org/mailman/listinfo/pypy-commit