aboutsummaryrefslogtreecommitdiff
path: root/sysdeps/libm-ieee754
diff options
context:
space:
mode:
Diffstat (limited to 'sysdeps/libm-ieee754')
-rw-r--r--sysdeps/libm-ieee754/e_asin.c21
-rw-r--r--sysdeps/libm-ieee754/e_asinf.c17
-rw-r--r--sysdeps/libm-ieee754/e_atan2l.c4
-rw-r--r--sysdeps/libm-ieee754/e_remainderl.c4
-rw-r--r--sysdeps/libm-ieee754/s_ceill.c4
-rw-r--r--sysdeps/libm-ieee754/s_floorl.c3
-rw-r--r--sysdeps/libm-ieee754/s_llrint.c14
-rw-r--r--sysdeps/libm-ieee754/s_llrintf.c2
-rw-r--r--sysdeps/libm-ieee754/s_llrintl.c4
-rw-r--r--sysdeps/libm-ieee754/s_llround.c9
-rw-r--r--sysdeps/libm-ieee754/s_llroundf.c4
-rw-r--r--sysdeps/libm-ieee754/s_llroundl.c9
-rw-r--r--sysdeps/libm-ieee754/s_lrint.c4
-rw-r--r--sysdeps/libm-ieee754/s_lrintf.c2
-rw-r--r--sysdeps/libm-ieee754/s_lrintl.c2
-rw-r--r--sysdeps/libm-ieee754/s_lround.c2
-rw-r--r--sysdeps/libm-ieee754/s_lroundf.c2
-rw-r--r--sysdeps/libm-ieee754/s_lroundl.c2
-rw-r--r--sysdeps/libm-ieee754/s_scalblnl.c2
-rw-r--r--sysdeps/libm-ieee754/s_scalbnl.c2
-rw-r--r--sysdeps/libm-ieee754/s_sincosl.c2
-rw-r--r--sysdeps/libm-ieee754/s_tanl.c2
22 files changed, 63 insertions, 54 deletions
diff --git a/sysdeps/libm-ieee754/e_asin.c b/sysdeps/libm-ieee754/e_asin.c
index b62a1c9914..09d06a9158 100644
--- a/sysdeps/libm-ieee754/e_asin.c
+++ b/sysdeps/libm-ieee754/e_asin.c
@@ -5,7 +5,7 @@
*
* Developed at SunPro, a Sun Microsystems, Inc. business.
* Permission to use, copy, modify, and distribute this
- * software is freely granted, provided that this notice
+ * software is freely granted, provided that this notice
* is preserved.
* ====================================================
*/
@@ -15,12 +15,12 @@ static char rcsid[] = "$NetBSD: e_asin.c,v 1.9 1995/05/12 04:57:22 jtc Exp $";
#endif
/* __ieee754_asin(x)
- * Method :
+ * Method :
* Since asin(x) = x + x^3/6 + x^5*3/40 + x^7*15/336 + ...
* we approximate asin(x) on [0,0.5] by
* asin(x) = x + x*x^2*R(x^2)
* where
- * R(x^2) is a rational approximation of (asin(x)-x)/x^3
+ * R(x^2) is a rational approximation of (asin(x)-x)/x^3
* and its remez error is bounded by
* |(asin(x)-x)/x^3 - R(x^2)| < 2^(-58.75)
*
@@ -49,9 +49,9 @@ static char rcsid[] = "$NetBSD: e_asin.c,v 1.9 1995/05/12 04:57:22 jtc Exp $";
#include "math_private.h"
#ifdef __STDC__
-static const double
+static const double
#else
-static double
+static double
#endif
one = 1.00000000000000000000e+00, /* 0x3FF00000, 0x00000000 */
huge = 1.000e+300,
@@ -86,17 +86,18 @@ qS4 = 7.70381505559019352791e-02; /* 0x3FB3B8C5, 0xB12E9282 */
GET_LOW_WORD(lx,x);
if(((ix-0x3ff00000)|lx)==0)
/* asin(1)=+-pi/2 with inexact */
- return x*pio2_hi+x*pio2_lo;
- return (x-x)/(x-x); /* asin(|x|>1) is NaN */
+ return x*pio2_hi+x*pio2_lo;
+ return (x-x)/(x-x); /* asin(|x|>1) is NaN */
} else if (ix<0x3fe00000) { /* |x|<0.5 */
if(ix<0x3e400000) { /* if |x| < 2**-27 */
if(huge+x>one) return x;/* return x with inexact if x!=0*/
- } else
+ } else {
t = x*x;
p = t*(pS0+t*(pS1+t*(pS2+t*(pS3+t*(pS4+t*pS5)))));
q = one+t*(qS1+t*(qS2+t*(qS3+t*qS4)));
w = p/q;
return x+x*w;
+ }
}
/* 1> |x|>= 0.5 */
w = one-fabs(x);
@@ -115,6 +116,6 @@ qS4 = 7.70381505559019352791e-02; /* 0x3FB3B8C5, 0xB12E9282 */
p = 2.0*s*r-(pio2_lo-2.0*c);
q = pio4_hi-2.0*w;
t = pio4_hi-(p-q);
- }
- if(hx>0) return t; else return -t;
+ }
+ if(hx>0) return t; else return -t;
}
diff --git a/sysdeps/libm-ieee754/e_asinf.c b/sysdeps/libm-ieee754/e_asinf.c
index 21157d84e1..5270f31144 100644
--- a/sysdeps/libm-ieee754/e_asinf.c
+++ b/sysdeps/libm-ieee754/e_asinf.c
@@ -8,7 +8,7 @@
*
* Developed at SunPro, a Sun Microsystems, Inc. business.
* Permission to use, copy, modify, and distribute this
- * software is freely granted, provided that this notice
+ * software is freely granted, provided that this notice
* is preserved.
* ====================================================
*/
@@ -21,9 +21,9 @@ static char rcsid[] = "$NetBSD: e_asinf.c,v 1.5 1995/05/12 04:57:25 jtc Exp $";
#include "math_private.h"
#ifdef __STDC__
-static const float
+static const float
#else
-static float
+static float
#endif
one = 1.0000000000e+00, /* 0x3F800000 */
huge = 1.000e+30,
@@ -55,18 +55,19 @@ qS4 = 7.7038154006e-02; /* 0x3d9dc62e */
ix = hx&0x7fffffff;
if(ix==0x3f800000) {
/* asin(1)=+-pi/2 with inexact */
- return x*pio2_hi+x*pio2_lo;
+ return x*pio2_hi+x*pio2_lo;
} else if(ix> 0x3f800000) { /* |x|>= 1 */
- return (x-x)/(x-x); /* asin(|x|>1) is NaN */
+ return (x-x)/(x-x); /* asin(|x|>1) is NaN */
} else if (ix<0x3f000000) { /* |x|<0.5 */
if(ix<0x32000000) { /* if |x| < 2**-27 */
if(huge+x>one) return x;/* return x with inexact if x!=0*/
- } else
+ } else {
t = x*x;
p = t*(pS0+t*(pS1+t*(pS2+t*(pS3+t*(pS4+t*pS5)))));
q = one+t*(qS1+t*(qS2+t*(qS3+t*qS4)));
w = p/q;
return x+x*w;
+ }
}
/* 1> |x|>= 0.5 */
w = one-fabsf(x);
@@ -87,6 +88,6 @@ qS4 = 7.7038154006e-02; /* 0x3d9dc62e */
p = (float)2.0*s*r-(pio2_lo-(float)2.0*c);
q = pio4_hi-(float)2.0*w;
t = pio4_hi-(p-q);
- }
- if(hx>0) return t; else return -t;
+ }
+ if(hx>0) return t; else return -t;
}
diff --git a/sysdeps/libm-ieee754/e_atan2l.c b/sysdeps/libm-ieee754/e_atan2l.c
index 72d3eac172..aff7a3d976 100644
--- a/sysdeps/libm-ieee754/e_atan2l.c
+++ b/sysdeps/libm-ieee754/e_atan2l.c
@@ -71,10 +71,10 @@ pi_lo = -5.01655761266833202345176e-20L;/* 0xBFBE, 0xECE675D1, 0xFC8F8CBB */
int32_t k,m,hx,hy,ix,iy;
u_int32_t sx,sy,lx,ly;
- EXTRACT_LDOUBLE_WORDS(sx,hx,lx,x);
+ GET_LDOUBLE_WORDS(sx,hx,lx,x);
ix = sx&0x7fff;
lx |= hx & 0x7fffffff;
- EXTRACT_LDOUBLE_WORDS(sy,hy,ly,y);
+ GET_LDOUBLE_WORDS(sy,hy,ly,y);
iy = sy&0x7fff;
ly |= hy & 0x7fffffff;
if(((2*ix|((lx|-lx)>>31))>0xfffe)||
diff --git a/sysdeps/libm-ieee754/e_remainderl.c b/sysdeps/libm-ieee754/e_remainderl.c
index 3b2cd7c5e5..e721a6e8cd 100644
--- a/sysdeps/libm-ieee754/e_remainderl.c
+++ b/sysdeps/libm-ieee754/e_remainderl.c
@@ -47,8 +47,8 @@ static long double zero = 0.0;
u_int32_t sx,sex,sep,x0,x1,p0,p1;
long double p_half;
- EXTRACT_LDOUBLE_WORDS(sex,x0,x1,x);
- EXTRACT_LDOUBLE_WORDS(sep,p0,p1,p);
+ GET_LDOUBLE_WORDS(sex,x0,x1,x);
+ GET_LDOUBLE_WORDS(sep,p0,p1,p);
sx = sex&0x8000;
sep &= 0x7fff;
sex &= 0x7fff;
diff --git a/sysdeps/libm-ieee754/s_ceill.c b/sysdeps/libm-ieee754/s_ceill.c
index 773be32995..d53f3954ba 100644
--- a/sysdeps/libm-ieee754/s_ceill.c
+++ b/sysdeps/libm-ieee754/s_ceill.c
@@ -51,8 +51,8 @@ static long double huge = 1.0e4930;
if(j0<31) {
if(j0<0) { /* raise inexact if x != 0 */
if(huge+x>0.0) {/* return 0*sign(x) if |x|<1 */
- if(sx) {es=0x8000;i0=0;i1=0;}
- else if((i0|i1)!=0) { es=0x3fff;i0=0;i1=0;}
+ if(sx) {se=0x8000;i0=0;i1=0;}
+ else if((i0|i1)!=0) { se=0x3fff;i0=0;i1=0;}
}
} else {
i = (0x7fffffff)>>j0;
diff --git a/sysdeps/libm-ieee754/s_floorl.c b/sysdeps/libm-ieee754/s_floorl.c
index 0eb0bec9b8..fb0c37e801 100644
--- a/sysdeps/libm-ieee754/s_floorl.c
+++ b/sysdeps/libm-ieee754/s_floorl.c
@@ -53,7 +53,7 @@ static long double huge = 1.0e4930;
if(huge+x>0.0) {/* return 0*sign(x) if |x|<1 */
if(sx==0) {se=0;i0=i1=0;}
else if(((se&0x7fff)|i0|i1)!=0)
- { se=0xbfff;i0;i1=0;}
+ { se=0xbfff;i0=i1=0;}
}
} else {
i = (0x7fffffff)>>j0;
@@ -62,6 +62,7 @@ static long double huge = 1.0e4930;
if(sx) {
if (j0>0) i0 += (0x80000000)>>j0;
else ++se;
+ }
i0 &= (~i); i1=0;
}
}
diff --git a/sysdeps/libm-ieee754/s_llrint.c b/sysdeps/libm-ieee754/s_llrint.c
index a50ba96952..8e70bcff36 100644
--- a/sysdeps/libm-ieee754/s_llrint.c
+++ b/sysdeps/libm-ieee754/s_llrint.c
@@ -55,27 +55,27 @@ __llrint (double x)
w = two52[sx] + x;
t = w - two52[sx];
EXTRACT_WORDS (i0, i1, t);
- i0 = i & 0xfffff;
- i0 |= 0x100000;
j0 = ((i0 >> 20) & 0x7ff) - 0x3ff;
+ i0 &= 0xfffff;
+ i0 |= 0x100000;
result = i0 >> (20 - j0);
}
}
- else if (j0 < (int32_t) (8 * sizeof (long long int)))
+ else if (j0 < (int32_t) (8 * sizeof (long long int)) - 1)
{
if (j0 >= 52)
- result = ((long long int) i0 << (j0 - 20)) | (i1 << (j0 - 52));
+ result = (((long long int) i0 << 32) | i1) << (j0 - 52);
else
{
w = two52[sx] + x;
t = w - two52[sx];
EXTRACT_WORDS (i0, i1, t);
- i0 = i & 0xfffff;
- i0 |= 0x100000;
j0 = ((i0 >> 20) & 0x7ff) - 0x3ff;
+ i0 &= 0xfffff;
+ i0 |= 0x100000;
- result = ((long long int) i0 << (j0 - 20)) | (j >> (52 - j0));
+ result = ((long long int) i0 << (j0 - 20)) | (i1 >> (52 - j0));
}
}
else
diff --git a/sysdeps/libm-ieee754/s_llrintf.c b/sysdeps/libm-ieee754/s_llrintf.c
index f73afd0fd2..83cb7fdd37 100644
--- a/sysdeps/libm-ieee754/s_llrintf.c
+++ b/sysdeps/libm-ieee754/s_llrintf.c
@@ -47,7 +47,7 @@ __llrintf (float x)
i0 = i & 0x7fffff;
i0 |= 0x800000;
- if (j0 < (int32_t) (sizeof (long long int) * 8))
+ if (j0 < (int32_t) (sizeof (long long int) * 8) - 1)
{
if (j0 < -1)
return 0;
diff --git a/sysdeps/libm-ieee754/s_llrintl.c b/sysdeps/libm-ieee754/s_llrintl.c
index d3b9b12d76..2aeaa1e102 100644
--- a/sysdeps/libm-ieee754/s_llrintl.c
+++ b/sysdeps/libm-ieee754/s_llrintl.c
@@ -45,12 +45,12 @@ __llrintl (long double x)
sx = (se >> 15) & 1;
j0 = (se & 0x7fff) - 0x3fff;
- if (j0 < (int32_t) (8 * sizeof (long long int)))
+ if (j0 < (int32_t) (8 * sizeof (long long int)) - 1)
{
if (j0 < -1)
return 0;
else if (j0 >= 63)
- result = ((long long int) i0 << (j0 - 31)) | (i1 << (j0 - 63));
+ result = (((long long int) i0 << 32) | i1) << (j0 - 63);
else
{
w = two63[sx] + x;
diff --git a/sysdeps/libm-ieee754/s_llround.c b/sysdeps/libm-ieee754/s_llround.c
index 1deb630e96..92ce10fc42 100644
--- a/sysdeps/libm-ieee754/s_llround.c
+++ b/sysdeps/libm-ieee754/s_llround.c
@@ -48,17 +48,20 @@ __llround (double x)
result = i0 >> (20 - j0);
}
}
- else if (j0 < (int32_t) (8 * sizeof (long long int)))
+ else if (j0 < (int32_t) (8 * sizeof (long long int)) - 1)
{
if (j0 >= 52)
- result = ((long long int) i0 << (j0 - 20)) | (i1 << (j0 - 52));
+ result = (((long long int) i0 << 32) | i1) << (j0 - 52);
else
{
u_int32_t j = i1 + (0x80000000 >> (j0 - 20));
if (j < i1)
++i0;
- result = ((long long int) i0 << (j0 - 20)) | (j >> (52 - j0));
+ if (j0 == 20)
+ result = (long long int) i0;
+ else
+ result = ((long long int) i0 << (j0 - 20)) | (j >> (52 - j0));
}
}
else
diff --git a/sysdeps/libm-ieee754/s_llroundf.c b/sysdeps/libm-ieee754/s_llroundf.c
index 87ed1a3117..9aad81fd45 100644
--- a/sysdeps/libm-ieee754/s_llroundf.c
+++ b/sysdeps/libm-ieee754/s_llroundf.c
@@ -37,12 +37,12 @@ __llroundf (float x)
i &= 0x7fffff;
i |= 0x800000;
- if (j0 < (int32_t) (8 * sizeof (long long int)))
+ if (j0 < (int32_t) (8 * sizeof (long long int)) - 1)
{
if (j0 < 0)
return j0 < -1 ? 0 : sign;
else if (j0 >= 23)
- result = (long int) i << (j0 - 23);
+ result = (long long int) i << (j0 - 23);
else
{
i += 0x400000 >> j0;
diff --git a/sysdeps/libm-ieee754/s_llroundl.c b/sysdeps/libm-ieee754/s_llroundl.c
index 959b1e3fe9..4a537c871e 100644
--- a/sysdeps/libm-ieee754/s_llroundl.c
+++ b/sysdeps/libm-ieee754/s_llroundl.c
@@ -52,17 +52,20 @@ __llroundl (long double x)
result = j >> (31 - j0);
}
}
- else if (j0 < (int32_t) (8 * sizeof (long long int)))
+ else if (j0 < (int32_t) (8 * sizeof (long long int)) - 1)
{
if (j0 >= 63)
- result = ((long long int) i0 << (j0 - 31)) | (i1 << (j0 - 63));
+ result = (((long long int) i0 << 32) | i1) << (j0 - 63);
else
{
u_int32_t j = i1 + (0x80000000 >> (j0 - 31));
if (j < i1)
++i0;
- result = ((long long int) i0 << (j0 - 31)) | (j >> (63 - j0));
+ if (j0 == 31)
+ result = (long long int) i0;
+ else
+ result = ((long long int) i0 << (j0 - 31)) | (j >> (63 - j0));
}
}
else
diff --git a/sysdeps/libm-ieee754/s_lrint.c b/sysdeps/libm-ieee754/s_lrint.c
index 0ccd06a061..8fe7d24e14 100644
--- a/sysdeps/libm-ieee754/s_lrint.c
+++ b/sysdeps/libm-ieee754/s_lrint.c
@@ -62,7 +62,7 @@ __lrint (double x)
result = i0 >> (20 - j0);
}
}
- else if (j0 < (int32_t) (8 * sizeof (long int)))
+ else if (j0 < (int32_t) (8 * sizeof (long int)) - 1)
{
if (j0 >= 52)
result = ((long int) i0 << (j0 - 20)) | (i1 << (j0 - 52));
@@ -75,7 +75,7 @@ __lrint (double x)
i0 |= 0x100000;
j0 = ((i0 >> 20) & 0x7ff) - 0x3ff;
- result = ((long int) i0 << (j0 - 20)) | (j >> (52 - j0));
+ result = ((long int) i0 << (j0 - 20)) | (i1 >> (52 - j0));
}
}
else
diff --git a/sysdeps/libm-ieee754/s_lrintf.c b/sysdeps/libm-ieee754/s_lrintf.c
index 6d74b362f5..d80d81a718 100644
--- a/sysdeps/libm-ieee754/s_lrintf.c
+++ b/sysdeps/libm-ieee754/s_lrintf.c
@@ -47,7 +47,7 @@ __lrintf (float x)
i0 = i & 0x7fffff;
i0 |= 0x800000;
- if (j0 < (int32_t) (sizeof (long int) * 8))
+ if (j0 < (int32_t) (sizeof (long int) * 8) - 1)
{
if (j0 < -1)
return 0;
diff --git a/sysdeps/libm-ieee754/s_lrintl.c b/sysdeps/libm-ieee754/s_lrintl.c
index 5a41427f72..673cf3d9db 100644
--- a/sysdeps/libm-ieee754/s_lrintl.c
+++ b/sysdeps/libm-ieee754/s_lrintl.c
@@ -59,7 +59,7 @@ __lrintl (long double x)
result = i0 >> (31 - j0);
}
}
- else if (j0 < (int32_t) (8 * sizeof (long int)))
+ else if (j0 < (int32_t) (8 * sizeof (long int)) - 1)
{
if (j0 >= 63)
result = ((long int) i0 << (j0 - 31)) | (i1 << (j0 - 63));
diff --git a/sysdeps/libm-ieee754/s_lround.c b/sysdeps/libm-ieee754/s_lround.c
index a6468ba78a..49be12f03b 100644
--- a/sysdeps/libm-ieee754/s_lround.c
+++ b/sysdeps/libm-ieee754/s_lround.c
@@ -48,7 +48,7 @@ __lround (double x)
result = i0 >> (20 - j0);
}
}
- else if (j0 < (int32_t) (8 * sizeof (long int)))
+ else if (j0 < (int32_t) (8 * sizeof (long int)) - 1)
{
if (j0 >= 52)
result = ((long int) i0 << (j0 - 20)) | (i1 << (j0 - 52));
diff --git a/sysdeps/libm-ieee754/s_lroundf.c b/sysdeps/libm-ieee754/s_lroundf.c
index 0d3889c24a..df1d242e2a 100644
--- a/sysdeps/libm-ieee754/s_lroundf.c
+++ b/sysdeps/libm-ieee754/s_lroundf.c
@@ -37,7 +37,7 @@ __lroundf (float x)
i &= 0x7fffff;
i |= 0x800000;
- if (j0 < (int32_t) (8 * sizeof (long int)))
+ if (j0 < (int32_t) (8 * sizeof (long int)) - 1)
{
if (j0 < 0)
return j0 < -1 ? 0 : sign;
diff --git a/sysdeps/libm-ieee754/s_lroundl.c b/sysdeps/libm-ieee754/s_lroundl.c
index d8b7db4b5c..3bdac830b4 100644
--- a/sysdeps/libm-ieee754/s_lroundl.c
+++ b/sysdeps/libm-ieee754/s_lroundl.c
@@ -52,7 +52,7 @@ __lroundl (long double x)
result = j >> (31 - j0);
}
}
- else if (j0 < (int32_t) (8 * sizeof (long int)))
+ else if (j0 < (int32_t) (8 * sizeof (long int)) - 1)
{
if (j0 >= 63)
result = ((long int) i0 << (j0 - 31)) | (i1 << (j0 - 63));
diff --git a/sysdeps/libm-ieee754/s_scalblnl.c b/sysdeps/libm-ieee754/s_scalblnl.c
index aafb73e688..b885fbcadb 100644
--- a/sysdeps/libm-ieee754/s_scalblnl.c
+++ b/sysdeps/libm-ieee754/s_scalblnl.c
@@ -34,7 +34,7 @@ static const long double
static long double
#endif
two63 = 4.50359962737049600000e+15,
-twom63 = 1.08420217248550443400e-19;
+twom63 = 1.08420217248550443400e-19,
huge = 1.0e+4900L,
tiny = 1.0e-4900L;
diff --git a/sysdeps/libm-ieee754/s_scalbnl.c b/sysdeps/libm-ieee754/s_scalbnl.c
index 4e1d08ef90..32e4fb8cea 100644
--- a/sysdeps/libm-ieee754/s_scalbnl.c
+++ b/sysdeps/libm-ieee754/s_scalbnl.c
@@ -34,7 +34,7 @@ static const long double
static long double
#endif
two63 = 4.50359962737049600000e+15,
-twom63 = 1.08420217248550443400e-19;
+twom63 = 1.08420217248550443400e-19,
huge = 1.0e+4900L,
tiny = 1.0e-4900L;
diff --git a/sysdeps/libm-ieee754/s_sincosl.c b/sysdeps/libm-ieee754/s_sincosl.c
index 7cadf88a40..78c78d5619 100644
--- a/sysdeps/libm-ieee754/s_sincosl.c
+++ b/sysdeps/libm-ieee754/s_sincosl.c
@@ -38,7 +38,7 @@ __sincosl (long double x, long double *sinx, long double *cosx)
*sinx = __kernel_sinl (x, 0.0, 0);
*cosx = __kernel_cosl (x, 0.0);
}
- else if (ix == 0x7fff)
+ else if (se == 0x7fff)
{
/* sin(Inf or NaN) is NaN */
*sinx = *cosx = x - x;
diff --git a/sysdeps/libm-ieee754/s_tanl.c b/sysdeps/libm-ieee754/s_tanl.c
index bce6d07f3d..97a0b27f32 100644
--- a/sysdeps/libm-ieee754/s_tanl.c
+++ b/sysdeps/libm-ieee754/s_tanl.c
@@ -66,7 +66,7 @@ static char rcsid[] = "$NetBSD: $";
/* |x| ~< pi/4 */
se &= 0x7fff;
- if(ix <= 0x3ffe) return __kernel_tanl(x,z,1);
+ if(se <= 0x3ffe) return __kernel_tanl(x,z,1);
/* tan(Inf or NaN) is NaN */
else if (se==0x7fff) return x-x; /* NaN */