yann@1249: diff -Naurd mpfr-2.4.1-a/PATCHES mpfr-2.4.1-b/PATCHES
yann@1249: --- mpfr-2.4.1-a/PATCHES	2009-02-20 09:43:17.000000000 +0000
yann@1249: +++ mpfr-2.4.1-b/PATCHES	2009-02-27 16:56:29.000000000 +0000
yann@1249: @@ -0,0 +1 @@
yann@1249: +remainder-neg
yann@1249: diff -Naurd mpfr-2.4.1-a/VERSION mpfr-2.4.1-b/VERSION
yann@1249: --- mpfr-2.4.1-a/VERSION	2009-02-25 16:16:08.000000000 +0000
yann@1249: +++ mpfr-2.4.1-b/VERSION	2009-02-27 16:55:37.000000000 +0000
yann@1249: @@ -1 +1 @@
yann@1249: -2.4.1
yann@1249: +2.4.1-p1
yann@1249: diff -Naurd mpfr-2.4.1-a/mpfr.h mpfr-2.4.1-b/mpfr.h
yann@1249: --- mpfr-2.4.1-a/mpfr.h	2009-02-25 16:16:08.000000000 +0000
yann@1249: +++ mpfr-2.4.1-b/mpfr.h	2009-02-27 16:55:38.000000000 +0000
yann@1249: @@ -27,7 +27,7 @@
yann@1249:  #define MPFR_VERSION_MAJOR 2
yann@1249:  #define MPFR_VERSION_MINOR 4
yann@1249:  #define MPFR_VERSION_PATCHLEVEL 1
yann@1249: -#define MPFR_VERSION_STRING "2.4.1"
yann@1249: +#define MPFR_VERSION_STRING "2.4.1-p1"
yann@1249:  
yann@1249:  /* Macros dealing with MPFR VERSION */
yann@1249:  #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c))
yann@1249: diff -Naurd mpfr-2.4.1-a/rem1.c mpfr-2.4.1-b/rem1.c
yann@1249: --- mpfr-2.4.1-a/rem1.c	2009-02-20 09:43:17.000000000 +0000
yann@1249: +++ mpfr-2.4.1-b/rem1.c	2009-02-27 16:55:15.000000000 +0000
yann@1249: @@ -170,7 +170,12 @@
yann@1249:      }
yann@1249:  
yann@1249:    if (mpz_cmp_ui (r, 0) == 0)
yann@1249: -    inex = mpfr_set_ui (rem, 0, GMP_RNDN);
yann@1249: +    {
yann@1249: +      inex = mpfr_set_ui (rem, 0, GMP_RNDN);
yann@1249: +      /* take into account sign of x */
yann@1249: +      if (signx < 0)
yann@1249: +        mpfr_neg (rem, rem, GMP_RNDN);
yann@1249: +    }
yann@1249:    else
yann@1249:      {
yann@1249:        if (rnd_q == GMP_RNDN)
yann@1249: @@ -190,6 +195,9 @@
yann@1249:                  *quo += 1;
yann@1249:              }
yann@1249:          }
yann@1249: +      /* take into account sign of x */
yann@1249: +      if (signx < 0)
yann@1249: +        mpz_neg (r, r);
yann@1249:        inex = mpfr_set_z (rem, r, rnd);
yann@1249:        /* if ex > ey, rem should be multiplied by 2^ey, else by 2^ex */
yann@1249:        MPFR_EXP (rem) += (ex > ey) ? ey : ex;
yann@1249: @@ -198,13 +206,6 @@
yann@1249:    if (quo)
yann@1249:      *quo *= sign;
yann@1249:  
yann@1249: -  /* take into account sign of x */
yann@1249: -  if (signx < 0)
yann@1249: -    {
yann@1249: -      mpfr_neg (rem, rem, GMP_RNDN);
yann@1249: -      inex = -inex;
yann@1249: -    }
yann@1249: -
yann@1249:    mpz_clear (mx);
yann@1249:    mpz_clear (my);
yann@1249:    mpz_clear (r);
yann@1249: diff -Naurd mpfr-2.4.1-a/tests/tremquo.c mpfr-2.4.1-b/tests/tremquo.c
yann@1249: --- mpfr-2.4.1-a/tests/tremquo.c	2009-02-20 09:43:15.000000000 +0000
yann@1249: +++ mpfr-2.4.1-b/tests/tremquo.c	2009-02-27 16:55:15.000000000 +0000
yann@1249: @@ -25,6 +25,36 @@
yann@1249:  
yann@1249:  #include "mpfr-test.h"
yann@1249:  
yann@1249: +static void
yann@1249: +bug20090227 (void)
yann@1249: +{
yann@1249: +  mpfr_t x, y, r1, r2;
yann@1249: +  int inex1, inex2;
yann@1249: +
yann@1249: +  mpfr_init2 (x, 118);
yann@1249: +  mpfr_init2 (y, 181);
yann@1249: +  mpfr_init2 (r1, 140);
yann@1249: +  mpfr_init2 (r2, 140);
yann@1249: +  mpfr_set_si (x, -1, GMP_RNDN);
yann@1249: +  mpfr_set_str_binary (y, "1.100100100001111110110101010001000100001011010001100001000110100110001001100011001100010100010111000000011011100000111001101000100101001000000100100111000001000100010100110011111010");
yann@1249: +  inex1 = mpfr_remainder (r1, x, y, GMP_RNDU);
yann@1249: +  /* since the quotient is -1, r1 is the rounding of x+y */
yann@1249: +  inex2 = mpfr_add (r2, x, y, GMP_RNDU);
yann@1249: +  if (mpfr_cmp (r1, r2))
yann@1249: +    {
yann@1249: +      printf ("Error in mpfr_remainder (bug20090227)\n");
yann@1249: +      printf ("Expected ");
yann@1249: +      mpfr_dump (r2);
yann@1249: +      printf ("Got      ");
yann@1249: +      mpfr_dump (r1);
yann@1249: +      exit (1);
yann@1249: +    }
yann@1249: +  mpfr_clear (x);
yann@1249: +  mpfr_clear (y);
yann@1249: +  mpfr_clear (r1);
yann@1249: +  mpfr_clear (r2);
yann@1249: +}
yann@1249: +
yann@1249:  int
yann@1249:  main (int argc, char *argv[])
yann@1249:  {
yann@1249: @@ -50,6 +80,8 @@
yann@1249:  
yann@1249:    tests_start_mpfr ();
yann@1249:  
yann@1249: +  bug20090227 ();
yann@1249: +
yann@1249:    mpfr_init (x);
yann@1249:    mpfr_init (y);
yann@1249:    mpfr_init (r);
yann@1249: diff -Naurd mpfr-2.4.1-a/version.c mpfr-2.4.1-b/version.c
yann@1249: --- mpfr-2.4.1-a/version.c	2009-02-25 16:16:08.000000000 +0000
yann@1249: +++ mpfr-2.4.1-b/version.c	2009-02-27 16:55:38.000000000 +0000
yann@1249: @@ -25,5 +25,5 @@
yann@1249:  const char *
yann@1249:  mpfr_get_version (void)
yann@1249:  {
yann@1249: -  return "2.4.1";
yann@1249: +  return "2.4.1-p1";
yann@1249:  }