From 4e9ca91bb2bceb07ee8710fa4d5409e653a7a62f Mon Sep 17 00:00:00 2001 From: Richard Henderson Date: Sat, 19 May 2018 23:23:54 -0400 Subject: [PATCH] target/m68k: Use floatX_silence_nan when we have already checked for SNaN Backports commit 1c0c951f717e66b4be45611c0d6661a2dff4241c from qemu --- qemu/target/m68k/softfloat.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/qemu/target/m68k/softfloat.c b/qemu/target/m68k/softfloat.c index d0939972..b45a5e86 100644 --- a/qemu/target/m68k/softfloat.c +++ b/qemu/target/m68k/softfloat.c @@ -31,13 +31,14 @@ static floatx80 propagateFloatx80NaNOneArg(floatx80 a, float_status *status) { if (floatx80_is_signaling_nan(a, status)) { float_raise(float_flag_invalid, status); + a = floatx80_silence_nan(a, status); } if (status->default_nan_mode) { return floatx80_default_nan(status); } - return floatx80_maybe_silence_nan(a, status); + return a; } /*----------------------------------------------------------------------------