[pypy-svn] r70989 - in pypy/trunk/pypy/jit: backend/llgraph metainterp/test

[arigo at codespeak.net]

Author: arigo
Date: Sat Jan 30 17:47:22 2010
New Revision: 70989

Modified:
   pypy/trunk/pypy/jit/backend/llgraph/llimpl.py
   pypy/trunk/pypy/jit/backend/llgraph/runner.py
   pypy/trunk/pypy/jit/metainterp/test/test_ztranslation.py
Log:
Un-break this test.


Modified: pypy/trunk/pypy/jit/backend/llgraph/llimpl.py
==============================================================================
--- pypy/trunk/pypy/jit/backend/llgraph/llimpl.py	(original)
+++ pypy/trunk/pypy/jit/backend/llgraph/llimpl.py	Sat Jan 30 17:47:22 2010
@@ -20,7 +20,7 @@
 from pypy.jit.metainterp.resoperation import rop
 from pypy.jit.backend.llgraph import symbolic
 
-from pypy.rlib.objectmodel import ComputedIntSymbolic
+from pypy.rlib.objectmodel import ComputedIntSymbolic, we_are_translated
 from pypy.rlib.rarithmetic import ovfcheck
 
 import py
@@ -318,6 +318,8 @@
     op.descr = Descr(ofs, type)
 
 def compile_add_loop_token(loop, descr):
+    if we_are_translated():
+        raise ValueError("CALL_ASSEMBLER not supported")
     loop = _from_opaque(loop)
     op = loop.operations[-1]
     op.descr = descr

Modified: pypy/trunk/pypy/jit/backend/llgraph/runner.py
==============================================================================
--- pypy/trunk/pypy/jit/backend/llgraph/runner.py	(original)
+++ pypy/trunk/pypy/jit/backend/llgraph/runner.py	Sat Jan 30 17:47:22 2010
@@ -148,7 +148,7 @@
             descr = op.descr
             if isinstance(descr, Descr):
                 llimpl.compile_add_descr(c, descr.ofs, descr.typeinfo)
-            if isinstance(descr, history.LoopToken):
+            if isinstance(descr, history.LoopToken) and op.opnum != rop.JUMP:
                 llimpl.compile_add_loop_token(c, descr)
             if self.is_oo and isinstance(descr, (OODescr, MethDescr)):
                 # hack hack, not rpython

Modified: pypy/trunk/pypy/jit/metainterp/test/test_ztranslation.py
==============================================================================
--- pypy/trunk/pypy/jit/metainterp/test/test_ztranslation.py	(original)
+++ pypy/trunk/pypy/jit/metainterp/test/test_ztranslation.py	Sat Jan 30 17:47:22 2010
@@ -7,8 +7,6 @@
 from pypy.rpython.lltypesystem import lltype, llmemory
 from pypy.rpython.ootypesystem import ootype
 
-py.test.skip("Broken")
-
 class TranslationTest:
 
     CPUClass = None