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. */
*** 35,45 **** #include "libm.h" #if defined(__sparc) long long ! llroundl(long double x) { union { unsigned i[4]; long double q; } xx; union { --- 36,47 ---- #include "libm.h" #if defined(__sparc) long long ! llroundl(long double x) ! { union { unsigned i[4]; long double q; } xx; union {
*** 48,57 **** --- 50,60 ---- } zz; union { unsigned i; float f; } tt; + unsigned hx, sx, frac; int j; xx.q = x; sx = xx.i[0] & 0x80000000;
*** 59,97 **** /* 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); } /* handle |x| < 1 */ if (hx < 0x3fff0000) { if (hx >= 0x3ffe0000) 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 */ --- 62,105 ---- /* 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); } /* handle |x| < 1 */ if (hx < 0x3fff0000) { if (hx >= 0x3ffe0000) 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 */
*** 102,131 **** /* 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); } /* 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 ! llroundl(long double x) { union { unsigned i[3]; long double e; } xx; int ex, sx, i; xx.e = x; ex = xx.i[2] & 0x7fff; sx = xx.i[2] & 0x8000; --- 110,142 ---- /* 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); } /* 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 ! llroundl(long double x) ! { union { unsigned i[3]; long double e; } xx; + int ex, sx, i; xx.e = x; ex = xx.i[2] & 0x7fff; sx = xx.i[2] & 0x8000;
*** 133,142 **** --- 144,154 ---- if (ex < 0x403e) { /* |x| < 2^63 */ /* handle |x| < 1 */ if (ex < 0x3fff) { if (ex >= 0x3ffe) return (sx ? -1LL : 1LL); + return (0LL); } /* round x at the integer bit */ if (ex < 0x401e) {
*** 144,164 **** xx.i[1] = (xx.i[1] + i) & ~(i | (i - 1)); xx.i[0] = 0; } else { i = 1 << (0x403d - ex); xx.i[0] += i; if (xx.i[0] < i) xx.i[1]++; xx.i[0] &= ~(i | (i - 1)); } if (xx.i[1] == 0) { xx.i[2] = sx | ++ex; xx.i[1] = 0x80000000U; } } /* now x is nan, inf, or integral */ ! return ((long long) xx.e); } #else #error Unknown architecture #endif --- 156,179 ---- xx.i[1] = (xx.i[1] + i) & ~(i | (i - 1)); xx.i[0] = 0; } else { i = 1 << (0x403d - ex); xx.i[0] += i; + if (xx.i[0] < i) xx.i[1]++; + xx.i[0] &= ~(i | (i - 1)); } + if (xx.i[1] == 0) { xx.i[2] = sx | ++ex; xx.i[1] = 0x80000000U; } } /* now x is nan, inf, or integral */ ! return ((long long)xx.e); } #else #error Unknown architecture #endif