[pypy-svn] r53539 - pypy/branch/jit-hotpath/pypy/jit/codegen/ia32

[fijal at codespeak.net]

Author: fijal
Date: Mon Apr  7 20:18:58 2008
New Revision: 53539

Modified:
   pypy/branch/jit-hotpath/pypy/jit/codegen/ia32/objmodel.py
   pypy/branch/jit-hotpath/pypy/jit/codegen/ia32/rgenop.py
Log:
* fix annotation
* compute stack depth correctly (it's return ADDRESS, not return VALUE)


Modified: pypy/branch/jit-hotpath/pypy/jit/codegen/ia32/objmodel.py
==============================================================================
--- pypy/branch/jit-hotpath/pypy/jit/codegen/ia32/objmodel.py	(original)
+++ pypy/branch/jit-hotpath/pypy/jit/codegen/ia32/objmodel.py	Mon Apr  7 20:18:58 2008
@@ -197,6 +197,7 @@
     SIZE = 2
     # XXX hack for annotator
     buf = lltype.nullptr(FLOATBUF.TO)
+    is_pbc = False
     
     def __init__(self, floatval):
         if we_are_translated():

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 Apr  7 20:18:58 2008
@@ -1247,9 +1247,7 @@
         ofs = 0
         for argtoken in arg_tokens:
             ofs += TOKEN_TO_SIZE[argtoken]
-        if rettoken != 'v':
-            return ofs + TOKEN_TO_SIZE[rettoken]
-        return ofs
+        return ofs + WORD
 
     def newgraph(self, sigtoken, name):
         arg_tokens, res_token = sigtoken