[pypy-svn] r58464 - in pypy/branch/oo-jit/pypy: jit/codegen/cli jit/codegen/cli/test translator/cli

[antocuni at codespeak.net]

Author: antocuni
Date: Mon Sep 29 10:59:24 2008
New Revision: 58464

Modified:
   pypy/branch/oo-jit/pypy/jit/codegen/cli/operation.py
   pypy/branch/oo-jit/pypy/jit/codegen/cli/rgenop.py
   pypy/branch/oo-jit/pypy/jit/codegen/cli/test/test_gencli_interpreter.py
   pypy/branch/oo-jit/pypy/translator/cli/opcodes.py
Log:
put more meaningful skip messages for some tests; some other tests pass out of
the box



Modified: pypy/branch/oo-jit/pypy/jit/codegen/cli/operation.py
==============================================================================
--- pypy/branch/oo-jit/pypy/jit/codegen/cli/operation.py	(original)
+++ pypy/branch/oo-jit/pypy/jit/codegen/cli/operation.py	Mon Sep 29 10:59:24 2008
@@ -317,7 +317,7 @@
     return '_'.join(parts)
 
 def is_comparison(opname):
-    if opname in ('ooisnull', 'oononnull'):
+    if opname in ('ooisnull', 'oononnull', 'oois'):
         return True
     suffixes = '_lt _le _eq _ne _gt _ge'.split()
     for suffix in suffixes:

Modified: pypy/branch/oo-jit/pypy/jit/codegen/cli/rgenop.py
==============================================================================
--- pypy/branch/oo-jit/pypy/jit/codegen/cli/rgenop.py	(original)
+++ pypy/branch/oo-jit/pypy/jit/codegen/cli/rgenop.py	Mon Sep 29 10:59:24 2008
@@ -424,6 +424,7 @@
         return builder, graph.gv_entrypoint, graph.inputargs_gv[:]
 
     def replay(self, label):
+        print 'Replay!'
         raise NotImplementedError
 
 

Modified: pypy/branch/oo-jit/pypy/jit/codegen/cli/test/test_gencli_interpreter.py
==============================================================================
--- pypy/branch/oo-jit/pypy/jit/codegen/cli/test/test_gencli_interpreter.py	(original)
+++ pypy/branch/oo-jit/pypy/jit/codegen/cli/test/test_gencli_interpreter.py	Mon Sep 29 10:59:24 2008
@@ -97,16 +97,15 @@
     def test_indirect_red_call_with_exc(self):
         py.test.skip("replay: NotImplementedError")
 
-    def test_indirect_gray_call(self):
-        py.test.skip('mono 1.2 crashes, try again with a newer version')
-        
     def test_red_int_add_ovf(self):
         py.test.skip("TODO: exceptions")
 
-    test_learn_nonzeroness = skip
-    test_freeze_booleffects_correctly = skip
-    test_ptrequality = skip
-    test_void_args = skip
+    def test_learn_nonzeroness(self):
+        py.test.skip("replay: NotImplementedError")
+
+    def test_freeze_booleffects_correctly(self):
+        py.test.skip("replay: NotImplementedError")
+
     test_red_isinstance = skip
     test_red_isinstance_degenerated = skip
     test_simple_array = skip

Modified: pypy/branch/oo-jit/pypy/translator/cli/opcodes.py
==============================================================================
--- pypy/branch/oo-jit/pypy/translator/cli/opcodes.py	(original)
+++ pypy/branch/oo-jit/pypy/translator/cli/opcodes.py	Mon Sep 29 10:59:24 2008
@@ -106,7 +106,6 @@
     'ullong_is_true':            [PushAllArgs, 'ldc.i8 0', 'cgt.un'],
     'ullong_invert':             'not',
 
-    'oois':                     'ceq',
     'ooisnull':                 [PushAllArgs, 'nop', 'nop', 'nop', 'ldnull', 'ceq'],
     'oononnull':                [PushAllArgs, 'nop', 'nop', 'nop', 'nop', 'ldnull', 'ceq']+Not,
 
@@ -251,6 +250,8 @@
     'ullong_ge':                _not('clt.un'),
     'ullong_lshift':            [PushAllArgs, 'conv.u4', 'shl'],
     'ullong_rshift':            [PushAllArgs, 'conv.i4', 'shr'],
+
+    'oois':                     'ceq',
 }
 
 opcodes = misc_ops.copy()