[pypy-svn] r77857 - in pypy/branch/jitffi/pypy: jit/backend/llsupport rlib

[antocuni at codespeak.net]

Author: antocuni
Date: Wed Oct 13 11:12:17 2010
New Revision: 77857

Modified:
   pypy/branch/jitffi/pypy/jit/backend/llsupport/ffisupport.py
   pypy/branch/jitffi/pypy/rlib/clibffi.py
   pypy/branch/jitffi/pypy/rlib/libffi.py
Log:
fix translation


Modified: pypy/branch/jitffi/pypy/jit/backend/llsupport/ffisupport.py
==============================================================================
--- pypy/branch/jitffi/pypy/jit/backend/llsupport/ffisupport.py	(original)
+++ pypy/branch/jitffi/pypy/jit/backend/llsupport/ffisupport.py	Wed Oct 13 11:12:17 2010
@@ -1,3 +1,4 @@
+from pypy.rlib.rarithmetic import intmask
 from pypy.jit.metainterp import history
 from pypy.jit.backend.llsupport.descr import DynamicIntCallDescr, NonGcPtrCallDescr,\
     FloatCallDescr, VoidCallDescr
@@ -12,7 +13,8 @@
         return None # ??
     arg_classes = ''.join(argkinds)
     if reskind == history.INT:
-        return DynamicIntCallDescr(arg_classes, ffi_result.c_size, extrainfo)
+        size = intmask(ffi_result.c_size)
+        return DynamicIntCallDescr(arg_classes, size, extrainfo)
     elif reskind == history.REF:
         return  NonGcPtrCallDescr(arg_classes, extrainfo)
     elif reskind == history.FLOAT:

Modified: pypy/branch/jitffi/pypy/rlib/clibffi.py
==============================================================================
--- pypy/branch/jitffi/pypy/rlib/clibffi.py	(original)
+++ pypy/branch/jitffi/pypy/rlib/clibffi.py	Wed Oct 13 11:12:17 2010
@@ -378,6 +378,8 @@
     ll_cif = lltype.nullptr(FFI_CIFP.TO)
     ll_argtypes = lltype.nullptr(FFI_TYPE_PP.TO)
 
+    _immutable_fields_ = ['argtypes', 'restype']
+
     def __init__(self, name, argtypes, restype, flags=FUNCFLAG_CDECL):
         self.name = name
         self.argtypes = argtypes

Modified: pypy/branch/jitffi/pypy/rlib/libffi.py
==============================================================================
--- pypy/branch/jitffi/pypy/rlib/libffi.py	(original)
+++ pypy/branch/jitffi/pypy/rlib/libffi.py	Wed Oct 13 11:12:17 2010
@@ -155,10 +155,10 @@
 
 class Func(AbstractFuncPtr):
 
-    _immutable_fields_ = ['funcsym', 'argtypes', 'restype']
+    _immutable_fields_ = ['funcsym']
     argtypes = []
-    restype = None
-    funcsym = None
+    restype = lltype.nullptr(clibffi.FFI_TYPE_P.TO)
+    funcsym = lltype.nullptr(rffi.VOIDP.TO)
 
     def __init__(self, name, argtypes, restype, funcsym, flags=FUNCFLAG_CDECL,
                  keepalive=None):