diff options
| author | Joseph Myers <joseph@codesourcery.com> | 2012-05-01 15:37:43 +0000 |
|---|---|---|
| committer | Joseph Myers <joseph@codesourcery.com> | 2012-05-01 15:37:43 +0000 |
| commit | 7cb029ee6ec74801aebe41af62d20a44775d0697 (patch) | |
| tree | 68ee5f5b88832c10bc1c7560cc9f1651104aebf0 /sysdeps/i386 | |
| parent | 412bd96612ff5422befb98e990b66d10c26a4b21 (diff) | |
| download | glibc-7cb029ee6ec74801aebe41af62d20a44775d0697.tar.gz glibc-7cb029ee6ec74801aebe41af62d20a44775d0697.tar.xz glibc-7cb029ee6ec74801aebe41af62d20a44775d0697.zip | |
Fix nexttoward bugs (bugs 2550, 2570).
Diffstat (limited to 'sysdeps/i386')
| -rw-r--r-- | sysdeps/i386/fpu/s_nexttoward.c | 12 | ||||
| -rw-r--r-- | sysdeps/i386/fpu/s_nexttowardf.c | 8 |
2 files changed, 4 insertions, 16 deletions
diff --git a/sysdeps/i386/fpu/s_nexttoward.c b/sysdeps/i386/fpu/s_nexttoward.c index e5f0164ce1..74147c4f9e 100644 --- a/sysdeps/i386/fpu/s_nexttoward.c +++ b/sysdeps/i386/fpu/s_nexttoward.c @@ -55,11 +55,7 @@ double __nexttoward(double x, long double y) return x; } if(hx>=0) { /* x > 0 */ - if (esy>=0x8000||((ix>>20)&0x7ff)>iy-0x3c00 - || (((ix>>20)&0x7ff)==iy-0x3c00 - && (((hx<<11)|(lx>>21))>(hy&0x7fffffff) - || (((hx<<11)|(lx>>21))==(hy&0x7fffffff) - && (lx<<11)>ly)))) { /* x > y, x -= ulp */ + if (x > y) { /* x -= ulp */ if(lx==0) hx -= 1; lx -= 1; } else { /* x < y, x += ulp */ @@ -67,11 +63,7 @@ double __nexttoward(double x, long double y) if(lx==0) hx += 1; } } else { /* x < 0 */ - if (esy<0x8000||((ix>>20)&0x7ff)>iy-0x3c00 - || (((ix>>20)&0x7ff)==iy-0x3c00 - && (((hx<<11)|(lx>>21))>(hy&0x7fffffff) - || (((hx<<11)|(lx>>21))==(hy&0x7fffffff) - && (lx<<11)>ly)))) {/* x < y, x -= ulp */ + if (x < y) { /* x -= ulp */ if(lx==0) hx -= 1; lx -= 1; } else { /* x > y, x += ulp */ diff --git a/sysdeps/i386/fpu/s_nexttowardf.c b/sysdeps/i386/fpu/s_nexttowardf.c index 89e8771481..49651bed6f 100644 --- a/sysdeps/i386/fpu/s_nexttowardf.c +++ b/sysdeps/i386/fpu/s_nexttowardf.c @@ -47,17 +47,13 @@ float __nexttowardf(float x, long double y) return x; } if(hx>=0) { /* x > 0 */ - if(esy>=0x8000||((ix>>23)&0xff)>iy-0x3f80 - || (((ix>>23)&0xff)==iy-0x3f80 - && ((ix&0x7fffff)<<8)>(hy&0x7fffffff))) {/* x > y, x -= ulp */ + if(x > y) { /* x -= ulp */ hx -= 1; } else { /* x < y, x += ulp */ hx += 1; } } else { /* x < 0 */ - if(esy<0x8000||((ix>>23)&0xff)>iy-0x3f80 - || (((ix>>23)&0xff)==iy-0x3f80 - && ((ix&0x7fffff)<<8)>(hy&0x7fffffff))) {/* x < y, x -= ulp */ + if(x < y) { /* x -= ulp */ hx -= 1; } else { /* x > y, x += ulp */ hx += 1; |