diff options
| author | Carmelo Amoroso <carmelo.amoroso@st.com> | 2010-11-28 21:09:47 +0100 |
|---|---|---|
| committer | Carmelo Amoroso <carmelo.amoroso@st.com> | 2010-11-28 21:09:47 +0100 |
| commit | 57f6cce72c889f2e7b342e87a565a064320a6ee2 (patch) | |
| tree | 5466406472918d3adb63398f5fb9ea1511a5e73f /libm/s_modf.c | |
| parent | 4ec89b87bc0eea8d9ca6b50564d12eeb3b1b0119 (diff) | |
| parent | 5dea871ac73ef4608022c058b50adc946917f9b9 (diff) | |
Merge commit 'origin/master' into prelink
Conflicts:
ldso/include/dl-hash.h
Signed-off-by: Carmelo Amoroso <carmelo.amoroso@st.com>
Diffstat (limited to 'libm/s_modf.c')
| -rw-r--r-- | libm/s_modf.c | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/libm/s_modf.c b/libm/s_modf.c index 26c2f1cd5..f73d5fddb 100644 --- a/libm/s_modf.c +++ b/libm/s_modf.c @@ -37,10 +37,8 @@ double modf(double x, double *iptr) } else { i = (0x000fffff)>>j0; if(((i0&i)|i1)==0) { /* x is integral */ - u_int32_t high; *iptr = x; - GET_HIGH_WORD(high,x); - INSERT_WORDS(x,high&0x80000000,0); /* return +-0 */ + INSERT_WORDS(x,i0&0x80000000,0); /* return +-0 */ return x; } else { INSERT_WORDS(*iptr,i0&(~i),0); @@ -48,18 +46,17 @@ double modf(double x, double *iptr) } } } else if (j0>51) { /* no fraction part */ - u_int32_t high; *iptr = x*one; - GET_HIGH_WORD(high,x); - INSERT_WORDS(x,high&0x80000000,0); /* return +-0 */ + /* We must handle NaNs separately. */ + if (j0 == 0x400 && ((i0 & 0xfffff) | i1)) + return x*one; + INSERT_WORDS(x,i0&0x80000000,0); /* return +-0 */ return x; } else { /* fraction part in low x */ i = ((u_int32_t)(0xffffffff))>>(j0-20); if((i1&i)==0) { /* x is integral */ - u_int32_t high; *iptr = x; - GET_HIGH_WORD(high,x); - INSERT_WORDS(x,high&0x80000000,0); /* return +-0 */ + INSERT_WORDS(x,i0&0x80000000,0); /* return +-0 */ return x; } else { INSERT_WORDS(*iptr,i0,i1&(~i)); |