[pypy-svn] r54533 - pypy/dist/pypy/module/_rawffi

[arigo at codespeak.net]

Author: arigo
Date: Wed May  7 15:49:21 2008
New Revision: 54533

Modified:
   pypy/dist/pypy/module/_rawffi/callback.py
   pypy/dist/pypy/module/_rawffi/interp_rawffi.py
Log:
64-bit fixes.


Modified: pypy/dist/pypy/module/_rawffi/callback.py
==============================================================================
--- pypy/dist/pypy/module/_rawffi/callback.py	(original)
+++ pypy/dist/pypy/module/_rawffi/callback.py	Wed May  7 15:49:21 2008
@@ -53,12 +53,12 @@
                                            callback, number)
         self.ll_buffer = rffi.cast(rffi.VOIDP, self.ll_callback.ll_closure)
         if tracker.DO_TRACING:
-            addr = rffi.cast(rffi.INT, self.ll_callback.ll_closure)
+            addr = rffi.cast(lltype.Signed, self.ll_callback.ll_closure)
             tracker.trace_allocation(addr, self)
 
     def free(self):
         if tracker.DO_TRACING:
-            addr = rffi.cast(rffi.INT, self.ll_callback.ll_closure)
+            addr = rffi.cast(lltype.Signed, self.ll_callback.ll_closure)
             tracker.trace_free(addr)
         del self.global_counter.CallbackPtr_by_number[self.number]
     free.unwrap_spec = ['self']

Modified: pypy/dist/pypy/module/_rawffi/interp_rawffi.py
==============================================================================
--- pypy/dist/pypy/module/_rawffi/interp_rawffi.py	(original)
+++ pypy/dist/pypy/module/_rawffi/interp_rawffi.py	Wed May  7 15:49:21 2008
@@ -227,7 +227,7 @@
             self.ll_buffer = lltype.malloc(rffi.VOIDP.TO, size, flavor='raw',
                                            zero=True)
             if tracker.DO_TRACING:
-                ll_buf = rffi.cast(rffi.INT, self.ll_buffer)
+                ll_buf = rffi.cast(lltype.Signed, self.ll_buffer)
                 tracker.trace_allocation(ll_buf, self)
 
     def getbuffer(space, self):
@@ -249,7 +249,7 @@
 
     def _free(self):
         if tracker.DO_TRACING:
-            ll_buf = rffi.cast(rffi.INT, self.ll_buffer)
+            ll_buf = rffi.cast(lltype.Signed, self.ll_buffer)
             tracker.trace_free(ll_buf)
         lltype.free(self.ll_buffer, flavor='raw')
         self.ll_buffer = lltype.nullptr(rffi.VOIDP.TO)
@@ -355,7 +355,7 @@
         if tracker.DO_TRACING:
             # XXX this is needed, because functions tend to live forever
             #     hence our testing is not performing that well
-            del tracker.alloced[rffi.cast(rffi.INT, array.ll_buffer)]
+            del tracker.alloced[rffi.cast(lltype.Signed, array.ll_buffer)]
         return space.wrap(array)
     byptr.unwrap_spec = ['self', ObjSpace]