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.
*/
*** 31,45 ****
#include "libm.h"
#include <fenv.h>
float
! __nearbyintf(float x) {
union {
unsigned i;
float f;
} xx;
unsigned hx, sx, i, frac;
int rm;
xx.f = x;
sx = xx.i & 0x80000000;
--- 32,48 ----
#include "libm.h"
#include <fenv.h>
float
! __nearbyintf(float x)
! {
union {
unsigned i;
float f;
} xx;
+
unsigned hx, sx, i, frac;
int rm;
xx.f = x;
sx = xx.i & 0x80000000;
*** 47,59 ****
/* handle trivial cases */
if (hx >= 0x4b000000) { /* x is nan, inf, or already integral */
if (hx > 0x7f800000) /* x is nan */
return (x * x); /* + -> * for Cheetah */
return (x);
! } else if (hx == 0) /* x is zero */
return (x);
/* get the rounding mode */
rm = fegetround();
/* flip the sense of directed roundings if x is negative */
--- 50,64 ----
/* handle trivial cases */
if (hx >= 0x4b000000) { /* x is nan, inf, or already integral */
if (hx > 0x7f800000) /* x is nan */
return (x * x); /* + -> * for Cheetah */
+
return (x);
! } else if (hx == 0) { /* x is zero */
return (x);
+ }
/* get the rounding mode */
rm = fegetround();
/* flip the sense of directed roundings if x is negative */
*** 64,110 ****
if (hx < 0x3f800000) {
if (rm == FE_UPWARD || (rm == FE_TONEAREST && hx > 0x3f000000))
xx.i = sx | 0x3f800000;
else
xx.i = sx;
return (xx.f);
}
/* round x at the integer bit */
i = 1 << (0x96 - (hx >> 23));
frac = hx & (i - 1);
if (!frac)
return (x);
hx &= ~(i - 1);
if (rm == FE_UPWARD || (rm == FE_TONEAREST && (frac > (i >> 1) ||
((frac == (i >> 1)) && (hx & i)))))
xx.i = sx | (hx + i);
else
xx.i = sx | hx;
return (xx.f);
}
#if 0
-
/*
* Alternate implementations for SPARC, x86, using fp ops. These may
* be faster depending on how expensive saving and restoring the fp
* modes and status flags is.
*/
#include "libm.h"
#include "fma.h"
#if defined(__sparc)
-
float
! __nearbyintf(float x) {
union {
unsigned i;
float f;
} xx, yy;
float z;
unsigned hx, sx, fsr, oldfsr;
int rm;
xx.f = x;
--- 69,119 ----
if (hx < 0x3f800000) {
if (rm == FE_UPWARD || (rm == FE_TONEAREST && hx > 0x3f000000))
xx.i = sx | 0x3f800000;
else
xx.i = sx;
+
return (xx.f);
}
/* round x at the integer bit */
i = 1 << (0x96 - (hx >> 23));
frac = hx & (i - 1);
+
if (!frac)
return (x);
hx &= ~(i - 1);
+
if (rm == FE_UPWARD || (rm == FE_TONEAREST && (frac > (i >> 1) ||
((frac == (i >> 1)) && (hx & i)))))
xx.i = sx | (hx + i);
else
xx.i = sx | hx;
+
return (xx.f);
}
#if 0
/*
* Alternate implementations for SPARC, x86, using fp ops. These may
* be faster depending on how expensive saving and restoring the fp
* modes and status flags is.
*/
#include "libm.h"
#include "fma.h"
#if defined(__sparc)
float
! __nearbyintf(float x)
! {
union {
unsigned i;
float f;
} xx, yy;
+
float z;
unsigned hx, sx, fsr, oldfsr;
int rm;
xx.f = x;
*** 122,137 ****
--- 131,149 ----
/* handle |x| < 1 */
if (hx < 0x3f800000) {
/* flip the sense of directed roundings if x is negative */
rm = oldfsr >> 30;
+
if (sx)
rm ^= rm >> 1;
+
if (rm == FSR_RP || (rm == FSR_RN && hx > 0x3f000000))
xx.i = sx | 0x3f800000;
else
xx.i = sx;
+
return (xx.f);
}
/* clear the inexact trap */
fsr = oldfsr & ~FSR_NXM;
*** 144,170 ****
/* restore the old fsr */
__fenv_setfsr(&oldfsr);
return (z);
}
-
#elif defined(__x86)
-
/* inline template */
extern long double frndint(long double);
float
! __nearbyintf(float x) {
long double z;
unsigned oldcwsw, cwsw;
/* save the control and status words, mask the inexact exception */
__fenv_getcwsw(&oldcwsw);
cwsw = oldcwsw | 0x00200000;
__fenv_setcwsw(&cwsw);
! z = frndint((long double) x);
/*
* restore the control and status words, preserving all but the
* inexact flag
*/
--- 156,181 ----
/* restore the old fsr */
__fenv_setfsr(&oldfsr);
return (z);
}
#elif defined(__x86)
/* inline template */
extern long double frndint(long double);
float
! __nearbyintf(float x)
! {
long double z;
unsigned oldcwsw, cwsw;
/* save the control and status words, mask the inexact exception */
__fenv_getcwsw(&oldcwsw);
cwsw = oldcwsw | 0x00200000;
__fenv_setcwsw(&cwsw);
! z = frndint((long double)x);
/*
* restore the control and status words, preserving all but the
* inexact flag
*/
*** 173,183 ****
__fenv_setcwsw(&oldcwsw);
/* note: the value of z is representable in single precision */
return (z);
}
-
#else
#error Unknown architecture
#endif
-
#endif
--- 184,192 ----