[pypy-svn] r63133 - pypy/branch/virtualizable-specnodes-2/pypy/jit/metainterp

[fijal at codespeak.net]

Author: fijal
Date: Fri Mar 20 13:41:21 2009
New Revision: 63133

Modified:
   pypy/branch/virtualizable-specnodes-2/pypy/jit/metainterp/compile.py
   pypy/branch/virtualizable-specnodes-2/pypy/jit/metainterp/optimize.py
Log:
clean up, call update_tree from a single place


Modified: pypy/branch/virtualizable-specnodes-2/pypy/jit/metainterp/compile.py
==============================================================================
--- pypy/branch/virtualizable-specnodes-2/pypy/jit/metainterp/compile.py	(original)
+++ pypy/branch/virtualizable-specnodes-2/pypy/jit/metainterp/compile.py	Fri Mar 20 13:41:21 2009
@@ -174,7 +174,7 @@
     bridge.jump_to = old_loop
     if newboxlist:
         # recompile loop
-        optimize.update_loop(metainterp, old_loop, bridge, newboxlist, storage,
-                             old_loop)
+        optimize.update_loop(old_loop, bridge, newboxlist, storage, old_loop)
+        metainterp.cpu.update_tree(old_loop)
     finish_loop_or_bridge(metainterp, bridge, old_loop, guard_op)
     return bridge

Modified: pypy/branch/virtualizable-specnodes-2/pypy/jit/metainterp/optimize.py
==============================================================================
--- pypy/branch/virtualizable-specnodes-2/pypy/jit/metainterp/optimize.py	(original)
+++ pypy/branch/virtualizable-specnodes-2/pypy/jit/metainterp/optimize.py	Fri Mar 20 13:41:21 2009
@@ -901,7 +901,7 @@
             res.append(op)
     return res
 
-def update_loop(metainterp, loop, bridge, newboxlist, newrebuildops, orig_loop):
+def update_loop(loop, bridge, newboxlist, newrebuildops, orig_loop):
     mp = loop.operations[0]
     mp.args += newboxlist
     jump = loop.operations[-1]
@@ -914,11 +914,10 @@
     for op in loop.operations:
         if op.is_guard():
             if op.jump_target is not None:
-                update_loop(metainterp, op.jump_target, bridge, newboxlist,
+                update_loop(op.jump_target, bridge, newboxlist,
                             newrebuildops, loop)
             op.liveboxes += newboxlist
             op.rebuild_ops += rename_ops(newrebuildops, renaming)
-    metainterp.cpu.update_loop(loop, mp, newboxlist)
 
 # ----------------------------------------------------------------------