diff options
Diffstat (limited to 'stdlib')
| -rw-r--r-- | stdlib/strtod.c | 12 | ||||
| -rw-r--r-- | stdlib/strtold.c | 41 |
2 files changed, 9 insertions, 44 deletions
diff --git a/stdlib/strtod.c b/stdlib/strtod.c index 5b15859066..0de96a571b 100644 --- a/stdlib/strtod.c +++ b/stdlib/strtod.c @@ -226,7 +226,7 @@ round_and_return (mp_limb_t *retval, int exponent, int negative, int i; round_limb = retval[RETURN_LIMB_SIZE - 1]; - round_bit = BITS_PER_MP_LIMB - 1; + round_bit = (MANT_DIG - 1) % BITS_PER_MP_LIMB; for (i = 0; i < RETURN_LIMB_SIZE; ++i) more_bits |= retval[i] != 0; MPN_ZERO (retval, RETURN_LIMB_SIZE); @@ -254,7 +254,13 @@ round_and_return (mp_limb_t *retval, int exponent, int negative, round_bit = shift - 1; (void) __mpn_rshift (retval, retval, RETURN_LIMB_SIZE, shift); } - exponent = MIN_EXP - 2; + /* This is a hook for the m68k long double format, where the + exponent bias is the same for normalized and denormalized + numbers. */ +#ifndef DENORM_EXP +# define DENORM_EXP (MIN_EXP - 2) +#endif + exponent = DENORM_EXP; } if ((round_limb & (((mp_limb_t) 1) << round_bit)) != 0 @@ -273,7 +279,7 @@ round_and_return (mp_limb_t *retval, int exponent, int negative, retval[RETURN_LIMB_SIZE - 1] |= ((mp_limb_t) 1) << ((MANT_DIG - 1) % BITS_PER_MP_LIMB); } - else if (exponent == MIN_EXP - 2 + else if (exponent == DENORM_EXP && (retval[RETURN_LIMB_SIZE - 1] & (((mp_limb_t) 1) << ((MANT_DIG - 1) % BITS_PER_MP_LIMB))) != 0) diff --git a/stdlib/strtold.c b/stdlib/strtold.c deleted file mode 100644 index f1bb2f1c0d..0000000000 --- a/stdlib/strtold.c +++ /dev/null @@ -1,41 +0,0 @@ -#include <math.h> - -#ifndef __NO_LONG_DOUBLE_MATH -/* The actual implementation for all floating point sizes is in strtod.c. - These macros tell it to produce the `long double' version, `strtold'. */ - -# define FLOAT long double -# define FLT LDBL -# ifdef USE_IN_EXTENDED_LOCALE_MODEL -# define STRTOF __strtold_l -# else -# define STRTOF strtold -# endif -# define MPN2FLOAT __mpn_construct_long_double -# define FLOAT_HUGE_VAL HUGE_VALL -# define SET_MANTISSA(flt, mant) \ - do { union ieee854_long_double u; \ - u.d = (flt); \ - if ((mant & 0x7fffffffffffffffULL) == 0) \ - mant = 0x4000000000000000ULL; \ - u.ieee.mantissa0 = (((mant) >> 32) & 0x7fffffff) | 0x80000000; \ - u.ieee.mantissa1 = (mant) & 0xffffffff; \ - (flt) = u.d; \ - } while (0) - -# include "strtod.c" -#else -# include <stdlib.h> -/* There is no `long double' type, use the `double' implementations. */ -long double -__strtold_internal (const char *nptr, char **endptr, int group) -{ - return __strtod_internal (nptr, endptr, group); -} - -long double -strtold (const char *nptr, char **endptr) -{ - return __strtod_internal (nptr, endptr, 0); -} -#endif |