[pypy-commit] pypy stmgc-c7: Try to make non-stm jit backend tests passing again, but not done yet

[arigo]

Author: Armin Rigo <arigo at tunes.org>
Branch: stmgc-c7
Changeset: r72897:dd825891d2a8
Date: 2014-08-18 22:24 +0200
http://bitbucket.org/pypy/pypy/changeset/dd825891d2a8/

Log:	Try to make non-stm jit backend tests passing again, but not done
	yet

diff --git a/rpython/jit/backend/x86/assembler.py b/rpython/jit/backend/x86/assembler.py
--- a/rpython/jit/backend/x86/assembler.py
+++ b/rpython/jit/backend/x86/assembler.py
@@ -2607,6 +2607,7 @@
         # so if it is followed with a JB, it will follow the jump if
         # we should break the transaction now.
         #
+        assert self.cpu.gc_ll_descr.stm
         if not IS_X86_64:
             todo()   # "needed for X86_64_SCRATCH_REG"
         psnlfm_adr = rstm.adr_pypy_stm_nursery_low_fill_mark
@@ -2631,6 +2632,7 @@
             self.implement_guard(guard_token, 'AE')  # JAE goes to "no, don't"
 
     def genop_discard_stm_read(self, op, arglocs):
+        assert self.cpu.gc_ll_descr.stm
         if not IS_X86_64:
             todo()   # "needed for X86_64_SCRATCH_REG"
         mc = self.mc
diff --git a/rpython/translator/c/funcgen.py b/rpython/translator/c/funcgen.py
--- a/rpython/translator/c/funcgen.py
+++ b/rpython/translator/c/funcgen.py
@@ -310,6 +310,8 @@
                 line = meth(self, op)
         elif op.opname.startswith('stm_'):
             if not self._is_stm():
+                if op.opname in ('stm_ignored_start', 'stm_ignored_stop'):
+                    return
                 raise AssertionError("STM transformation not applied.  "
                                      "You need '--stm'")
             from rpython.translator.stm import funcgen