math: fix logb*.c exceptions now that ilogb raises invalid

This commit is contained in:
Szabolcs Nagy 2012-11-13 00:45:51 +01:00
commit 52bcf3f5fb
3 changed files with 17 additions and 25 deletions

View file

@ -1,20 +1,17 @@
#include <limits.h>
#include "libm.h" #include "libm.h"
/* /*
special cases: special cases:
logb(+-0) = -inf logb(+-0) = -inf, and raise divbyzero
logb(+-inf) = +inf logb(+-inf) = +inf
logb(nan) = nan logb(nan) = nan
these are calculated at runtime to raise fp exceptions
*/ */
double logb(double x) { double logb(double x)
int i = ilogb(x); {
if (!isfinite(x))
if (i == FP_ILOGB0)
return -1.0/fabs(x);
if (i == FP_ILOGBNAN || i == INT_MAX)
return x * x; return x * x;
return i; if (x == 0)
return -1/(x+0);
return ilogb(x);
} }

View file

@ -1,12 +1,10 @@
#include <limits.h>
#include "libm.h" #include "libm.h"
float logbf(float x) { float logbf(float x)
int i = ilogbf(x); {
if (!isfinite(x))
if (i == FP_ILOGB0)
return -1.0f/fabsf(x);
if (i == FP_ILOGBNAN || i == INT_MAX)
return x * x; return x * x;
return i; if (x == 0)
return -1/(x+0);
return ilogbf(x);
} }

View file

@ -1,4 +1,3 @@
#include <limits.h>
#include "libm.h" #include "libm.h"
#if LDBL_MANT_DIG == 53 && LDBL_MAX_EXP == 1024 #if LDBL_MANT_DIG == 53 && LDBL_MAX_EXP == 1024
long double logbl(long double x) long double logbl(long double x)
@ -8,12 +7,10 @@ long double logbl(long double x)
#else #else
long double logbl(long double x) long double logbl(long double x)
{ {
int i = ilogbl(x); if (!isfinite(x))
if (i == FP_ILOGB0)
return -1.0/fabsl(x);
if (i == FP_ILOGBNAN || i == INT_MAX)
return x * x; return x * x;
return i; if (x == 0)
return -1/(x+0);
return ilogbl(x);
} }
#endif #endif