Author: Armin Rigo <ar...@tunes.org> Branch: continulet-jit-2 Changeset: r53056:388d3780ddea Date: 2012-03-01 16:17 +0100 http://bitbucket.org/pypy/pypy/changeset/388d3780ddea/
Log: Next test passes. diff --git a/pypy/jit/backend/x86/assembler.py b/pypy/jit/backend/x86/assembler.py --- a/pypy/jit/backend/x86/assembler.py +++ b/pypy/jit/backend/x86/assembler.py @@ -514,8 +514,9 @@ operations, self.current_clt.allgcrefs) - stackadjustpos = self._patchable_stackadjust() - frame_depth, param_depth = self._assemble(regalloc, operations) + #stackadjustpos = self._patchable_stackadjust() + (frame_depth #, param_depth + ) = self._assemble(regalloc, operations) codeendpos = self.mc.get_relative_pos() self.write_pending_failure_recoveries() fullsize = self.mc.get_relative_pos() @@ -525,13 +526,13 @@ debug_print("bridge out of Guard %d has address %x to %x" % (descr_number, rawstart, rawstart + codeendpos)) debug_stop("jit-backend-addr") - self._patch_stackadjust(rawstart + stackadjustpos, - frame_depth + param_depth) + #self._patch_stackadjust(rawstart + stackadjustpos, + # frame_depth + param_depth) self.patch_pending_failure_recoveries(rawstart) if not we_are_translated(): # for the benefit of tests faildescr._x86_bridge_frame_depth = frame_depth - faildescr._x86_bridge_param_depth = param_depth + #faildescr._x86_bridge_param_depth = param_depth # patch the jump from original guard self.patch_jump_for_descr(faildescr, rawstart) ops_offset = self.mc.ops_offset _______________________________________________ pypy-commit mailing list pypy-commit@python.org http://mail.python.org/mailman/listinfo/pypy-commit