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

fijal at codespeak.net fijal at codespeak.net
Sat Apr 25 02:28:24 CEST 2009


Author: fijal
Date: Sat Apr 25 02:28:22 2009
New Revision: 64661

Modified:
   pypy/branch/pyjitpl5/pypy/interpreter/pyopcode.py
   pypy/branch/pyjitpl5/pypy/module/pypyjit/interp_jit.py
Log:
Seems our jit is not too happy with pypy's python interpreter. Make it
look like tests a bit more


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 02:28:22 2009
@@ -221,9 +221,6 @@
                         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 02:28:22 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
 



More information about the Pypy-commit mailing list