Author: David Schneider <[email protected]>
Branch: arm-backend-2
Changeset: r51479:75e7ec3f604f
Date: 2012-01-19 12:28 +0100
http://bitbucket.org/pypy/pypy/changeset/75e7ec3f604f/
Log: merge heads
diff --git a/pypy/jit/backend/arm/assembler.py
b/pypy/jit/backend/arm/assembler.py
--- a/pypy/jit/backend/arm/assembler.py
+++ b/pypy/jit/backend/arm/assembler.py
@@ -257,6 +257,7 @@
to the failboxes. Values for spilled vars and registers are stored on
stack at frame_loc """
assert frame_pointer & 1 == 0
+ self.fail_force_index = frame_pointer
bytecode = rffi.cast(rffi.UCHARP, mem_loc)
num = 0
value = 0
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
