From 6bbbb1ab41a5319b0558b2f0131b3f746f0cb5b9 Mon Sep 17 00:00:00 2001
From: Damien George <damien.p.george@gmail.com>
Date: Tue, 28 Apr 2015 19:40:34 +0100
Subject: [PATCH] unix/modffi: Support passing float/double args.
---
tests/unix/ffi_float.py | 8 ++++++++
tests/unix/ffi_float.py.exp | 12 ++++++++++++
unix/modffi.c | 8 ++++++++
3 files changed, 28 insertions(+)
diff --git a/tests/unix/ffi_float.py b/tests/unix/ffi_float.py
index 448ba4412..144e8cb12 100644
--- a/tests/unix/ffi_float.py
+++ b/tests/unix/ffi_float.py
@@ -24,3 +24,11 @@ print('%.6f' % strtof('1.23', None))
strtod = libc.func("d", "strtod", "sp")
print('%.6f' % strtod('1.23', None))
+
+# test passing double and float args
+libm = ffi_open(('libm.so', 'libc.so.0', 'libc.so.6', 'libc.dylib'))
+tgamma = libm.func('d', 'tgamma', 'd')
+tgammaf = libm.func('f', 'tgammaf', 'f')
+for fun in (tgamma, tgammaf):
+ for val in (0.5, 1, 1.0, 1.5, 4, 4.0):
+ print('%.6f' % fun(val))
diff --git a/tests/unix/ffi_float.py.exp b/tests/unix/ffi_float.py.exp
index e6fd5b729..f50613000 100644
--- a/tests/unix/ffi_float.py.exp
+++ b/tests/unix/ffi_float.py.exp
@@ -1,2 +1,14 @@
1.230000
1.230000
+1.772454
+1.000000
+1.000000
+0.886227
+6.000000
+6.000000
+1.772454
+1.000000
+1.000000
+0.886227
+6.000000
+6.000000
diff --git a/unix/modffi.c b/unix/modffi.c
index 9e81b1e33..e0d86ad1d 100644
--- a/unix/modffi.c
+++ b/unix/modffi.c
@@ -356,6 +356,14 @@ STATIC mp_obj_t ffifunc_call(mp_obj_t self_in, mp_uint_t n_args, mp_uint_t n_kw,
mp_obj_t a = args[i];
if (*argtype == 'O') {
values[i] = (ffi_arg)a;
+ #if MICROPY_PY_BUILTINS_FLOAT
+ } else if (*argtype == 'f') {
+ float *p = (float*)&values[i];
+ *p = mp_obj_get_float(a);
+ } else if (*argtype == 'd') {
+ double *p = (double*)&values[i];
+ *p = mp_obj_get_float(a);
+ #endif
} else if (a == mp_const_none) {
values[i] = 0;
} else if (MP_OBJ_IS_INT(a)) {
--
GitLab