[pypy-svn] r76419 - in pypy/branch/fast-ctypes/pypy: module/jitffi rlib

[getxsick at codespeak.net]

Author: getxsick
Date: Sat Jul 31 17:27:36 2010
New Revision: 76419

Modified:
   pypy/branch/fast-ctypes/pypy/module/jitffi/interp_jitffi.py
   pypy/branch/fast-ctypes/pypy/rlib/rjitffi.py
Log:
temporary remove support for C pointers. it has never worked actually.


Modified: pypy/branch/fast-ctypes/pypy/module/jitffi/interp_jitffi.py
==============================================================================
--- pypy/branch/fast-ctypes/pypy/module/jitffi/interp_jitffi.py	(original)
+++ pypy/branch/fast-ctypes/pypy/module/jitffi/interp_jitffi.py	Sat Jul 31 17:27:36 2010
@@ -83,8 +83,6 @@
                     self.rget.push_int(space.int_w(w_arg))
                 elif self.rget.args_type[i] == 'f':
                     self.rget.push_float(space.float_w(w_arg))
-                elif self.rget.args_type[i] == 'p':
-                    self.rget.push_ref(space.int_w(w_arg))
                 else:
                     raise OperationError(
                             space.w_TypeError,

Modified: pypy/branch/fast-ctypes/pypy/rlib/rjitffi.py
==============================================================================
--- pypy/branch/fast-ctypes/pypy/rlib/rjitffi.py	(original)
+++ pypy/branch/fast-ctypes/pypy/rlib/rjitffi.py	Sat Jul 31 17:27:36 2010
@@ -3,7 +3,7 @@
 from pypy.rpython.lltypesystem import rffi, lltype
 from pypy.jit.backend.llsupport import descr, symbolic
 from pypy.jit.metainterp.history import LoopToken, BasicFailDescr
-from pypy.jit.metainterp.history import BoxInt, BoxFloat, BoxPtr, NULLBOX
+from pypy.jit.metainterp.history import BoxInt, BoxFloat, NULLBOX
 from pypy.jit.metainterp.resoperation import ResOperation, rop
 from pypy.jit.metainterp.typesystem import deref
 
@@ -59,8 +59,6 @@
                     bargs.append(BoxInt())
                 elif arg == 'f':
                     bargs.append(BoxFloat())
-                elif arg == 'p':
-                    bargs.append(BoxPtr())
                 else:
                     raise ValueError(arg)
 
@@ -68,8 +66,6 @@
                 bres = BoxInt()
             elif self.res_type == 'f':
                 bres = BoxFloat()
-            elif self.res_type == 'p':
-                bres = BoxPtr()
             elif self.res_type == 'v':
                 bres = NULLBOX
             else:
@@ -92,8 +88,6 @@
             cls = SignedCallDescr
         elif self.res_type == 'f':
             cls = descr.FloatCallDescr
-        elif self.res_type == 'p':
-            cls = descr.NonGcPtrCallDescr
         elif self.res_type == 'v':
             cls = descr.VoidCallDescr
         else:
@@ -111,8 +105,6 @@
             r = push_result(self.cpu.get_latest_value_int(0))
         elif self.res_type == 'f':
             r = push_result(self.cpu.get_latest_value_float(0))
-        elif self.res_type == 'p':
-            r = push_result(self.cpu.get_latest_value_ref(0))
         elif self.res_type == 'v':
             r = None
         else:
@@ -134,10 +126,6 @@
         self.cpu.set_future_value_float(self.esp, value)
         self.esp += 1
 
-    def push_ref(self, value):
-        self.cpu.set_future_value_ref(self.esp, value)
-        self.esp += 1
-
 # ____________________________________________________________
 # CallDescrs