diff options
| author | Damien George | 2015-04-28 19:40:34 +0100 |
|---|---|---|
| committer | Damien George | 2015-04-28 19:40:34 +0100 |
| commit | 6bbbb1ab41a5319b0558b2f0131b3f746f0cb5b9 (patch) | |
| tree | 2ada905d837725acff9dd64a9bc611af84eed7bf | |
| parent | f1ed8c8a2e82dd4026d4a17a8356da314a91711e (diff) | |
unix/modffi: Support passing float/double args.
| -rw-r--r-- | tests/unix/ffi_float.py | 8 | ||||
| -rw-r--r-- | tests/unix/ffi_float.py.exp | 12 | ||||
| -rw-r--r-- | unix/modffi.c | 8 |
3 files changed, 28 insertions, 0 deletions
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)) { |