[pypy-commit] pypy default: Try to fix ARM

[arigo]

Author: Armin Rigo <arigo at tunes.org>
Branch: 
Changeset: r76939:61817d7f51b1
Date: 2015-04-26 19:29 +0200
http://bitbucket.org/pypy/pypy/changeset/61817d7f51b1/

Log:	Try to fix ARM

diff --git a/rpython/jit/backend/arm/opassembler.py b/rpython/jit/backend/arm/opassembler.py
--- a/rpython/jit/backend/arm/opassembler.py
+++ b/rpython/jit/backend/arm/opassembler.py
@@ -459,6 +459,8 @@
         return fcond
     emit_op_jit_debug = emit_op_debug_merge_point
     emit_op_keepalive = emit_op_debug_merge_point
+    emit_op_enter_portal_frame = emit_op_debug_merge_point
+    emit_op_leave_portal_frame = emit_op_debug_merge_point
 
     def emit_op_cond_call_gc_wb(self, op, arglocs, regalloc, fcond):
         self._write_barrier_fastpath(self.mc, op.getdescr(), arglocs, fcond)
diff --git a/rpython/jit/backend/arm/regalloc.py b/rpython/jit/backend/arm/regalloc.py
--- a/rpython/jit/backend/arm/regalloc.py
+++ b/rpython/jit/backend/arm/regalloc.py
@@ -1155,6 +1155,8 @@
     prepare_op_debug_merge_point = void
     prepare_op_jit_debug = void
     prepare_op_keepalive = void
+    prepare_op_enter_portal_frame = void
+    prepare_op_leave_portal_frame = void
 
     def prepare_op_cond_call_gc_wb(self, op, fcond):
         assert op.result is None