From 4c8b31e7fed11581fe48c8799fef809b83321e71 Mon Sep 17 00:00:00 2001
From: Richard Henderson <richard.henderson@linaro.org>
Date: Sat, 19 May 2018 23:25:02 -0400
Subject: [PATCH] target/mips: Remove floatX_maybe_silence_nan from conversions

This is now handled properly by the generic softfloat code.

Backports commit 4accd4a89f776b0d2a34d1edf74c785549c7f3b9 from qemu
---
 qemu/target/mips/msa_helper.c | 4 ----
 qemu/target/mips/op_helper.c  | 2 --
 2 files changed, 6 deletions(-)

diff --git a/qemu/target/mips/msa_helper.c b/qemu/target/mips/msa_helper.c
index 5e2a6a39..d9d3b8b6 100644
--- a/qemu/target/mips/msa_helper.c
+++ b/qemu/target/mips/msa_helper.c
@@ -1614,7 +1614,6 @@ static inline float16 float16_from_float32(int32_t a, flag ieee, float_status *s
       float16 f_val;
 
       f_val = float32_to_float16((float32)a, ieee , status);
-      f_val = float16_maybe_silence_nan(f_val, status);
 
       return a < 0 ? (f_val | (1 << 15)) : f_val;
 }
@@ -1624,7 +1623,6 @@ static inline float32 float32_from_float64(int64_t a, float_status *status)
       float32 f_val;
 
       f_val = float64_to_float32((float64)a, status);
-      f_val = float32_maybe_silence_nan(f_val, status);
 
       return a < 0 ? (f_val | (1 << 31)) : f_val;
 }
@@ -1634,7 +1632,6 @@ static inline float32 float32_from_float16(int16_t a, flag ieee, float_status *s
       float32 f_val;
 
       f_val = float16_to_float32((float16)a, ieee, status);
-      f_val = float32_maybe_silence_nan(f_val, status);
 
       return a < 0 ? (f_val | (1 << 31)) : f_val;
 }
@@ -1644,7 +1641,6 @@ static inline float64 float64_from_float32(int32_t a, float_status *status)
       float64 f_val;
 
       f_val = float32_to_float64((float64)a, status);
-      f_val = float64_maybe_silence_nan(f_val, status);
 
       return a < 0 ? (f_val | (1ULL << 63)) : f_val;
 }
diff --git a/qemu/target/mips/op_helper.c b/qemu/target/mips/op_helper.c
index 30b6a4ee..1651b73a 100644
--- a/qemu/target/mips/op_helper.c
+++ b/qemu/target/mips/op_helper.c
@@ -2690,7 +2690,6 @@ uint64_t helper_float_cvtd_s(CPUMIPSState *env, uint32_t fst0)
     uint64_t fdt2;
 
     fdt2 = float32_to_float64(fst0, &env->active_fpu.fp_status);
-    fdt2 = float64_maybe_silence_nan(fdt2, &env->active_fpu.fp_status);
     update_fcr31(env, GETPC());
     return fdt2;
 }
@@ -2780,7 +2779,6 @@ uint32_t helper_float_cvts_d(CPUMIPSState *env, uint64_t fdt0)
     uint32_t fst2;
 
     fst2 = float64_to_float32(fdt0, &env->active_fpu.fp_status);
-    fst2 = float32_maybe_silence_nan(fst2, &env->active_fpu.fp_status);
     update_fcr31(env, GETPC());
     return fst2;
 }