Merge branch 'misc' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild

[karo-tx-linux.git] / arch / mips / math-emu / sp_tint.c

diff --git a/arch/mips/math-emu/sp_tint.c b/arch/mips/math-emu/sp_tint.c
index 0fe9acc7716edecdf005be7836bb4544bcca9473..091299a317980b6bf0cfd84f0958b1f271d2bf9d 100644 (file)
--- a/arch/mips/math-emu/sp_tint.c
+++ b/arch/mips/math-emu/sp_tint.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,20 +16,21 @@
  *
  *  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 <linux/kernel.h>
 #include "ieee754sp.h"
 
-int ieee754sp_tint(ieee754sp x)
+int ieee754sp_tint(union ieee754sp x)
 {
+       u32 residue;
+       int round;
+       int sticky;
+       int odd;
+
        COMPXSP;
 
-       CLEARCX;
+       ieee754_clearcx();
 
        EXPLODEXSP;
        FLUSHXSP;
@@ -40,10 +39,12 @@ int ieee754sp_tint(ieee754sp x)
        case IEEE754_CLASS_SNAN:
        case IEEE754_CLASS_QNAN:
        case IEEE754_CLASS_INF:
-               SETCX(IEEE754_INVALID_OPERATION);
-               return ieee754si_xcpt(ieee754si_indef(), "sp_tint", x);
+               ieee754_setcx(IEEE754_INVALID_OPERATION);
+               return ieee754si_indef();
+
        case IEEE754_CLASS_ZERO:
                return 0;
+
        case IEEE754_CLASS_DNORM:
        case IEEE754_CLASS_NORM:
                break;
@@ -54,18 +55,13 @@ int ieee754sp_tint(ieee754sp x)
                        return -0x80000000;
                /* Set invalid. We will only use overflow for floating
                   point overflow */
-               SETCX(IEEE754_INVALID_OPERATION);
-               return ieee754si_xcpt(ieee754si_indef(), "sp_tint", x);
+               ieee754_setcx(IEEE754_INVALID_OPERATION);
+               return ieee754si_indef();
        }
        /* oh gawd */
-       if (xe > SP_MBITS) {
-               xm <<= xe - SP_MBITS;
+       if (xe > SP_FBITS) {
+               xm <<= xe - SP_FBITS;
        } else {
-               u32 residue;
-               int round;
-               int sticky;
-               int odd;
-
                if (xe < -1) {
                        residue = xm;
                        round = 0;
@@ -76,51 +72,38 @@ int ieee754sp_tint(ieee754sp x)
                        * so we do it in two steps. Be aware that xe
                        * may be -1 */
                        residue = xm << (xe + 1);
-                       residue <<= 31 - SP_MBITS;
+                       residue <<= 31 - SP_FBITS;
                        round = (residue >> 31) != 0;
                        sticky = (residue << 1) != 0;
-                       xm >>= SP_MBITS - xe;
+                       xm >>= SP_FBITS - xe;
                }
                odd = (xm & 0x1) != 0x0;
                switch (ieee754_csr.rm) {
-               case IEEE754_RN:
+               case FPU_CSR_RN:
                        if (round && (sticky || odd))
                                xm++;
                        break;
-               case IEEE754_RZ:
+               case FPU_CSR_RZ:
                        break;
-               case IEEE754_RU:        /* toward +Infinity */
+               case FPU_CSR_RU:        /* toward +Infinity */
                        if ((round || sticky) && !xs)
                                xm++;
                        break;
-               case IEEE754_RD:        /* toward -Infinity */
+               case FPU_CSR_RD:        /* toward -Infinity */
                        if ((round || sticky) && xs)
                                xm++;
                        break;
                }
                if ((xm >> 31) != 0) {
                        /* This can happen after rounding */
-                       SETCX(IEEE754_INVALID_OPERATION);
-                       return ieee754si_xcpt(ieee754si_indef(), "sp_tint", x);
+                       ieee754_setcx(IEEE754_INVALID_OPERATION);
+                       return ieee754si_indef();
                }
                if (round || sticky)
-                       SETCX(IEEE754_INEXACT);
+                       ieee754_setcx(IEEE754_INEXACT);
        }
        if (xs)
                return -xm;
        else
                return xm;
 }
-
-
-unsigned int ieee754sp_tuns(ieee754sp x)
-{
-       ieee754sp hb = ieee754sp_1e31();
-
-       /* what if x < 0 ?? */
-       if (ieee754sp_lt(x, hb))
-               return (unsigned) ieee754sp_tint(x);
-
-       return (unsigned) ieee754sp_tint(ieee754sp_sub(x, hb)) |
-           ((unsigned) 1 << 31);
-}