1 files changed, 10 insertions, 29 deletions

diff --git a/arch/mips/math-emu/sp_simple.c b/arch/mips/math-emu/sp_simple.c
index ae4fcfafd853..f1ffaa9a17e0 100644
--- a/arch/mips/math-emu/sp_simple.c
+++ b/arch/mips/math-emu/sp_simple.c
@@ -5,8 +5,6 @@
  * MIPS floating point support
  * Copyright (C) 1994-2000 Algorithmics Ltd.
  *
- * ########################################################################
- *
  *  This program is free software; you can distribute it and/or modify it
  *  under the terms of the GNU General Public License (Version 2) as
  *  published by the Free Software Foundation.
@@ -18,33 +16,17 @@
  *
  *  You should have received a copy of the GNU General Public License along
  *  with this program; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place - Suite 330, Boston MA 02111-1307, USA.
- *
- * ########################################################################
+ *  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA.
  */
 
-
 #include "ieee754sp.h"
 
-int ieee754sp_finite(ieee754sp x)
-{
-        return SPBEXP(x) != SP_EMAX + 1 + SP_EBIAS;
-}
-
-ieee754sp ieee754sp_copysign(ieee754sp x, ieee754sp y)
-{
-        CLEARCX;
-        SPSIGN(x) = SPSIGN(y);
-        return x;
-}
-
-
-ieee754sp ieee754sp_neg(ieee754sp x)
+union ieee754sp ieee754sp_neg(union ieee754sp x)
 {
         COMPXSP;
 
         EXPLODEXSP;
-        CLEARCX;
+        ieee754_clearcx();
         FLUSHXSP;
 
         /*
@@ -55,30 +37,29 @@ ieee754sp ieee754sp_neg(ieee754sp x)
         SPSIGN(x) ^= 1;
 
         if (xc == IEEE754_CLASS_SNAN) {
-                ieee754sp y = ieee754sp_indef();
-                SETCX(IEEE754_INVALID_OPERATION);
+                union ieee754sp y = ieee754sp_indef();
+                ieee754_setcx(IEEE754_INVALID_OPERATION);
                 SPSIGN(y) = SPSIGN(x);
-                return ieee754sp_nanxcpt(y, "neg");
+                return ieee754sp_nanxcpt(y);
         }
 
         return x;
 }
 
-
-ieee754sp ieee754sp_abs(ieee754sp x)
+union ieee754sp ieee754sp_abs(union ieee754sp x)
 {
         COMPXSP;
 
         EXPLODEXSP;
-        CLEARCX;
+        ieee754_clearcx();
         FLUSHXSP;
 
         /* Clear sign ALWAYS, irrespective of NaN */
         SPSIGN(x) = 0;
 
         if (xc == IEEE754_CLASS_SNAN) {
-                SETCX(IEEE754_INVALID_OPERATION);
-                return ieee754sp_nanxcpt(ieee754sp_indef(), "abs");
+                ieee754_setcx(IEEE754_INVALID_OPERATION);
+                return ieee754sp_nanxcpt(ieee754sp_indef());
         }
 
         return x;