diff options
author | Andreas Jaeger <aj@suse.de> | 2012-03-14 16:36:17 +0100 |
---|---|---|
committer | Andreas Jaeger <aj@suse.de> | 2012-03-14 16:36:17 +0100 |
commit | 356a10ee3ee36bec0af7e8a1c61e353e0af45904 (patch) | |
tree | 421de93f9f53c04d796ccd31102baf135dc55ed8 /sysdeps/ieee754/dbl-64/s_rint.c | |
parent | a20026128cef2e95ffd15fb293dd6b1e9bf3ae1e (diff) | |
parent | e456826d7a539fb322bb9719297bd386eded8e32 (diff) | |
download | glibc-356a10ee3ee36bec0af7e8a1c61e353e0af45904.tar.gz glibc-356a10ee3ee36bec0af7e8a1c61e353e0af45904.tar.xz glibc-356a10ee3ee36bec0af7e8a1c61e353e0af45904.zip |
Merge branch 'master' into bug13658-branch
Diffstat (limited to 'sysdeps/ieee754/dbl-64/s_rint.c')
-rw-r--r-- | sysdeps/ieee754/dbl-64/s_rint.c | 37 |
1 files changed, 5 insertions, 32 deletions
diff --git a/sysdeps/ieee754/dbl-64/s_rint.c b/sysdeps/ieee754/dbl-64/s_rint.c index a671a6277e..8458909165 100644 --- a/sysdeps/ieee754/dbl-64/s_rint.c +++ b/sysdeps/ieee754/dbl-64/s_rint.c @@ -20,8 +20,8 @@ * Inexact flag raised if x not equal to rint(x). */ -#include "math.h" -#include "math_private.h" +#include <math.h> +#include <math_private.h> static const double TWO52[2]={ @@ -33,49 +33,22 @@ double __rint(double x) { int32_t i0,j0,sx; - u_int32_t i,i1; double w,t; - EXTRACT_WORDS(i0,i1,x); + GET_HIGH_WORD(i0,x); sx = (i0>>31)&1; j0 = ((i0>>20)&0x7ff)-0x3ff; - if(j0<20) { + if(j0<52) { if(j0<0) { - if(((i0&0x7fffffff)|i1)==0) return x; - i1 |= (i0&0x0fffff); - i0 &= 0xfffe0000; - i0 |= ((i1|-i1)>>12)&0x80000; - SET_HIGH_WORD(x,i0); w = TWO52[sx]+x; t = w-TWO52[sx]; GET_HIGH_WORD(i0,t); SET_HIGH_WORD(t,(i0&0x7fffffff)|(sx<<31)); return t; - } else { - i = (0x000fffff)>>j0; - if(((i0&i)|i1)==0) return x; /* x is integral */ - i>>=1; - if(((i0&i)|i1)!=0) { - if (j0==19) - i1 = 0x40000000; - else if (j0<18) - i0 = (i0&(~i))|((0x20000)>>j0); - else - { - i0 &= ~i; - i1 = 0x80000000; - } - } } - } else if (j0>51) { + } else { if(j0==0x400) return x+x; /* inf or NaN */ else return x; /* x is integral */ - } else { - i = ((u_int32_t)(0xffffffff))>>(j0-20); - if((i1&i)==0) return x; /* x is integral */ - i>>=1; - if((i1&i)!=0) i1 = (i1&(~i))|((0x40000000)>>(j0-20)); } - INSERT_WORDS(x,i0,i1); w = TWO52[sx]+x; return w-TWO52[sx]; } |