[pypy-svn] r51872 - in pypy/branch/jit-refactoring/pypy/jit/rainbow: . test

[cfbolz at codespeak.net]

Author: cfbolz
Date: Tue Feb 26 11:27:34 2008
New Revision: 51872

Modified:
   pypy/branch/jit-refactoring/pypy/jit/rainbow/interpreter.py
   pypy/branch/jit-refactoring/pypy/jit/rainbow/test/test_portal.py
Log:
get the green handling right when resuming. this passes the first dfa test


Modified: pypy/branch/jit-refactoring/pypy/jit/rainbow/interpreter.py
==============================================================================
--- pypy/branch/jit-refactoring/pypy/jit/rainbow/interpreter.py	(original)
+++ pypy/branch/jit-refactoring/pypy/jit/rainbow/interpreter.py	Tue Feb 26 11:27:34 2008
@@ -69,7 +69,7 @@
         interpreter.newjitstate(jitstate)
         interpreter.frame.pc = self.pc
         interpreter.frame.bytecode = self.bytecode
-        interpreter.frame.local_green = []
+        interpreter.frame.local_green = jitstate.greens[:]
         jitstate.frame.dispatchqueue = dispatchqueue
         interpreter.bytecode_loop()
         finaljitstate = interpreter.jitstate
@@ -449,6 +449,7 @@
 
     @arguments()
     def opimpl_guard_global_merge(self):
+        rtimeshift.save_greens(self.jitstate, self.frame.local_green)
         rtimeshift.guard_global_merge(self.jitstate, self.frame.pc)
         return self.dispatch()
 

Modified: pypy/branch/jit-refactoring/pypy/jit/rainbow/test/test_portal.py
==============================================================================
--- pypy/branch/jit-refactoring/pypy/jit/rainbow/test/test_portal.py	(original)
+++ pypy/branch/jit-refactoring/pypy/jit/rainbow/test/test_portal.py	Tue Feb 26 11:27:34 2008
@@ -138,7 +138,6 @@
         self.check_insns(int_floordiv=1, int_mul=0)
 
     def test_dfa_compile(self):
-        py.test.skip("not working yet")
         from pypy.lang.automata.dfa import getautomaton, convertdfa, recognizetable
         a = getautomaton()
         dfatable, final_states = convertdfa(a)