projects
/
musl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'nsz/review'
[musl]
/
src
/
math
/
powl.c
diff --git
a/src/math/powl.c
b/src/math/powl.c
index
a1d2f07
..
ce6274c
100644
(file)
--- a/
src/math/powl.c
+++ b/
src/math/powl.c
@@
-78,8
+78,6
@@
long double powl(long double x, long double y)
/* Table size */
#define NXT 32
/* Table size */
#define NXT 32
-/* log2(Table size) */
-#define LNXT 5
/* log(1+x) = x - .5x^2 + x^3 * P(z)/Q(z)
* on the domain 2^(-1/32) - 1 <= x <= 2^(1/32) - 1
/* log(1+x) = x - .5x^2 + x^3 * P(z)/Q(z)
* on the domain 2^(-1/32) - 1 <= x <= 2^(1/32) - 1
@@
-167,8
+165,6
@@
static const long double R[] = {
6.9314718055994530931447E-1L,
};
6.9314718055994530931447E-1L,
};
-#define douba(k) A[k]
-#define doubb(k) B[k]
#define MEXP (NXT*16384.0L)
/* The following if denormal numbers are supported, else -MEXP: */
#define MNEXP (-NXT*(16384.0L+64.0L))
#define MEXP (NXT*16384.0L)
/* The following if denormal numbers are supported, else -MEXP: */
#define MNEXP (-NXT*(16384.0L+64.0L))
@@
-203,38
+199,35
@@
long double powl(long double x, long double y)
volatile long double z=0;
long double w=0, W=0, Wa=0, Wb=0, ya=0, yb=0, u=0;
volatile long double z=0;
long double w=0, W=0, Wa=0, Wb=0, ya=0, yb=0, u=0;
- if (y == 0.0)
- return 1.0;
- if (isnan(x))
+ /* make sure no invalid exception is raised by nan comparision */
+ if (isnan(x)) {
+ if (!isnan(y) && y == 0.0)
+ return 1.0;
return x;
return x;
- if (isnan(y))
+ }
+ if (isnan(y)) {
+ if (x == 1.0)
+ return 1.0;
return y;
return y;
+ }
+ if (x == 1.0)
+ return 1.0; /* 1**y = 1, even if y is nan */
+ if (x == -1.0 && !isfinite(y))
+ return 1.0; /* -1**inf = 1 */
+ if (y == 0.0)
+ return 1.0; /* x**0 = 1, even if x is nan */
if (y == 1.0)
return x;
if (y == 1.0)
return x;
-
- // FIXME: this is wrong, see pow special cases in c99 F.9.4.4
- if (!isfinite(y) && (x == -1.0 || x == 1.0) )
- return y - y; /* +-1**inf is NaN */
- if (x == 1.0)
- return 1.0;
if (y >= LDBL_MAX) {
if (y >= LDBL_MAX) {
- if (x > 1.0)
+ if (x > 1.0
|| x < -1.0
)
return INFINITY;
return INFINITY;
- if (x > 0.0 && x < 1.0)
- return 0.0;
- if (x < -1.0)
- return INFINITY;
- if (x > -1.0 && x < 0.0)
+ if (x != 0.0)
return 0.0;
}
if (y <= -LDBL_MAX) {
return 0.0;
}
if (y <= -LDBL_MAX) {
- if (x > 1.0)
+ if (x > 1.0
|| x < -1.0
)
return 0.0;
return 0.0;
- if (x > 0.0 && x < 1.0)
- return INFINITY;
- if (x < -1.0)
- return 0.0;
- if (x > -1.0 && x < 0.0)
+ if (x != 0.0)
return INFINITY;
}
if (x >= LDBL_MAX) {
return INFINITY;
}
if (x >= LDBL_MAX) {
@@
-244,6
+237,7
@@
long double powl(long double x, long double y)
}
w = floorl(y);
}
w = floorl(y);
+
/* Set iyflg to 1 if y is an integer. */
iyflg = 0;
if (w == y)
/* Set iyflg to 1 if y is an integer. */
iyflg = 0;
if (w == y)
@@
-271,58
+265,48
@@
long double powl(long double x, long double y)
return 0.0;
}
}
return 0.0;
}
}
-
-
- nflg = 0; /* flag = 1 if x<0 raised to integer power */
+ nflg = 0; /* (x<0)**(odd int) */
if (x <= 0.0) {
if (x == 0.0) {
if (y < 0.0) {
if (signbit(x) && yoddint)
if (x <= 0.0) {
if (x == 0.0) {
if (y < 0.0) {
if (signbit(x) && yoddint)
- return -INFINITY;
- return INFINITY;
+ /* (-0.0)**(-odd int) = -inf, divbyzero */
+ return -1.0/0.0;
+ /* (+-0.0)**(negative) = inf, divbyzero */
+ return 1.0/0.0;
}
}
- if (y > 0.0) {
- if (signbit(x) && yoddint)
- return -0.0;
- return 0.0;
- }
- if (y == 0.0)
- return 1.0; /* 0**0 */
- return 0.0; /* 0**y */
+ if (signbit(x) && yoddint)
+ return -0.0;
+ return 0.0;
}
if (iyflg == 0)
return (x - x) / (x - x); /* (x<0)**(non-int) is NaN */
}
if (iyflg == 0)
return (x - x) / (x - x); /* (x<0)**(non-int) is NaN */
- nflg = 1;
+ /* (x<0)**(integer) */
+ if (yoddint)
+ nflg = 1; /* negate result */
+ x = -x;
}
}
-
- /* Integer power of an integer. */
- if (iyflg) {
- i = w;
- w = floorl(x);
- if (w == x && fabsl(y) < 32768.0) {
- w = powil(x, (int)y);
- return w;
- }
+ /* (+integer)**(integer) */
+ if (iyflg && floorl(x) == x && fabsl(y) < 32768.0) {
+ w = powil(x, (int)y);
+ return nflg ? -w : w;
}
}
- if (nflg)
- x = fabsl(x);
-
/* separate significand from exponent */
x = frexpl(x, &i);
e = i;
/* find significand in antilog table A[] */
i = 1;
/* separate significand from exponent */
x = frexpl(x, &i);
e = i;
/* find significand in antilog table A[] */
i = 1;
- if (x <=
douba(17)
)
+ if (x <=
A[17]
)
i = 17;
i = 17;
- if (x <=
douba(i+8)
)
+ if (x <=
A[i+8]
)
i += 8;
i += 8;
- if (x <=
douba(i+4)
)
+ if (x <=
A[i+4]
)
i += 4;
i += 4;
- if (x <=
douba(i+2)
)
+ if (x <=
A[i+2]
)
i += 2;
i += 2;
- if (x >=
douba(1)
)
+ if (x >=
A[1]
)
i = -1;
i += 1;
i = -1;
i += 1;
@@
-333,9
+317,9
@@
long double powl(long double x, long double y)
*
* log(x/a) = log(1+v), v = x/a - 1 = (x-a)/a
*/
*
* log(x/a) = log(1+v), v = x/a - 1 = (x-a)/a
*/
- x -=
douba(i)
;
- x -=
doubb(i/2)
;
- x /=
douba(i)
;
+ x -=
A[i]
;
+ x -=
B[i/2]
;
+ x /=
A[i]
;
/* rational approximation for log(1+v):
*
/* rational approximation for log(1+v):
*
@@
-355,8
+339,7
@@
long double powl(long double x, long double y)
/* Compute exponent term of the base 2 logarithm. */
w = -i;
/* Compute exponent term of the base 2 logarithm. */
w = -i;
- // TODO: use w * 0x1p-5;
- w = scalbnl(w, -LNXT); /* divide by NXT */
+ w /= NXT;
w += e;
/* Now base 2 log of x is w + z. */
w += e;
/* Now base 2 log of x is w + z. */
@@
-381,7
+364,7
@@
long double powl(long double x, long double y)
H = Fb + Gb;
Ha = reducl(H);
H = Fb + Gb;
Ha = reducl(H);
- w =
scalbnl( Ga+Ha, LNXT )
;
+ w =
(Ga + Ha) * NXT
;
/* Test the power of 2 for overflow */
if (w > MEXP)
/* Test the power of 2 for overflow */
if (w > MEXP)
@@
-413,23
+396,13
@@
long double powl(long double x, long double y)
i = 1;
i = e/NXT + i;
e = NXT*i - e;
i = 1;
i = e/NXT + i;
e = NXT*i - e;
- w =
douba(e)
;
+ w =
A[e]
;
z = w * z; /* 2**-e * ( 1 + (2**Hb-1) ) */
z = z + w;
z = scalbnl(z, i); /* multiply by integer power of 2 */
z = w * z; /* 2**-e * ( 1 + (2**Hb-1) ) */
z = z + w;
z = scalbnl(z, i); /* multiply by integer power of 2 */
- if (nflg) {
- /* For negative x,
- * find out if the integer exponent
- * is odd or even.
- */
- w = 0.5*y;
- w = floorl(w);
- w = 2.0*w;
- if (w != y)
- z = -z; /* odd exponent */
- }
-
+ if (nflg)
+ z = -z;
return z;
}
return z;
}
@@
-439,15
+412,14
@@
static long double reducl(long double x)
{
long double t;
{
long double t;
- t =
scalbnl(x, LNXT)
;
+ t =
x * NXT
;
t = floorl(t);
t = floorl(t);
- t =
scalbnl(t, -LNXT)
;
+ t =
t / NXT
;
return t;
}
return t;
}
-/* powil.c
- *
- * Real raised to integer power, long double precision
+/*
+ * Positive real raised to integer power, long double precision
*
*
* SYNOPSIS:
*
*
* SYNOPSIS:
@@
-460,7
+432,7
@@
static long double reducl(long double x)
*
* DESCRIPTION:
*
*
* DESCRIPTION:
*
- * Returns argument x raised to the nth power.
+ * Returns argument x
>0
raised to the nth power.
* The routine efficiently decomposes n as a sum of powers of
* two. The desired power is a product of two-to-the-kth
* powers of x. Thus to compute the 32767 power of x requires
* The routine efficiently decomposes n as a sum of powers of
* two. The desired power is a product of two-to-the-kth
* powers of x. Thus to compute the 32767 power of x requires
@@
-482,25
+454,11
@@
static long double powil(long double x, int nn)
{
long double ww, y;
long double s;
{
long double ww, y;
long double s;
- int n, e, sign, asign, lx;
-
- if (x == 0.0) {
- if (nn == 0)
- return 1.0;
- else if (nn < 0)
- return LDBL_MAX;
- return 0.0;
- }
+ int n, e, sign, lx;
if (nn == 0)
return 1.0;
if (nn == 0)
return 1.0;
- if (x < 0.0) {
- asign = -1;
- x = -x;
- } else
- asign = 0;
-
if (nn < 0) {
sign = -1;
n = -nn;
if (nn < 0) {
sign = -1;
n = -nn;
@@
-539,10
+497,8
@@
static long double powil(long double x, int nn)
/* First bit of the power */
if (n & 1)
y = x;
/* First bit of the power */
if (n & 1)
y = x;
- else
{
+ else
y = 1.0;
y = 1.0;
- asign = 0;
- }
ww = x;
n >>= 1;
ww = x;
n >>= 1;
@@
-553,8
+509,6
@@
static long double powil(long double x, int nn)
n >>= 1;
}
n >>= 1;
}
- if (asign)
- y = -y; /* odd power of negative number */
if (sign < 0)
y = 1.0/y;
return y;
if (sign < 0)
y = 1.0/y;
return y;