[pypy-svn] r74815 - in pypy/branch/blackhole-improvement/pypy/jit: metainterp/test tl

[arigo at codespeak.net]

Author: arigo
Date: Thu May 27 16:34:35 2010
New Revision: 74815

Modified:
   pypy/branch/blackhole-improvement/pypy/jit/metainterp/test/test_tl.py
   pypy/branch/blackhole-improvement/pypy/jit/metainterp/test/test_tlc.py
   pypy/branch/blackhole-improvement/pypy/jit/tl/tl.py
   pypy/branch/blackhole-improvement/pypy/jit/tl/tlc.py
   pypy/branch/blackhole-improvement/pypy/jit/tl/tlr.py
Log:
Fix tests.


Modified: pypy/branch/blackhole-improvement/pypy/jit/metainterp/test/test_tl.py
==============================================================================
--- pypy/branch/blackhole-improvement/pypy/jit/metainterp/test/test_tl.py	(original)
+++ pypy/branch/blackhole-improvement/pypy/jit/metainterp/test/test_tl.py	Thu May 27 16:34:35 2010
@@ -1,6 +1,6 @@
 import py
-from pypy.rlib.jit import JitDriver, OPTIMIZER_SIMPLE
-from pypy.jit.metainterp.policy import StopAtXPolicy
+from pypy.rlib.jit import OPTIMIZER_SIMPLE
+from pypy.jit.codewriter.policy import StopAtXPolicy
 from pypy.jit.metainterp.test.test_basic import OOJitMixin, LLJitMixin
 
 

Modified: pypy/branch/blackhole-improvement/pypy/jit/metainterp/test/test_tlc.py
==============================================================================
--- pypy/branch/blackhole-improvement/pypy/jit/metainterp/test/test_tlc.py	(original)
+++ pypy/branch/blackhole-improvement/pypy/jit/metainterp/test/test_tlc.py	Thu May 27 16:34:35 2010
@@ -21,7 +21,7 @@
         pool = tlc.ConstantPool()
         bytecode = tlc.compile(src, pool)
         interp = self._get_interp(bytecode, pool)
-        return self.meta_interp(interp, [0, inputarg], view=False)
+        return self.meta_interp(interp, [0, inputarg])
 
     def test_method(self):
         code = """

Modified: pypy/branch/blackhole-improvement/pypy/jit/tl/tl.py
==============================================================================
--- pypy/branch/blackhole-improvement/pypy/jit/tl/tl.py	(original)
+++ pypy/branch/blackhole-improvement/pypy/jit/tl/tl.py	Thu May 27 16:34:35 2010
@@ -56,7 +56,7 @@
 
 def make_interp(supports_call):
     myjitdriver = JitDriver(greens = ['pc', 'code'],
-                            reds = ['stack', 'inputarg'],
+                            reds = ['inputarg', 'stack'],
                             virtualizables = ['stack'])
     def interp(code='', pc=0, inputarg=0):
         if not isinstance(code,str):

Modified: pypy/branch/blackhole-improvement/pypy/jit/tl/tlc.py
==============================================================================
--- pypy/branch/blackhole-improvement/pypy/jit/tl/tlc.py	(original)
+++ pypy/branch/blackhole-improvement/pypy/jit/tl/tlc.py	Thu May 27 16:34:35 2010
@@ -226,7 +226,7 @@
 
         
 def make_interp(supports_call, jitted=True):
-    myjitdriver = JitDriver(greens = ['code', 'pc'],
+    myjitdriver = JitDriver(greens = ['pc', 'code'],
                             reds = ['frame', 'pool'])
 
     def interp(code='', pc=0, inputarg=0, pool=None):

Modified: pypy/branch/blackhole-improvement/pypy/jit/tl/tlr.py
==============================================================================
--- pypy/branch/blackhole-improvement/pypy/jit/tl/tlr.py	(original)
+++ pypy/branch/blackhole-improvement/pypy/jit/tl/tlr.py	Thu May 27 16:34:35 2010
@@ -12,7 +12,7 @@
 NEG_A      = 8
 
 class TLRJitDriver(JitDriver):
-    greens = ['bytecode', 'pc']
+    greens = ['pc', 'bytecode']
     reds   = ['a', 'regs']
 
 tlrjitdriver = TLRJitDriver()