[pypy-svn] r63933 - pypy/branch/pyjitpl5-simplify/pypy/jit/metainterp

[arigo at codespeak.net]

Author: arigo
Date: Fri Apr 10 13:22:05 2009
New Revision: 63933

Modified:
   pypy/branch/pyjitpl5-simplify/pypy/jit/metainterp/compile.py
   pypy/branch/pyjitpl5-simplify/pypy/jit/metainterp/resoperation.py
Log:
Disable 'prepare_loop_from_bridge' until I can think of a reasonable
test for it.  Currently all the tests continue to pass.


Modified: pypy/branch/pyjitpl5-simplify/pypy/jit/metainterp/compile.py
==============================================================================
--- pypy/branch/pyjitpl5-simplify/pypy/jit/metainterp/compile.py	(original)
+++ pypy/branch/pyjitpl5-simplify/pypy/jit/metainterp/compile.py	Fri Apr 10 13:22:05 2009
@@ -281,6 +281,7 @@
     # To handle this case, we prepend to the history the unoptimized
     # operations coming from the loop, in order to make a (fake) complete
     # unoptimized trace.  (Then we will just compile this loop normally.)
+    raise PrepareLoopFromBridgeIsDisabled
     if not we_are_translated():
         log.info("completing the bridge into a stand-alone loop")
     else:
@@ -308,16 +309,6 @@
         guard_op = ResOperation(rop.GUARD_FALSE, guard_op.args, None)
     elif guard_op.opnum == rop.GUARD_FALSE:
         guard_op = ResOperation(rop.GUARD_TRUE, guard_op.args, None)
-    elif guard_op.opnum == rop.GUARD_EXCEPTION:
-        guard_op = ResOperation(rop.GUARD_EXCEPTION_INVERSE, guard_op.args,
-                                None)
-    elif guard_op.opnum == rop.GUARD_VALUE:
-        guard_op = ResOperation(rop.GUARD_VALUE_INVERSE, guard_op.args, None)
-    elif guard_op.opnum == rop.GUARD_NO_EXCEPTION:
-        guard_op = ResOperation(rop.GUARD_NO_EXCEPTION_INVERSE, guard_op.args,
-                                None)
-    elif guard_op.opnum == rop.GUARD_CLASS:
-        guard_op = ResOperation(rop.GUARD_CLASS_INVERSE, guard_op.args, None)
     else:
         # XXX other guards have no inverse so far
         raise InverseTheOtherGuardsPlease(guard_op)
@@ -327,3 +318,6 @@
 
 class InverseTheOtherGuardsPlease(Exception):
     pass
+
+class PrepareLoopFromBridgeIsDisabled(Exception):
+    pass

Modified: pypy/branch/pyjitpl5-simplify/pypy/jit/metainterp/resoperation.py
==============================================================================
--- pypy/branch/pyjitpl5-simplify/pypy/jit/metainterp/resoperation.py	(original)
+++ pypy/branch/pyjitpl5-simplify/pypy/jit/metainterp/resoperation.py	Fri Apr 10 13:22:05 2009
@@ -96,10 +96,6 @@
     GUARD_NONVIRTUALIZED   = 12
     GUARD_NO_EXCEPTION     = 13
     GUARD_EXCEPTION        = 14
-    GUARD_VALUE_INVERSE    = 15
-    GUARD_CLASS_INVERSE    = 16
-    GUARD_EXCEPTION_INVERSE = 17
-    GUARD_NO_EXCEPTION_INVERSE = 18
     _GUARD_LAST = 19 # ----- end of guard operations -----
 
     _NOSIDEEFFECT_FIRST = 20 # ----- start of no_side_effect operations -----