aboutsummaryrefslogtreecommitdiff
path: root/sysdeps/ieee754
diff options
context:
space:
mode:
Diffstat (limited to 'sysdeps/ieee754')
-rw-r--r--sysdeps/ieee754/dbl-64/e_exp2.c6
-rw-r--r--sysdeps/ieee754/dbl-64/e_log2.c (renamed from sysdeps/ieee754/dbl-64/s_log2.c)12
-rw-r--r--sysdeps/ieee754/dbl-64/s_ilogb.c14
-rw-r--r--sysdeps/ieee754/flt-32/e_exp2f.c6
-rw-r--r--sysdeps/ieee754/flt-32/e_log2f.c (renamed from sysdeps/ieee754/flt-32/s_log2f.c)5
-rw-r--r--sysdeps/ieee754/flt-32/s_ilogbf.c8
-rw-r--r--sysdeps/ieee754/k_standard.c39
-rw-r--r--sysdeps/ieee754/ldbl-128/s_ilogbl.c12
-rw-r--r--sysdeps/ieee754/ldbl-96/e_coshl.c9
-rw-r--r--sysdeps/ieee754/ldbl-96/s_ilogbl.c11
-rw-r--r--sysdeps/ieee754/ldbl-96/s_llroundl.c12
11 files changed, 94 insertions, 40 deletions
diff --git a/sysdeps/ieee754/dbl-64/e_exp2.c b/sysdeps/ieee754/dbl-64/e_exp2.c
index d02af15ecc..699f44ec4e 100644
--- a/sysdeps/ieee754/dbl-64/e_exp2.c
+++ b/sysdeps/ieee754/dbl-64/e_exp2.c
@@ -1,5 +1,5 @@
/* Double-precision floating point 2^x.
- Copyright (C) 1997, 1998, 2000 Free Software Foundation, Inc.
+ Copyright (C) 1997, 1998, 2000, 2001 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Geoffrey Keating <geoffk@ozemail.com.au>
@@ -44,10 +44,10 @@ double
__ieee754_exp2 (double x)
{
static const double himark = (double) DBL_MAX_EXP;
- static const double lomark = (double) (DBL_MIN_EXP - DBL_MANT_DIG - 1) - 1.0;
+ static const double lomark = (double) (DBL_MIN_EXP - DBL_MANT_DIG - 1);
/* Check for usual case. */
- if (isless (x, himark) && isgreater (x, lomark))
+ if (isless (x, himark) && isgreaterequal (x, lomark))
{
static const double THREEp42 = 13194139533312.0;
int tval, unsafe;
diff --git a/sysdeps/ieee754/dbl-64/s_log2.c b/sysdeps/ieee754/dbl-64/e_log2.c
index 7379ce85e7..f05d0ce966 100644
--- a/sysdeps/ieee754/dbl-64/s_log2.c
+++ b/sysdeps/ieee754/dbl-64/e_log2.c
@@ -10,7 +10,7 @@
* ====================================================
*/
-/* __log2(x)
+/* __ieee754_log2(x)
* Return the logarithm to base 2 of x
*
* Method :
@@ -79,9 +79,9 @@ static double zero = 0.0;
#endif
#ifdef __STDC__
- double __log2(double x)
+ double __ieee754_log2(double x)
#else
- double __log2(x)
+ double __ieee754_log2(x)
double x;
#endif
{
@@ -128,9 +128,3 @@ static double zero = 0.0;
return dk-((s*(f-R))-f)/ln2;
}
}
-
-weak_alias (__log2, log2)
-#ifdef NO_LONG_DOUBLE
-strong_alias (__log2, __log2l)
-weak_alias (__log2, log2l)
-#endif
diff --git a/sysdeps/ieee754/dbl-64/s_ilogb.c b/sysdeps/ieee754/dbl-64/s_ilogb.c
index 820f01c9b2..89a833781d 100644
--- a/sysdeps/ieee754/dbl-64/s_ilogb.c
+++ b/sysdeps/ieee754/dbl-64/s_ilogb.c
@@ -16,10 +16,12 @@ static char rcsid[] = "$NetBSD: s_ilogb.c,v 1.9 1995/05/10 20:47:28 jtc Exp $";
/* ilogb(double x)
* return the binary exponent of non-zero x
- * ilogb(0) = 0x80000001
- * ilogb(inf/NaN) = 0x7fffffff (no signal is raised)
+ * ilogb(0) = FP_ILOGB0
+ * ilogb(NaN) = FP_ILOGBNAN (no signal is raised)
+ * ilogb(+-Inf) = INT_MAX (no signal is raised)
*/
+#include <limits.h>
#include "math.h"
#include "math_private.h"
@@ -47,7 +49,13 @@ static char rcsid[] = "$NetBSD: s_ilogb.c,v 1.9 1995/05/10 20:47:28 jtc Exp $";
return ix;
}
else if (hx<0x7ff00000) return (hx>>20)-1023;
- else return FP_ILOGBNAN;
+ else if (FP_ILOGBNAN != INT_MAX) {
+ /* ISO C99 requires ilogb(+-Inf) == INT_MAX. */
+ GET_LOW_WORD(lx,x);
+ if(((hx^0x7ff00000)|lx) == 0)
+ return INT_MAX;
+ }
+ return FP_ILOGBNAN;
}
weak_alias (__ilogb, ilogb)
#ifdef NO_LONG_DOUBLE
diff --git a/sysdeps/ieee754/flt-32/e_exp2f.c b/sysdeps/ieee754/flt-32/e_exp2f.c
index 4d529ea285..263ee16a9f 100644
--- a/sysdeps/ieee754/flt-32/e_exp2f.c
+++ b/sysdeps/ieee754/flt-32/e_exp2f.c
@@ -1,5 +1,5 @@
/* Single-precision floating point 2^x.
- Copyright (C) 1997, 1998, 2000 Free Software Foundation, Inc.
+ Copyright (C) 1997, 1998, 2000, 2001 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Geoffrey Keating <geoffk@ozemail.com.au>
@@ -45,10 +45,10 @@ float
__ieee754_exp2f (float x)
{
static const float himark = (float) FLT_MAX_EXP;
- static const float lomark = (float) (FLT_MIN_EXP - FLT_MANT_DIG - 1) - 1.0;
+ static const float lomark = (float) (FLT_MIN_EXP - FLT_MANT_DIG - 1);
/* Check for usual case. */
- if (isless (x, himark) && isgreater (x, lomark))
+ if (isless (x, himark) && isgreaterequal (x, lomark))
{
static const float THREEp14 = 49152.0;
int tval, unsafe;
diff --git a/sysdeps/ieee754/flt-32/s_log2f.c b/sysdeps/ieee754/flt-32/e_log2f.c
index 2377acd36a..af3c6eadfe 100644
--- a/sysdeps/ieee754/flt-32/s_log2f.c
+++ b/sysdeps/ieee754/flt-32/e_log2f.c
@@ -40,9 +40,9 @@ static float zero = 0.0;
#endif
#ifdef __STDC__
- float __log2f(float x)
+ float __ieee754_log2f(float x)
#else
- float __log2f(x)
+ float __ieee754_log2f(x)
float x;
#endif
{
@@ -88,4 +88,3 @@ static float zero = 0.0;
return dk-((s*(f-R))-f)/ln2;
}
}
-weak_alias (__log2f, log2f)
diff --git a/sysdeps/ieee754/flt-32/s_ilogbf.c b/sysdeps/ieee754/flt-32/s_ilogbf.c
index e652b93619..ea3dc13bcb 100644
--- a/sysdeps/ieee754/flt-32/s_ilogbf.c
+++ b/sysdeps/ieee754/flt-32/s_ilogbf.c
@@ -17,6 +17,7 @@
static char rcsid[] = "$NetBSD: s_ilogbf.c,v 1.4 1995/05/10 20:47:31 jtc Exp $";
#endif
+#include <limits.h>
#include "math.h"
#include "math_private.h"
@@ -39,6 +40,11 @@ static char rcsid[] = "$NetBSD: s_ilogbf.c,v 1.4 1995/05/10 20:47:31 jtc Exp $";
return ix;
}
else if (hx<0x7f800000) return (hx>>23)-127;
- else return FP_ILOGBNAN;
+ else if (FP_ILOGBNAN != INT_MAX) {
+ /* ISO C99 requires ilogbf(+-Inf) == INT_MAX. */
+ if (hx==0x7f800000)
+ return INT_MAX;
+ }
+ return FP_ILOGBNAN;
}
weak_alias (__ilogbf, ilogbf)
diff --git a/sysdeps/ieee754/k_standard.c b/sysdeps/ieee754/k_standard.c
index 22300652e9..6def34bc0c 100644
--- a/sysdeps/ieee754/k_standard.c
+++ b/sysdeps/ieee754/k_standard.c
@@ -88,6 +88,8 @@ static double zero = 0.0; /* used as const */
* 45-- exp2 underflow
* 46-- exp10 overflow
* 47-- exp10 underflow
+ * 48-- log2(0)
+ * 49-- log2(x<0)
*/
@@ -937,7 +939,42 @@ static double zero = 0.0; /* used as const */
__set_errno (ERANGE);
}
break;
- /* #### Last used is 47/147/247 ### */
+ case 48:
+ case 148:
+ case 248:
+ /* log2(0) */
+ exc.type = SING;
+ exc.name = type < 100 ? "log2" : (type < 200
+ ? "log2f" : "log2l");
+ if (_LIB_VERSION == _SVID_)
+ exc.retval = -HUGE;
+ else
+ exc.retval = -HUGE_VAL;
+ if (_LIB_VERSION == _POSIX_)
+ __set_errno (ERANGE);
+ else if (!matherr(&exc)) {
+ __set_errno (EDOM);
+ }
+ break;
+ case 49:
+ case 149:
+ case 249:
+ /* log2(x<0) */
+ exc.type = DOMAIN;
+ exc.name = type < 100 ? "log2" : (type < 200
+ ? "log2f" : "log2l");
+ if (_LIB_VERSION == _SVID_)
+ exc.retval = -HUGE;
+ else
+ exc.retval = NAN;
+ if (_LIB_VERSION == _POSIX_)
+ __set_errno (EDOM);
+ else if (!matherr(&exc)) {
+ __set_errno (EDOM);
+ }
+ break;
+
+ /* #### Last used is 49/149/249 ### */
}
return exc.retval;
}
diff --git a/sysdeps/ieee754/ldbl-128/s_ilogbl.c b/sysdeps/ieee754/ldbl-128/s_ilogbl.c
index d2acfd3105..c042aa43d8 100644
--- a/sysdeps/ieee754/ldbl-128/s_ilogbl.c
+++ b/sysdeps/ieee754/ldbl-128/s_ilogbl.c
@@ -19,8 +19,9 @@ static char rcsid[] = "$NetBSD: $";
/* ilogbl(long double x)
* return the binary exponent of non-zero x
- * ilogbl(0) = 0x80000001
- * ilogbl(inf/NaN) = 0x7fffffff (no signal is raised)
+ * ilogbl(0) = FP_ILOGB0
+ * ilogbl(NaN) = FP_ILOGBNAN (no signal is raised)
+ * ilogbl(+-Inf) = INT_MAX (no signal is raised)
*/
#include "math.h"
@@ -50,6 +51,11 @@ static char rcsid[] = "$NetBSD: $";
return ix;
}
else if (hx<0x7fff000000000000LL) return (hx>>48)-0x3fff;
- else return FP_ILOGBNAN;
+ else if (FP_ILOGBNAN != INT_MAX) {
+ /* ISO C99 requires ilogbl(+-Inf) == INT_MAX. */
+ if (((hx^0x7fff000000000000LL)|lx) == 0)
+ return INT_MAX;
+ }
+ return FP_ILOGBNAN;
}
weak_alias (__ilogbl, ilogbl)
diff --git a/sysdeps/ieee754/ldbl-96/e_coshl.c b/sysdeps/ieee754/ldbl-96/e_coshl.c
index 6af846cb2d..8c38fa4da2 100644
--- a/sysdeps/ieee754/ldbl-96/e_coshl.c
+++ b/sysdeps/ieee754/ldbl-96/e_coshl.c
@@ -79,16 +79,15 @@ static long double one = 1.0, half=0.5, huge = 1.0e4900L;
if (ex < 0x400c || (ex == 0x400c && mx < 0xb1700000u))
return half*__ieee754_expl(fabsl(x));
- /* |x| in [log(maxdouble), overflowthresold] */
- if (ex < 0x400d
- || (ex == 0x400d && (mx < 0xb170b513u
- || (mx == 0xb170b513u && lx < 0xa1dfd60cu))))
+ /* |x| in [log(maxdouble), log(2*maxdouble)) */
+ if (ex == 0x400c && (mx < 0xb174ddc0u
+ || (mx == 0xb174ddc0u && lx < 0x31aec0ebu)))
{
w = __ieee754_expl(half*fabsl(x));
t = half*w;
return t*w;
}
- /* |x| > overflowthresold, cosh(x) overflow */
+ /* |x| >= log(2*maxdouble), cosh(x) overflow */
return huge*huge;
}
diff --git a/sysdeps/ieee754/ldbl-96/s_ilogbl.c b/sysdeps/ieee754/ldbl-96/s_ilogbl.c
index d44229dcda..9688f5af8f 100644
--- a/sysdeps/ieee754/ldbl-96/s_ilogbl.c
+++ b/sysdeps/ieee754/ldbl-96/s_ilogbl.c
@@ -20,10 +20,12 @@ static char rcsid[] = "$NetBSD: $";
/* ilogbl(long double x)
* return the binary exponent of non-zero x
- * ilogbl(0) = 0x80000001
- * ilogbl(inf/NaN) = 0x7fffffff (no signal is raised)
+ * ilogbl(0) = FP_ILOGB0
+ * ilogbl(NaN) = FP_ILOGBNAN (no signal is raised)
+ * ilogbl(+-Inf) = INT_MAX (no signal is raised)
*/
+#include <limits.h>
#include "math.h"
#include "math_private.h"
@@ -51,6 +53,9 @@ static char rcsid[] = "$NetBSD: $";
return ix;
}
else if (es<0x7fff) return es-0x3fff;
- else return FP_ILOGBNAN;
+ else if (FP_ILOGBNAN != INT_MAX && (hx|lx) == 0)
+ /* ISO C99 requires ilogbl(+-Inf) == INT_MAX. */
+ return INT_MAX;
+ return FP_ILOGBNAN;
}
weak_alias (__ilogbl, ilogbl)
diff --git a/sysdeps/ieee754/ldbl-96/s_llroundl.c b/sysdeps/ieee754/ldbl-96/s_llroundl.c
index 4a537c871e..61df42d3c2 100644
--- a/sysdeps/ieee754/ldbl-96/s_llroundl.c
+++ b/sysdeps/ieee754/ldbl-96/s_llroundl.c
@@ -1,5 +1,5 @@
/* Round long double value to long long int.
- Copyright (C) 1997 Free Software Foundation, Inc.
+ Copyright (C) 1997, 2001 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
@@ -59,13 +59,13 @@ __llroundl (long double x)
else
{
u_int32_t j = i1 + (0x80000000 >> (j0 - 31));
+
+ result = (long long int) i0;
if (j < i1)
- ++i0;
+ ++result;
- if (j0 == 31)
- result = (long long int) i0;
- else
- result = ((long long int) i0 << (j0 - 31)) | (j >> (63 - j0));
+ if (j0 > 31)
+ result = (result << (j0 - 31)) | (j >> (63 - j0));
}
}
else