From: Richard Henderson <richard.henderson@linaro.org>
Date: Thu, 10 May 2018 20:49:00 +0000 (-0700)
Subject: target/m68k: Use floatX_silence_nan when we have already checked for SNaN
X-Git-Tag: qemu-xen-4.12.0-rc1~226^2~12
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=1c0c951f717e66b4be45611c0d6661a2dff4241c;p=qemu-xen.git

target/m68k: Use floatX_silence_nan when we have already checked for SNaN

Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Laurent Vivier <laurent@vivier.eu>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---

diff --git a/target/m68k/softfloat.c b/target/m68k/softfloat.c
index d093997219..b45a5e8690 100644
--- a/target/m68k/softfloat.c
+++ b/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;
 }
 
 /*----------------------------------------------------------------------------