From: Alex Bennée Date: Fri, 13 Apr 2018 14:03:34 +0000 (+0100) Subject: fpu/softfloat: raise float_invalid for NaN/Inf in round_to_int_and_pack X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=801bc56336a127d9b351b3a2cc0336e4d0cb2686;p=qemu.git fpu/softfloat: raise float_invalid for NaN/Inf in round_to_int_and_pack The re-factor broke the raising of INVALID when NaN/Inf is passed to the float_to_int conversion functions. round_to_uint_and_pack got this right for NaN but also missed out the Inf handling. Fixes https://bugs.launchpad.net/qemu/+bug/1759264 Signed-off-by: Alex Bennée Reviewed-by: Bastian Koppelmann Tested-by: Bastian Koppelmann Reviewed-by: Peter Maydell Message-id: 20180413140334.26622-3-alex.bennee@linaro.org Cc: Bastian Koppelmann Signed-off-by: Peter Maydell --- diff --git a/fpu/softfloat.c b/fpu/softfloat.c index 9b99aa6ec8..fb8663f59e 100644 --- a/fpu/softfloat.c +++ b/fpu/softfloat.c @@ -1344,8 +1344,10 @@ static int64_t round_to_int_and_pack(FloatParts in, int rmode, case float_class_qnan: case float_class_dnan: case float_class_msnan: + s->float_exception_flags = orig_flags | float_flag_invalid; return max; case float_class_inf: + s->float_exception_flags = orig_flags | float_flag_invalid; return p.sign ? min : max; case float_class_zero: return 0; @@ -1437,6 +1439,7 @@ static uint64_t round_to_uint_and_pack(FloatParts in, int rmode, uint64_t max, s->float_exception_flags = orig_flags | float_flag_invalid; return max; case float_class_inf: + s->float_exception_flags = orig_flags | float_flag_invalid; return p.sign ? 0 : max; case float_class_zero: return 0;