Author: Maciej Fijalkowski <[email protected]>
Branch: jitframe-on-heap
Changeset: r60035:9db4daaabba4
Date: 2013-01-13 19:12 +0200
http://bitbucket.org/pypy/pypy/changeset/9db4daaabba4/
Log: revert this debugging help
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
@@ -2101,13 +2101,13 @@
fail_index = self._store_force_index(guard_op)
descr = op.getdescr()
assert isinstance(descr, JitCellToken)
- frame_loc = arglocs[0]
+ [frame_loc, argloc] = arglocs
#
# Write a call to the target assembler
# we need to allocate the frame, keep in sync with runner's
# execute_token
self._emit_call(fail_index, imm(descr._x86_function_addr),
- [frame_loc], 0, tmp=eax)
+ [argloc], 0, tmp=eax)
if op.result is None:
assert result_loc is None
value = self.cpu.done_with_this_frame_void_v
diff --git a/pypy/jit/backend/x86/regalloc.py b/pypy/jit/backend/x86/regalloc.py
--- a/pypy/jit/backend/x86/regalloc.py
+++ b/pypy/jit/backend/x86/regalloc.py
@@ -942,7 +942,8 @@
frame_loc = self.fm.loc(op.getarg(0))
if vable_index >= 0:
xxx
- self._call(op, [frame_loc], guard_not_forced_op=guard_op)
+ self._call(op, [frame_loc, self.loc(op.getarg(0))],
+ guard_not_forced_op=guard_op)
def consider_cond_call_gc_wb(self, op):
assert op.result is None
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
