[pypy-svn] r40635 - in pypy/branch/jit-virtual-world/pypy: interpreter module/pypyjit

[arigo at codespeak.net]

Author: arigo
Date: Sat Mar 17 15:11:57 2007
New Revision: 40635

Modified:
   pypy/branch/jit-virtual-world/pypy/interpreter/eval.py
   pypy/branch/jit-virtual-world/pypy/module/pypyjit/interp_jit.py
Log:
(pedronis, arigo)

Move _virtualizable_ out of the base Frame class if translating a pypy
without the jit.


Modified: pypy/branch/jit-virtual-world/pypy/interpreter/eval.py
==============================================================================
--- pypy/branch/jit-virtual-world/pypy/interpreter/eval.py	(original)
+++ pypy/branch/jit-virtual-world/pypy/interpreter/eval.py	Sat Mar 17 15:11:57 2007
@@ -73,8 +73,6 @@
     """A frame is an environment supporting the execution of a code object.
     Abstract base class."""
 
-    _virtualizable_ = True
-
     def __init__(self, space, w_globals=None, numlocals=-1):
         self.space      = space
         self.w_globals  = w_globals  # wrapped dict of globals

Modified: pypy/branch/jit-virtual-world/pypy/module/pypyjit/interp_jit.py
==============================================================================
--- pypy/branch/jit-virtual-world/pypy/module/pypyjit/interp_jit.py	(original)
+++ pypy/branch/jit-virtual-world/pypy/module/pypyjit/interp_jit.py	Sat Mar 17 15:11:57 2007
@@ -12,12 +12,14 @@
 from pypy.rlib.rarithmetic import r_uint, intmask
 from pypy.rlib.objectmodel import hint, _is_early_constant
 import pypy.interpreter.pyopcode   # for side-effects
+from pypy.interpreter.eval import Frame
 from pypy.interpreter.pycode import PyCode, CO_VARARGS, CO_VARKEYWORDS
 from pypy.interpreter.pyframe import PyFrame
 from pypy.interpreter.function import Function
 from pypy.interpreter.pyopcode import Return, Yield
 
 
+Frame._virtualizable_ = True
 PyCode.jit_enable = False     # new default attribute
 super_dispatch = PyFrame.dispatch