Print this page
11210 libm should be cstyle(1ONBLD) clean

*** 20,29 **** --- 20,30 ---- */ /* * Copyright 2011 Nexenta Systems, Inc. All rights reserved. */ + /* * Copyright 2006 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */
*** 34,49 **** #endif #include "libm.h" #if defined(__sparc) - #include "fma.h" #include "fenv_inlines.h" long long ! llrintl(long double x) { union { unsigned i[4]; long double q; } xx; union { --- 35,50 ---- #endif #include "libm.h" #if defined(__sparc) #include "fma.h" #include "fenv_inlines.h" long long ! llrintl(long double x) ! { union { unsigned i[4]; long double q; } xx; union {
*** 52,61 **** --- 53,63 ---- } zz; union { unsigned i; float f; } tt; + unsigned int hx, sx, frac, fsr; int rm, j; volatile float dummy; xx.q = x;
*** 64,76 **** /* handle trivial cases */ if (hx > 0x403e0000) { /* |x| > 2^63 + ... or x is nan */ /* convert an out-of-range float */ tt.i = sx | 0x7f000000; ! return ((long long) tt.f); ! } else if ((hx | xx.i[1] | xx.i[2] | xx.i[3]) == 0) /* x is zero */ return (0LL); /* get the rounding mode */ __fenv_getfsr32(&fsr); rm = fsr >> 30; --- 66,79 ---- /* handle trivial cases */ if (hx > 0x403e0000) { /* |x| > 2^63 + ... or x is nan */ /* convert an out-of-range float */ tt.i = sx | 0x7f000000; ! return ((long long)tt.f); ! } else if ((hx | xx.i[1] | xx.i[2] | xx.i[3]) == 0) { /* x is zero */ return (0LL); + } /* get the rounding mode */ __fenv_getfsr32(&fsr); rm = fsr >> 30;
*** 80,114 **** /* handle |x| < 1 */ if (hx < 0x3fff0000) { dummy = 1.0e30f; /* x is nonzero, so raise inexact */ dummy += 1.0e-30f; ! if (rm == FSR_RP || (rm == FSR_RN && (hx >= 0x3ffe0000 && ! ((hx & 0xffff) | xx.i[1] | xx.i[2] | xx.i[3])))) return (sx ? -1LL : 1LL); return (0LL); } /* extract the integer and fractional parts of x */ j = 0x406f - (hx >> 16); xx.i[0] = 0x10000 | (xx.i[0] & 0xffff); if (j >= 96) { zz.i[0] = 0; zz.i[1] = xx.i[0] >> (j - 96); frac = ((xx.i[0] << 1) << (127 - j)) | (xx.i[1] >> (j - 96)); if (((xx.i[1] << 1) << (127 - j)) | xx.i[2] | xx.i[3]) frac |= 1; } else if (j >= 64) { zz.i[0] = xx.i[0] >> (j - 64); zz.i[1] = ((xx.i[0] << 1) << (95 - j)) | (xx.i[1] >> (j - 64)); frac = ((xx.i[1] << 1) << (95 - j)) | (xx.i[2] >> (j - 64)); if (((xx.i[2] << 1) << (95 - j)) | xx.i[3]) frac |= 1; } else { zz.i[0] = ((xx.i[0] << 1) << (63 - j)) | (xx.i[1] >> (j - 32)); zz.i[1] = ((xx.i[1] << 1) << (63 - j)) | (xx.i[2] >> (j - 32)); frac = ((xx.i[2] << 1) << (63 - j)) | (xx.i[3] >> (j - 32)); if ((xx.i[3] << 1) << (63 - j)) frac |= 1; } /* round */ --- 83,123 ---- /* handle |x| < 1 */ if (hx < 0x3fff0000) { dummy = 1.0e30f; /* x is nonzero, so raise inexact */ dummy += 1.0e-30f; ! ! if (rm == FSR_RP || (rm == FSR_RN && (hx >= 0x3ffe0000 && ((hx & ! 0xffff) | xx.i[1] | xx.i[2] | xx.i[3])))) return (sx ? -1LL : 1LL); + return (0LL); } /* extract the integer and fractional parts of x */ j = 0x406f - (hx >> 16); xx.i[0] = 0x10000 | (xx.i[0] & 0xffff); + if (j >= 96) { zz.i[0] = 0; zz.i[1] = xx.i[0] >> (j - 96); frac = ((xx.i[0] << 1) << (127 - j)) | (xx.i[1] >> (j - 96)); + if (((xx.i[1] << 1) << (127 - j)) | xx.i[2] | xx.i[3]) frac |= 1; } else if (j >= 64) { zz.i[0] = xx.i[0] >> (j - 64); zz.i[1] = ((xx.i[0] << 1) << (95 - j)) | (xx.i[1] >> (j - 64)); frac = ((xx.i[1] << 1) << (95 - j)) | (xx.i[2] >> (j - 64)); + if (((xx.i[2] << 1) << (95 - j)) | xx.i[3]) frac |= 1; } else { zz.i[0] = ((xx.i[0] << 1) << (63 - j)) | (xx.i[1] >> (j - 32)); zz.i[1] = ((xx.i[1] << 1) << (63 - j)) | (xx.i[2] >> (j - 32)); frac = ((xx.i[2] << 1) << (63 - j)) | (xx.i[3] >> (j - 32)); + if ((xx.i[3] << 1) << (63 - j)) frac |= 1; } /* round */
*** 120,130 **** /* check for result out of range (note that z is |x| at this point) */ if (zz.i[0] > 0x80000000u || (zz.i[0] == 0x80000000 && (zz.i[1] || !sx))) { tt.i = sx | 0x7f000000; ! return ((long long) tt.f); } /* raise inexact if need be */ if (frac) { dummy = 1.0e30F; --- 129,139 ---- /* check for result out of range (note that z is |x| at this point) */ if (zz.i[0] > 0x80000000u || (zz.i[0] == 0x80000000 && (zz.i[1] || !sx))) { tt.i = sx | 0x7f000000; ! return ((long long)tt.f); } /* raise inexact if need be */ if (frac) { dummy = 1.0e30F;
*** 133,159 **** /* negate result if need be */ if (sx) { zz.i[0] = ~zz.i[0]; zz.i[1] = -zz.i[1]; if (zz.i[1] == 0) zz.i[0]++; } return (zz.l); } #elif defined(__x86) long long ! llrintl(long double x) { /* * Note: The following code works on x86 (in the default rounding * precision mode), but one ought to just use the fistpll instruction * instead. */ union { unsigned i[3]; long double e; } xx, yy; int ex; xx.e = x; ex = xx.i[2] & 0x7fff; --- 142,172 ---- /* negate result if need be */ if (sx) { zz.i[0] = ~zz.i[0]; zz.i[1] = -zz.i[1]; + if (zz.i[1] == 0) zz.i[0]++; } + return (zz.l); } #elif defined(__x86) long long ! llrintl(long double x) ! { /* * Note: The following code works on x86 (in the default rounding * precision mode), but one ought to just use the fistpll instruction * instead. */ union { unsigned i[3]; long double e; } xx, yy; + int ex; xx.e = x; ex = xx.i[2] & 0x7fff;
*** 164,173 **** yy.i[0] = 0; x = (x + yy.e) - yy.e; } /* now x is nan, inf, or integral */ ! return ((long long) x); } #else #error Unknown architecture #endif --- 177,186 ---- yy.i[0] = 0; x = (x + yy.e) - yy.e; } /* now x is nan, inf, or integral */ ! return ((long long)x); } #else #error Unknown architecture #endif