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. */
*** 43,57 **** */ #include "libm.h" long long ! llround(double x) { union { unsigned i[2]; double d; } xx; unsigned hx, sx, i; xx.d = x; hx = xx.i[HIWORD] & ~0x80000000; sx = xx.i[HIWORD] & 0x80000000; --- 44,60 ---- */ #include "libm.h" long long ! llround(double x) ! { union { unsigned i[2]; double d; } xx; + unsigned hx, sx, i; xx.d = x; hx = xx.i[HIWORD] & ~0x80000000; sx = xx.i[HIWORD] & 0x80000000;
*** 59,68 **** --- 62,72 ---- if (hx < 0x43300000) { /* |x| < 2^52 */ /* handle |x| < 1 */ if (hx < 0x3ff00000) { if (hx >= 0x3fe00000) return (sx ? -1LL : 1LL); + return (0LL); } /* round x at the integer bit */ if (hx < 0x41300000) {
*** 70,83 **** xx.i[HIWORD] = (xx.i[HIWORD] + i) & ~(i | (i - 1)); xx.i[LOWORD] = 0; } else { i = 1 << (0x432 - (hx >> 20)); xx.i[LOWORD] += i; if (xx.i[LOWORD] < i) xx.i[HIWORD]++; xx.i[LOWORD] &= ~(i | (i - 1)); } } /* now x is nan, inf, or integral */ ! return ((long long) xx.d); } --- 74,89 ---- xx.i[HIWORD] = (xx.i[HIWORD] + i) & ~(i | (i - 1)); xx.i[LOWORD] = 0; } else { i = 1 << (0x432 - (hx >> 20)); xx.i[LOWORD] += i; + if (xx.i[LOWORD] < i) xx.i[HIWORD]++; + xx.i[LOWORD] &= ~(i | (i - 1)); } } /* now x is nan, inf, or integral */ ! return ((long long)xx.d); }