diff options
| author | joseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d> | 2012-02-08 16:44:31 +0000 |
|---|---|---|
| committer | joseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d> | 2012-02-08 16:44:31 +0000 |
| commit | 78be84cd747c2e3965bf6c2fd5f702d6ff2f5525 (patch) | |
| tree | c070a60ef7c5371bef8b7a559442a6920b394c8e /libc/sysdeps/ieee754/dbl-64/s_modf.c | |
| parent | de06548e980675e65a1e6d850bb8c3a3f7ec638d (diff) | |
| download | eglibc2-78be84cd747c2e3965bf6c2fd5f702d6ff2f5525.tar.gz | |
Merge changes between r16568 and r17050 from /fsf/trunk.
git-svn-id: svn://svn.eglibc.org/trunk@17051 7b3dc134-2b1b-0410-93df-9e9f96275f8d
Diffstat (limited to 'libc/sysdeps/ieee754/dbl-64/s_modf.c')
| -rw-r--r-- | libc/sysdeps/ieee754/dbl-64/s_modf.c | 23 |
1 files changed, 5 insertions, 18 deletions
diff --git a/libc/sysdeps/ieee754/dbl-64/s_modf.c b/libc/sysdeps/ieee754/dbl-64/s_modf.c index 7851f675a..a884de5d5 100644 --- a/libc/sysdeps/ieee754/dbl-64/s_modf.c +++ b/libc/sysdeps/ieee754/dbl-64/s_modf.c @@ -1,4 +1,3 @@ -/* @(#)s_modf.c 5.1 93/09/24 */ /* * ==================================================== * Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved. @@ -10,10 +9,6 @@ * ==================================================== */ -#if defined(LIBM_SCCS) && !defined(lint) -static char rcsid[] = "$NetBSD: s_modf.c,v 1.8 1995/05/10 20:47:55 jtc Exp $"; -#endif - /* * modf(double x, double *iptr) * return fraction part of x, and return x's integral part in *iptr. @@ -27,18 +22,10 @@ static char rcsid[] = "$NetBSD: s_modf.c,v 1.8 1995/05/10 20:47:55 jtc Exp $"; #include "math.h" #include "math_private.h" -#ifdef __STDC__ static const double one = 1.0; -#else -static double one = 1.0; -#endif -#ifdef __STDC__ - double __modf(double x, double *iptr) -#else - double __modf(x, iptr) - double x,*iptr; -#endif +double +__modf(double x, double *iptr) { int32_t i0,i1,j0; u_int32_t i; @@ -46,7 +33,7 @@ static double one = 1.0; j0 = ((i0>>20)&0x7ff)-0x3ff; /* exponent of x */ if(j0<20) { /* integer part in high x */ if(j0<0) { /* |x|<1 */ - INSERT_WORDS(*iptr,i0&0x80000000,0); /* *iptr = +-0 */ + INSERT_WORDS(*iptr,i0&0x80000000,0); /* *iptr = +-0 */ return x; } else { i = (0x000fffff)>>j0; @@ -59,7 +46,7 @@ static double one = 1.0; return x - *iptr; } } - } else if (j0>51) { /* no fraction part */ + } else if (__builtin_expect(j0>51, 0)) { /* no fraction part */ *iptr = x*one; /* We must handle NaNs separately. */ if (j0 == 0x400 && ((i0 & 0xfffff) | i1)) @@ -73,7 +60,7 @@ static double one = 1.0; INSERT_WORDS(x,i0&0x80000000,0); /* return +-0 */ return x; } else { - INSERT_WORDS(*iptr,i0,i1&(~i)); + INSERT_WORDS(*iptr,i0,i1&(~i)); return x - *iptr; } } |