diff options
| author | Thomas Schwinge <thomas@codesourcery.com> | 2013-05-23 18:00:10 +0200 |
|---|---|---|
| committer | Thomas Schwinge <thomas@codesourcery.com> | 2013-08-29 12:22:10 +0200 |
| commit | 0007fc9bdd1d9efcd52d07837f2cd085b5a8f58b (patch) | |
| tree | b3c86dbee5b95c24a8413be634ae11318ceb2f8e /sysdeps/ieee754/ldbl-128ibm | |
| parent | f1cc4c8654b6bc431273286d3562942c50975caf (diff) | |
| download | glibc-0007fc9bdd1d9efcd52d07837f2cd085b5a8f58b.tar.gz glibc-0007fc9bdd1d9efcd52d07837f2cd085b5a8f58b.tar.xz glibc-0007fc9bdd1d9efcd52d07837f2cd085b5a8f58b.zip | |
[BZ #15522] strtod ("nan(N)") returning a sNaN in some cases
Diffstat (limited to 'sysdeps/ieee754/ldbl-128ibm')
| -rw-r--r-- | sysdeps/ieee754/ldbl-128ibm/ieee754.h | 19 | ||||
| -rw-r--r-- | sysdeps/ieee754/ldbl-128ibm/strtold_l.c | 9 |
2 files changed, 23 insertions, 5 deletions
diff --git a/sysdeps/ieee754/ldbl-128ibm/ieee754.h b/sysdeps/ieee754/ldbl-128ibm/ieee754.h index e5644f5d31..9e94f53b04 100644 --- a/sysdeps/ieee754/ldbl-128ibm/ieee754.h +++ b/sysdeps/ieee754/ldbl-128ibm/ieee754.h @@ -199,6 +199,25 @@ union ibm_extended_long_double unsigned int mantissa2:20; unsigned int mantissa3:32; } ieee; + + /* This format makes it easier to see if a NaN is a signalling NaN. */ + struct + { /* Big endian. There is no other. */ + + unsigned int negative:1; + unsigned int exponent:11; + unsigned int quiet_nan:1; + /* Together Mantissa0-3 comprise the mantissa. */ + unsigned int mantissa0:19; + unsigned int mantissa1:32; + + unsigned int negative2:1; + unsigned int exponent2:11; + /* There is an implied 1 here? */ + /* Together these comprise the mantissa. */ + unsigned int mantissa2:20; + unsigned int mantissa3:32; + } ieee_nan; }; #define IBM_EXTENDED_LONG_DOUBLE_BIAS 0x3ff /* Added to exponent. */ diff --git a/sysdeps/ieee754/ldbl-128ibm/strtold_l.c b/sysdeps/ieee754/ldbl-128ibm/strtold_l.c index 93415f0f01..04e3288571 100644 --- a/sysdeps/ieee754/ldbl-128ibm/strtold_l.c +++ b/sysdeps/ieee754/ldbl-128ibm/strtold_l.c @@ -44,11 +44,10 @@ libc_hidden_proto (STRTOF) # define SET_MANTISSA(flt, mant) \ do { union ibm_extended_long_double u; \ u.d = (flt); \ - if ((mant & 0xfffffffffffffULL) == 0) \ - mant = 0x8000000000000ULL; \ - u.ieee.mantissa0 = ((mant) >> 32) & 0xfffff; \ - u.ieee.mantissa1 = (mant) & 0xffffffff; \ - (flt) = u.d; \ + u.ieee_nan.mantissa0 = (mant) >> 32; \ + u.ieee_nan.mantissa1 = (mant); \ + if ((u.ieee.mantissa0 | u.ieee.mantissa1) != 0) \ + (flt) = u.d; \ } while (0) #include <strtod_l.c> |