[pypy-commit] pypy arm-backend-2: implement changes from 458e381ff84d

[bivab]

Author: David Schneider <david.schneider at picle.org>
Branch: arm-backend-2
Changeset: r52286:44d8b36be898
Date: 2012-02-09 15:00 +0100
http://bitbucket.org/pypy/pypy/changeset/44d8b36be898/

Log:	implement changes from 458e381ff84d

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
@@ -505,6 +505,7 @@
     def emit_op_debug_merge_point(self, op, arglocs, regalloc, fcond):
         return fcond
     emit_op_jit_debug = emit_op_debug_merge_point
+    emit_op_keepalive = emit_op_debug_merge_point
 
     def emit_op_cond_call_gc_wb(self, op, arglocs, regalloc, fcond):
         # Write code equivalent to write_barrier() in the GC: it checks
diff --git a/pypy/jit/backend/arm/regalloc.py b/pypy/jit/backend/arm/regalloc.py
--- a/pypy/jit/backend/arm/regalloc.py
+++ b/pypy/jit/backend/arm/regalloc.py
@@ -978,6 +978,7 @@
 
     prepare_op_debug_merge_point = void
     prepare_op_jit_debug = void
+    prepare_keepalive = void
 
     def prepare_op_cond_call_gc_wb(self, op, fcond):
         assert op.result is None