diff options
27 files changed, 176 insertions, 89 deletions
diff --git a/ChangeLog b/ChangeLog index c4825619bb..4daa80f53b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,39 @@ 2013-10-04 Alan Modra <amodra@gmail.com> + * sysdeps/ieee754/ldbl-128ibm/math_ldbl.h (ldbl_high): Define. + * sysdeps/ieee754/ldbl-128ibm/e_acoshl.c (__ieee754_acoshl): Rewrite + all uses of ieee854 long double macros and unions. + * sysdeps/ieee754/ldbl-128ibm/e_acosl.c (__ieee754_acosl): Likewise. + * sysdeps/ieee754/ldbl-128ibm/e_asinl.c (__ieee754_asinl): Likewise. + * sysdeps/ieee754/ldbl-128ibm/e_atanhl.c (__ieee754_atanhl): Likewise. + * sysdeps/ieee754/ldbl-128ibm/e_coshl.c (__ieee754_coshl): Likewise. + * sysdeps/ieee754/ldbl-128ibm/e_log2l.c (__ieee754_log2l): Likewise. + * sysdeps/ieee754/ldbl-128ibm/e_rem_pio2l.c (__ieee754_rem_pio2l): + Likewise. + * sysdeps/ieee754/ldbl-128ibm/e_sinhl.c (__ieee754_sinhl): Likewise. + * sysdeps/ieee754/ldbl-128ibm/k_cosl.c (__kernel_cosl): Likewise. + * sysdeps/ieee754/ldbl-128ibm/k_sincosl.c (__kernel_sincosl): Likewise. + * sysdeps/ieee754/ldbl-128ibm/k_sinl.c (__kernel_sinl): Likewise. + * sysdeps/ieee754/ldbl-128ibm/s_asinhl.c (__asinhl): Likewise. + * sysdeps/ieee754/ldbl-128ibm/s_atanl.c (__atanl): Likewise. + Simplify sign and nan test too. + * sysdeps/ieee754/ldbl-128ibm/s_cosl.c (__cosl): Likewise. + * sysdeps/ieee754/ldbl-128ibm/s_fabsl.c (__fabsl): Likewise. + * sysdeps/ieee754/ldbl-128ibm/s_finitel.c (___finitel): Likewise. + * sysdeps/ieee754/ldbl-128ibm/s_fpclassifyl.c (___fpclassifyl): + Likewise. + * sysdeps/ieee754/ldbl-128ibm/s_isnanl.c (___isnanl): Likewise. + * sysdeps/ieee754/ldbl-128ibm/s_issignalingl.c (__issignalingl): + Likewise. + * sysdeps/ieee754/ldbl-128ibm/s_logbl.c (__logbl): Likewise. + * sysdeps/ieee754/ldbl-128ibm/s_signbitl.c (___signbitl): Likewise. + * sysdeps/ieee754/ldbl-128ibm/s_sincosl.c (__sincosl): Likewise. + * sysdeps/ieee754/ldbl-128ibm/s_sinl.c (__sinl): Likewise. + * sysdeps/ieee754/ldbl-128ibm/s_tanl.c (__tanl): Likewise. + * sysdeps/powerpc/powerpc32/power7/fpu/s_logbl.c (__logbl): Likewise. + +2013-10-04 Alan Modra <amodra@gmail.com> + * stdio-common/printf_size.c (__printf_size): Don't use union ieee854_long_double in fpnum union. * stdio-common/printf_fphex.c (__printf_fphex): Likewise. Use diff --git a/sysdeps/ieee754/ldbl-128ibm/e_acoshl.c b/sysdeps/ieee754/ldbl-128ibm/e_acoshl.c index abc78a35bd..8a4a5bb7b9 100644 --- a/sysdeps/ieee754/ldbl-128ibm/e_acoshl.c +++ b/sysdeps/ieee754/ldbl-128ibm/e_acoshl.c @@ -36,8 +36,12 @@ __ieee754_acoshl(long double x) { long double t; int64_t hx; - u_int64_t lx; - GET_LDOUBLE_WORDS64(hx,lx,x); + uint64_t lx; + double xhi, xlo; + + ldbl_unpack (x, &xhi, &xlo); + EXTRACT_WORDS64 (hx, xhi); + EXTRACT_WORDS64 (lx, xlo); if(hx<0x3ff0000000000000LL) { /* x < 1 */ return (x-x)/(x-x); } else if(hx >=0x41b0000000000000LL) { /* x > 2**28 */ diff --git a/sysdeps/ieee754/ldbl-128ibm/e_acosl.c b/sysdeps/ieee754/ldbl-128ibm/e_acosl.c index 5d2af30346..86639930c9 100644 --- a/sysdeps/ieee754/ldbl-128ibm/e_acosl.c +++ b/sysdeps/ieee754/ldbl-128ibm/e_acosl.c @@ -151,26 +151,25 @@ static const long double long double __ieee754_acosl (long double x) { - long double z, r, w, p, q, s, t, f2; - ieee854_long_double_shape_type u; + long double a, z, r, w, p, q, s, t, f2; - u.value = __builtin_fabsl (x); - if (u.value == 1.0L) + a = __builtin_fabsl (x); + if (a == 1.0L) { if (x > 0.0L) return 0.0; /* acos(1) = 0 */ else return (2.0 * pio2_hi) + (2.0 * pio2_lo); /* acos(-1)= pi */ } - else if (u.value > 1.0L) + else if (a > 1.0L) { return (x - x) / (x - x); /* acos(|x| > 1) is NaN */ } - if (u.value < 0.5L) + if (a < 0.5L) { - if (u.value < 6.938893903907228e-18L) /* |x| < 2**-57 */ + if (a < 6.938893903907228e-18L) /* |x| < 2**-57 */ return pio2_hi + pio2_lo; - if (u.value < 0.4375L) + if (a < 0.4375L) { /* Arcsine of x. */ z = x * x; @@ -199,7 +198,7 @@ __ieee754_acosl (long double x) return z; } /* .4375 <= |x| < .5 */ - t = u.value - 0.4375L; + t = a - 0.4375L; p = ((((((((((P10 * t + P9) * t + P8) * t @@ -230,9 +229,9 @@ __ieee754_acosl (long double x) r = acosr4375 + r; return r; } - else if (u.value < 0.625L) + else if (a < 0.625L) { - t = u.value - 0.5625L; + t = a - 0.5625L; p = ((((((((((rS10 * t + rS9) * t + rS8) * t @@ -264,7 +263,9 @@ __ieee754_acosl (long double x) } else { /* |x| >= .625 */ - z = (one - u.value) * 0.5; + double shi, slo; + + z = (one - a) * 0.5; s = __ieee754_sqrtl (z); /* Compute an extended precision square root from the Newton iteration s -> 0.5 * (s + z / s). @@ -273,12 +274,11 @@ __ieee754_acosl (long double x) Express s = f1 + f2 where f1 * f1 is exactly representable. w = (z - s^2)/2s = (z - f1^2 - 2 f1 f2 - f2^2)/2s . s + w has extended precision. */ - u.value = s; - u.parts32.w2 = 0; - u.parts32.w3 = 0; - f2 = s - u.value; - w = z - u.value * u.value; - w = w - 2.0 * u.value * f2; + ldbl_unpack (s, &shi, &slo); + a = shi; + f2 = slo; + w = z - a * a; + w = w - 2.0 * a * f2; w = w - f2 * f2; w = w / (2.0 * s); /* Arcsine of s. */ diff --git a/sysdeps/ieee754/ldbl-128ibm/e_asinl.c b/sysdeps/ieee754/ldbl-128ibm/e_asinl.c index b395439495..99a5b85fa0 100644 --- a/sysdeps/ieee754/ldbl-128ibm/e_asinl.c +++ b/sysdeps/ieee754/ldbl-128ibm/e_asinl.c @@ -131,19 +131,18 @@ static const long double long double __ieee754_asinl (long double x) { - long double t, w, p, q, c, r, s; + long double a, t, w, p, q, c, r, s; int flag; - ieee854_long_double_shape_type u; flag = 0; - u.value = __builtin_fabsl (x); - if (u.value == 1.0L) /* |x|>= 1 */ + a = __builtin_fabsl (x); + if (a == 1.0L) /* |x|>= 1 */ return x * pio2_hi + x * pio2_lo; /* asin(1)=+-pi/2 with inexact */ - else if (u.value >= 1.0L) + else if (a >= 1.0L) return (x - x) / (x - x); /* asin(|x|>1) is NaN */ - else if (u.value < 0.5L) + else if (a < 0.5L) { - if (u.value < 6.938893903907228e-18L) /* |x| < 2**-57 */ + if (a < 6.938893903907228e-18L) /* |x| < 2**-57 */ { if (huge + x > one) return x; /* return x with inexact if x!=0 */ @@ -155,9 +154,9 @@ __ieee754_asinl (long double x) flag = 1; } } - else if (u.value < 0.625L) + else if (a < 0.625L) { - t = u.value - 0.5625; + t = a - 0.5625; p = ((((((((((rS10 * t + rS9) * t + rS8) * t @@ -190,7 +189,7 @@ __ieee754_asinl (long double x) else { /* 1 > |x| >= 0.625 */ - w = one - u.value; + w = one - a; t = w * 0.5; } @@ -223,17 +222,14 @@ __ieee754_asinl (long double x) } s = __ieee754_sqrtl (t); - if (u.value > 0.975L) + if (a > 0.975L) { w = p / q; t = pio2_hi - (2.0 * (s + s * w) - pio2_lo); } else { - u.value = s; - u.parts32.w3 = 0; - u.parts32.w2 = 0; - w = u.value; + w = ldbl_high (s); c = (t - w * w) / (s + w); r = p / q; p = 2.0 * s * r - (pio2_lo - 2.0 * c); diff --git a/sysdeps/ieee754/ldbl-128ibm/e_atanhl.c b/sysdeps/ieee754/ldbl-128ibm/e_atanhl.c index f35182f03e..29f2e92072 100644 --- a/sysdeps/ieee754/ldbl-128ibm/e_atanhl.c +++ b/sysdeps/ieee754/ldbl-128ibm/e_atanhl.c @@ -40,8 +40,10 @@ __ieee754_atanhl(long double x) { long double t; int64_t hx,ix; - u_int64_t lx __attribute__ ((unused)); - GET_LDOUBLE_WORDS64(hx,lx,x); + double xhi; + + xhi = ldbl_high (x); + EXTRACT_WORDS64 (hx, xhi); ix = hx&0x7fffffffffffffffLL; if (ix >= 0x3ff0000000000000LL) { /* |x|>=1 */ if (ix > 0x3ff0000000000000LL) diff --git a/sysdeps/ieee754/ldbl-128ibm/e_coshl.c b/sysdeps/ieee754/ldbl-128ibm/e_coshl.c index 3e8e1875c6..05683bc02f 100644 --- a/sysdeps/ieee754/ldbl-128ibm/e_coshl.c +++ b/sysdeps/ieee754/ldbl-128ibm/e_coshl.c @@ -41,9 +41,11 @@ __ieee754_coshl (long double x) { long double t,w; int64_t ix; + double xhi; /* High word of |x|. */ - GET_LDOUBLE_MSW64(ix,x); + xhi = ldbl_high (x); + EXTRACT_WORDS64 (ix, xhi); ix &= 0x7fffffffffffffffLL; /* x is INF or NaN */ diff --git a/sysdeps/ieee754/ldbl-128ibm/e_log2l.c b/sysdeps/ieee754/ldbl-128ibm/e_log2l.c index f0098f6c73..323ded0c0f 100644 --- a/sysdeps/ieee754/ldbl-128ibm/e_log2l.c +++ b/sysdeps/ieee754/ldbl-128ibm/e_log2l.c @@ -177,11 +177,13 @@ __ieee754_log2l (x) long double z; long double y; int e; - int64_t hx, lx; + int64_t hx; + double xhi; /* Test for domain */ - GET_LDOUBLE_WORDS64 (hx, lx, x); - if (((hx & 0x7fffffffffffffffLL) | (lx & 0x7fffffffffffffffLL)) == 0) + xhi = ldbl_high (x); + EXTRACT_WORDS64 (hx, xhi); + if ((hx & 0x7fffffffffffffffLL) == 0) return (-1.0L / (x - x)); if (hx < 0) return (x - x) / (x - x); diff --git a/sysdeps/ieee754/ldbl-128ibm/e_rem_pio2l.c b/sysdeps/ieee754/ldbl-128ibm/e_rem_pio2l.c index 8885def4e1..36bc03226b 100644 --- a/sysdeps/ieee754/ldbl-128ibm/e_rem_pio2l.c +++ b/sysdeps/ieee754/ldbl-128ibm/e_rem_pio2l.c @@ -200,10 +200,11 @@ int32_t __ieee754_rem_pio2l(long double x, long double *y) double tx[8]; int exp; int64_t n, ix, hx, ixd; - u_int64_t lx __attribute__ ((unused)); u_int64_t lxd; + double xhi; - GET_LDOUBLE_WORDS64 (hx, lx, x); + xhi = ldbl_high (x); + EXTRACT_WORDS64 (hx, xhi); ix = hx & 0x7fffffffffffffffLL; if (ix <= 0x3fe921fb54442d10LL) /* x in <-pi/4, pi/4> */ { diff --git a/sysdeps/ieee754/ldbl-128ibm/e_sinhl.c b/sysdeps/ieee754/ldbl-128ibm/e_sinhl.c index 4e8481c419..1790bef87e 100644 --- a/sysdeps/ieee754/ldbl-128ibm/e_sinhl.c +++ b/sysdeps/ieee754/ldbl-128ibm/e_sinhl.c @@ -38,9 +38,11 @@ __ieee754_sinhl(long double x) { long double t,w,h; int64_t ix,jx; + double xhi; /* High word of |x|. */ - GET_LDOUBLE_MSW64(jx,x); + xhi = ldbl_high (x); + EXTRACT_WORDS64 (jx, xhi); ix = jx&0x7fffffffffffffffLL; /* x is INF or NaN */ diff --git a/sysdeps/ieee754/ldbl-128ibm/k_cosl.c b/sysdeps/ieee754/ldbl-128ibm/k_cosl.c index 0b81782fdb..046f3b573c 100644 --- a/sysdeps/ieee754/ldbl-128ibm/k_cosl.c +++ b/sysdeps/ieee754/ldbl-128ibm/k_cosl.c @@ -81,8 +81,11 @@ __kernel_cosl(long double x, long double y) { long double h, l, z, sin_l, cos_l_m1; int64_t ix; - u_int32_t tix, hix, index; - GET_LDOUBLE_MSW64 (ix, x); + uint32_t tix, hix, index; + double xhi, hhi; + + xhi = ldbl_high (x); + EXTRACT_WORDS64 (ix, xhi); tix = ((u_int64_t)ix) >> 32; tix &= ~0x80000000; /* tix = |x|'s high 32 bits */ if (tix < 0x3fc30000) /* |x| < 0.1484375 */ @@ -136,7 +139,8 @@ __kernel_cosl(long double x, long double y) case 2: index = (hix - 0x3fc30000) >> 14; break; } */ - SET_LDOUBLE_WORDS64(h, ((u_int64_t)hix) << 32, 0); + INSERT_WORDS64 (hhi, ((uint64_t)hix) << 32); + h = hhi; l = y - (h - x); z = l * l; sin_l = l*(ONE+z*(SSIN1+z*(SSIN2+z*(SSIN3+z*(SSIN4+z*SSIN5))))); diff --git a/sysdeps/ieee754/ldbl-128ibm/k_sincosl.c b/sysdeps/ieee754/ldbl-128ibm/k_sincosl.c index fc1ead6597..3ba9d7e907 100644 --- a/sysdeps/ieee754/ldbl-128ibm/k_sincosl.c +++ b/sysdeps/ieee754/ldbl-128ibm/k_sincosl.c @@ -100,9 +100,12 @@ __kernel_sincosl(long double x, long double y, long double *sinx, long double *c { long double h, l, z, sin_l, cos_l_m1; int64_t ix; - u_int32_t tix, hix, index; - GET_LDOUBLE_MSW64 (ix, x); - tix = ((u_int64_t)ix) >> 32; + uint32_t tix, hix, index; + double xhi, hhi; + + xhi = ldbl_high (x); + EXTRACT_WORDS64 (ix, xhi); + tix = ((uint64_t)ix) >> 32; tix &= ~0x80000000; /* tix = |x|'s high 32 bits */ if (tix < 0x3fc30000) /* |x| < 0.1484375 */ { @@ -164,7 +167,8 @@ __kernel_sincosl(long double x, long double y, long double *sinx, long double *c case 2: index = (hix - 0x3fc30000) >> 14; break; } */ - SET_LDOUBLE_WORDS64(h, ((u_int64_t)hix) << 32, 0); + INSERT_WORDS64 (hhi, ((uint64_t)hix) << 32); + h = hhi; if (iy) l = y - (h - x); else diff --git a/sysdeps/ieee754/ldbl-128ibm/k_sinl.c b/sysdeps/ieee754/ldbl-128ibm/k_sinl.c index f17c0ae5db..b12ea134d5 100644 --- a/sysdeps/ieee754/ldbl-128ibm/k_sinl.c +++ b/sysdeps/ieee754/ldbl-128ibm/k_sinl.c @@ -82,7 +82,10 @@ __kernel_sinl(long double x, long double y, int iy) long double h, l, z, sin_l, cos_l_m1; int64_t ix; u_int32_t tix, hix, index; - GET_LDOUBLE_MSW64 (ix, x); + double xhi, hhi; + + xhi = ldbl_high (x); + EXTRACT_WORDS64 (ix, xhi); tix = ((u_int64_t)ix) >> 32; tix &= ~0x80000000; /* tix = |x|'s high 32 bits */ if (tix < 0x3fc30000) /* |x| < 0.1484375 */ @@ -132,7 +135,8 @@ __kernel_sinl(long double x, long double y, int iy) case 2: index = (hix - 0x3fc30000) >> 14; break; } */ - SET_LDOUBLE_WORDS64(h, ((u_int64_t)hix) << 32, 0); + INSERT_WORDS64 (hhi, ((uint64_t)hix) << 32); + h = hhi; if (iy) l = (ix < 0 ? -y : y) - (h - x); else diff --git a/sysdeps/ieee754/ldbl-128ibm/math_ldbl.h b/sysdeps/ieee754/ldbl-128ibm/math_ldbl.h index 4bb49c8dd0..8adb081c38 100644 --- a/sysdeps/ieee754/ldbl-128ibm/math_ldbl.h +++ b/sysdeps/ieee754/ldbl-128ibm/math_ldbl.h @@ -192,6 +192,9 @@ default_ldbl_unpack (long double l, double *a, double *aa) # define ldbl_unpack default_ldbl_unpack #endif +/* Extract high double. */ +#define ldbl_high(x) ((double) x) + /* Convert a finite long double to canonical form. Does not handle +/-Inf properly. */ static inline void diff --git a/sysdeps/ieee754/ldbl-128ibm/s_asinhl.c b/sysdeps/ieee754/ldbl-128ibm/s_asinhl.c index a833457eab..63c6edbb1a 100644 --- a/sysdeps/ieee754/ldbl-128ibm/s_asinhl.c +++ b/sysdeps/ieee754/ldbl-128ibm/s_asinhl.c @@ -38,7 +38,10 @@ long double __asinhl(long double x) { long double t,w; int64_t hx,ix; - GET_LDOUBLE_MSW64(hx,x); + double xhi; + + xhi = ldbl_high (x); + EXTRACT_WORDS64 (hx, xhi); ix = hx&0x7fffffffffffffffLL; if(ix>=0x7ff0000000000000LL) return x+x; /* x is inf or NaN */ if(ix< 0x3e20000000000000LL) { /* |x|<2**-29 */ diff --git a/sysdeps/ieee754/ldbl-128ibm/s_atanl.c b/sysdeps/ieee754/ldbl-128ibm/s_atanl.c index 2a36d16bb4..41dde23998 100644 --- a/sysdeps/ieee754/ldbl-128ibm/s_atanl.c +++ b/sysdeps/ieee754/ldbl-128ibm/s_atanl.c @@ -173,23 +173,20 @@ static const long double long double __atanl (long double x) { - int k, sign; + int32_t k, sign, lx; long double t, u, p, q; - ieee854_long_double_shape_type s; + double xhi; - s.value = x; - k = s.parts32.w0; - if (k & 0x80000000) - sign = 1; - else - sign = 0; + xhi = ldbl_high (x); + EXTRACT_WORDS (k, lx, xhi); + sign = k & 0x80000000; /* Check for IEEE special cases. */ k &= 0x7fffffff; if (k >= 0x7ff00000) { /* NaN. */ - if ((k & 0xfffff) | s.parts32.w1 ) + if (((k - 0x7ff00000) | lx) != 0) return (x + x); /* Infinity. */ diff --git a/sysdeps/ieee754/ldbl-128ibm/s_cosl.c b/sysdeps/ieee754/ldbl-128ibm/s_cosl.c index 23148392f1..54c6cc77d2 100644 --- a/sysdeps/ieee754/ldbl-128ibm/s_cosl.c +++ b/sysdeps/ieee754/ldbl-128ibm/s_cosl.c @@ -53,9 +53,11 @@ long double __cosl(long double x) { long double y[2],z=0.0L; int64_t n, ix; + double xhi; /* High word of x. */ - GET_LDOUBLE_MSW64(ix,x); + xhi = ldbl_high (x); + EXTRACT_WORDS64 (ix, xhi); /* |x| ~< pi/4 */ ix &= 0x7fffffffffffffffLL; diff --git a/sysdeps/ieee754/ldbl-128ibm/s_fabsl.c b/sysdeps/ieee754/ldbl-128ibm/s_fabsl.c index 99146d8021..c801c97065 100644 --- a/sysdeps/ieee754/ldbl-128ibm/s_fabsl.c +++ b/sysdeps/ieee754/ldbl-128ibm/s_fabsl.c @@ -29,10 +29,16 @@ static char rcsid[] = "$NetBSD: $"; long double __fabsl(long double x) { u_int64_t hx, lx; - GET_LDOUBLE_WORDS64(hx,lx,x); + double xhi, xlo; + + ldbl_unpack (x, &xhi, &xlo); + EXTRACT_WORDS64 (hx, xhi); + EXTRACT_WORDS64 (lx, xlo); lx = lx ^ ( hx & 0x8000000000000000LL ); hx = hx & 0x7fffffffffffffffLL; - SET_LDOUBLE_WORDS64(x,hx,lx); + INSERT_WORDS64 (xhi, hx); + INSERT_WORDS64 (xlo, lx); + x = ldbl_pack (xhi, xlo); return x; } long_double_symbol (libm, __fabsl, fabsl); diff --git a/sysdeps/ieee754/ldbl-128ibm/s_finitel.c b/sysdeps/ieee754/ldbl-128ibm/s_finitel.c index 8edb34154d..7b4655fadb 100644 --- a/sysdeps/ieee754/ldbl-128ibm/s_finitel.c +++ b/sysdeps/ieee754/ldbl-128ibm/s_finitel.c @@ -29,10 +29,14 @@ static char rcsid[] = "$NetBSD: $"; int ___finitel (long double x) { - int64_t hx; - GET_LDOUBLE_MSW64(hx,x); - return (int)((u_int64_t)((hx&0x7fffffffffffffffLL) - -0x7ff0000000000000LL)>>63); + uint64_t hx; + double xhi; + + xhi = ldbl_high (x); + EXTRACT_WORDS64 (hx, xhi); + hx &= 0x7fffffffffffffffLL; + hx -= 0x7ff0000000000000LL; + return hx >> 63; } hidden_ver (___finitel, __finitel) weak_alias (___finitel, ____finitel) diff --git a/sysdeps/ieee754/ldbl-128ibm/s_fpclassifyl.c b/sysdeps/ieee754/ldbl-128ibm/s_fpclassifyl.c index f4a90b08c7..90586e822e 100644 --- a/sysdeps/ieee754/ldbl-128ibm/s_fpclassifyl.c +++ b/sysdeps/ieee754/ldbl-128ibm/s_fpclassifyl.c @@ -46,8 +46,10 @@ ___fpclassifyl (long double x) { u_int64_t hx, lx; int retval = FP_NORMAL; + double xhi, xlo; - GET_LDOUBLE_WORDS64 (hx, lx, x); + ldbl_unpack (x, &xhi, &xlo); + EXTRACT_WORDS64 (hx, xhi); if ((hx & 0x7ff0000000000000ULL) == 0x7ff0000000000000ULL) { /* +/-NaN or +/-Inf */ if (hx & 0x000fffffffffffffULL) { @@ -65,6 +67,7 @@ ___fpclassifyl (long double x) retval = FP_NORMAL; } else { if ((hx & 0x7ff0000000000000ULL) == 0x0360000000000000ULL) { + EXTRACT_WORDS64 (lx, xlo); if ((lx & 0x7fffffffffffffff) /* lower is non-zero */ && ((lx^hx) & 0x8000000000000000ULL)) { /* and sign differs */ /* +/- denormal */ diff --git a/sysdeps/ieee754/ldbl-128ibm/s_isnanl.c b/sysdeps/ieee754/ldbl-128ibm/s_isnanl.c index 264dec745e..d12f1d3bf5 100644 --- a/sysdeps/ieee754/ldbl-128ibm/s_isnanl.c +++ b/sysdeps/ieee754/ldbl-128ibm/s_isnanl.c @@ -29,12 +29,14 @@ static char rcsid[] = "$NetBSD: $"; int ___isnanl (long double x) { - int64_t hx; - int64_t lx __attribute__ ((unused)); - GET_LDOUBLE_WORDS64(hx,lx,x); - hx &= 0x7fffffffffffffffLL; - hx = 0x7ff0000000000000LL - hx; - return (int)((u_int64_t)hx>>63); + uint64_t hx; + double xhi; + + xhi = ldbl_high (x); + EXTRACT_WORDS64 (hx, xhi); + hx &= 0x7fffffffffffffffLL; + hx = 0x7ff0000000000000LL - hx; + return (int) (hx >> 63); } hidden_ver (___isnanl, __isnanl) #ifndef IS_IN_libm diff --git a/sysdeps/ieee754/ldbl-128ibm/s_issignalingl.c b/sysdeps/ieee754/ldbl-128ibm/s_issignalingl.c index 96fab1aff1..bdd58f8f25 100644 --- a/sysdeps/ieee754/ldbl-128ibm/s_issignalingl.c +++ b/sysdeps/ieee754/ldbl-128ibm/s_issignalingl.c @@ -22,10 +22,13 @@ int __issignalingl (long double x) { - u_int64_t xi; + uint64_t xi; /* For inspecting NaN status, we only have to look at the first of the pair of IEEE 754 64-bit precision numbers. */ - GET_LDOUBLE_MSW64 (xi, x); + double xhi; + + xhi = ldbl_high (x); + EXTRACT_WORDS64 (xi, xhi); #ifdef HIGH_ORDER_BIT_IS_SET_FOR_SNAN # error untested /* We only have to care about the high-order bit of x's significand, because diff --git a/sysdeps/ieee754/ldbl-128ibm/s_logbl.c b/sysdeps/ieee754/ldbl-128ibm/s_logbl.c index 6cbfcfa1cc..e140288612 100644 --- a/sysdeps/ieee754/ldbl-128ibm/s_logbl.c +++ b/sysdeps/ieee754/ldbl-128ibm/s_logbl.c @@ -27,9 +27,10 @@ long double __logbl (long double x) { int64_t hx, rhx; - int64_t lx __attribute__ ((unused)); + double xhi; - GET_LDOUBLE_WORDS64 (hx, lx, x); + xhi = ldbl_high (x); + EXTRACT_WORDS64 (hx, xhi); hx &= 0x7fffffffffffffffLL; /* high |x| */ if (hx == 0) return -1.0 / fabs (x); diff --git a/sysdeps/ieee754/ldbl-128ibm/s_signbitl.c b/sysdeps/ieee754/ldbl-128ibm/s_signbitl.c index ee4aea6cf4..aecb1fd792 100644 --- a/sysdeps/ieee754/ldbl-128ibm/s_signbitl.c +++ b/sysdeps/ieee754/ldbl-128ibm/s_signbitl.c @@ -25,8 +25,10 @@ int ___signbitl (long double x) { int64_t e; + double xhi; - GET_LDOUBLE_MSW64 (e, x); + xhi = ldbl_high (x); + EXTRACT_WORDS64 (e, xhi); return e < 0; } #ifdef IS_IN_libm diff --git a/sysdeps/ieee754/ldbl-128ibm/s_sincosl.c b/sysdeps/ieee754/ldbl-128ibm/s_sincosl.c index 3b1e547bdc..a9e2f3d19a 100644 --- a/sysdeps/ieee754/ldbl-128ibm/s_sincosl.c +++ b/sysdeps/ieee754/ldbl-128ibm/s_sincosl.c @@ -27,9 +27,11 @@ void __sincosl (long double x, long double *sinx, long double *cosx) { int64_t ix; + double xhi; /* High word of x. */ - GET_LDOUBLE_MSW64 (ix, x); + xhi = ldbl_high (x); + EXTRACT_WORDS64 (ix, xhi); /* |x| ~< pi/4 */ ix &= 0x7fffffffffffffffLL; diff --git a/sysdeps/ieee754/ldbl-128ibm/s_sinl.c b/sysdeps/ieee754/ldbl-128ibm/s_sinl.c index 6fec16f851..087921a913 100644 --- a/sysdeps/ieee754/ldbl-128ibm/s_sinl.c +++ b/sysdeps/ieee754/ldbl-128ibm/s_sinl.c @@ -53,9 +53,11 @@ long double __sinl(long double x) { long double y[2],z=0.0L; int64_t n, ix; + double xhi; /* High word of x. */ - GET_LDOUBLE_MSW64(ix,x); + xhi = ldbl_high (x); + EXTRACT_WORDS64 (ix, xhi); /* |x| ~< pi/4 */ ix &= 0x7fffffffffffffffLL; diff --git a/sysdeps/ieee754/ldbl-128ibm/s_tanl.c b/sysdeps/ieee754/ldbl-128ibm/s_tanl.c index 9967d0c206..66b8a0621e 100644 --- a/sysdeps/ieee754/ldbl-128ibm/s_tanl.c +++ b/sysdeps/ieee754/ldbl-128ibm/s_tanl.c @@ -53,9 +53,11 @@ long double __tanl(long double x) { long double y[2],z=0.0L; int64_t n, ix; + double xhi; /* High word of x. */ - GET_LDOUBLE_MSW64(ix,x); + xhi = ldbl_high (x); + EXTRACT_WORDS64 (ix, xhi); /* |x| ~< pi/4 */ ix &= 0x7fffffffffffffffLL; diff --git a/sysdeps/powerpc/powerpc32/power7/fpu/s_logbl.c b/sysdeps/powerpc/powerpc32/power7/fpu/s_logbl.c index e008ed0c3d..1c82577f5d 100644 --- a/sysdeps/powerpc/powerpc32/power7/fpu/s_logbl.c +++ b/sysdeps/powerpc/powerpc32/power7/fpu/s_logbl.c @@ -35,14 +35,14 @@ static const union { long double __logbl (long double x) { - double xh, xl; + double xh; double ret; if (__builtin_expect (x == 0.0L, 0)) /* Raise FE_DIVBYZERO and return -HUGE_VAL[LF]. */ return -1.0L / __builtin_fabsl (x); - ldbl_unpack (x, &xh, &xl); + xh = ldbl_high (x); /* ret = x & 0x7ff0000000000000; */ asm ( "xxland %x0,%x1,%x2\n" @@ -58,9 +58,9 @@ __logbl (long double x) { /* POSIX specifies that denormal number is treated as though it were normalized. */ - int64_t lx, hx; + int64_t hx; - GET_LDOUBLE_WORDS64 (hx, lx, x); + EXTRACT_WORDS64 (hx, xh); return (long double) (-1023 - (__builtin_clzll (hx) - 12)); } /* Test to avoid logb_downward (0.0) == -0.0. */ |