MIPS: math-emu: Factor out NaN FP format conversions

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

diff --git a/arch/mips/math-emu/dp_fsp.c b/arch/mips/math-emu/dp_fsp.c
index ffb69c5..88581f7 100644 (file)
--- a/arch/mips/math-emu/dp_fsp.c
+++ b/arch/mips/math-emu/dp_fsp.c
@@ -22,6 +22,12 @@
 #include "ieee754sp.h"
 #include "ieee754dp.h"
 
+static inline union ieee754dp ieee754dp_nan_fsp(int xs, u64 xm)
+{
+       return builddp(xs, DP_EMAX + 1 + DP_EBIAS,
+                      xm << (DP_FBITS - SP_FBITS));
+}
+
 union ieee754dp ieee754dp_fsp(union ieee754sp x)
 {
        COMPXSP;
@@ -38,11 +44,8 @@ union ieee754dp ieee754dp_fsp(union ieee754sp x)
                return ieee754dp_nanxcpt(ieee754dp_indef());
 
        case IEEE754_CLASS_QNAN:
-               return ieee754dp_nanxcpt(builddp(xs,
-                                                DP_EMAX + 1 + DP_EBIAS,
-                                                ((u64) xm
-                                                 << (DP_FBITS -
-                                                     SP_FBITS))));
+               return ieee754dp_nanxcpt(ieee754dp_nan_fsp(xs, xm));
+
        case IEEE754_CLASS_INF:
                return ieee754dp_inf(xs);
 

diff --git a/arch/mips/math-emu/sp_fdp.c b/arch/mips/math-emu/sp_fdp.c
index 1b266fb..4c0d0b4 100644 (file)
--- a/arch/mips/math-emu/sp_fdp.c
+++ b/arch/mips/math-emu/sp_fdp.c
@@ -22,6 +22,12 @@
 #include "ieee754sp.h"
 #include "ieee754dp.h"
 
+static inline union ieee754sp ieee754sp_nan_fdp(int xs, u64 xm)
+{
+       return buildsp(xs, SP_EMAX + 1 + SP_EBIAS,
+                      xm >> (DP_FBITS - SP_FBITS));
+}
+
 union ieee754sp ieee754sp_fdp(union ieee754dp x)
 {
        u32 rm;
@@ -41,8 +47,7 @@ union ieee754sp ieee754sp_fdp(union ieee754dp x)
                return ieee754sp_nanxcpt(ieee754sp_indef());
 
        case IEEE754_CLASS_QNAN:
-               nan = buildsp(xs, SP_EMAX + 1 + SP_EBIAS, (u32)
-                               (xm >> (DP_FBITS - SP_FBITS)));
+               nan = ieee754sp_nan_fdp(xs, xm);
                if (!ieee754sp_isnan(nan))
                        nan = ieee754sp_indef();
                return ieee754sp_nanxcpt(nan);