[pypy-svn] r66161 - pypy/branch/pyjitpl5/pypy/rlib

[arigo at codespeak.net]

Author: arigo
Date: Fri Jul 10 12:28:55 2009
New Revision: 66161

Modified:
   pypy/branch/pyjitpl5/pypy/rlib/libffi.py
   pypy/branch/pyjitpl5/pypy/rlib/rmmap.py
Log:
Fix for r63773 the proper way.
Makes test_libffi pass again.


Modified: pypy/branch/pyjitpl5/pypy/rlib/libffi.py
==============================================================================
--- pypy/branch/pyjitpl5/pypy/rlib/libffi.py	(original)
+++ pypy/branch/pyjitpl5/pypy/rlib/libffi.py	Fri Jul 10 12:28:55 2009
@@ -10,7 +10,6 @@
 from pypy.tool.autopath import pypydir
 from pypy.translator.tool.cbuild import ExternalCompilationInfo
 from pypy.rlib.rmmap import alloc
-from pypy.rlib.nonconst import NonConstant
 import py
 import os
 import sys
@@ -410,7 +409,7 @@
         self.free_list = lltype.nullptr(rffi.VOIDP.TO)
 
     def _more(self):
-        chunk = rffi.cast(CLOSURES, alloc(NonConstant(CHUNK)))
+        chunk = rffi.cast(CLOSURES, alloc(CHUNK))
         count = CHUNK//rffi.sizeof(FFI_CLOSUREP.TO)
         for i in range(count):
             rffi.cast(rffi.VOIDPP, chunk)[0] = self.free_list

Modified: pypy/branch/pyjitpl5/pypy/rlib/rmmap.py
==============================================================================
--- pypy/branch/pyjitpl5/pypy/rlib/rmmap.py	(original)
+++ pypy/branch/pyjitpl5/pypy/rlib/rmmap.py	Fri Jul 10 12:28:55 2009
@@ -634,6 +634,7 @@
             raise MemoryError
         hint.pos += map_size
         return res
+    alloc._annenforceargs_ = (int,)
 
     free = c_munmap