about summary refs log tree commit diff
path: root/src
diff options
context:
space:
mode:
authorSzabolcs Nagy <nsz@port70.net>2012-11-13 00:45:51 +0100
committerSzabolcs Nagy <nsz@port70.net>2012-11-13 00:45:51 +0100
commit52bcf3f5fb3251dca4df5b97b01543160340b31b (patch)
treee74784aa10dc7a82f9b625462142be80fc4905b6 /src
parent37aa7f7301d6526c14635375886acd881b471f6c (diff)
downloadmusl-52bcf3f5fb3251dca4df5b97b01543160340b31b.tar.gz
musl-52bcf3f5fb3251dca4df5b97b01543160340b31b.tar.xz
musl-52bcf3f5fb3251dca4df5b97b01543160340b31b.zip
math: fix logb*.c exceptions now that ilogb raises invalid
Diffstat (limited to 'src')
-rw-r--r--src/math/logb.c17
-rw-r--r--src/math/logbf.c14
-rw-r--r--src/math/logbl.c11
3 files changed, 17 insertions, 25 deletions
diff --git a/src/math/logb.c b/src/math/logb.c
index f7cd7613..624425a8 100644
--- a/src/math/logb.c
+++ b/src/math/logb.c
@@ -1,20 +1,17 @@
-#include <limits.h>
 #include "libm.h"
 
 /*
 special cases:
-	logb(+-0) = -inf
+	logb(+-0) = -inf, and raise divbyzero
 	logb(+-inf) = +inf
 	logb(nan) = nan
-these are calculated at runtime to raise fp exceptions
 */
 
-double logb(double x) {
-	int i = ilogb(x);
-
-	if (i == FP_ILOGB0)
-		return -1.0/fabs(x);
-	if (i == FP_ILOGBNAN || i == INT_MAX)
+double logb(double x)
+{
+	if (!isfinite(x))
 		return x * x;
-	return i;
+	if (x == 0)
+		return -1/(x+0);
+	return ilogb(x);
 }
diff --git a/src/math/logbf.c b/src/math/logbf.c
index 934827f8..950d3569 100644
--- a/src/math/logbf.c
+++ b/src/math/logbf.c
@@ -1,12 +1,10 @@
-#include <limits.h>
 #include "libm.h"
 
-float logbf(float x) {
-	int i = ilogbf(x);
-
-	if (i == FP_ILOGB0)
-		return -1.0f/fabsf(x);
-	if (i == FP_ILOGBNAN || i == INT_MAX)
+float logbf(float x)
+{
+	if (!isfinite(x))
 		return x * x;
-	return i;
+	if (x == 0)
+		return -1/(x+0);
+	return ilogbf(x);
 }
diff --git a/src/math/logbl.c b/src/math/logbl.c
index 5d04abd7..f3850745 100644
--- a/src/math/logbl.c
+++ b/src/math/logbl.c
@@ -1,4 +1,3 @@
-#include <limits.h>
 #include "libm.h"
 #if LDBL_MANT_DIG == 53 && LDBL_MAX_EXP == 1024
 long double logbl(long double x)
@@ -8,12 +7,10 @@ long double logbl(long double x)
 #else
 long double logbl(long double x)
 {
-	int i = ilogbl(x);
-
-	if (i == FP_ILOGB0)
-		return -1.0/fabsl(x);
-	if (i == FP_ILOGBNAN || i == INT_MAX)
+	if (!isfinite(x))
 		return x * x;
-	return i;
+	if (x == 0)
+		return -1/(x+0);
+	return ilogbl(x);
 }
 #endif