[pypy-svn] r36600 - in pypy/dist/pypy/jit/codegen/llvm: . test

[ericvrp at codespeak.net]

Author: ericvrp
Date: Fri Jan 12 18:17:17 2007
New Revision: 36600

Modified:
   pypy/dist/pypy/jit/codegen/llvm/compatibility.py
   pypy/dist/pypy/jit/codegen/llvm/rgenop.py
   pypy/dist/pypy/jit/codegen/llvm/test/test_genc_ts.py
Log:
Remaining fixes to have all test_genc_ts tests pass on either llvm 1.9 or 2.0


Modified: pypy/dist/pypy/jit/codegen/llvm/compatibility.py
==============================================================================
--- pypy/dist/pypy/jit/codegen/llvm/compatibility.py	(original)
+++ pypy/dist/pypy/jit/codegen/llvm/compatibility.py	Fri Jan 12 18:17:17 2007
@@ -7,7 +7,7 @@
 if llvm_version() < 2.0:
     icmp = scmp = ucmp = fcmp = 'set'
     inttoptr = trunc = zext = bitcast = 'cast'
-    shr_prefix = ('', '')
+    shr_prefix = ['', '']
     i8  = 'ubyte'
     i16 = 'short'
     i32 = 'int'
@@ -22,7 +22,7 @@
     trunc = 'trunc'
     zext = 'zext'
     bitcast = 'bitcast'
-    shr_prefix = ('l', 'a')
+    shr_prefix = ['l', 'a']
     define = 'define'
     i8  = 'i8'
     i16 = 'i16'

Modified: pypy/dist/pypy/jit/codegen/llvm/rgenop.py
==============================================================================
--- pypy/dist/pypy/jit/codegen/llvm/rgenop.py	(original)
+++ pypy/dist/pypy/jit/codegen/llvm/rgenop.py	Fri Jan 12 18:17:17 2007
@@ -1,6 +1,7 @@
 import py, os
 from pypy.rlib.objectmodel import specialize
 from pypy.rpython.lltypesystem import lltype, llmemory
+from pypy.rlib.rarithmetic import intmask
 from pypy.jit.codegen.model import AbstractRGenOp, GenLabel, GenBuilder
 from pypy.jit.codegen.model import GenVar, GenConst, CodeGenSwitch
 from pypy.jit.codegen.llvm import llvmjit
@@ -180,13 +181,13 @@
     signed = False
 
     def __init__(self, value):
-        self.value = int(value)
+        self.value = value
 
     def operand2(self):
         return str(self.value)
 
     def get_integer_value(self):
-        return self.value
+        return intmask(self.value)
 
 
 class FloatConst(GenericConst):

Modified: pypy/dist/pypy/jit/codegen/llvm/test/test_genc_ts.py
==============================================================================
--- pypy/dist/pypy/jit/codegen/llvm/test/test_genc_ts.py	(original)
+++ pypy/dist/pypy/jit/codegen/llvm/test/test_genc_ts.py	Fri Jan 12 18:17:17 2007
@@ -5,10 +5,6 @@
 from pypy.jit.codegen.llvm.llvmjit import llvm_version, MINIMAL_VERSION
 
 
-skip_passing = False
-skip_failing = True
-
-
 class LLVMTimeshiftingTestMixin(I386TimeshiftingTestMixin):
     RGenOp = RLLVMGenOp
 
@@ -38,56 +34,3 @@
         test_array_of_voids = skip
         test_merge_structures = skip
         test_green_char_at_merge = skip
-
-    if skip_passing:
-        test_very_simple = skip
-        test_convert_const_to_redbox = skip
-        test_simple_opt_const_propagation2 = skip
-        test_simple_opt_const_propagation1 = skip
-        test_loop_folding = skip
-        test_loop_merging = skip
-        test_two_loops_merging = skip
-        test_convert_greenvar_to_redvar = skip
-        test_green_across_split = skip
-        test_merge_const_before_return = skip
-        test_merge_3_redconsts_before_return = skip
-        test_arith_plus_minus = skip
-        test_plus_minus_all_inlined = skip
-        test_call_simple = skip
-        test_call_2 = skip
-        test_call_3 = skip
-        test_call_4 = skip
-        test_void_call = skip
-        test_green_call = skip
-        test_split_on_green_return = skip
-        test_recursive_call = skip
-        test_simple_indirect_call = skip
-        test_normalize_indirect_call = skip
-        test_normalize_indirect_call_more = skip
-        test_green_red_mismatch_in_call = skip
-        test_red_call_ignored_result = skip
-        test_simple_struct = skip
-        test_simple_array = skip
-        test_setarrayitem  = skip
-        test_degenerated_before_return = skip
-        test_degenerated_before_return_2 = skip
-        test_degenerated_via_substructure = skip
-        test_red_virtual_container = skip
-        test_red_propagate = skip
-        test_red_subcontainer = skip
-        test_red_subcontainer_cast = skip
-        test_degenerated_at_return = skip
-        test_degenerate_with_voids = skip
-        test_red_array = skip
-        test_red_struct_array = skip
-        test_red_varsized_struct = skip
-        test_array_of_voids = skip
-        test_green_with_side_effects = skip
-        test_residual_red_call = skip
-        test_merge_structures = skip
-        test_simple_meth = skip
-        test_simple_red_meth = skip
-
-    #failing...
-    if skip_failing:
-        test_compile_time_const_tuple = skip