[pypy-svn] r40703 - in pypy/dist: . pypy/jit/codegen/dump pypy/jit/codegen/dump/test pypy/jit/codegen/llgraph/test pypy/jit/codegen/test

[arigo at codespeak.net]

Author: arigo
Date: Sun Mar 18 17:00:50 2007
New Revision: 40703

Modified:
   pypy/dist/   (props changed)
   pypy/dist/pypy/jit/codegen/dump/rgenop.py
   pypy/dist/pypy/jit/codegen/dump/test/test_rgenop.py
   pypy/dist/pypy/jit/codegen/llgraph/test/test_rgenop.py
   pypy/dist/pypy/jit/codegen/test/rgenop_tests.py
Log:
(pedronis, arigo)

- switch PyPy to the py lib trunk until the next py lib merge.
- fix some of the JIT tests broken by the jit branch merge.


Modified: pypy/dist/pypy/jit/codegen/dump/rgenop.py
==============================================================================
--- pypy/dist/pypy/jit/codegen/dump/rgenop.py	(original)
+++ pypy/dist/pypy/jit/codegen/dump/rgenop.py	Sun Mar 18 17:00:50 2007
@@ -110,6 +110,17 @@
         return v
 
     @specialize.arg(1)
+    def genraisingop1(self, opname, gv_arg):
+        v1, v2 = self.llbuilder.genraisingop1(opname, gv_arg)
+        self.dump("%s, %s = %s.genraisingop1('%s', %s)" % (
+            self.rgenop.vname(v1),
+            self.rgenop.vname(v2),
+            self.name,
+            opname,
+            self.rgenop.vname(gv_arg)))
+        return v1, v2
+
+    @specialize.arg(1)
     def genop2(self, opname, gv_arg1, gv_arg2):
         v = self.llbuilder.genop2(opname, gv_arg1, gv_arg2)
         self.dump("%s = %s.genop2('%s', %s, %s)" % (
@@ -120,6 +131,18 @@
             self.rgenop.vname(gv_arg2)))
         return v
 
+    @specialize.arg(1)
+    def genraisingop2(self, opname, gv_arg1, gv_arg2):
+        v1, v2 = self.llbuilder.genraisingop2(opname, gv_arg1, gv_arg2)
+        self.dump("%s, %s = %s.genraisingop2('%s', %s, %s)" % (
+            self.rgenop.vname(v1),
+            self.rgenop.vname(v2),
+            self.name,
+            opname,
+            self.rgenop.vname(gv_arg1),
+            self.rgenop.vname(gv_arg2)))
+        return v1, v2
+
     def genop_ptr_iszero(self, kind, gv_ptr):
         v = self.llbuilder.genop_ptr_iszero(kind, gv_ptr)
         self.dump("%s = %s.genop_ptr_iszero(%s, %s)" % (

Modified: pypy/dist/pypy/jit/codegen/dump/test/test_rgenop.py
==============================================================================
--- pypy/dist/pypy/jit/codegen/dump/test/test_rgenop.py	(original)
+++ pypy/dist/pypy/jit/codegen/dump/test/test_rgenop.py	Sun Mar 18 17:00:50 2007
@@ -24,3 +24,5 @@
         return True
     def __ne__(self, other):
         return False
+    def __and__(self, other):
+        return Whatever()      # for test_ovfcheck_adder_direct

Modified: pypy/dist/pypy/jit/codegen/llgraph/test/test_rgenop.py
==============================================================================
--- pypy/dist/pypy/jit/codegen/llgraph/test/test_rgenop.py	(original)
+++ pypy/dist/pypy/jit/codegen/llgraph/test/test_rgenop.py	Sun Mar 18 17:00:50 2007
@@ -12,6 +12,7 @@
     def setup_method(self, meth):
         if 'ovfcheck' in meth.__name__:
             py.test.skip("no chance (the llinterpreter has no rtyper)")
+        AbstractRGenOpTests.setup_method(self, meth)
 
     def getcompiled(self, runner, argtypes, annotatorpolicy):
         def quasi_compiled_runner(*args):

Modified: pypy/dist/pypy/jit/codegen/test/rgenop_tests.py
==============================================================================
--- pypy/dist/pypy/jit/codegen/test/rgenop_tests.py	(original)
+++ pypy/dist/pypy/jit/codegen/test/rgenop_tests.py	Sun Mar 18 17:00:50 2007
@@ -1963,7 +1963,7 @@
         builder.finish_and_return(sigtoken, gv_result)
         builder.end()
 
-        fnptr = self.cast(gv_fn, 1)
+        fnptr = self.cast(gv_fn, 2)
         for x, y, expected in testcases:
             res = fnptr(x, y)
             if expected is None: