source: patches/mpfr-2.4.1-branch_update-2.patch@ 3457742

mpfr-gmp.c

@@ -301 +301 @@
       if (linenum != -1)
         fprintf (stderr, "%d: ", linenum);
     }
-  fprintf (stderr, " assertion failed: %s\n", expr);
+  fprintf (stderr, "MPFR assertion failed: %s\n", expr);
   abort();
 }
 

mpfr-2.4.1

@@ -27 +27 @@
 #define MPFR_VERSION_MAJOR 2
 #define MPFR_VERSION_MINOR 4
 #define MPFR_VERSION_PATCHLEVEL 1
-#define MPFR_VERSION_STRING "2.4.1"
+#define MPFR_VERSION_STRING "2.4.1-p5"
 
 /* Macros dealing with MPFR VERSION */
 #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c))

mpfr-2.4.1

@@ +1 @@
+zeta_ui-shift
+vasprintf-mp_limb_t
+assert
+remainder-neg

mpfr-2.4.1

@@ -170 +170 @@
     }
 
   if (mpz_cmp_ui (r, 0) == 0)
-    inex = mpfr_set_ui (rem, 0, GMP_RNDN);
+    {
+      inex = mpfr_set_ui (rem, 0, GMP_RNDN);
+      /* take into account sign of x */
+      if (signx < 0)
+        mpfr_neg (rem, rem, GMP_RNDN);
+    }
   else
     {
       if (rnd_q == GMP_RNDN)
@@ -190 +195 @@
                 *quo += 1;
             }
         }
+      /* take into account sign of x */
+      if (signx < 0)
+        mpz_neg (r, r);
       inex = mpfr_set_z (rem, r, rnd);
       /* if ex > ey, rem should be multiplied by 2^ey, else by 2^ex */
       MPFR_EXP (rem) += (ex > ey) ? ey : ex;
@@ -198 +206 @@
   if (quo)
     *quo *= sign;
 
-  /* take into account sign of x */
-  if (signx < 0)
-    {
-      mpfr_neg (rem, rem, GMP_RNDN);
-      inex = -inex;
-    }
-
   mpz_clear (mx);
   mpz_clear (my);
   mpz_clear (r);

tests/tfprintf.c

@@ -195 +195 @@
   check_vfprintf (fout, "a. %Pu, b. %c, c. %Zi%Zn", prec, ch, mpz, &mpz);
   check_length_with_cmp (6, mpz, 17, mpz_cmp_ui (mpz, 17), Zi);
   check_vfprintf (fout, "%% a. %#.0RNg, b. %Qx%Rn, c. %p", mpfr, mpq, &mpfr,
-                  &i);
+                  (void *) &i);
   check_length_with_cmp (7, mpfr, 16, mpfr_cmp_ui (mpfr, 16), Rg);
 
 #ifndef NPRINTF_T

tests/tprintf.c

@@ -191 +191 @@
   check_length (5, sz, 34, zu);
   check_vprintf ("a. %Pu, b. %c, c. %RUG, d. %Zi%Zn", prec, ch, mpfr, mpz, &mpz);
   check_length_with_cmp (6, mpz, 24, mpz_cmp_ui (mpz, 24), Zi);
-  check_vprintf ("%% a. %#.0RNg, b. %Qx%Rn c. %p", mpfr, mpq, &mpfr, &i);
+  check_vprintf ("%% a. %#.0RNg, b. %Qx%Rn c. %p",
+                 mpfr, mpq, &mpfr, (void *) &i);
   check_length_with_cmp (7, mpfr, 16, mpfr_cmp_ui (mpfr, 16), Rg);
 
 #ifndef NPRINTF_T

tests/tremquo.c

@@ -25 +25 @@
 
 #include "mpfr-test.h"
 
+static void
+bug20090227 (void)
+{
+  mpfr_t x, y, r1, r2;
+  int inex1, inex2;
+
+  mpfr_init2 (x, 118);
+  mpfr_init2 (y, 181);
+  mpfr_init2 (r1, 140);
+  mpfr_init2 (r2, 140);
+  mpfr_set_si (x, -1, GMP_RNDN);
+  mpfr_set_str_binary (y, "1.100100100001111110110101010001000100001011010001100001000110100110001001100011001100010100010111000000011011100000111001101000100101001000000100100111000001000100010100110011111010");
+  inex1 = mpfr_remainder (r1, x, y, GMP_RNDU);
+  /* since the quotient is -1, r1 is the rounding of x+y */
+  inex2 = mpfr_add (r2, x, y, GMP_RNDU);
+  if (mpfr_cmp (r1, r2))
+    {
+      printf ("Error in mpfr_remainder (bug20090227)\n");
+      printf ("Expected ");
+      mpfr_dump (r2);
+      printf ("Got      ");
+      mpfr_dump (r1);
+      exit (1);
+    }
+  mpfr_clear (x);
+  mpfr_clear (y);
+  mpfr_clear (r1);
+  mpfr_clear (r2);
+}
+
 int
 main (int argc, char *argv[])
 {
@@ -50 +80 @@
 
   tests_start_mpfr ();
 
+  bug20090227 ();
+
   mpfr_init (x);
   mpfr_init (y);
   mpfr_init (r);

vasprintf.c

@@ -398 +398 @@
         (void) va_arg ((ap), mpq_srcptr);       \
         break;                                  \
       case MP_LIMB_ARG:                         \
-        (void) va_arg ((ap), mp_ptr);           \
+        (void) va_arg ((ap), mp_limb_t);        \
         break;                                  \
       case MP_LIMB_ARRAY_ARG:                   \
         (void) va_arg ((ap), mp_ptr);           \

mpfr-2.4.1

@@ -1 @@
-2.4.1
+2.4.1-p5

version.c

@@ -25 +25 @@
 const char *
 mpfr_get_version (void)
 {
-  return "2.4.1";
+  return "2.4.1-p5";
 }

zeta_ui.c

@@ -177 +177 @@
                   mpz_mul_ui (t, t, 2 * k - 1);
                 }
               mpz_div_2exp (t, t, 1);
-              if (n < 1UL << (BITS_PER_MP_LIMB / 2))
+              /* Warning: the test below assumes that an unsigned long
+                 has no padding bits. */
+              if (n < 1UL << ((sizeof(unsigned long) * CHAR_BIT) / 2))
                 /* (n - k + 1) * (n + k - 1) < n^2 */
                 mpz_divexact_ui (t, t, (n - k + 1) * (n + k - 1));
               else