[pypy-svn] r53198 - in pypy/branch/jit-hotpath/pypy/jit/codegen/ia32: . test

[arigo at codespeak.net]

Author: arigo
Date: Mon Mar 31 11:33:53 2008
New Revision: 53198

Modified:
   pypy/branch/jit-hotpath/pypy/jit/codegen/ia32/rgenop.py
   pypy/branch/jit-hotpath/pypy/jit/codegen/ia32/test/test_rgenop.py
Log:
Trivial fix for void returns.


Modified: pypy/branch/jit-hotpath/pypy/jit/codegen/ia32/rgenop.py
==============================================================================
--- pypy/branch/jit-hotpath/pypy/jit/codegen/ia32/rgenop.py	(original)
+++ pypy/branch/jit-hotpath/pypy/jit/codegen/ia32/rgenop.py	Mon Mar 31 11:33:53 2008
@@ -577,7 +577,7 @@
         initialstackdepth = self.rgenop._initial_stack_depth(stackdepth)
         if isinstance(gv_returnvar, FloatVar) or isinstance(gv_returnvar, FloatConst):
             self.mc.FLDL(gv_returnvar.operand(self))
-        else:
+        elif gv_returnvar is not None:
             self.mc.MOV(eax, gv_returnvar.operand(self))
         self.mc.ADD(esp, imm(WORD * (self.stackdepth - initialstackdepth)))
         self.mc.RET()

Modified: pypy/branch/jit-hotpath/pypy/jit/codegen/ia32/test/test_rgenop.py
==============================================================================
--- pypy/branch/jit-hotpath/pypy/jit/codegen/ia32/test/test_rgenop.py	(original)
+++ pypy/branch/jit-hotpath/pypy/jit/codegen/ia32/test/test_rgenop.py	Mon Mar 31 11:33:53 2008
@@ -32,8 +32,7 @@
     # casts
     test_cast_direct = skipped
 
-    # void returns
-    test_void_return = skipped
+    # lltype.Address in function arguments
     test_demo_f1_direct = skipped
 
 class TestRI386GenopCompile(AbstractRGenOpTestsCompile):