[pypy-commit] pypy ppc-jit-backend: merge

[hager]

Author: hager <sven.hager at uni-duesseldorf.de>
Branch: ppc-jit-backend
Changeset: r52636:62baa025967b
Date: 2012-02-16 06:50 -0800
http://bitbucket.org/pypy/pypy/changeset/62baa025967b/

Log:	merge

diff --git a/pypy/jit/backend/ppc/opassembler.py b/pypy/jit/backend/ppc/opassembler.py
--- a/pypy/jit/backend/ppc/opassembler.py
+++ b/pypy/jit/backend/ppc/opassembler.py
@@ -882,6 +882,7 @@
         pass
 
     emit_jit_debug = emit_debug_merge_point
+    emit_keepalive = emit_debug_merge_point
 
     def emit_cond_call_gc_wb(self, op, arglocs, regalloc):
         # Write code equivalent to write_barrier() in the GC: it checks
diff --git a/pypy/jit/backend/ppc/regalloc.py b/pypy/jit/backend/ppc/regalloc.py
--- a/pypy/jit/backend/ppc/regalloc.py
+++ b/pypy/jit/backend/ppc/regalloc.py
@@ -811,6 +811,7 @@
 
     prepare_debug_merge_point = void
     prepare_jit_debug = void
+    prepare_keepalive = void
 
     def prepare_cond_call_gc_wb(self, op):
         assert op.result is None
diff --git a/pypy/jit/backend/test/runner_test.py b/pypy/jit/backend/test/runner_test.py
--- a/pypy/jit/backend/test/runner_test.py
+++ b/pypy/jit/backend/test/runner_test.py
@@ -1677,6 +1677,7 @@
         c_box = self.alloc_string("hi there").constbox()
         c_nest = ConstInt(0)
         self.execute_operation(rop.DEBUG_MERGE_POINT, [c_box, c_nest], 'void')
+        self.execute_operation(rop.KEEPALIVE, [c_box], 'void')
         self.execute_operation(rop.JIT_DEBUG, [c_box, c_nest, c_nest,
                                                c_nest, c_nest], 'void')