[pypy-commit] pypy arm-backend-2: Reverse this BKPT back to a NOP here, because this is not always patched

[bivab]

Author: David Schneider <david.schneider at picle.org>
Branch: arm-backend-2
Changeset: r50304:9512dcdd4967
Date: 2011-12-08 15:15 +0100
http://bitbucket.org/pypy/pypy/changeset/9512dcdd4967/

Log:	Reverse this BKPT back to a NOP here, because this is not always
	patched

diff --git a/pypy/jit/backend/arm/opassembler.py b/pypy/jit/backend/arm/opassembler.py
--- a/pypy/jit/backend/arm/opassembler.py
+++ b/pypy/jit/backend/arm/opassembler.py
@@ -1028,8 +1028,9 @@
 
         # jump to merge point
         jmp_pos = self.mc.currpos()
-        #jmp_location = self.mc.curraddr()
-        self.mc.BKPT()
+        # This location is not necessarily patched later, depending on how many
+        # instructions we emit from here to the merge point below.
+        self.mc.NOP()
 
         # Path B: load return value and reset token
         # Fast Path using result boxes