diff options
| author | stijn <stijn@ignitron.net> | 2020-04-09 09:05:48 +0200 |
|---|---|---|
| committer | Damien George <damien.p.george@gmail.com> | 2020-04-18 22:36:14 +1000 |
| commit | 0ba68f8a1dae84de950420aebf8ad46582a38e66 (patch) | |
| tree | c996a9b3d26f58b286ef6f9deb508de141b66574 /extmod | |
| parent | b909e8b2dd007d8e7d61547768518b29bb4f833c (diff) | |
all: Fix implicit floating point promotion.
Initially some of these were found building the unix coverage variant on
MacOS because that build uses clang and has -Wdouble-promotion enabled, and
clang performs more vigorous promotion checks than gcc. Additionally the
codebase has been compiled with clang and msvc (the latter with warning
level 3), and with MICROPY_FLOAT_IMPL_FLOAT to find the rest of the
conversions.
Fixes are implemented either as explicit casts, or by using the correct
type, or by using one of the utility functions to handle floating point
casting; these have been moved from nativeglue.c to the public API.
Diffstat (limited to 'extmod')
| -rw-r--r-- | extmod/moductypes.c | 7 | ||||
| -rw-r--r-- | extmod/moduselect.c | 2 |
2 files changed, 4 insertions, 5 deletions
diff --git a/extmod/moductypes.c b/extmod/moductypes.c index eb9ca57e3..cdbf49ad4 100644 --- a/extmod/moductypes.c +++ b/extmod/moductypes.c @@ -360,7 +360,7 @@ STATIC mp_obj_t get_aligned(uint val_type, void *p, mp_int_t index) { return mp_obj_new_int_from_ll(((int64_t *)p)[index]); #if MICROPY_PY_BUILTINS_FLOAT case FLOAT32: - return mp_obj_new_float(((float *)p)[index]); + return mp_obj_new_float_from_f(((float *)p)[index]); case FLOAT64: return mp_obj_new_float(((double *)p)[index]); #endif @@ -373,11 +373,10 @@ STATIC mp_obj_t get_aligned(uint val_type, void *p, mp_int_t index) { STATIC void set_aligned(uint val_type, void *p, mp_int_t index, mp_obj_t val) { #if MICROPY_PY_BUILTINS_FLOAT if (val_type == FLOAT32 || val_type == FLOAT64) { - mp_float_t v = mp_obj_get_float(val); if (val_type == FLOAT32) { - ((float *)p)[index] = v; + ((float *)p)[index] = mp_obj_get_float_to_f(val); } else { - ((double *)p)[index] = v; + ((double *)p)[index] = mp_obj_get_float_to_d(val); } return; } diff --git a/extmod/moduselect.c b/extmod/moduselect.c index 122365607..80beb8e09 100644 --- a/extmod/moduselect.c +++ b/extmod/moduselect.c @@ -125,7 +125,7 @@ STATIC mp_obj_t select_select(size_t n_args, const mp_obj_t *args) { if (n_args == 4) { if (args[3] != mp_const_none) { #if MICROPY_PY_BUILTINS_FLOAT - float timeout_f = mp_obj_get_float(args[3]); + float timeout_f = mp_obj_get_float_to_f(args[3]); if (timeout_f >= 0) { timeout = (mp_uint_t)(timeout_f * 1000); } |