about summary refs log tree commit diff
path: root/sysdeps/ieee754/dbl-64/s_rint.c
diff options
context:
space:
mode:
authorStefan Liebler <stli@linux.ibm.com>2019-12-11 15:09:14 +0100
committerStefan Liebler <stli@linux.ibm.com>2019-12-11 15:12:12 +0100
commitab48bdd098a675dddb360faafc497a61c4bd4334 (patch)
tree4bcc08b408c56b3077b4e2f31a879a7f7aa33e6f /sysdeps/ieee754/dbl-64/s_rint.c
parentaf123aa95091d3d2d1b4ff027cf806ca1721d29d (diff)
downloadglibc-ab48bdd098a675dddb360faafc497a61c4bd4334.tar.gz
glibc-ab48bdd098a675dddb360faafc497a61c4bd4334.tar.xz
glibc-ab48bdd098a675dddb360faafc497a61c4bd4334.zip
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>
Diffstat (limited to 'sysdeps/ieee754/dbl-64/s_rint.c')
-rw-r--r--sysdeps/ieee754/dbl-64/s_rint.c32
1 files changed, 16 insertions, 16 deletions
diff --git a/sysdeps/ieee754/dbl-64/s_rint.c b/sysdeps/ieee754/dbl-64/s_rint.c
index dd01a84176..66c9196473 100644
--- 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