[pypy-svn] r77568 - in pypy/branch/jitffi/pypy: jit/codewriter rlib

antocuni at codespeak.net antocuni at codespeak.net
Mon Oct 4 14:20:51 CEST 2010


Author: antocuni
Date: Mon Oct  4 14:20:50 2010
New Revision: 77568

Modified:
   pypy/branch/jitffi/pypy/jit/codewriter/support.py
   pypy/branch/jitffi/pypy/rlib/libffi.py
Log:
use rffi.{LONG,DOUBLE} instead of lltype.{Signed,Float} (just for aesthetic reasons)


Modified: pypy/branch/jitffi/pypy/jit/codewriter/support.py
==============================================================================
--- pypy/branch/jitffi/pypy/jit/codewriter/support.py	(original)
+++ pypy/branch/jitffi/pypy/jit/codewriter/support.py	Mon Oct  4 14:20:50 2010
@@ -1,5 +1,5 @@
 import sys
-from pypy.rpython.lltypesystem import lltype, rclass
+from pypy.rpython.lltypesystem import lltype, rclass, rffi
 from pypy.rpython.ootypesystem import ootype
 from pypy.rpython import rlist
 from pypy.rpython.lltypesystem import rstr as ll_rstr, rdict as ll_rdict
@@ -236,10 +236,10 @@
     return func(llfunc)._push_float(value, ll_args, i)
 
 def _ll_3_libffi_call_int(llfunc, funcsym, ll_args):
-    return func(llfunc)._do_call(funcsym, ll_args, lltype.Signed)
+    return func(llfunc)._do_call(funcsym, ll_args, rffi.LONG)
 
 def _ll_3_libffi_call_float(llfunc, funcsym, ll_args):
-    return func(llfunc)._do_call(funcsym, ll_args, lltype.Float)
+    return func(llfunc)._do_call(funcsym, ll_args, rffi.DOUBLE)
 
 
 

Modified: pypy/branch/jitffi/pypy/rlib/libffi.py
==============================================================================
--- pypy/branch/jitffi/pypy/rlib/libffi.py	(original)
+++ pypy/branch/jitffi/pypy/rlib/libffi.py	Mon Oct  4 14:20:50 2010
@@ -101,9 +101,9 @@
             arg.push(self, ll_args, i)
             i += 1
             arg = arg.next
-        if RESULT is lltype.Signed:
+        if RESULT is rffi.LONG:
             return self._do_call_int(self.funcsym, ll_args)
-        elif RESULT is lltype.Float:
+        elif RESULT is rffi.DOUBLE:
             return self._do_call_float(self.funcsym, ll_args)
         else:
             raise TypeError, 'Unsupported result type: %s' % RESULT
@@ -135,11 +135,11 @@
 
     @jit.oopspec('libffi_call_int(self, funcsym, ll_args)')
     def _do_call_int(self, funcsym, ll_args):
-        return self._do_call(funcsym, ll_args, lltype.Signed)
+        return self._do_call(funcsym, ll_args, rffi.LONG)
 
     @jit.oopspec('libffi_call_float(self, funcsym, ll_args)')
     def _do_call_float(self, funcsym, ll_args):
-        return self._do_call(funcsym, ll_args, lltype.Float)
+        return self._do_call(funcsym, ll_args, rffi.DOUBLE)
 
     # ------------------------------------------------------------------------
     # private methods



More information about the Pypy-commit mailing list