diff options
| author | Szabolcs Nagy <nsz@port70.net> | 2013-09-05 12:26:26 +0000 |
|---|---|---|
| committer | Szabolcs Nagy <nsz@port70.net> | 2013-09-05 12:26:26 +0000 |
| commit | 101e6012856918440b5d7474739c3fc22a8d3b85 (patch) | |
| tree | 04b79d042e6dd3dda62afeecc9e9c80627616867 | |
| parent | 02343946215a7ae03634c6490abcc69da68df589 (diff) | |
| download | musl-101e6012856918440b5d7474739c3fc22a8d3b85.tar.gz musl-101e6012856918440b5d7474739c3fc22a8d3b85.tar.xz musl-101e6012856918440b5d7474739c3fc22a8d3b85.zip | |
math: fix acoshf on negative values
acosh(x) is invalid for x<1, acoshf tried to be clever using signed comparisions to handle all x<2 the same way, but the formula was wrong on large negative values.
| -rw-r--r-- | src/math/acoshf.c | 11 | ||||
| -rw-r--r-- | src/math/acoshl.c | 4 |
2 files changed, 8 insertions, 7 deletions
diff --git a/src/math/acoshf.c b/src/math/acoshf.c index 4596085e..16550f19 100644 --- a/src/math/acoshf.c +++ b/src/math/acoshf.c @@ -3,14 +3,15 @@ /* acosh(x) = log(x + sqrt(x*x-1)) */ float acoshf(float x) { - union {float f; int32_t i;} u = {.f = x}; + union {float f; uint32_t i;} u = {x}; + uint32_t a = u.i & 0x7fffffff; - if (u.i < 0x3f800000+(1<<23)) - /* x < 2, invalid if x < 1 or nan */ + if (a < 0x3f800000+(1<<23)) + /* |x| < 2, invalid if x < 1 or nan */ /* up to 2ulp error in [1,1.125] */ return log1pf(x-1 + sqrtf((x-1)*(x-1)+2*(x-1))); - if (u.i < 0x3f800000+(12<<23)) - /* x < 0x1p12 */ + if (a < 0x3f800000+(12<<23)) + /* |x| < 0x1p12 */ return logf(2*x - 1/(x+sqrtf(x*x-1))); /* x >= 0x1p12 */ return logf(x) + 0.693147180559945309417232121458176568f; diff --git a/src/math/acoshl.c b/src/math/acoshl.c index de31fb75..4aa84acb 100644 --- a/src/math/acoshl.c +++ b/src/math/acoshl.c @@ -13,10 +13,10 @@ long double acoshl(long double x) int e = u.i.se & 0x7fff; if (e < 0x3fff + 1) - /* x < 2, invalid if x < 1 or nan */ + /* |x| < 2, invalid if x < 1 or nan */ return log1pl(x-1 + sqrtl((x-1)*(x-1)+2*(x-1))); if (e < 0x3fff + 32) - /* x < 0x1p32 */ + /* |x| < 0x1p32 */ return logl(2*x - 1/(x+sqrtl(x*x-1))); return logl(x) + 0.693147180559945309417232121458176568L; } |