[pypy-svn] r52757 - pypy/branch/jit-hotpath/pypy/module/pypyjit

[cfbolz at codespeak.net]

Author: cfbolz
Date: Thu Mar 20 00:56:42 2008
New Revision: 52757

Modified:
   pypy/branch/jit-hotpath/pypy/module/pypyjit/interp_jit.py
   pypy/branch/jit-hotpath/pypy/module/pypyjit/portal.py
Log:
a typo and some missing changes


Modified: pypy/branch/jit-hotpath/pypy/module/pypyjit/interp_jit.py
==============================================================================
--- pypy/branch/jit-hotpath/pypy/module/pypyjit/interp_jit.py	(original)
+++ pypy/branch/jit-hotpath/pypy/module/pypyjit/interp_jit.py	Thu Mar 20 00:56:42 2008
@@ -30,6 +30,7 @@
         # *loads* of nonsense for now
         frame = self.frame
         pycode = self.pycode
+        pycode = hint(pycode, deepfreeze=True)
 
         fastlocals_w = [None] * pycode.co_nlocals
 
@@ -89,11 +90,9 @@
     def JUMP_ABSOLUTE(f, jumpto, next_instr, *ignored):
         ec = f.space.getexecutioncontext()
         PyPyJitDriver.can_enter_jit(frame=f, ec=ec, next_instr=jumpto,
-                                    pycode=self.getcode())
+                                    pycode=f.getcode())
         return jumpto
 
-PORTAL = PyFrame.dispatch_jit
-
 class __extend__(Function):
     __metaclass__ = extendabletype
 

Modified: pypy/branch/jit-hotpath/pypy/module/pypyjit/portal.py
==============================================================================
--- pypy/branch/jit-hotpath/pypy/module/pypyjit/portal.py	(original)
+++ pypy/branch/jit-hotpath/pypy/module/pypyjit/portal.py	Thu Mar 20 00:56:42 2008
@@ -1,12 +1,11 @@
 import pypy
-from pypy.module.pypyjit.interp_jit import PORTAL
 from pypy.module.pypyjit.newbool import NewBoolDesc
 from pypy.translator.translator import graphof
 from pypy.annotation.specialize import getuniquenondirectgraph
 from pypy.jit.hintannotator.policy import ManualGraphPolicy
 
 class PyPyHintAnnotatorPolicy(ManualGraphPolicy):
-    PORTAL = PORTAL
+    hotpath = True
     
     def look_inside_graph_of_module(self, graph, func, mod):
         if mod.startswith('pypy.objspace'):
@@ -127,9 +126,6 @@
 
 def get_portal(drv):
     t = drv.translator
-    portal = getattr(PORTAL, 'im_func', PORTAL)
-    portal_graph = graphof(t, portal)
-
     policy = PyPyHintAnnotatorPolicy()
     policy.seetranslator(t)
-    return portal, policy
+    return None, policy