gdtoa/FreeBSD/_ldtoa.c.patch

   1 --- _ldtoa.c.orig       2004-06-03 15:17:18.000000000 -0700
   2 +++ _ldtoa.c    2005-10-09 00:09:11.000000000 -0700
   3 @@ -46,7 +46,7 @@
   4  __ldtoa(long double *ld, int mode, int ndigits, int *decpt, int *sign,
   5      char **rve)
   6  {
   7 -       static FPI fpi = {
   8 +       static FPI fpi0 = {
   9                 LDBL_MANT_DIG,                  /* nbits */
  10                 LDBL_MIN_EXP - LDBL_MANT_DIG,   /* emin */
  11                 LDBL_MAX_EXP - LDBL_MANT_DIG,   /* emax */
  12 @@ -61,28 +61,55 @@
  13         char *ret;
  14         union IEEEl2bits u;
  15         uint32_t bits[(LDBL_MANT_DIG + 31) / 32];
  16 +       FPI *fpi = &fpi0, fpi1;
  17 +#ifdef Honor_FLT_ROUNDS
  18 +       int rounding = Flt_Rounds;
  19 +#endif
  20 +#if defined(__ppc__) || defined(__ppc64__)
  21 +       int type;
  22 +#endif /* defined(__ppc__) || defined(__ppc64__) */
  23
  24         u.e = *ld;
  25 +#if defined(__ppc__) || defined(__ppc64__)
  26 +       /*
  27 +        * Subnormal head-tail doubles don't seem to be converted correctly
  28 +        * by gdtoa.  So we multiply by 10^32 to make them normal then
  29 +        * subtract 32 from the exponent later.
  30 +        */
  31 +       if ((type = __fpclassify(u.e)) == FP_NORMAL && __fpclassifyd(u.d[1]) == FP_SUBNORMAL)
  32 +               type = FP_SUBNORMAL;
  33 +       if (type == FP_SUBNORMAL)
  34 +               u.e *= 1.0e32L;
  35 +#endif /* defined(__ppc__) || defined(__ppc64__) */
  36         *sign = u.bits.sign;
  37         be = u.bits.exp - (LDBL_MAX_EXP - 1) - (LDBL_MANT_DIG - 1);
  38         LDBL_TO_ARRAY32(u, bits);
  39
  40 +#if defined(__ppc__) || defined(__ppc64__)
  41 +       switch (type) {
  42 +       case FP_SUBNORMAL:
  43 +#else /* !defined(__ppc__) && !defined(__ppc64__) */
  44         switch (fpclassify(u.e)) {
  45 +#endif /* defined(__ppc__) || defined(__ppc64__) */
  46         case FP_NORMAL:
  47 +       case FP_SUPERNORMAL:
  48                 kind = STRTOG_Normal;
  49 +/* For ppc/ppc64 and head-tail long double, the implicit bit is already there */
  50 +#if !defined(__ppc__) && !defined(__ppc64__)
  51  #ifdef LDBL_IMPLICIT_NBIT
  52                 bits[LDBL_MANT_DIG / 32] |= 1 << ((LDBL_MANT_DIG - 1) % 32);
  53  #endif /* LDBL_IMPLICIT_NBIT */
  54 +#endif /* !defined(__ppc__) && !defined(__ppc64__) */
  55                 break;
  56         case FP_ZERO:
  57                 kind = STRTOG_Zero;
  58                 break;
  59 +#if !defined(__ppc__) && !defined(__ppc64__)
  60         case FP_SUBNORMAL:
  61                 kind = STRTOG_Denormal;
  62 -#ifdef LDBL_IMPLICIT_NBIT
  63                 be++;
  64 -#endif
  65                 break;
  66 +#endif /* !defined(__ppc__) && !defined(__ppc64__) */
  67         case FP_INFINITE:
  68                 kind = STRTOG_Infinite;
  69                 break;
  70 @@ -93,8 +120,19 @@
  71                 abort();
  72         }
  73
  74 -       ret = gdtoa(&fpi, be, (ULong *)bits, &kind, mode, ndigits, decpt, rve);
  75 +#ifdef Honor_FLT_ROUNDS
  76 +       if (rounding != fpi0.rounding) {
  77 +               fpi1 = fpi0; /* for thread safety */
  78 +               fpi1.rounding = rounding;
  79 +               fpi = &fpi1;
  80 +               }
  81 +#endif /* Honor_FLT_ROUNDS */
  82 +       ret = gdtoa(fpi, be, (ULong *)bits, &kind, mode, ndigits, decpt, rve);
  83         if (*decpt == -32768)
  84                 *decpt = INT_MAX;
  85 +#if defined(__ppc__) || defined(__ppc64__)
  86 +       else if (type == FP_SUBNORMAL)
  87 +               *decpt -= 32;
  88 +#endif /* defined(__ppc__) || defined(__ppc64__) */
  89         return ret;
  90  }