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

[ericvrp at codespeak.net]

Author: ericvrp
Date: Sat Jan 13 16:00:45 2007
New Revision: 36661

Modified:
   pypy/dist/pypy/jit/codegen/llvm/rgenop.py
   pypy/dist/pypy/jit/codegen/llvm/test/test_genc_ts.py
   pypy/dist/pypy/jit/codegen/llvm/test/test_rgenop.py
   pypy/dist/pypy/jit/codegen/test/rgenop_tests.py
Log:
Another missing builder.end(), more tests pass


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	Sat Jan 13 16:00:45 2007
@@ -217,7 +217,8 @@
         return '%s %s' % (self.type, self.operand2())
 
     def operand2(self):
-        s = str(llmemory.cast_adr_to_int(self.addr))
+        addr = self.addr
+        s = str(llmemory.cast_adr_to_int(addr))
         if s == '0':
             s = 'null'
         return s

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	Sat Jan 13 16:00:45 2007
@@ -27,5 +27,3 @@
         test_two_loops_merging = skip_too_minimal #segfault
         test_green_char_at_merge = skip #segfault
         test_residual_red_call_with_exc = skip
-    else: #needs fixing for >= 2.0
-        test_array_of_voids = skip

Modified: pypy/dist/pypy/jit/codegen/llvm/test/test_rgenop.py
==============================================================================
--- pypy/dist/pypy/jit/codegen/llvm/test/test_rgenop.py	(original)
+++ pypy/dist/pypy/jit/codegen/llvm/test/test_rgenop.py	Sat Jan 13 16:00:45 2007
@@ -24,6 +24,4 @@
         test_goto_compile = skip_too_minimal #segfault
         test_fact_direct = skip_too_minimal #segfault
 
-    test_fact_compile = skip #XXX Blocked block, introducted by this checkin (I don't understand)
-    test_calling_pause_direct = skip #segfault, look into later...
-    test_calling_pause_compile = skip # dito
+    test_fact_compile = skip #XXX Blocked block, (addr = self.addr) in AddrConst.operand2()

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	Sat Jan 13 16:00:45 2007
@@ -355,6 +355,7 @@
     builder.start_writing()
     builder.finish_and_return(sigtoken, gv_x)
 
+    builder.end()
     return gv_f
 
 def get_func_calling_pause_runner(RGenOp):