yann@1699: diff -Naurd mpfr-2.4.2-a/PATCHES mpfr-2.4.2-b/PATCHES
yann@1699: --- mpfr-2.4.2-a/PATCHES	2009-12-07 13:37:12.000000000 +0000
yann@1699: +++ mpfr-2.4.2-b/PATCHES	2009-12-07 13:37:12.000000000 +0000
yann@1699: @@ -0,0 +1 @@
yann@1699: +sin_cos_underflow
yann@1699: diff -Naurd mpfr-2.4.2-a/VERSION mpfr-2.4.2-b/VERSION
yann@1699: --- mpfr-2.4.2-a/VERSION	2009-11-30 02:43:08.000000000 +0000
yann@1699: +++ mpfr-2.4.2-b/VERSION	2009-12-07 13:37:12.000000000 +0000
yann@1699: @@ -1 +1 @@
yann@1699: -2.4.2
yann@1699: +2.4.2-p1
yann@1699: diff -Naurd mpfr-2.4.2-a/mpfr.h mpfr-2.4.2-b/mpfr.h
yann@1699: --- mpfr-2.4.2-a/mpfr.h	2009-11-30 02:43:08.000000000 +0000
yann@1699: +++ mpfr-2.4.2-b/mpfr.h	2009-12-07 13:37:12.000000000 +0000
yann@1699: @@ -27,7 +27,7 @@
yann@1699:  #define MPFR_VERSION_MAJOR 2
yann@1699:  #define MPFR_VERSION_MINOR 4
yann@1699:  #define MPFR_VERSION_PATCHLEVEL 2
yann@1699: -#define MPFR_VERSION_STRING "2.4.2"
yann@1699: +#define MPFR_VERSION_STRING "2.4.2-p1"
yann@1699:  
yann@1699:  /* Macros dealing with MPFR VERSION */
yann@1699:  #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c))
yann@1699: diff -Naurd mpfr-2.4.2-a/sin_cos.c mpfr-2.4.2-b/sin_cos.c
yann@1699: --- mpfr-2.4.2-a/sin_cos.c	2009-11-30 02:43:09.000000000 +0000
yann@1699: +++ mpfr-2.4.2-b/sin_cos.c	2009-12-07 13:37:12.000000000 +0000
yann@1699: @@ -82,17 +82,19 @@
yann@1699:        if (y != x)
yann@1699:          /* y and x differ, thus we can safely try to compute y first */
yann@1699:          {
yann@1699: -          MPFR_FAST_COMPUTE_IF_SMALL_INPUT (y, x, -2 * expx, 2, 0, rnd_mode,
yann@1699: -                                            { inexy = _inexact;
yann@1699: -                                              goto small_input; });
yann@1699: +          MPFR_FAST_COMPUTE_IF_SMALL_INPUT (
yann@1699: +            y, x, -2 * expx, 2, 0, rnd_mode,
yann@1699: +            { inexy = _inexact;
yann@1699: +              goto small_input; });
yann@1699:            if (0)
yann@1699:              {
yann@1699:              small_input:
yann@1699:                /* we can go here only if we can round sin(x) */
yann@1699: -              MPFR_FAST_COMPUTE_IF_SMALL_INPUT (z, __gmpfr_one, -2 * expx,
yann@1699: -                                                1, 0, rnd_mode,
yann@1699: -                                                { inexz = _inexact;
yann@1699: -                                                  goto end; });
yann@1699: +              MPFR_FAST_COMPUTE_IF_SMALL_INPUT (
yann@1699: +                z, __gmpfr_one, -2 * expx, 1, 0, rnd_mode,
yann@1699: +                { inexz = _inexact;
yann@1699: +                  MPFR_SAVE_EXPO_UPDATE_FLAGS (expo, __gmpfr_flags);
yann@1699: +                  goto end; });
yann@1699:              }
yann@1699:  
yann@1699:            /* if we go here, one of the two MPFR_FAST_COMPUTE_IF_SMALL_INPUT
yann@1699: @@ -101,18 +103,19 @@
yann@1699:        else /* y and x are the same variable: try to compute z first, which
yann@1699:                necessarily differs */
yann@1699:          {
yann@1699: -          MPFR_FAST_COMPUTE_IF_SMALL_INPUT (z, __gmpfr_one, -2 * expx,
yann@1699: -                                            1, 0, rnd_mode,
yann@1699: -                                            { inexz = _inexact;
yann@1699: -                                              goto small_input2; });
yann@1699: +          MPFR_FAST_COMPUTE_IF_SMALL_INPUT (
yann@1699: +            z, __gmpfr_one, -2 * expx, 1, 0, rnd_mode,
yann@1699: +            { inexz = _inexact;
yann@1699: +              goto small_input2; });
yann@1699:            if (0)
yann@1699:              {
yann@1699:              small_input2:
yann@1699:                /* we can go here only if we can round cos(x) */
yann@1699: -              MPFR_FAST_COMPUTE_IF_SMALL_INPUT (y, x, -2 * expx, 2, 0,
yann@1699: -                                                rnd_mode,
yann@1699: -                                                { inexy = _inexact;
yann@1699: -                                                  goto end; });
yann@1699: +              MPFR_FAST_COMPUTE_IF_SMALL_INPUT (
yann@1699: +                y, x, -2 * expx, 2, 0, rnd_mode,
yann@1699: +                { inexy = _inexact;
yann@1699: +                  MPFR_SAVE_EXPO_UPDATE_FLAGS (expo, __gmpfr_flags);
yann@1699: +                  goto end; });
yann@1699:              }
yann@1699:          }
yann@1699:        m += 2 * (-expx);
yann@1699: @@ -207,7 +210,6 @@
yann@1699:    mpfr_clear (xr);
yann@1699:  
yann@1699:   end:
yann@1699: -  /* FIXME: update the underflow flag if need be. */
yann@1699:    MPFR_SAVE_EXPO_FREE (expo);
yann@1699:    mpfr_check_range (y, inexy, rnd_mode);
yann@1699:    mpfr_check_range (z, inexz, rnd_mode);
yann@1699: diff -Naurd mpfr-2.4.2-a/tests/tsin_cos.c mpfr-2.4.2-b/tests/tsin_cos.c
yann@1699: --- mpfr-2.4.2-a/tests/tsin_cos.c	2009-11-30 02:43:08.000000000 +0000
yann@1699: +++ mpfr-2.4.2-b/tests/tsin_cos.c	2009-12-07 13:37:12.000000000 +0000
yann@1699: @@ -382,23 +382,56 @@
yann@1699:  consistency (void)
yann@1699:  {
yann@1699:    mpfr_t x, s1, s2, c1, c2;
yann@1699: +  mp_exp_t emin, emax;
yann@1699:    mp_rnd_t rnd;
yann@1699: +  unsigned int flags_sin, flags_cos, flags, flags_before, flags_ref;
yann@1699: +  int inex_sin, inex_cos, inex, inex_ref;
yann@1699:    int i;
yann@1699:  
yann@1699: +  emin = mpfr_get_emin ();
yann@1699: +  emax = mpfr_get_emax ();
yann@1699: +
yann@1699:    for (i = 0; i <= 10000; i++)
yann@1699:      {
yann@1699:        mpfr_init2 (x, MPFR_PREC_MIN + (randlimb () % 8));
yann@1699:        mpfr_inits2 (MPFR_PREC_MIN + (randlimb () % 8), s1, s2, c1, c2,
yann@1699:                     (mpfr_ptr) 0);
yann@1699: -      tests_default_random (x, 256, -5, 50);
yann@1699: -      rnd = RND_RAND ();
yann@1699: -      mpfr_sin (s1, x, rnd);
yann@1699: -      mpfr_cos (c1, x, rnd);
yann@1699: -      mpfr_sin_cos (s2, c2, x, rnd);
yann@1699: -      if (!(mpfr_equal_p (s1, s2) && mpfr_equal_p (c1, c2)))
yann@1699: +      if (i < 8 * GMP_RND_MAX)
yann@1699:          {
yann@1699: -          printf ("mpfr_sin_cos and mpfr_sin/mpfr_cos disagree on %s,\nx = ",
yann@1699: -                  mpfr_print_rnd_mode (rnd));
yann@1699: +          int j = i / GMP_RND_MAX;
yann@1699: +          if (j & 1)
yann@1699: +            mpfr_set_emin (MPFR_EMIN_MIN);
yann@1699: +          mpfr_set_si (x, (j & 2) ? 1 : -1, GMP_RNDN);
yann@1699: +          mpfr_set_exp (x, mpfr_get_emin ());
yann@1699: +          rnd = (mpfr_rnd_t) (i % GMP_RND_MAX);
yann@1699: +          flags_before = 0;
yann@1699: +          if (j & 4)
yann@1699: +            mpfr_set_emax (-17);
yann@1699: +        }
yann@1699: +      else
yann@1699: +        {
yann@1699: +          tests_default_random (x, 256, -5, 50);
yann@1699: +          rnd = RND_RAND ();
yann@1699: +          flags_before = (randlimb () & 1) ?
yann@1699: +            (unsigned int) (MPFR_FLAGS_ALL ^ MPFR_FLAGS_ERANGE) :
yann@1699: +            (unsigned int) 0;
yann@1699: +        }
yann@1699: +      __gmpfr_flags = flags_before;
yann@1699: +      inex_sin = mpfr_sin (s1, x, rnd);
yann@1699: +      flags_sin = __gmpfr_flags;
yann@1699: +      __gmpfr_flags = flags_before;
yann@1699: +      inex_cos = mpfr_cos (c1, x, rnd);
yann@1699: +      flags_cos = __gmpfr_flags;
yann@1699: +      __gmpfr_flags = flags_before;
yann@1699: +      inex = !!mpfr_sin_cos (s2, c2, x, rnd);
yann@1699: +      flags = __gmpfr_flags;
yann@1699: +      inex_ref = inex_sin || inex_cos;
yann@1699: +      flags_ref = flags_sin | flags_cos;
yann@1699: +      if (!(mpfr_equal_p (s1, s2) && mpfr_equal_p (c1, c2)) ||
yann@1699: +          inex != inex_ref || flags != flags_ref)
yann@1699: +        {
yann@1699: +          printf ("mpfr_sin_cos and mpfr_sin/mpfr_cos disagree on %s,"
yann@1699: +                  " i = %d\nx = ", mpfr_print_rnd_mode (rnd), i);
yann@1699:            mpfr_dump (x);
yann@1699:            printf ("s1 = ");
yann@1699:            mpfr_dump (s1);
yann@1699: @@ -408,9 +441,16 @@
yann@1699:            mpfr_dump (c1);
yann@1699:            printf ("c2 = ");
yann@1699:            mpfr_dump (c2);
yann@1699: +          printf ("inex_sin = %d, inex_cos = %d, inex = %d (expected %d)\n",
yann@1699: +                  inex_sin, inex_cos, inex, inex_ref);
yann@1699: +          printf ("flags_sin = 0x%x, flags_cos = 0x%x, "
yann@1699: +                  "flags = 0x%x (expected 0x%x)\n",
yann@1699: +                  flags_sin, flags_cos, flags, flags_ref);
yann@1699:            exit (1);
yann@1699:          }
yann@1699:        mpfr_clears (x, s1, s2, c1, c2, (mpfr_ptr) 0);
yann@1699: +      mpfr_set_emin (emin);
yann@1699: +      mpfr_set_emax (emax);
yann@1699:      }
yann@1699:  }
yann@1699:  
yann@1699: diff -Naurd mpfr-2.4.2-a/version.c mpfr-2.4.2-b/version.c
yann@1699: --- mpfr-2.4.2-a/version.c	2009-11-30 02:43:08.000000000 +0000
yann@1699: +++ mpfr-2.4.2-b/version.c	2009-12-07 13:37:12.000000000 +0000
yann@1699: @@ -25,5 +25,5 @@
yann@1699:  const char *
yann@1699:  mpfr_get_version (void)
yann@1699:  {
yann@1699: -  return "2.4.2";
yann@1699: +  return "2.4.2-p1";
yann@1699:  }