[pypy-commit] pypy jit-simplify-backendintf: Fix test

[arigo]

Author: Armin Rigo <arigo at tunes.org>
Branch: jit-simplify-backendintf
Changeset: r50415:a7c8b3b608d5
Date: 2011-12-12 10:27 +0100
http://bitbucket.org/pypy/pypy/changeset/a7c8b3b608d5/

Log:	Fix test

diff --git a/pypy/jit/backend/x86/test/test_recompilation.py b/pypy/jit/backend/x86/test/test_recompilation.py
--- a/pypy/jit/backend/x86/test/test_recompilation.py
+++ b/pypy/jit/backend/x86/test/test_recompilation.py
@@ -19,8 +19,7 @@
         finish(i3, descr=fdescr2)
         '''
         bridge = self.attach_bridge(ops, loop, -2)
-        self.cpu.set_future_value_int(0, 0)
-        fail = self.run(loop)
+        fail = self.run(loop, 0)
         assert fail.identifier == 2
         assert self.getint(0) == 21
     
@@ -55,8 +54,7 @@
         assert descr._x86_bridge_param_depth == 0
         # the force_spill() forces the stack to grow
         assert new > previous
-        self.cpu.set_future_value_int(0, 0)
-        fail = self.run(loop)
+        fail = self.run(loop, 0)
         assert fail.identifier == 2
         assert self.getint(0) == 21
         assert self.getint(1) == 22
@@ -71,20 +69,19 @@
         i2 = int_lt(i1, 20)
         guard_true(i2, descr=fdescr1) [i1]
         jump(i1, i10, i11, i12, i13, i14, i15, i16, descr=targettoken)
-        ''', [0])
+        ''', [0, 0, 0, 0, 0, 0, 0, 0])
         other_loop = self.interpret('''
-        [i3]
+        [i3, i10, i11, i12, i13, i14, i15, i16]
         label(i3, descr=targettoken2)
         guard_false(i3, descr=fdescr2) [i3]
         jump(i3, descr=targettoken2)
-        ''', [1])
+        ''', [1, 0, 0, 0, 0, 0, 0, 0])
         ops = '''
         [i3]
         jump(i3, 1, 2, 3, 4, 5, 6, 7, descr=targettoken)
         '''
         bridge = self.attach_bridge(ops, other_loop, 1)
-        self.cpu.set_future_value_int(0, 1)
-        fail = self.run(other_loop)
+        fail = self.run(other_loop, 1, 0, 0, 0, 0, 0, 0, 0)
         assert fail.identifier == 1
 
     def test_bridge_jumps_to_self_deeper(self):
@@ -100,7 +97,7 @@
         i5 = int_lt(i3, 20)
         guard_true(i5) [i99, i3]
         jump(i3, i30, 1, i30, i30, i30, descr=targettoken)
-        ''', [0])
+        ''', [0, 0, 0, 0, 0, 0])
         assert self.getint(0) == 0
         assert self.getint(1) == 1
         ops = '''
@@ -123,10 +120,7 @@
         # the force_spill() forces the stack to grow
         assert guard_op.getdescr()._x86_bridge_frame_depth > loop_frame_depth
         assert guard_op.getdescr()._x86_bridge_param_depth == 0
-        self.cpu.set_future_value_int(0, 0)
-        self.cpu.set_future_value_int(1, 0)
-        self.cpu.set_future_value_int(2, 0)
-        self.run(loop)
+        self.run(loop, 0, 0, 0, 0, 0, 0)
         assert self.getint(0) == 1
         assert self.getint(1) == 20
 
@@ -142,7 +136,7 @@
         i5 = int_lt(i3, 20)
         guard_true(i5) [i99, i3]
         jump(i3, i1, i2, descr=targettoken)
-        ''', [0])
+        ''', [0, 0, 0])
         assert self.getint(0) == 0
         assert self.getint(1) == 1
         ops = '''
@@ -150,10 +144,7 @@
         jump(i3, 0, 1, descr=targettoken)
         '''
         bridge = self.attach_bridge(ops, loop, 5)
-        self.cpu.set_future_value_int(0, 0)
-        self.cpu.set_future_value_int(1, 0)
-        self.cpu.set_future_value_int(2, 0)
-        self.run(loop)
+        self.run(loop, 0, 0, 0)
         assert self.getint(0) == 1
         assert self.getint(1) == 20