[pypy-svn] r52533 - pypy/branch/jit-hotpath/pypy/jit/rainbow

[arigo at codespeak.net]

Author: arigo
Date: Fri Mar 14 19:55:07 2008
New Revision: 52533

Modified:
   pypy/branch/jit-hotpath/pypy/jit/rainbow/fallback.py
   pypy/branch/jit-hotpath/pypy/jit/rainbow/hotpath.py
Log:
Translation fixes.


Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/fallback.py
==============================================================================
--- pypy/branch/jit-hotpath/pypy/jit/rainbow/fallback.py	(original)
+++ pypy/branch/jit-hotpath/pypy/jit/rainbow/fallback.py	Fri Mar 14 19:55:07 2008
@@ -120,9 +120,9 @@
             self.interpreter.debug_trace("fb_raise", type_name(llexctype))
             raise LLException(llexctype, llvalue)
         else:
-            ARGS = self.hotrunnerdesc.RAISE_DONE_FUNCPTR.TO.ARGS
-            if ARGS:
-                result = gv_result.revealconst(ARGS[0])
+            ARG = self.hotrunnerdesc.RAISE_DONE_FUNCPTR.TO.ARGS[0]
+            if ARG is not lltype.Void:
+                result = gv_result.revealconst(ARG)
             else:
                 result = None
             self.interpreter.debug_trace("fb_return", result)

Modified: pypy/branch/jit-hotpath/pypy/jit/rainbow/hotpath.py
==============================================================================
--- pypy/branch/jit-hotpath/pypy/jit/rainbow/hotpath.py	(original)
+++ pypy/branch/jit-hotpath/pypy/jit/rainbow/hotpath.py	Fri Mar 14 19:55:07 2008
@@ -223,10 +223,7 @@
                     ', '.join(map(str, self.args)),)
 
         self.raise_done = raise_done
-        if RES is lltype.Void:
-            RAISE_DONE_FUNC = lltype.FuncType([], lltype.Void)
-        else:
-            RAISE_DONE_FUNC = lltype.FuncType([RES], lltype.Void)
+        RAISE_DONE_FUNC = lltype.FuncType([RES], lltype.Void)
         self.tok_raise_done = self.RGenOp.sigToken(RAISE_DONE_FUNC)
         self.RAISE_DONE_FUNCPTR = lltype.Ptr(RAISE_DONE_FUNC)
         self.DoneWithThisFrame = DoneWithThisFrame