2 files changed, 38 insertions, 72 deletions

diff --git a/arch/mips/math-emu/dp_simple.c b/arch/mips/math-emu/dp_simple.c
index bccbe90efceb..926d56bf37f2 100644
--- a/arch/mips/math-emu/dp_simple.c
+++ b/arch/mips/math-emu/dp_simple.c
@@ -23,44 +23,27 @@
 
 union ieee754dp ieee754dp_neg(union ieee754dp x)
 {
-        COMPXDP;
-
-        EXPLODEXDP;
-        ieee754_clearcx();
-        FLUSHXDP;
-
-        /*
-         * Invert the sign ALWAYS to prevent an endless recursion on
-         * pow() in libc.
-         */
-        /* quick fix up */
-        DPSIGN(x) ^= 1;
-
-        if (xc == IEEE754_CLASS_SNAN) {
-                union ieee754dp y = ieee754dp_indef();
-                ieee754_setcx(IEEE754_INVALID_OPERATION);
-                DPSIGN(y) = DPSIGN(x);
-                return ieee754dp_nanxcpt(y);
-        }
-
-        return x;
+        unsigned int oldrm;
+        union ieee754dp y;
+
+        oldrm = ieee754_csr.rm;
+        ieee754_csr.rm = FPU_CSR_RD;
+        y = ieee754dp_sub(ieee754dp_zero(0), x);
+        ieee754_csr.rm = oldrm;
+        return y;
 }
 
 union ieee754dp ieee754dp_abs(union ieee754dp x)
 {
-        COMPXDP;
-
-        EXPLODEXDP;
-        ieee754_clearcx();
-        FLUSHXDP;
-
-        /* Clear sign ALWAYS, irrespective of NaN */
-        DPSIGN(x) = 0;
-
-        if (xc == IEEE754_CLASS_SNAN) {
-                ieee754_setcx(IEEE754_INVALID_OPERATION);
-                return ieee754dp_nanxcpt(ieee754dp_indef());
-        }
-
-        return x;
+        unsigned int oldrm;
+        union ieee754dp y;
+
+        oldrm = ieee754_csr.rm;
+        ieee754_csr.rm = FPU_CSR_RD;
+        if (DPSIGN(x))
+                y = ieee754dp_sub(ieee754dp_zero(0), x);
+        else
+                y = ieee754dp_add(ieee754dp_zero(0), x);
+        ieee754_csr.rm = oldrm;
+        return y;
 }
diff --git a/arch/mips/math-emu/sp_simple.c b/arch/mips/math-emu/sp_simple.c
index f1ffaa9a17e0..c50e9451f2d2 100644
--- a/arch/mips/math-emu/sp_simple.c
+++ b/arch/mips/math-emu/sp_simple.c
@@ -23,44 +23,27 @@
 
 union ieee754sp ieee754sp_neg(union ieee754sp x)
 {
-        COMPXSP;
-
-        EXPLODEXSP;
-        ieee754_clearcx();
-        FLUSHXSP;
-
-        /*
-         * Invert the sign ALWAYS to prevent an endless recursion on
-         * pow() in libc.
-         */
-        /* quick fix up */
-        SPSIGN(x) ^= 1;
-
-        if (xc == IEEE754_CLASS_SNAN) {
-                union ieee754sp y = ieee754sp_indef();
-                ieee754_setcx(IEEE754_INVALID_OPERATION);
-                SPSIGN(y) = SPSIGN(x);
-                return ieee754sp_nanxcpt(y);
-        }
-
-        return x;
+        unsigned int oldrm;
+        union ieee754sp y;
+
+        oldrm = ieee754_csr.rm;
+        ieee754_csr.rm = FPU_CSR_RD;
+        y = ieee754sp_sub(ieee754sp_zero(0), x);
+        ieee754_csr.rm = oldrm;
+        return y;
 }
 
 union ieee754sp ieee754sp_abs(union ieee754sp x)
 {
-        COMPXSP;
-
-        EXPLODEXSP;
-        ieee754_clearcx();
-        FLUSHXSP;
-
-        /* Clear sign ALWAYS, irrespective of NaN */
-        SPSIGN(x) = 0;
-
-        if (xc == IEEE754_CLASS_SNAN) {
-                ieee754_setcx(IEEE754_INVALID_OPERATION);
-                return ieee754sp_nanxcpt(ieee754sp_indef());
-        }
-
-        return x;
+        unsigned int oldrm;
+        union ieee754sp y;
+
+        oldrm = ieee754_csr.rm;
+        ieee754_csr.rm = FPU_CSR_RD;
+        if (SPSIGN(x))
+                y = ieee754sp_sub(ieee754sp_zero(0), x);
+        else
+                y = ieee754sp_add(ieee754sp_zero(0), x);
+        ieee754_csr.rm = oldrm;
+        return y;
 }