[pypy-svn] r64676 - in pypy/branch/pyjitpl5/pypy: interpreter module/pypyjit

[arigo at codespeak.net]

Author: arigo
Date: Sat Apr 25 18:22:31 2009
New Revision: 64676

Modified:
   pypy/branch/pyjitpl5/pypy/interpreter/pyopcode.py
   pypy/branch/pyjitpl5/pypy/module/pypyjit/interp_jit.py
Log:
Revert r64661, as requested by fijal.


Modified: pypy/branch/pyjitpl5/pypy/interpreter/pyopcode.py
==============================================================================
--- pypy/branch/pyjitpl5/pypy/interpreter/pyopcode.py	(original)
+++ pypy/branch/pyjitpl5/pypy/interpreter/pyopcode.py	Sat Apr 25 18:22:31 2009
@@ -221,6 +221,9 @@
                         next_instr = block.handle(self, unroller)
                 return next_instr
 
+            if opcode == opcodedesc.JUMP_ABSOLUTE.index:
+                return self.JUMP_ABSOLUTE(oparg, next_instr, ec)
+
             if we_are_translated():
                 from pypy.rlib import rstack # for resume points
 

Modified: pypy/branch/pyjitpl5/pypy/module/pypyjit/interp_jit.py
==============================================================================
--- pypy/branch/pyjitpl5/pypy/module/pypyjit/interp_jit.py	(original)
+++ pypy/branch/pyjitpl5/pypy/module/pypyjit/interp_jit.py	Sat Apr 25 18:22:31 2009
@@ -44,15 +44,15 @@
                     frame=self, next_instr=next_instr, pycode=pycode)
                 co_code = pycode.co_code
                 self.valuestackdepth = hint(self.valuestackdepth, promote=True)
-                prev = next_instr
                 next_instr = self.handle_bytecode(co_code, next_instr, ec)
-                if next_instr < prev:
-                    pypyjitdriver.can_enter_jit(frame=self, ec=ec,
-                                                next_instr=next_instr,
-                                                pycode=pycode)
         except ExitFrame:
             return self.popvalue()
 
+    def JUMP_ABSOLUTE(f, jumpto, next_instr, ec=None):
+        pypyjitdriver.can_enter_jit(frame=f, ec=ec, next_instr=jumpto,
+                                    pycode=f.getcode())
+        return jumpto
+
 ##class __extend__(Function):
 ##    __metaclass__ = extendabletype