MIPS: math-emu: Optimise qNaN handling in `ieee754sp_fdp'

Rewrite qNaN handling in `ieee754sp_fdp' using the `ieee754_class_nan'
helper recently added, removing the external call to `ieee754sp_isnan'
and reducing the size of code by 16 instructions or 64 bytes.

Signed-off-by: Maciej W. Rozycki <macro@linux-mips.org>
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/9692/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

diff --git a/arch/mips/math-emu/sp_fdp.c b/arch/mips/math-emu/sp_fdp.c
index 152637093854fd645d72db786ef6ea3c6c259a15..3797148893adb62c10a989dc78e5e9dce56e1e9e 100644 (file)
--- a/arch/mips/math-emu/sp_fdp.c
+++ b/arch/mips/math-emu/sp_fdp.c
@@ -30,10 +30,11 @@ static inline union ieee754sp ieee754sp_nan_fdp(int xs, u64 xm)
 
 union ieee754sp ieee754sp_fdp(union ieee754dp x)
 {
+       union ieee754sp y;
        u32 rm;
 
        COMPXDP;
-       union ieee754sp nan;
+       COMPYSP;
 
        EXPLODEXDP;
 
@@ -46,10 +47,11 @@ union ieee754sp ieee754sp_fdp(union ieee754dp x)
                return ieee754sp_nanxcpt(ieee754sp_nan_fdp(xs, xm));
 
        case IEEE754_CLASS_QNAN:
-               nan = ieee754sp_nan_fdp(xs, xm);
-               if (!ieee754sp_isnan(nan))
-                       nan = ieee754sp_indef();
-               return nan;
+               y = ieee754sp_nan_fdp(xs, xm);
+               EXPLODEYSP;
+               if (!ieee754_class_nan(yc))
+                       y = ieee754sp_indef();
+               return y;
 
        case IEEE754_CLASS_INF:
                return ieee754sp_inf(xs);