[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[commits] r8880 - in /fsf/trunk/libc: ./ sysdeps/ieee754/dbl-64/wordsize-64/
- To: commits@xxxxxxxxxx
- Subject: [commits] r8880 - in /fsf/trunk/libc: ./ sysdeps/ieee754/dbl-64/wordsize-64/
- From: eglibc@xxxxxxxxxx
- Date: Wed, 26 Aug 2009 07:04:21 -0000
Author: eglibc
Date: Wed Aug 26 00:04:20 2009
New Revision: 8880
Log:
Import glibc-mainline for 2009-08-26
Added:
fsf/trunk/libc/sysdeps/ieee754/dbl-64/wordsize-64/s_llround.c
fsf/trunk/libc/sysdeps/ieee754/dbl-64/wordsize-64/s_nearbyint.c
fsf/trunk/libc/sysdeps/ieee754/dbl-64/wordsize-64/s_rint.c
fsf/trunk/libc/sysdeps/ieee754/dbl-64/wordsize-64/s_round.c
Modified:
fsf/trunk/libc/ChangeLog
fsf/trunk/libc/sysdeps/ieee754/dbl-64/wordsize-64/s_lround.c
Modified: fsf/trunk/libc/ChangeLog
==============================================================================
--- fsf/trunk/libc/ChangeLog (original)
+++ fsf/trunk/libc/ChangeLog Wed Aug 26 00:04:20 2009
@@ -1,3 +1,14 @@
+2009-08-25 Ulrich Drepper <drepper@xxxxxxxxxx>
+
+ * sysdeps/ieee754/dbl-64/wordsize-64/s_lround.c: Add llround aliases.
+ * sysdeps/ieee754/dbl-64/wordsize-64/s_llround.c: New file.
+
+ * sysdeps/ieee754/dbl-64/wordsize-64/s_nearbyint.c: New file
+
+ * sysdeps/ieee754/dbl-64/wordsize-64/s_rint.c: New file.
+
+ * sysdeps/ieee754/dbl-64/wordsize-64/s_round.c: New file.
+
2009-08-25 Joseph Myers <joseph@xxxxxxxxxxxxxxxx>
* math/s_fdiml.c (__fdiml): Use fpclassify instead of fpclassifyl.
Added: fsf/trunk/libc/sysdeps/ieee754/dbl-64/wordsize-64/s_llround.c
==============================================================================
--- fsf/trunk/libc/sysdeps/ieee754/dbl-64/wordsize-64/s_llround.c (added)
+++ fsf/trunk/libc/sysdeps/ieee754/dbl-64/wordsize-64/s_llround.c Wed Aug 26 00:04:20 2009
@@ -1,0 +1,1 @@
+/* The code is the same as lround. Use an alias, see l_round.c. */
Modified: fsf/trunk/libc/sysdeps/ieee754/dbl-64/wordsize-64/s_lround.c
==============================================================================
--- fsf/trunk/libc/sysdeps/ieee754/dbl-64/wordsize-64/s_lround.c (original)
+++ fsf/trunk/libc/sysdeps/ieee754/dbl-64/wordsize-64/s_lround.c Wed Aug 26 00:04:20 2009
@@ -17,6 +17,9 @@
License along with the GNU C Library; if not, write to the Free
Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
02111-1307 USA. */
+
+#define llround __hidden_llround
+#define __llround __hidden___llround
#include <math.h>
@@ -65,3 +68,13 @@
strong_alias (__lround, __lroundl)
weak_alias (__lround, lroundl)
#endif
+
+/* long long has the same width as long on 64-bit machines. */
+#undef llround
+#undef __llround
+strong_alias (__lround, __llround)
+weak_alias (__lround, llround)
+#ifdef NO_LONG_DOUBLE
+strong_alias (__lround, __llroundl)
+weak_alias (__lround, llroundl)
+#endif
Added: fsf/trunk/libc/sysdeps/ieee754/dbl-64/wordsize-64/s_nearbyint.c
==============================================================================
--- fsf/trunk/libc/sysdeps/ieee754/dbl-64/wordsize-64/s_nearbyint.c (added)
+++ fsf/trunk/libc/sysdeps/ieee754/dbl-64/wordsize-64/s_nearbyint.c Wed Aug 26 00:04:20 2009
@@ -1,0 +1,86 @@
+/* Adapted for use as nearbyint by Ulrich Drepper <drepper@xxxxxxxxxx>. */
+/*
+ * ====================================================
+ * 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).
+ */
+
+#include <fenv.h>
+#include "math.h"
+#include "math_private.h"
+
+#ifdef __STDC__
+static const double
+#else
+static double
+#endif
+TWO52[2]={
+ 4.50359962737049600000e+15, /* 0x43300000, 0x00000000 */
+ -4.50359962737049600000e+15, /* 0xC3300000, 0x00000000 */
+};
+
+#ifdef __STDC__
+ double __nearbyint(double x)
+#else
+ double __nearbyint(x)
+ double x;
+#endif
+{
+ fenv_t env;
+ 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) {
+ if((i0&UINT64_C(0x7fffffffffffffff))==0) return x;
+ uint64_t i = i0 & UINT64_C(0xfffffffffffff);
+ i0 &= UINT64_C(0xfffe000000000000);
+ i0 |= (((i|-i) >> 12) & UINT64_C(0x8000000000000));
+ INSERT_WORDS64(x,i0);
+ feholdexcept (&env);
+ double w = TWO52[sx]+x;
+ double t = w-TWO52[sx];
+ fesetenv (&env);
+ EXTRACT_WORDS64(i0,t);
+ INSERT_WORDS64(t,(i0&UINT64_C(0x7fffffffffffffff))|(sx<<63));
+ return t;
+ } else {
+ uint64_t i = UINT64_C(0x000fffffffffffff)>>j0;
+ if((i0&i)==0) return x; /* x is integral */
+ i>>=1;
+ if((i0&i)!=0)
+ i0 = (i0&(~i))|(UINT64_C(0x4000000000000)>>j0);
+ }
+ } else {
+ if(j0==0x400) return x+x; /* inf or NaN */
+ else return x; /* x is integral */
+ }
+ INSERT_WORDS64(x,i0);
+ feholdexcept (&env);
+ double w = TWO52[sx]+x;
+ double t = w-TWO52[sx];
+ fesetenv (&env);
+ return t;
+}
+weak_alias (__nearbyint, nearbyint)
+#ifdef NO_LONG_DOUBLE
+strong_alias (__nearbyint, __nearbyintl)
+weak_alias (__nearbyint, nearbyintl)
+#endif
Added: fsf/trunk/libc/sysdeps/ieee754/dbl-64/wordsize-64/s_rint.c
==============================================================================
--- fsf/trunk/libc/sysdeps/ieee754/dbl-64/wordsize-64/s_rint.c (added)
+++ fsf/trunk/libc/sysdeps/ieee754/dbl-64/wordsize-64/s_rint.c Wed Aug 26 00:04:20 2009
@@ -1,0 +1,79 @@
+/* @(#)s_rint.c 5.1 93/09/24 */
+/*
+ * ====================================================
+ * 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).
+ */
+
+#include "math.h"
+#include "math_private.h"
+
+#ifdef __STDC__
+static const double
+#else
+static double
+#endif
+TWO52[2]={
+ 4.50359962737049600000e+15, /* 0x43300000, 0x00000000 */
+ -4.50359962737049600000e+15, /* 0xC3300000, 0x00000000 */
+};
+
+#ifdef __STDC__
+ double __rint(double x)
+#else
+ double __rint(x)
+ double x;
+#endif
+{
+ 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) {
+ if((i0 & UINT64_C(0x7fffffffffffffff))==0) return x;
+ uint64_t i = i0 & UINT64_C(0xfffffffffffff);
+ i0 &= UINT64_C(0xfffe000000000000);
+ i0 |= (((i|-i) >> 12) & UINT64_C(0x8000000000000));
+ INSERT_WORDS64(x,i0);
+ 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 {
+ uint64_t i = UINT64_C(0x000fffffffffffff)>>j0;
+ if((i0&i)==0) return x; /* x is integral */
+ i>>=1;
+ if((i0&i)!=0)
+ i0 = (i0&(~i))|(UINT64_C(0x4000000000000)>>j0);
+ }
+ } else {
+ if(j0==0x400) return x+x; /* inf or NaN */
+ else return x; /* x is integral */
+ }
+ INSERT_WORDS64(x,i0);
+ double w = TWO52[sx]+x;
+ return w-TWO52[sx];
+}
+weak_alias (__rint, rint)
+#ifdef NO_LONG_DOUBLE
+strong_alias (__rint, __rintl)
+weak_alias (__rint, rintl)
+#endif
Added: fsf/trunk/libc/sysdeps/ieee754/dbl-64/wordsize-64/s_round.c
==============================================================================
--- fsf/trunk/libc/sysdeps/ieee754/dbl-64/wordsize-64/s_round.c (added)
+++ fsf/trunk/libc/sysdeps/ieee754/dbl-64/wordsize-64/s_round.c Wed Aug 26 00:04:20 2009
@@ -1,0 +1,77 @@
+/* Round double to integer away from zero.
+ Copyright (C) 1997, 2009 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+ Contributed by Ulrich Drepper <drepper@xxxxxxxxxx>, 1997.
+
+ The GNU C Library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ The GNU C Library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with the GNU C Library; if not, write to the Free
+ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+ 02111-1307 USA. */
+
+#include <math.h>
+
+#include "math_private.h"
+
+
+static const double huge = 1.0e300;
+
+
+double
+__round (double x)
+{
+ int64_t i0, j0;
+
+ EXTRACT_WORDS64 (i0, x);
+ j0 = ((i0 >> 52) & 0x7ff) - 0x3ff;
+ if (__builtin_expect (j0 < 52, 1))
+ {
+ if (j0 < 0)
+ {
+ if (huge + x > 0.0)
+ {
+ i0 &= UINT64_C(0x8000000000000000);
+ if (j0 == -1)
+ i0 |= UINT64_C(0x3ff0000000000000);
+ }
+ }
+ else
+ {
+ uint64_t i = UINT64_C(0x000fffffffffffff) >> j0;
+ if ((i0 & i) == 0)
+ /* X is integral. */
+ return x;
+ if (huge + x > 0.0)
+ {
+ /* Raise inexact if x != 0. */
+ i0 += UINT64_C(0x0008000000000000) >> j0;
+ i0 &= ~i;
+ }
+ }
+ }
+ else
+ {
+ if (j0 == 0x400)
+ /* Inf or NaN. */
+ return x + x;
+ else
+ return x;
+ }
+
+ INSERT_WORDS64 (x, i0);
+ return x;
+}
+weak_alias (__round, round)
+#ifdef NO_LONG_DOUBLE
+strong_alias (__round, __roundl)
+weak_alias (__round, roundl)
+#endif