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 /math | |
| parent | 412bd96612ff5422befb98e990b66d10c26a4b21 (diff) | |
| download | glibc-7cb029ee6ec74801aebe41af62d20a44775d0697.zip glibc-7cb029ee6ec74801aebe41af62d20a44775d0697.tar.gz glibc-7cb029ee6ec74801aebe41af62d20a44775d0697.tar.bz2 | |
Fix nexttoward bugs (bugs 2550, 2570).
Diffstat (limited to 'math')
| -rw-r--r-- | math/libm-test.inc | 69 | ||||
| -rw-r--r-- | math/s_nexttowardf.c | 8 |
2 files changed, 69 insertions, 8 deletions
diff --git a/math/libm-test.inc b/math/libm-test.inc index d643bad..0875e2c 100644 --- a/math/libm-test.inc +++ b/math/libm-test.inc @@ -5743,8 +5743,73 @@ nexttoward_test (void) TEST_ff_f (nexttoward, 1.1L, nan_value, nan_value); TEST_ff_f (nexttoward, nan_value, nan_value, nan_value); - /* XXX We need the hexadecimal FP number representation here for further - tests. */ +#ifdef TEST_FLOAT + TEST_ff_f (nexttoward, 1.0, 1.1L, 0x1.000002p0); + TEST_ff_f (nexttoward, 1.0, LDBL_MAX, 0x1.000002p0); + TEST_ff_f (nexttoward, 1.0, 0x1.0000000000001p0, 0x1.000002p0); + TEST_ff_f (nexttoward, 1.0, 0.9L, 0x0.ffffffp0); + TEST_ff_f (nexttoward, 1.0, -LDBL_MAX, 0x0.ffffffp0); + TEST_ff_f (nexttoward, 1.0, 0x0.fffffffffffff8p0, 0x0.ffffffp0); + TEST_ff_f (nexttoward, -1.0, -1.1L, -0x1.000002p0); + TEST_ff_f (nexttoward, -1.0, -LDBL_MAX, -0x1.000002p0); + TEST_ff_f (nexttoward, -1.0, -0x1.0000000000001p0, -0x1.000002p0); + TEST_ff_f (nexttoward, -1.0, -0.9L, -0x0.ffffffp0); + TEST_ff_f (nexttoward, -1.0, LDBL_MAX, -0x0.ffffffp0); + TEST_ff_f (nexttoward, -1.0, -0x0.fffffffffffff8p0, -0x0.ffffffp0); + TEST_ff_f (nexttoward, -0x1.3p-145, -0xap-148L, -0x1.4p-145); +# if LDBL_MANT_DIG >= 64 + TEST_ff_f (nexttoward, 1.0, 0x1.000000000000002p0L, 0x1.000002p0); + TEST_ff_f (nexttoward, 1.0, 0x0.ffffffffffffffffp0L, 0x0.ffffffp0); + TEST_ff_f (nexttoward, -1.0, -0x1.000000000000002p0L, -0x1.000002p0); + TEST_ff_f (nexttoward, -1.0, -0x0.ffffffffffffffffp0L, -0x0.ffffffp0); +# endif +# if LDBL_MANT_DIG >= 106 + TEST_ff_f (nexttoward, 1.0, 0x1.000000000000000000000000008p0L, 0x1.000002p0); + TEST_ff_f (nexttoward, 1.0, 0x0.ffffffffffffffffffffffffffcp0L, 0x0.ffffffp0); + TEST_ff_f (nexttoward, -1.0, -0x1.000000000000000000000000008p0L, -0x1.000002p0); + TEST_ff_f (nexttoward, -1.0, -0x0.ffffffffffffffffffffffffffcp0L, -0x0.ffffffp0); +# endif +# if LDBL_MANT_DIG >= 113 + TEST_ff_f (nexttoward, 1.0, 0x1.0000000000000000000000000001p0L, 0x1.000002p0); + TEST_ff_f (nexttoward, 1.0, 0x0.ffffffffffffffffffffffffffff8p0L, 0x0.ffffffp0); + TEST_ff_f (nexttoward, -1.0, -0x1.0000000000000000000000000001p0L, -0x1.000002p0); + TEST_ff_f (nexttoward, -1.0, -0x0.ffffffffffffffffffffffffffff8p0L, -0x0.ffffffp0); +# endif +#endif +#ifdef TEST_DOUBLE + TEST_ff_f (nexttoward, 1.0, 1.1L, 0x1.0000000000001p0); + TEST_ff_f (nexttoward, 1.0, LDBL_MAX, 0x1.0000000000001p0); + TEST_ff_f (nexttoward, 1.0, 0x1.0000000000001p0, 0x1.0000000000001p0); + TEST_ff_f (nexttoward, 1.0, 0.9L, 0x0.fffffffffffff8p0); + TEST_ff_f (nexttoward, 1.0, -LDBL_MAX, 0x0.fffffffffffff8p0); + TEST_ff_f (nexttoward, 1.0, 0x0.fffffffffffff8p0, 0x0.fffffffffffff8p0); + TEST_ff_f (nexttoward, -1.0, -1.1L, -0x1.0000000000001p0); + TEST_ff_f (nexttoward, -1.0, -LDBL_MAX, -0x1.0000000000001p0); + TEST_ff_f (nexttoward, -1.0, -0x1.0000000000001p0, -0x1.0000000000001p0); + TEST_ff_f (nexttoward, -1.0, -0.9L, -0x0.fffffffffffff8p0); + TEST_ff_f (nexttoward, -1.0, LDBL_MAX, -0x0.fffffffffffff8p0); + TEST_ff_f (nexttoward, -1.0, -0x0.fffffffffffff8p0, -0x0.fffffffffffff8p0); + TEST_ff_f (nexttoward, -1.0, -0x8.00346dc5d6388p-3L, -0x1.0000000000001p0); + TEST_ff_f (nexttoward, 0x1p-1074, 0x1p-1073L, 0x1p-1073); +# if LDBL_MANT_DIG >= 64 + TEST_ff_f (nexttoward, 1.0, 0x1.000000000000002p0L, 0x1.0000000000001p0); + TEST_ff_f (nexttoward, 1.0, 0x0.ffffffffffffffffp0L, 0x0.fffffffffffff8p0); + TEST_ff_f (nexttoward, -1.0, -0x1.000000000000002p0L, -0x1.0000000000001p0); + TEST_ff_f (nexttoward, -1.0, -0x0.ffffffffffffffffp0L, -0x0.fffffffffffff8p0); +# endif +# if LDBL_MANT_DIG >= 106 + TEST_ff_f (nexttoward, 1.0, 0x1.000000000000000000000000008p0L, 0x1.0000000000001p0); + TEST_ff_f (nexttoward, 1.0, 0x0.ffffffffffffffffffffffffffcp0L, 0x0.fffffffffffff8p0); + TEST_ff_f (nexttoward, -1.0, -0x1.000000000000000000000000008p0L, -0x1.0000000000001p0); + TEST_ff_f (nexttoward, -1.0, -0x0.ffffffffffffffffffffffffffcp0L, -0x0.fffffffffffff8p0); +# endif +# if LDBL_MANT_DIG >= 113 + TEST_ff_f (nexttoward, 1.0, 0x1.0000000000000000000000000001p0L, 0x1.0000000000001p0); + TEST_ff_f (nexttoward, 1.0, 0x0.ffffffffffffffffffffffffffff8p0L, 0x0.fffffffffffff8p0); + TEST_ff_f (nexttoward, -1.0, -0x1.0000000000000000000000000001p0L, -0x1.0000000000001p0); + TEST_ff_f (nexttoward, -1.0, -0x0.ffffffffffffffffffffffffffff8p0L, -0x0.fffffffffffff8p0); +# endif +#endif END (nexttoward); } diff --git a/math/s_nexttowardf.c b/math/s_nexttowardf.c index fb008d5..e8c4dd1 100644 --- a/math/s_nexttowardf.c +++ b/math/s_nexttowardf.c @@ -47,16 +47,12 @@ float __nexttowardf(float x, long double y) return x; } if(hx>=0) { /* x > 0 */ - if(hy<0||(ix>>23)>(iy>>20)-0x380 - || ((ix>>23)==(iy>>20)-0x380 - && (ix&0x7fffff)>(((hy<<3)|(ly>>29))&0x7fffff))) /* x > y, x -= ulp */ + if(x > y) /* x -= ulp */ hx -= 1; else /* x < y, x += ulp */ hx += 1; } else { /* x < 0 */ - if(hy>=0||(ix>>23)>(iy>>20)-0x380 - || ((ix>>23)==(iy>>20)-0x380 - && (ix&0x7fffff)>(((hy<<3)|(ly>>29))&0x7fffff))) /* x < y, x -= ulp */ + if(x < y) /* x -= ulp */ hx -= 1; else /* x > y, x += ulp */ hx += 1; |