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

[ericvrp at codespeak.net]

Author: ericvrp
Date: Fri Jan 19 10:41:15 2007
New Revision: 36978

Modified:
   pypy/dist/pypy/jit/codegen/llvm/compatibility.py
   pypy/dist/pypy/jit/codegen/llvm/test/test_llvmjit.py
Log:
llvm 2.x now uses i1 instead of bool


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 19 10:41:15 2007
@@ -8,6 +8,7 @@
     icmp = scmp = ucmp = fcmp = 'set'
     inttoptr = trunc = zext = bitcast = inttoptr = 'cast'
     shr_prefix = ['', '']
+    i1  = 'bool'
     i8  = 'ubyte'
     i16 = 'short'
     i32 = 'int'
@@ -25,10 +26,10 @@
     inttoptr = 'inttoptr'
     shr_prefix = ['l', 'a']
     define = 'define'
+    i1  = 'i1'
     i8  = 'i8'
     i16 = 'i16'
     i32 = 'i32'
     i64 = 'i64'
 
-i1 = 'bool'
 f64 = 'double'

Modified: pypy/dist/pypy/jit/codegen/llvm/test/test_llvmjit.py
==============================================================================
--- pypy/dist/pypy/jit/codegen/llvm/test/test_llvmjit.py	(original)
+++ pypy/dist/pypy/jit/codegen/llvm/test/test_llvmjit.py	Fri Jan 19 10:41:15 2007
@@ -2,7 +2,7 @@
 from os.path import dirname, join
 from pypy.translator.c.test.test_genc import compile
 from pypy.jit.codegen.llvm import llvmjit
-from pypy.jit.codegen.llvm.compatibility import define, icmp, i32
+from pypy.jit.codegen.llvm.compatibility import define, icmp, i1, i32
 
 try:
     from pypy.jit.codegen.llvm import llvmjit
@@ -30,7 +30,7 @@
 lldeadcode = '''%(define)s %(i32)s %%deadcode(%(i32)s %%n) {
 Test:
     %%cond = %(icmp)seq %(i32)s %%n, %%n
-    br bool %%cond, label %%IfEqual, label %%IfUnequal
+    br %(i1)s %%cond, label %%IfEqual, label %%IfUnequal
 
 IfEqual:
     %%n2 = mul %(i32)s %%n, 2