[pypy-commit] pypy stmgc-c4: skip stm_barriers; no implementation in runner.py

[Raemi]

Author: Remi Meier <meierrem at student.ethz.ch>
Branch: stmgc-c4
Changeset: r65281:5d3354d5a836
Date: 2013-07-08 08:26 +0200
http://bitbucket.org/pypy/pypy/changeset/5d3354d5a836/

Log:	skip stm_barriers; no implementation in runner.py

diff --git a/rpython/jit/backend/llgraph/runner.py b/rpython/jit/backend/llgraph/runner.py
--- a/rpython/jit/backend/llgraph/runner.py
+++ b/rpython/jit/backend/llgraph/runner.py
@@ -958,6 +958,12 @@
     def execute_cond_call_gc_wb_array(self, descr, a, b, c):
         py.test.skip("cond_call_gc_wb_array not supported")
 
+    def execute_cond_call_stm_wb(self, descr, a, b):
+        py.test.skip("cond_call_stm_wb not supported")
+
+    def execute_cond_call_stm_rb(self, descr, a, b):
+        py.test.skip("cond_call_stm_rb not supported")
+
     def execute_keepalive(self, descr, x):
         pass
 
diff --git a/rpython/jit/backend/llsupport/stmrewrite.py b/rpython/jit/backend/llsupport/stmrewrite.py
--- a/rpython/jit/backend/llsupport/stmrewrite.py
+++ b/rpython/jit/backend/llsupport/stmrewrite.py
@@ -9,8 +9,8 @@
 #
 # Any SETFIELD_GC, SETARRAYITEM_GC, SETINTERIORFIELD_GC must be done on a
 # W object.  The operation that forces an object p1 to be W is
-# COND_CALL_GC_WB(p1, 0, descr=x2Wdescr), for x in 'PGORL'.  This
-# COND_CALL_GC_WB is a bit special because if p1 is not W, it *replaces*
+# COND_CALL_STM_WB(p1, 0, descr=x2Wdescr), for x in 'PGORL'.  This
+# COND_CALL_STM_WB is a bit special because if p1 is not W, it *replaces*
 # its value with the W copy (by changing the register's value and
 # patching the stack location if any).  It's still conceptually the same
 # object, but the pointer is different.
diff --git a/rpython/jit/metainterp/executor.py b/rpython/jit/metainterp/executor.py
--- a/rpython/jit/metainterp/executor.py
+++ b/rpython/jit/metainterp/executor.py
@@ -345,9 +345,9 @@
             if value in (rop.FORCE_TOKEN,
                          rop.CALL_ASSEMBLER,
                          rop.COND_CALL_GC_WB,
+                         rop.COND_CALL_GC_WB_ARRAY,
                          rop.COND_CALL_STM_WB,
                          rop.COND_CALL_STM_RB,
-                         rop.COND_CALL_GC_WB_ARRAY,
                          rop.DEBUG_MERGE_POINT,
                          rop.JIT_DEBUG,
                          rop.SETARRAYITEM_RAW,