[pypy-svn] r32709 - in pypy/branch/jit-promotion/pypy/jit: codegen/i386 timeshifter timeshifter/test

[arigo at codespeak.net]

Author: arigo
Date: Thu Sep 28 19:38:29 2006
New Revision: 32709

Modified:
   pypy/branch/jit-promotion/pypy/jit/codegen/i386/ri386genop.py
   pypy/branch/jit-promotion/pypy/jit/timeshifter/test/test_promotion.py
   pypy/branch/jit-promotion/pypy/jit/timeshifter/transform.py
Log:
Typo and a new test in-progress.  Now is the time to merge the branch...


Modified: pypy/branch/jit-promotion/pypy/jit/codegen/i386/ri386genop.py
==============================================================================
--- pypy/branch/jit-promotion/pypy/jit/codegen/i386/ri386genop.py	(original)
+++ pypy/branch/jit-promotion/pypy/jit/codegen/i386/ri386genop.py	Thu Sep 28 19:38:29 2006
@@ -436,8 +436,6 @@
         return self.returnvar(eax)
 
     op_uint_is_true = op_int_is_true
-    op_uint_neg     = op_int_neg
-    op_uint_abs     = identity
     op_uint_invert  = op_int_invert
     op_uint_add     = op_int_add
     op_uint_sub     = op_int_sub

Modified: pypy/branch/jit-promotion/pypy/jit/timeshifter/test/test_promotion.py
==============================================================================
--- pypy/branch/jit-promotion/pypy/jit/timeshifter/test/test_promotion.py	(original)
+++ pypy/branch/jit-promotion/pypy/jit/timeshifter/test/test_promotion.py	Thu Sep 28 19:38:29 2006
@@ -41,3 +41,17 @@
         res = self.timeshift(ll_function, [10, 0], [], policy=P_NOVIRTUAL)
         assert res == ll_function(10, 0)
         self.check_insns(int_add=10, int_mul=0)
+
+##    def test_method_call(self):
+##        class Base(object):
+##            pass
+##        class Int(Base):
+##            def __init__(self, n):
+##                self.n = n
+##            def double(self):
+##                return Int(self.n * 2)
+##        class Str(Base):
+##            def __init__(self, s):
+##                self.s = s
+##            def double(self):
+##                return Str(self.s + self.s)

Modified: pypy/branch/jit-promotion/pypy/jit/timeshifter/transform.py
==============================================================================
--- pypy/branch/jit-promotion/pypy/jit/timeshifter/transform.py	(original)
+++ pypy/branch/jit-promotion/pypy/jit/timeshifter/transform.py	Thu Sep 28 19:38:29 2006
@@ -566,8 +566,8 @@
     def handle_forget_hint(self, block, i):
         # a hint for testing only
         op = block.operations[i]
-        assert self.binding(op.result).is_green()
-        assert not self.binding(op.args[0]).is_green()
+        assert self.hannotator.binding(op.result).is_green()
+        assert not self.hannotator.binding(op.args[0]).is_green()
         newop = SpaceOperation('revealconst', [op.args[0]], op.result)
         block.operations[i] = newop