From: Richard Henderson <richard.henderson@linaro.org>
Date: Thu, 22 Oct 2020 17:48:48 +0000 (-0700)
Subject: softfloat: Use return_nan in float_to_float
X-Git-Tag: v6.1.0-rc0~119^2~35
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0d40cd939ac852270da545de235744abe34b61e5;p=thirdparty%2Fqemu.git

softfloat: Use return_nan in float_to_float

Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: David Hildenbrand <david@redhat.com>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---

diff --git a/fpu/softfloat.c b/fpu/softfloat.c
index 64edb237935..b694e385222 100644
--- a/fpu/softfloat.c
+++ b/fpu/softfloat.c
@@ -1931,13 +1931,7 @@ static FloatParts float_to_float(FloatParts a, const FloatFmt *dstf,
             break;
         }
     } else if (is_nan(a.cls)) {
-        if (is_snan(a.cls)) {
-            float_raise(float_flag_invalid, s);
-            a = parts_silence_nan(a, s);
-        }
-        if (s->default_nan_mode) {
-            return parts_default_nan(s);
-        }
+        return return_nan(a, s);
     }
     return a;
 }