Author: Armin Rigo <[email protected]>
Branch: cpy-extension
Changeset: r299:86354ee3f21e
Date: 2012-06-12 18:19 +0200
http://bitbucket.org/cffi/cffi/changeset/86354ee3f21e/
Log: Avoid generating a platform-specific .c file. Instead, use #ifs in
the .c file here too.
diff --git a/cffi/verifier.py b/cffi/verifier.py
--- a/cffi/verifier.py
+++ b/cffi/verifier.py
@@ -72,37 +72,7 @@
def convert_to_c(self, tp, fromvar, tovar, errcode, is_funcarg=False):
if isinstance(tp, model.PrimitiveType):
- bt = self.ffi._get_cached_btype(tp)
- if tp.name in ('float', 'double'):
- # float types
- converter = 'PyFloat_AsDouble'
- #
- elif tp.name == 'char':
- # char
- converter = '_cffi_to_c_char'
- #
- else:
- unsigned = tp.name.startswith('unsigned ')
- size = self.ffi.sizeof(bt)
- size_of_long = self.ffi.sizeof('long')
- if size > size_of_long:
- # a 64-bit long long type on a 32-bit platform
- if unsigned:
- converter = '_cffi_to_c_unsigned_long_long'
- else:
- converter = 'PyLong_AsLongLong'
- #
- elif size == size_of_long and unsigned:
- # 'unsigned long' or an equivalently-sized unsigned type
- converter = '_cffi_to_c_unsigned_long'
- #
- elif size == size_of_long:
- # fits precisely in a 'long'
- converter = 'PyInt_AsLong'
- else:
- # shorter than a 'long'
- converter = '_cffi_to_c_%s' % (tp.name.replace(' ', '_'),)
- #
+ converter = '_cffi_to_c_%s' % (tp.name.replace(' ', '_'),)
errvalue = '-1'
#
elif isinstance(tp, model.PointerType):
@@ -245,10 +215,17 @@
((short(*)(PyObject *))_cffi_exports[3])
#define _cffi_to_c_unsigned_short \
((unsigned short(*)(PyObject *))_cffi_exports[4])
-#define _cffi_to_c_int \
- ((int(*)(PyObject *))_cffi_exports[5])
-#define _cffi_to_c_unsigned_int \
- ((unsigned int(*)(PyObject *))_cffi_exports[6])
+
+#if SIZEOF_INT < SIZEOF_LONG
+# define _cffi_to_c_int \
+ ((int(*)(PyObject *))_cffi_exports[5])
+# define _cffi_to_c_unsigned_int \
+ ((unsigned int(*)(PyObject *))_cffi_exports[6])
+#else
+# define _cffi_to_c_int _cffi_to_c_long
+# define _cffi_to_c_unsigned_int _cffi_to_c_unsigned_long
+#endif
+
#define _cffi_to_c_unsigned_long \
((unsigned long(*)(PyObject *))_cffi_exports[7])
#define _cffi_to_c_unsigned_long_long \
@@ -256,6 +233,12 @@
#define _cffi_to_c_char \
((char(*)(PyObject *))_cffi_exports[9])
+#if SIZEOF_LONG < SIZEOF_LONG_LONG
+# define _cffi_to_c_long_long PyLong_AsLongLong
+#else
+# define _cffi_to_c_long_long _cffi_to_c_long
+#endif
+
static void **_cffi_exports;
static int _cffi_init(void)
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
