[pypy-svn] r62915 - in pypy/branch/pyjitpl5/pypy/jit/backend/x86: . test

[fijal at codespeak.net]

Author: fijal
Date: Fri Mar 13 00:17:27 2009
New Revision: 62915

Modified:
   pypy/branch/pyjitpl5/pypy/jit/backend/x86/regalloc.py
   pypy/branch/pyjitpl5/pypy/jit/backend/x86/test/test_regalloc.py
Log:
shuffle test around until it explodes :)


Modified: pypy/branch/pyjitpl5/pypy/jit/backend/x86/regalloc.py
==============================================================================
--- pypy/branch/pyjitpl5/pypy/jit/backend/x86/regalloc.py	(original)
+++ pypy/branch/pyjitpl5/pypy/jit/backend/x86/regalloc.py	Fri Mar 13 00:17:27 2009
@@ -330,8 +330,8 @@
             else:
                 ops = []
             del self.reg_bindings[v_to_spill]
-            self.free_regs.append(selected_reg)
-            return selected_reg, ops+[Load(v, convert_to_imm(v), loc)]
+            self.free_regs.append(loc)
+            return loc, ops+[Load(v, convert_to_imm(v), loc)]
         return convert_to_imm(v), []
 
     def force_allocate_reg(self, v, forbidden_vars, selected_reg=None):
@@ -641,6 +641,7 @@
         locs = self._locs_from_liveboxes(guard_op)
         self.position += 1
         self.eventually_free_vars(guard_op.liveboxes)
+        self.eventually_free_var(guard_op.result)
         return ops + [PerformWithGuard(op, guard_op, [loc, argloc] + locs, loc)]
 
     consider_int_mul_ovf = _consider_binop_ovf

Modified: pypy/branch/pyjitpl5/pypy/jit/backend/x86/test/test_regalloc.py
==============================================================================
--- pypy/branch/pyjitpl5/pypy/jit/backend/x86/test/test_regalloc.py	(original)
+++ pypy/branch/pyjitpl5/pypy/jit/backend/x86/test/test_regalloc.py	Fri Mar 13 00:17:27 2009
@@ -223,7 +223,7 @@
     ops = [
         ResOperation(rop.MERGE_POINT, [p0, p1, i2, i3, i4, i5, p6, p7, i8,
                                        i9, i10, i11, p12, p13], None),
-        ResOperation(rop.GUARD_VALUE, [i10, ConstInt(1)], None),
+        ResOperation(rop.GUARD_VALUE, [ConstInt(1), i10], None),
         ResOperation(rop.OOISNULL, [p1], i14),
         ResOperation(rop.GUARD_TRUE, [i14], None),
         ResOperation(rop.INT_LT, [i5, ConstInt(0)], i15),