Always use wordsize-64 version of s_rint.c.

This patch replaces s_rint.c in sysdeps/dbl-64 with the one in
sysdeps/dbl-64/wordsize-64 and removes the latter one.
The code is not changed except changes in code style.

Also adjusted the include path in x86_64 file.

Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org>

diff --git a/sysdeps/ieee754/dbl-64/s_rint.c b/sysdeps/ieee754/dbl-64/s_rint.c
index dd01a841760d0243c90995c627ba6807ccb5b320..66c9196473e5db7cc690fe8b8e78286d6f707ccb 100644 (file)
--- a/sysdeps/ieee754/dbl-64/s_rint.c
+++ b/sysdeps/ieee754/dbl-64/s_rint.c
@@ -1,4 +1,3 @@
-/* @(#)s_rint.c 5.1 93/09/24 */
 /*
  * ====================================================
  * Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved.
@@ -26,38 +25,39 @@
 #include <libm-alias-double.h>
 
 static const double
-  TWO52[2] = {
-  4.50359962737049600000e+15, /* 0x43300000, 0x00000000 */
- -4.50359962737049600000e+15, /* 0xC3300000, 0x00000000 */
+TWO52[2] = {
+           4.50359962737049600000e+15, /* 0x43300000, 0x00000000 */
+           -4.50359962737049600000e+15, /* 0xC3300000, 0x00000000 */
 };
 
 double
 __rint (double x)
 {
-  int32_t i0, j0, sx;
-  double w, t;
-  GET_HIGH_WORD (i0, x);
-  sx = (i0 >> 31) & 1;
-  j0 = ((i0 >> 20) & 0x7ff) - 0x3ff;
+  int64_t i0, sx;
+  int32_t j0;
+  EXTRACT_WORDS64 (i0, x);
+  sx = (i0 >> 63) & 1;
+  j0 = ((i0 >> 52) & 0x7ff) - 0x3ff;
   if (j0 < 52)
     {
       if (j0 < 0)
        {
-         w = TWO52[sx] + x;
-         t = w - TWO52[sx];
-         GET_HIGH_WORD (i0, t);
-         SET_HIGH_WORD (t, (i0 & 0x7fffffff) | (sx << 31));
+         double w = TWO52[sx] + x;
+         double t =  w - TWO52[sx];
+         EXTRACT_WORDS64 (i0, t);
+         INSERT_WORDS64 (t, (i0 & UINT64_C (0x7fffffffffffffff))
+                         | (sx << 63));
          return t;
        }
     }
   else
     {
       if (j0 == 0x400)
-       return x + x;                   /* inf or NaN */
+       return x + x;                   /* inf or NaN  */
       else
-       return x;                       /* x is integral */
+       return x;                       /* x is integral  */
     }
-  w = TWO52[sx] + x;
+  double w = TWO52[sx] + x;
   return w - TWO52[sx];
 }
 #ifndef __rint

diff --git a/sysdeps/ieee754/dbl-64/wordsize-64/s_rint.c b/sysdeps/ieee754/dbl-64/wordsize-64/s_rint.c
deleted file mode 100644 (file)
index 378b73a..0000000
--- a/sysdeps/ieee754/dbl-64/wordsize-64/s_rint.c
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * ====================================================
- * Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved.
- *
- * Developed at SunPro, a Sun Microsystems, Inc. business.
- * Permission to use, copy, modify, and distribute this
- * software is freely granted, provided that this notice
- * is preserved.
- * ====================================================
- */
-
-/*
- * rint(x)
- * Return x rounded to integral value according to the prevailing
- * rounding mode.
- * Method:
- *     Using floating addition.
- * Exception:
- *     Inexact flag raised if x not equal to rint(x).
- */
-
-#define NO_MATH_REDIRECT
-#include <math.h>
-#include <math_private.h>
-#include <libm-alias-double.h>
-
-static const double
-TWO52[2]={
-  4.50359962737049600000e+15, /* 0x43300000, 0x00000000 */
- -4.50359962737049600000e+15, /* 0xC3300000, 0x00000000 */
-};
-
-double
-__rint(double x)
-{
-       int64_t i0,sx;
-       int32_t j0;
-       EXTRACT_WORDS64(i0,x);
-       sx = (i0>>63)&1;
-       j0 = ((i0>>52)&0x7ff)-0x3ff;
-       if(j0<52) {
-           if(j0<0) {
-               double w = TWO52[sx]+x;
-               double t =  w-TWO52[sx];
-               EXTRACT_WORDS64(i0,t);
-               INSERT_WORDS64(t,(i0&UINT64_C(0x7fffffffffffffff))|(sx<<63));
-               return t;
-           }
-       } else {
-           if(j0==0x400) return x+x;   /* inf or NaN */
-           else return x;              /* x is integral */
-       }
-       double w = TWO52[sx]+x;
-       return w-TWO52[sx];
-}
-#ifndef __rint
-libm_alias_double (__rint, rint)
-#endif

diff --git a/sysdeps/x86_64/fpu/multiarch/s_rint-c.c b/sysdeps/x86_64/fpu/multiarch/s_rint-c.c
index 162a630ff9afd45b69d30c9ca20de5d6ba3cc77b..b010150f524e54495f3a3101e170dd5f1263e65a 100644 (file)
--- a/sysdeps/x86_64/fpu/multiarch/s_rint-c.c
+++ b/sysdeps/x86_64/fpu/multiarch/s_rint-c.c
@@ -1,3 +1,3 @@
 #undef __rint
 #define __rint __rint_c
-#include <sysdeps/ieee754/dbl-64/wordsize-64/s_rint.c>
+#include <sysdeps/ieee754/dbl-64/s_rint.c>