开源软件构建与测试

_service:tar_scm:mpfr.spec Changed

_service:tar_scm:backport-allpatches.patch Deleted

@@ -1,1898 +0,0 @@
-From b92eb70eb7dcd02d5f221a259b07b9158c875ed3 Mon Sep 17 00:00:00 2001
-Date: Mon, 27 Nov 2023 17:13:28 +0800
-Subject: PATCH backport allpatches
-
-Reference: https://www.mpfr.org/mpfr-4.2.0/allpatches
-Conflict: src/version.c has context conflict
-
----
- PATCHES           |  12 ++
- VERSION           |   2 +-
- src/compound.c    | 186 ++++++++++++++++++++++++-----
- src/inp_str.c     |   9 ++
- src/mpfr.h        |   2 +-
- src/pow.c         |  31 +++--
- src/rec_sqrt.c    |   5 +-
- src/reldiff.c     |  32 ++---
- src/strtofr.c     |   5 +-
- src/ui_pow_ui.c   |  59 ++++++++--
- src/vasprintf.c   |  12 +-
- src/version.c     |   2 +-
- tests/reuse.c     | 127 ++++++++++----------
- tests/tcompound.c | 293 +++++++++++++++++++++++++++++++++++++++++++++-
- tests/tests.c     |  11 +-
- tests/texp10.c    | 184 +++++++++++++++++++++++++++++
- tests/tfpif.c     |   5 +-
- tests/tfprintf.c  |  14 ++-
- tests/tlog10.c    |  56 +++++++++
- tests/tprintf.c   |  14 ++-
- tests/trec_sqrt.c |   2 +
- tests/tsprintf.c  |  45 ++++++-
- tests/tui_pow.c   |  32 +++++
- 23 files changed, 980 insertions(+), 160 deletions(-)
-
-diff --git a/PATCHES b/PATCHES
-index e69de29..ef19046 100644
---- a/PATCHES
-+++ b/PATCHES
-@@ -0,0 +1,12 @@
-+strtofr-nullchar
-+inp_str-nullchar
-+gcc-pr106155-workaround
-+printf_large_prec_for_g
-+compound
-+pow_general
-+tests-reuse
-+reldiff
-+rec_sqrt-zivloop
-+multibyte-decimal_point
-+ui_pow_ui-overflow
-+tsprintf-thousands
-diff --git a/VERSION b/VERSION
-index 6aba2b2..3a53320 100644
---- a/VERSION
-+++ b/VERSION
-@@ -1 +1 @@
--4.2.0
-+4.2.0-p12
-diff --git a/src/compound.c b/src/compound.c
-index 16f3b88..2dbfa86 100644
---- a/src/compound.c
-+++ b/src/compound.c
-@@ -55,9 +55,9 @@ int
- mpfr_compound_si (mpfr_ptr y, mpfr_srcptr x, long n, mpfr_rnd_t rnd_mode)
- {
-   int inexact, compared, k, nloop;
--  mpfr_t t;
--  mpfr_exp_t e;
--  mpfr_prec_t prec;
-+  mpfr_t t, u;
-+  mpfr_prec_t py, prec, extra;
-+  mpfr_rnd_t rnd1;
-   MPFR_ZIV_DECL (loop);
-   MPFR_SAVE_EXPO_DECL (expo);
- 
-@@ -136,64 +136,185 @@ mpfr_compound_si (mpfr_ptr y, mpfr_srcptr x, long n, mpfr_rnd_t rnd_mode)
- 
-   MPFR_SAVE_EXPO_MARK (expo);
- 
--  prec = MPFR_PREC(y);
--  prec += MPFR_INT_CEIL_LOG2 (prec) + 6;
-+  py = MPFR_GET_PREC (y);
-+  prec = py + MPFR_INT_CEIL_LOG2 (py) + 6;
- 
-   mpfr_init2 (t, prec);
-+  mpfr_init2 (u, prec);
- 
-   k = MPFR_INT_CEIL_LOG2(SAFE_ABS (unsigned long, n));  /* thus |n| <= 2^k */
- 
-+  /* We compute u=log2p1(x) with prec+extra bits, since we lose some bits
-+     in 2^u. */
-+  extra = 0;
-+  rnd1 = VSIGN (n) == MPFR_SIGN (x) ? MPFR_RNDD : MPFR_RNDU;
-+
-   MPFR_ZIV_INIT (loop, prec);
-   for (nloop = 0; ; nloop++)
-     {
--      /* we compute (1+x)^n as 2^(n*log2p1(x)) */
--      inexact = mpfr_log2p1 (t, x, MPFR_RNDN) != 0;
--      e = MPFR_GET_EXP(t);
--      /* |t - log2(1+x)| <= 1/2*ulp(t) = 2^(e-prec-1) */
--      inexact |= mpfr_mul_si (t, t, n, MPFR_RNDN) != 0;
--      /* |t - n*log2(1+x)| <= 2^(e2-prec-1) + |n|*2^(e-prec-1)
--                           <= 2^(e2-prec-1) + 2^(e+k-prec-1) <= 2^(e+k-prec)
--                          where |n| <= 2^k, and e2 is the new exponent of t. */
--      MPFR_ASSERTD(MPFR_GET_EXP(t) <= e + k);
--      e += k;
--      /* |t - n*log2(1+x)| <= 2^(e-prec) */
--      /* detect overflow */
--      if (nloop == 0 && mpfr_cmp_si (t, __gmpfr_emax) >= 0)
-+      unsigned int inex;
-+      mpfr_exp_t e, e2, ex;
-+      mpfr_prec_t precu = MPFR_ADD_PREC (prec, extra);
-+      mpfr_prec_t new_extra;
-+      mpfr_rnd_t rnd2;
-+
-+      /* We compute (1+x)^n as 2^(n*log2p1(x)),
-+         and we round toward 1, thus we round n*log2p1(x) toward 0,
-+         thus for x*n > 0 we round log2p1(x) toward -Inf, and for x*n < 0
-+         we round log2p1(x) toward +Inf. */
-+      inex = mpfr_log2p1 (u, x, rnd1) != 0;
-+      e = MPFR_GET_EXP (u);
-+      /* |u - log2(1+x)| <= ulp(t) = 2^(e-precu) */
-+      inex |= mpfr_mul_si (u, u, n, MPFR_RNDZ) != 0;
-+      e2 = MPFR_GET_EXP (u);
-+      /* |u - n*log2(1+x)| <= 2^(e2-precu) + |n|*2^(e-precu)
-+                           <= 2^(e2-precu) + 2^(e+k-precu) <= 2^(e+k+1-precu)
-+                          where |n| <= 2^k, and e2 is the new exponent of u. */
-+      MPFR_ASSERTD (e2 <= e + k);
-+      e += k + 1;
-+      MPFR_ASSERTN (e2 <= MPFR_PREC_MAX);
-+      new_extra = e2 > 0 ? e2 : 0;
-+      /* |u - n*log2(1+x)| <= 2^(e-precu) */
-+      /* detect overflow: since we rounded n*log2p1(x) toward 0,
-+         if n*log2p1(x) >= __gmpfr_emax, we are sure there is overflow. */
-+      if (mpfr_cmp_si (u, __gmpfr_emax) >= 0)
-         {
-           MPFR_ZIV_FREE (loop);
-           mpfr_clear (t);
-+          mpfr_clear (u);
-           MPFR_SAVE_EXPO_FREE (expo);
-           return mpfr_overflow (y, rnd_mode, 1);
-         }
--      /* detect underflow */
--      if (nloop == 0 && mpfr_cmp_si (t, __gmpfr_emin - 1) <= 0)
-+      /* detect underflow: similarly, since we rounded n*log2p1(x) toward 0,
-+         if n*log2p1(x) < __gmpfr_emin-1, we are sure there is underflow. */
-+      if (mpfr_cmp_si (u, __gmpfr_emin - 1) < 0)
-         {
-           MPFR_ZIV_FREE (loop);
-           mpfr_clear (t);
-+          mpfr_clear (u);
-           MPFR_SAVE_EXPO_FREE (expo);
-           return mpfr_underflow (y,
--                            (rnd_mode == MPFR_RNDN) ? MPFR_RNDZ : rnd_mode, 1);
-+                            rnd_mode == MPFR_RNDN ? MPFR_RNDZ : rnd_mode, 1);
-         }
-       /* Detect cases where result is 1 or 1+ulp(1) or 1-1/2*ulp(1):
--         |2^t - 1| = |exp(t*log(2)) - 1| <= |t|*log(2) < |t| */
--      if (nloop == 0 && MPFR_GET_EXP(t) < - (mpfr_exp_t) MPFR_PREC(y))
-+         |2^u - 1| = |exp(u*log(2)) - 1| <= |u|*log(2) < |u| */
-+      if (nloop == 0 && MPFR_GET_EXP(u) < - py)
-         {
--          /* since ulp(1) = 2^(1-PREC(y)), we have |t| < 1/4*ulp(1) */
-+          /* since ulp(1) = 2^(1-py), we have |u| < 1/4*ulp(1) */
-           /* mpfr_compound_near_one must be called in the extended
-              exponent range, so that 1 is representable. */
--          inexact = mpfr_compound_near_one (y, MPFR_SIGN (t), rnd_mode);
-+          inexact = mpfr_compound_near_one (y, MPFR_SIGN (u), rnd_mode);
-           goto end;
-         }
--      inexact |= mpfr_exp2 (t, t, MPFR_RNDA) != 0;
--      /* |t - (1+x)^n| <= ulp(t) + |t|*log(2)*2^(e-prec)
--                       < 2^(EXP(t)-prec) + 2^(EXP(t)+e-prec) */
--      e = (e >= 0) ? e + 1 : 1;
-+      /* FIXME: mpfr_exp2 could underflow to the smallest positive number
-+         since MPFR_RNDA is used, and this case will not be detected by
-+         MPFR_CAN_ROUND (see BUGS). Either fix that, or do early underflow
-+         detection (which may be necessary). */
-+      /* round 2^u toward 1 */
-+      rnd2 = MPFR_IS_POS (u) ? MPFR_RNDD : MPFR_RNDU;
-+      inex |= mpfr_exp2 (t, u, rnd2) != 0;
-+      /* we had |u - n*log2(1+x)| < 2^(e-precu)
-+         thus u = n*log2(1+x) + delta with |delta| < 2^(e-precu)
-+         then 2^u = (1+x)^n * 2^delta with |delta| < 2^(e-precu).
-+         For |delta| < 0.5, |2^delta - 1| <= |delta| thus
-+         |t - (1+x)^n| <= ulp(t) + |t|*2^(e-precu)
-+                       < 2^(EXP(t)-prec) + 2^(EXP(t)+e-precu) */
-+      e = (precu - prec >= e) ? 1 : e + 1 - (precu - prec);
-       /* now |t - (1+x)^n| < 2^(EXP(t)+e-prec) */
- 
--      if (MPFR_LIKELY (inexact == 0 ||
--                       MPFR_CAN_ROUND (t, prec - e, MPFR_PREC(y), rnd_mode)))
-+      if (MPFR_LIKELY (!inex || MPFR_CAN_ROUND (t, prec - e, py, rnd_mode)))
-         break;
- 
-+      /* If t fits in the target precision (or with 1 more bit), then we can
-+         round, assuming the working precision is large enough, but the above
-+         MPFR_CAN_ROUND() will fail because we cannot determine the ternary
-+         value. However since we rounded t toward 1, we can determine it.

_service:tar_scm:mpfr-4.2.0.tar.xz/BUGS -> _service:tar_scm:mpfr-4.2.1.tar.xz/BUGS Changed

_service:tar_scm:mpfr-4.2.0.tar.xz/ChangeLog -> _service:tar_scm:mpfr-4.2.1.tar.xz/ChangeLog Changed

@@ -1,5 +1,850 @@
+2023-08-22  Vincent Lefevre  <vincent@vinc17.net>
+
+	Updated version to 4.2.1.
+
+2023-08-18  Vincent Lefevre  <vincent@vinc17.net>
+
+	ChangeLog update with tools/update-changelog
+
+	tools/gitlog-to-changelog Improve --strip-cherry-pick for this repository.
+
+	Updated version to 4.2.1-rc1.
+
+2023-08-18  Vincent Lefevre  <vincent@vinc17.net>
+
+	configure.ac More checks for the support of old dtags.
+
+	There is an attempt to use the old dtags when LD_LIBRARY_PATH is
+	defined in order to avoid issues with the testsuite when this path
+	contains some compatible version of the MPFR library. However, the
+	old dtags do not work everywhere at run time, even when they appear
+	to work at link time (via -Wl,--disable-new-dtags).
+
+	So, let's restrict to *-*-linux-gnu hosts. Unfortunately, this is
+	not sufficient for Android/Termux, where config.guess currently
+	identifies the host as GNU/Linux (matching *-*-linux-gnu) instead of
+	Android, but the old dtags do not work at run time. So, let's also
+	exclude Termux explicitly (a test to exclude all Android hosts would
+	be better, though).
+
+	Note: in most cases, LD_LIBRARY_PATH is not set, so that there should
+	be no issues in practice.
+
+2023-08-18  Vincent Lefevre  <vincent@vinc17.net>
+
+	NEWS Update for 4.2.1
+
+2023-08-18  Vincent Lefevre  <vincent@vinc17.net>
+
+	src/compound.c Removed obsolete FIXME.
+
+	The implementation changed in 63cc8dfaf4dd93d68bb4f12c0787046f8a525893
+	(cherry picked in 952fb0f5cc2df1fffde3eb54c462fdae5f123ea6).
+
+2023-08-17  Vincent Lefevre  <vincent@vinc17.net>
+
+	strtofr.c Fixed 2 mpfr_strtofr bugs in case of huge negative exponent.
+
+	This fixes the bugs triggered by bug20230606, mentioned at
+	  https://sympa.inria.fr/sympa/arc/mpfr/2023-06/msg00000.html
+	  https://sympa.inria.fr/sympa/arc/mpfr/2023-06/msg00001.html
+
+	These bugs are integer overflows, meaning undefined behavior.
+	In practice, the consequences may be incorrect results. But
+	for the first bug, it has been seen that a GCC optimization
+	makes the bug invisible.
+
+	Note: There are other issues with the code for huge exponents
+	(in strtofr.c and the MPFR_SADD_OVERFLOW macro from mpfr-impl.h).
+	See FIXME from commits
+	  aa30bfe3c868640852fa2510b0f228170e39c0c5
+	  e06a073c157fe95dd24d16d9fc3eef3781b58795
+	in master. But it is not clear whether the problematic cases can
+	occur in the context of mpfr_strtofr: my attempts to trigger a
+	problematic case failed, so that there is a chance that the code
+	is actually correct; but many parameters are involved, including
+	those based on the internal structure in limbs, so that it is
+	difficult to say for now. A closer analysis needs to be done.
+	Even if correct, the code would need to be cleaned up, proved,
+	and better documented.
+
+2023-08-17  Vincent Lefevre  <vincent@vinc17.net>
+
+	tests/tstrtofr.c Added testcases for mpfr_strtofr integer overflows.
+
+	These bugs occur on inputs with a large negative exponents, such as
+	"0.1E-99999999999999999999".
+
+	A first bug was reported by Michael Jones at
+	  https://sympa.inria.fr/sympa/arc/mpfr/2023-06/msg00000.html
+
+	Second bug mentioned at
+	  https://sympa.inria.fr/sympa/arc/mpfr/2023-06/msg00001.html
+
+2023-08-16  Vincent Lefevre  <vincent@vinc17.net>
+
+	doc/mpfr.texi Updated the month.
+
+2023-08-15  Vincent Lefevre  <vincent@vinc17.net>
+
+	Formatted output functions: fixed ‘+’/space flags on NaN and Inf.
+
+	This is about the documentation and behavior of the mpfr_printf,
+	etc. functions on MPFR numbers (mpfr_t) only, i.e. with the ‘R’
+	type specifier.
+
+	The ‘+’ and space flags were ignored on NaN and Inf. While this
+	was loosely documented as such (without an explicit mention of
+	these flags), the GNU MPFR manual also says that the flags have
+	the same meaning as for the standard ‘printf’ function. So this
+	was contradictory and regarded as a bug.
+
+	Behaving like the ISO C standard should give less surprise, and
+	this is probably what is expected (better for alignment purpose).
+
+	This was partly discussed at
+	  https://sympa.inria.fr/sympa/arc/mpfr/2023-03/msg00003.html
+	(only for NaN and the ‘+’ flag at that time).
+
+	* doc/mpfr.texi: corrected the documentation.
+	* src/vasprintf.c: fixed (the code is now simpler since the rule
+	  is the same in all cases: real and non-real values).
+	* tests/tsprintf.c: grouped all the tests of NaN and Inf, and
+	  added much more tests (by constructing the format string in
+	  nested loops instead of just a few hardcoded cases).
+
+2023-08-15  Vincent Lefevre  <vincent@vinc17.net>
+
+	src/vasprintf.c Coding style.
+
+2023-08-10  Vincent Lefevre  <vincent@vinc17.net>
+
+	configure.ac For libgmp, replaced AC_CHECK_LIB by our own link test.
+
+	The issue with AC_CHECK_LIB is that it cannot know the prototype of
+	mpz_init. Thus it declares the function without a prototype, which
+	is obsolescent in ISO C, so that the compiler may complain (e.g.
+	with GCC's -Werror=strict-prototypes option, which may be useful to
+	detect bugs in MPFR). Moreover, the call is done with an incorrect
+	prototype, which could also be an issue on some systems (currently,
+	no prototype check is done when linking, but this might change in
+	the future).
+
+	Note also that this new test is more robust, in case GMP changes the
+	symbol name in the future (the API does not need to be changed).
+
+	For the reference:
+	  https://sympa.inria.fr/sympa/arc/mpfr/2023-08/msg00003.html
+
+2023-08-10  Vincent Lefevre  <vincent@vinc17.net>
+
+	configure.ac Do the MPFR_CHECK_MP_LIMB_T_VS_* tests without -lgmp.
+
+	Moved the two tests
+
+	  MPFR_CHECK_MP_LIMB_T_VS_LONG
+	  MPFR_CHECK_MP_LIMB_T_VS_INTMAX
+
+	before the LIBS="-lgmp $LIBS" as linking with GMP is not needed for
+	these tests (only mp_limb_t is used from gmp.h), and it is actually
+	better not to link with GMP. Indeed, as said for these tests, which
+	use AC_LINK_IFELSE:
+
+	  AC_LINK_IFELSE is safer than AC_COMPILE_IFELSE, as it will detect
+	  undefined function-like macros (which otherwise may be regarded
+	  as valid function calls with AC_COMPILE_IFELSE since prototypes
+	  are not required by the C standard).
+
+	So linking with GMP could make a failure disappear in case of a bug
+	somewhere, so that the bug could remain undetected.
+
+2023-08-10  Vincent Lefevre  <vincent@vinc17.net>
+
+	acinclude.m4 Replaced <gmp.h> by "gmp.h" for #include.
+
+	The tests from configure.ac all use #include "gmp.h", and for the
+	MPFR build and tests, gmp.h is also included with #include "gmp.h"
+	(by mpfr-impl.h). For consistency, do the same in acinclude.m4.
+
+	Note: In practice, there should not be a difference, except if there
+	is a gmp.h file somewhere in the MPFR build tree. But this is not
+	supported, and this may break the build or the testsuite (whatever
+	is used in the configure tests).
+
+2023-07-19  Vincent Lefevre  <vincent@vinc17.net>
+
+	src/mpfr-gmp.h Fix integer overflow when mp_limb_t < int (mini-gmp).
+
+	When mp_limb_t is shorter than int (which is possible with mini-gmp),
+	an integer promotion in udiv_qr_3by2 triggers an integer overflow,
+	detected by testing MPFR with
+
+	  ./configure --with-mini-gmp=/path/to/mini-gmp CC=gcc-13 \
+	  CFLAGS="-O2 -fsanitize=undefined -fno-sanitize-recover
+	          -DMINI_GMP_LIMB_TYPE=short"
+
+	(many tests fail).
+
+	Note that this is not detected by GCC 12 and before, probably due to
+	an optimization bug that hides the UBsan error.
+
+	Moreover, mini-gmp currently has the same bug in gmp_udiv_qr_3by2,
+	but also in gmp_udiv_qrnnd_preinv; it needs to be fixed too in order
+	to avoid the failures in the MPFR tests.
+
+2023-07-19  Vincent Lefevre  <vincent@vinc17.net>
+
+	tests/trint.c C2x compat: replaced function without a prototype.
+
+	The second parameter of test_fct was "int (*g)()", i.e. a pointer to

_service:tar_scm:mpfr-4.2.0.tar.xz/INSTALL -> _service:tar_scm:mpfr-4.2.1.tar.xz/INSTALL Changed

@@ -42,17 +42,17 @@
    not been done yet and if patches are available. You can check
    on the release page:
 
-     https://www.mpfr.org/mpfr-4.2.0/
+     https://www.mpfr.org/mpfr-4.2.1/
 
    which may have additional information. The patches can be applied
    with commands like:
 
-     wget --no-config https://www.mpfr.org/mpfr-4.2.0/allpatches
+     wget --no-config https://www.mpfr.org/mpfr-4.2.1/allpatches
      patch -N -Z -p1 < allpatches
 
    or
 
-     curl https://www.mpfr.org/mpfr-4.2.0/allpatches | patch -N -Z -p1
+     curl https://www.mpfr.org/mpfr-4.2.1/allpatches | patch -N -Z -p1
 
    (Those instructions are for the GNU patch command, for example
    /usr/bin/gpatch on Solaris.)
@@ -392,7 +392,7 @@
   * the FAQ (either the FAQ.html file distributed with MPFR, or the
     on-line version <https://www.mpfr.org/faq.html>, which may be more
     up-to-date);
-  * the MPFR web page for this version <https://www.mpfr.org/mpfr-4.2.0/>,
+  * the MPFR web page for this version <https://www.mpfr.org/mpfr-4.2.1/>,
     which lists bugs found in this version and provides some patches.
 
 If the "configure" fails, please check that the C compiler and its

_service:tar_scm:mpfr-4.2.0.tar.xz/NEWS -> _service:tar_scm:mpfr-4.2.1.tar.xz/NEWS Changed

_service:tar_scm:mpfr-4.2.0.tar.xz/VERSION -> _service:tar_scm:mpfr-4.2.1.tar.xz/VERSION Changed

_service:tar_scm:mpfr-4.2.0.tar.xz/acinclude.m4 -> _service:tar_scm:mpfr-4.2.1.tar.xz/acinclude.m4 Changed

@@ -870,6 +870,32 @@
      )
 fi
 
+dnl Timeout support in the testsuite.
+dnl If the --enable-tests-timeout option has not been provided, let's
+dnl enable timeout support only in -dev versions and if we detect that
+dnl the needed POSIX features seem to be available (this is not much
+dnl useful for releases, where an infinite loop is very unlikely).
+dnl When supported, default is 0 (no timeout).
+if test -z "$enable_tests_timeout" && test -n "$dev_version"; then
+AC_MSG_CHECKING(if timeout can be supported)
+AC_LINK_IFELSE(AC_LANG_PROGRAM(
+#include <sys/resource.h>
+, 
+  struct rlimit rlim1;
+  if (getrlimit (RLIMIT_CPU, rlim))
+    return 1;
+  rlim->rlim_cur = 1;
+  if (setrlimit (RLIMIT_CPU, rlim))
+    return 1;
+), 
+  AC_MSG_RESULT(yes)
+  enable_tests_timeout=yes
+,AC_MSG_RESULT(no))
+fi
+if test "$enable_tests_timeout" = yes; then
+  AC_DEFINE(MPFR_TESTS_TIMEOUT, 0, timeout limit)
+fi
+
 )
 dnl end of MPFR_CONFIGS
 
@@ -892,7 +918,7 @@
 AC_RUN_IFELSE(AC_LANG_PROGRAM(
 #include <stdio.h>
 #include <limits.h>
-#include <gmp.h>
+#include "gmp.h"
 , 
   fprintf (stderr, "GMP_NAIL_BITS     = %d\n", (int) GMP_NAIL_BITS);
   fprintf (stderr, "GMP_NUMB_BITS     = %d\n", (int) GMP_NUMB_BITS);
@@ -953,7 +979,7 @@
 AC_CACHE_CHECK(for double-to-integer conversion bug, mpfr_cv_dbl_int_bug, 
 AC_RUN_IFELSE(AC_LANG_PROGRAM(
 #include <stdio.h>
-#include <gmp.h>
+#include "gmp.h"
 , 
   double d;
   mp_limb_t u;
@@ -1005,7 +1031,7 @@
 dnl as valid function calls with AC_COMPILE_IFELSE since prototypes
 dnl are not required by the C standard).
 AC_LINK_IFELSE(AC_LANG_PROGRAM(
-#include <gmp.h>
+#include "gmp.h"
 /* Make sure that a static assertion is used (not MPFR_ASSERTN). */
 #undef MPFR_USE_STATIC_ASSERT
 #define MPFR_USE_STATIC_ASSERT 1
@@ -1037,7 +1063,7 @@
 dnl as valid function calls with AC_COMPILE_IFELSE since prototypes
 dnl are not required by the C standard).
 AC_LINK_IFELSE(AC_LANG_PROGRAM(
-#include <gmp.h>
+#include "gmp.h"
 /* Make sure that a static assertion is used (not MPFR_ASSERTN). */
 #undef MPFR_USE_STATIC_ASSERT
 #define MPFR_USE_STATIC_ASSERT 1
@@ -1587,7 +1613,7 @@
 #include <stdio.h>
 #include <string.h>
 $3
-#include <gmp.h>
+#include "gmp.h"
 , 
   char s256;
   $2 a = 17;
@@ -1635,17 +1661,17 @@
 fi
 
 MPFR_FUNC_GMP_PRINTF_SPEC(hhd, char, 
-#include <gmp.h>
+#include "gmp.h"
          ,,
          AC_DEFINE(NPRINTF_HH, 1, printf/gmp_printf cannot use `hh' length modifier))
 
 MPFR_FUNC_GMP_PRINTF_SPEC(lld, long long int, 
-#include <gmp.h>
+#include "gmp.h"
          ,,
          AC_DEFINE(NPRINTF_LL, 1, printf/gmp_printf cannot read long long int))
 
 MPFR_FUNC_GMP_PRINTF_SPEC(Lf, long double, 
-#include <gmp.h>
+#include "gmp.h"
          ,
          AC_DEFINE(PRINTF_L, 1, printf/gmp_printf can read long double),
          AC_DEFINE(NPRINTF_L, 1, printf/gmp_printf cannot read long double))
@@ -1656,7 +1682,7 @@
 #else
 #include <stddef.h>
 #endif
-#include <gmp.h>
+#include "gmp.h"
     ,
     AC_DEFINE(PRINTF_T, 1, printf/gmp_printf can read ptrdiff_t),
     AC_DEFINE(NPRINTF_T, 1, printf/gmp_printf cannot read ptrdiff_t))
@@ -1673,7 +1699,7 @@
 AC_MSG_CHECKING(if gmp_printf supports the ' group flag)
 AC_RUN_IFELSE(AC_LANG_PROGRAM(
 #include <string.h>
-#include <gmp.h>
+#include "gmp.h"
 , 
   char s256;

_service:tar_scm:mpfr-4.2.0.tar.xz/configure -> _service:tar_scm:mpfr-4.2.1.tar.xz/configure Changed

@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.71 for MPFR 4.2.0.
+# Generated by GNU Autoconf 2.71 for MPFR 4.2.1.
 #
 #
 # Copyright 1999-2023 Free Software Foundation, Inc.
@@ -640,8 +640,8 @@
 # Identity of this package.
 PACKAGE_NAME='MPFR'
 PACKAGE_TARNAME='mpfr'
-PACKAGE_VERSION='4.2.0'
-PACKAGE_STRING='MPFR 4.2.0'
+PACKAGE_VERSION='4.2.1'
+PACKAGE_STRING='MPFR 4.2.1'
 PACKAGE_BUGREPORT=''
 PACKAGE_URL=''
 
@@ -1410,7 +1410,7 @@
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures MPFR 4.2.0 to adapt to many kinds of systems.
+\`configure' configures MPFR 4.2.1 to adapt to many kinds of systems.
 
 Usage: $0 OPTION... VAR=VALUE...
 
@@ -1481,7 +1481,7 @@
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of MPFR 4.2.0:";;
+     short | recursive ) echo "Configuration of MPFR 4.2.1:";;
    esac
   cat <<\_ACEOF
 
@@ -1634,7 +1634,7 @@
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-MPFR configure 4.2.0
+MPFR configure 4.2.1
 generated by GNU Autoconf 2.71
 
 Copyright (C) 2021 Free Software Foundation, Inc.
@@ -2261,7 +2261,7 @@
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by MPFR $as_me 4.2.0, which was
+It was created by MPFR $as_me 4.2.1, which was
 generated by GNU Autoconf 2.71.  Invocation command line was
 
   $ $0$ac_configure_args_raw
@@ -2547,9 +2547,7 @@
 /* Most of the following tests are stolen from RCS 5.7 src/conf.sh.  */
 struct buf { int x; };
 struct buf * (*rcsopen) (struct buf *, struct stat *, int);
-static char *e (p, i)
-     char **p;
-     int i;
+static char *e (char **p, int i)
 {
   return pi;
 }
@@ -2600,6 +2598,7 @@
 extern int printf (const char *, ...);
 extern int dprintf (int, const char *, ...);
 extern void *malloc (size_t);
+extern void free (void *);
 
 // Check varargs macros.  These examples are taken from C99 6.10.3.5.
 // dprintf is used instead of fprintf to avoid needing to declare
@@ -3607,7 +3606,7 @@
 
 # Define the identity of the package.
  PACKAGE='mpfr'
- VERSION='4.2.0'
+ VERSION='4.2.1'
 
 
 # Some tools Automake needs.
@@ -3961,6 +3960,11 @@
 
 unset gmp_lib_path GMP_CFLAGS GMP_CC
 
+unset dev_version
+if $EGREP -q -e '-dev$' $srcdir/VERSION; then
+  dev_version=1
+fi
+
 
 
 # Check whether --with-gmp_include was given.
@@ -4270,9 +4274,7 @@
 then :
   enableval=$enable_tests_timeout;  case $enableval in
       no)   ;;
-      yes)
-printf "%s\n" "#define MPFR_TESTS_TIMEOUT 0" >>confdefs.h
- ;;
+      yes)  ;;
       0-9|0-90-9|0-90-90-9|0-90-90-90-9)
 
 printf "%s\n" "#define MPFR_TESTS_TIMEOUT $enableval" >>confdefs.h
@@ -14883,8 +14885,8 @@
 
 
 case $host in
-  *-*-linux*)
-    if test -n "$LD_LIBRARY_PATH"; then
+  *-*-linux-gnu)
+    if test -n "$LD_LIBRARY_PATH" && test -z "$TERMUX_VERSION"; then
       saved_LDFLAGS="$LDFLAGS"
       LDFLAGS="$LDFLAGS -Wl,--disable-new-dtags"
       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether --disable-new-dtags is supported by the linker" >&5
@@ -18395,6 +18397,49 @@
 rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
+if test -z "$enable_tests_timeout" && test -n "$dev_version"; then
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if timeout can be supported" >&5
+printf %s "checking if timeout can be supported... " >&6; }
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#include <sys/resource.h>
+
+int
+main (void)
+{
+
+  struct rlimit rlim1;
+  if (getrlimit (RLIMIT_CPU, rlim))
+    return 1;
+  rlim->rlim_cur = 1;
+  if (setrlimit (RLIMIT_CPU, rlim))
+    return 1;
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"
+then :
+
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
+  enable_tests_timeout=yes
+
+else $as_nop
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
+    conftest$ac_exeext conftest.$ac_ext
+fi
+if test "$enable_tests_timeout" = yes; then
+
+printf "%s\n" "#define MPFR_TESTS_TIMEOUT 0" >>confdefs.h
+
+fi
+
 
 
 
@@ -18659,53 +18704,147 @@
 fi
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for __gmpz_init in -lgmp" >&5
-printf %s "checking for __gmpz_init in -lgmp... " >&6; }
-if test ${ac_cv_lib_gmp___gmpz_init+y}
+
+
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for long to fit in mp_limb_t" >&5
+printf %s "checking for long to fit in mp_limb_t... " >&6; }
+if test ${mpfr_cv_long_within_limb+y}
 then :
   printf %s "(cached) " >&6
 else $as_nop
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lgmp  $LIBS"
+
+saved_CPPFLAGS="$CPPFLAGS"
+CPPFLAGS="$CPPFLAGS -I$srcdir/src"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char __gmpz_init ();
+#include "gmp.h"
+/* Make sure that a static assertion is used (not MPFR_ASSERTN). */
+#undef MPFR_USE_STATIC_ASSERT

_service:tar_scm:mpfr-4.2.0.tar.xz/configure.ac -> _service:tar_scm:mpfr-4.2.1.tar.xz/configure.ac Changed

@@ -26,7 +26,7 @@
 )
 
 dnl Add check-news when it checks for more than 15 lines
-AC_INIT(MPFR,4.2.0)
+AC_INIT(MPFR,4.2.1)
 
 dnl AC_CANONICAL_HOST is needed by this configure.ac file.
 dnl AC_CANONICAL_TARGET is not explicitly needed, but may be required by
@@ -95,6 +95,11 @@
 
 unset gmp_lib_path GMP_CFLAGS GMP_CC
 
+unset dev_version
+if $EGREP -q -e '-dev$' $srcdir/VERSION; then
+  dev_version=1
+fi
+
 dnl ********************************************************************
 dnl Extra arguments to configure (AC_ARG_WITH and AC_ARG_ENABLE)
 
@@ -228,6 +233,9 @@
       *)   AC_MSG_ERROR(bad value for --enable-warnings: yes or no) ;;
      esac)
 
+dnl For timeout support (in the testsuite), the case "yes" and absent
+dnl --enable-tests-timeout option will be handled in a consistent way
+dnl in MPFR_CONFIGS (see acinclude.m4).
 AC_ARG_ENABLE(tests-timeout,
      --enable-tests-timeout=NUM
                           for developers enable timeout for test programs
@@ -236,7 +244,7 @@
                           overrides NUM (0: no timeout),
     case $enableval in
       no)   ;;
-      yes)  AC_DEFINE(MPFR_TESTS_TIMEOUT, 0, timeout limit) ;;
+      yes)  ;;
       0-9|0-90-9|0-90-90-9|0-90-90-90-9)
        AC_DEFINE_UNQUOTED(MPFR_TESTS_TIMEOUT, $enableval, timeout limit) ;;
       *)    AC_MSG_ERROR(bad value for --enable-tests-timeout) ;;
@@ -558,9 +566,16 @@
 dnl We need to check whether --disable-new-dtags is supported as alternate
 dnl linkers may be used (e.g., with tcc: CC=tcc LD=tcc).
 dnl
+dnl 2023-08
+dnl On Android/Termux, -Wl,--disable-new-dtags is supported by clang, but
+dnl the DT_RPATH directories are stripped away when running the program.
+dnl Moreover, config.guess identifies the host as GNU/Linux (*-*-linux-gnu)
+dnl instead of Android (linux*android*), so that we need to explicitly
+dnl exclude Termux.
+dnl
 case $host in
-  *-*-linux*)
-    if test -n "$LD_LIBRARY_PATH"; then
+  *-*-linux-gnu)
+    if test -n "$LD_LIBRARY_PATH" && test -z "$TERMUX_VERSION"; then
       saved_LDFLAGS="$LDFLAGS"
       LDFLAGS="$LDFLAGS -Wl,--disable-new-dtags"
       AC_MSG_CHECKING(whether --disable-new-dtags is supported by the linker)
@@ -721,10 +736,25 @@
 See 'config.log' for details (search for GMP_NUMB_BITS).),
        AC_MSG_RESULT(cannot test))
 
+MPFR_CHECK_MP_LIMB_T_VS_LONG
+MPFR_CHECK_MP_LIMB_T_VS_INTMAX
+
+dnl Now we will need the GMP library (not just gmp.h).
+dnl Do not use AC_CHECK_LIB as it is based on a deprecated ISO C feature.
+LIBS="-lgmp $LIBS"
+
 dnl Check if we can link with GMP
-AC_CHECK_LIB(gmp, __gmpz_init, LIBS="-lgmp $LIBS",
- AC_MSG_ERROR(libgmp not found or uses a different ABI (including static vs shared).
-Please read the INSTALL file -- see "In case of problem".))
+AC_MSG_CHECKING(if we can link with GMP)
+AC_LINK_IFELSE(AC_LANG_PROGRAM(
+#include "gmp.h"
+mpz_t m;
+,
+mpz_init (m);
+),AC_MSG_RESULT(yes),
+ AC_MSG_RESULT(no)
+ AC_MSG_ERROR(libgmp not found or uses a different ABI (including static vs shared).
+Please read the INSTALL file -- see "In case of problem".)
+)
 
 dnl Check for corresponding 'gmp.h' and libgmp
 AC_MSG_CHECKING(if gmp.h version and libgmp version are the same)
@@ -801,9 +831,6 @@
 dnl mpn_rsblsh1_n(rp, up, vp, n) does {rp, n} <- 2 * {vp, n} - {up, n}
 AC_CHECK_FUNCS(__gmpn_rsblsh1_n)
 
-MPFR_CHECK_MP_LIMB_T_VS_LONG
-MPFR_CHECK_MP_LIMB_T_VS_INTMAX
-
 else
 
 dnl Setup for mini-gmp
@@ -857,7 +884,7 @@
   done
 fi
 
-if $EGREP -q -e '-dev$' $srcdir/VERSION; then
+if test -n "$dev_version"; then
   AC_SUBST(DATAFILES)dnl
   DATAFILES=`echo \`$SED -n \
     's/^ *data_check *("$data\/^"*$".*/tests\/\1/p' \

_service:tar_scm:mpfr-4.2.0.tar.xz/doc/README.dev -> _service:tar_scm:mpfr-4.2.1.tar.xz/doc/README.dev Changed

@@ -241,6 +241,7 @@
      This should at least be done last, in order to be complete before the
      generation of the tarball.
      Note: First, make sure that all the pending commits have been done.
+     Push the changes with "git push".
 
   5) Create an annotated tag whose name corresponds to the content of
      the VERSION file:
@@ -435,8 +436,13 @@
      In case of a new patchlevel release, add a link from the web page
      of the previous release.
 
-     * For the release candidates: Announce the RC in the mpfr-announce,
-     mpfr, gmp-discuss, gcc and platform-testers2 mailing-lists.
+     * For the release candidates:
+     Upload the tarballs and the signatures to the MPFR web server
+     (via the misc.git repository).
+     Run the tools/announce-text script to do some checking and get
+     the announce text. Edit this text if need be.
+     Announce the RC in the mpfr-announce, mpfr, gmp-discuss, gcc and
+     platform-testers2 mailing-lists.
      A minimal web page for the MPFR release can be created right now
      (see Git history such as 3 for examples), as the manual already
      contains the new URLs.

_service:tar_scm:mpfr-4.2.0.tar.xz/doc/mpfr.info -> _service:tar_scm:mpfr-4.2.1.tar.xz/doc/mpfr.info Changed

@@ -1,7 +1,7 @@
-This is mpfr.info, produced by makeinfo version 6.8 from mpfr.texi.
+This is mpfr.info, produced by makeinfo version 7.0.3 from mpfr.texi.
 
 This manual documents how to install and use the Multiple Precision
-Floating-Point Reliable Library, version 4.2.0.
+Floating-Point Reliable Library, version 4.2.1.
 
    Copyright 1991, 1993-2023 Free Software Foundation, Inc.
 
@@ -23,7 +23,7 @@
 ********
 
 This manual documents how to install and use the Multiple Precision
-Floating-Point Reliable Library, version 4.2.0.
+Floating-Point Reliable Library, version 4.2.1.
 
    Copyright 1991, 1993-2023 Free Software Foundation, Inc.
 
@@ -284,8 +284,8 @@
 <https://www.mpfr.org/faq.html>.
 
    Please report problems to the MPFR mailing-list ‘mpfr@inria.fr’.
-*Note Reporting Bugs::.  Some bug fixes are available on the MPFR 4.2.0
-web page <https://www.mpfr.org/mpfr-4.2.0/>.
+*Note Reporting Bugs::.  Some bug fixes are available on the MPFR 4.2.1
+web page <https://www.mpfr.org/mpfr-4.2.1/>.
 
 2.4 Getting the Latest Version of MPFR
 ======================================
@@ -300,7 +300,7 @@
 ****************
 
 If you think you have found a bug in the MPFR library, first have a look
-on the MPFR 4.2.0 web page <https://www.mpfr.org/mpfr-4.2.0/> and the
+on the MPFR 4.2.1 web page <https://www.mpfr.org/mpfr-4.2.1/> and the
 FAQ <https://www.mpfr.org/faq.html>: perhaps this bug is already known,
 in which case you may find there a workaround for it.  You might also
 look in the archives of the MPFR mailing-list:
@@ -1158,9 +1158,10 @@
           mpfr_rnd_t RND)
      Set ROP to the value of the string S in base BASE, rounded in the
      direction RND.  See the documentation of ‘mpfr_strtofr’ for a
-     detailed description of the valid string formats.  Contrary to
-     ‘mpfr_strtofr’, ‘mpfr_set_str’ requires the _whole_ string to
-     represent a valid floating-point number.
+     detailed description of BASE (with its special value 0) and the
+     valid string formats.  Contrary to ‘mpfr_strtofr’, ‘mpfr_set_str’
+     requires the _whole_ string to represent a valid floating-point
+     number.
 
      The meaning of the return value differs from other MPFR functions:
      it is 0 if the entire string up to the final null character is a
@@ -1922,8 +1923,13 @@
  -- Function: int mpfr_compound_si (mpfr_t ROP, mpfr_t OP, long int N,
           mpfr_rnd_t RND)
      Set ROP to the power N of one plus OP, following IEEE 754 for the
-     special cases and exceptions.  When N is zero and OP is NaN or
-     greater or equal to −1, ROP is set to 1.
+     special cases and exceptions.  In particular:
+        • When OP < −1, ROP is set to NaN.
+        • When N is zero and OP is NaN (like any value greater or equal
+          to −1), ROP is set to 1.
+        • When OP = −1, ROP is set to +Inf for N < 0, and to +0 for
+          N > 0.
+     The other special cases follow the usual rules.
 
  -- Function: int mpfr_cos (mpfr_t ROP, mpfr_t OP, mpfr_rnd_t RND)
  -- Function: int mpfr_sin (mpfr_t ROP, mpfr_t OP, mpfr_rnd_t RND)
@@ -2231,12 +2237,15 @@
      Input a string in base BASE from stream STREAM, rounded in the
      direction RND, and put the read float in ROP.
 
-     This function reads a word (defined as a sequence of characters
-     between whitespace) and parses it using ‘mpfr_set_str’.  See the
-     documentation of ‘mpfr_strtofr’ for a detailed description of the
-     valid string formats.
+     After skipping optional whitespace (as defined by ‘isspace’, which
+     depends on the current locale), this function reads a word, defined
+     as the longest sequence of non-whitespace characters, and parses it
+     using ‘mpfr_set_str’.  See the documentation of ‘mpfr_strtofr’ for
+     a detailed description of the valid string formats.
 
-     Return the number of bytes read, or if an error occurred, return 0.
+     Return the number of bytes read (including the leading whitespace,
+     if any), or if the string format is invalid or an error occurred,
+     return 0.
 
  -- Function: int mpfr_fpif_export (FILE *STREAM, mpfr_t OP)
      Export the number OP to the stream STREAM in a floating-point
@@ -2374,7 +2383,7 @@
      mpfr_init (x);
      ...
      p = mpfr_get_prec (x);
-     mpfr_printf ("variable x with %Pu bits", p);
+     mpfr_printf ("variable x with %Pd bits", p);
 
    The ‘R’ type specifies that a following ‘a’, ‘A’, ‘b’, ‘e’, ‘E’, ‘f’,
 ‘F’, ‘g’, ‘G’, or ‘n’ conversion specifier applies to a ‘mpfr_t’
@@ -2417,10 +2426,14 @@
 ‘double’ argument.
 
    In case of non-decimal output, only the significand is written in the
-specified base, the exponent is always displayed in decimal.  Special
-values are always displayed as ‘nan’, ‘-inf’, and ‘inf’ for ‘a’, ‘b’,
-‘e’, ‘f’, and ‘g’ specifiers and ‘NAN’, ‘-INF’, and ‘INF’ for ‘A’, ‘E’,
-‘F’, and ‘G’ specifiers.
+specified base, the exponent is always displayed in decimal.
+
+   Non-real values are always displayed as ‘nan’ / ‘inf’ for the ‘a’,
+‘b’, ‘e’, ‘f’, and ‘g’ specifiers, and ‘NAN’ / ‘INF’ for ‘A’, ‘E’, ‘F’,
+and ‘G’ specifiers, possibly preceded by a sign or a space (the minus
+sign when the value has a negative sign, the plus sign when the value
+has a positive sign and the ‘+’ flag is used, a space when the value has
+a positive sign and the _space_ flag is used).
 
    The ‘mpfr_t’ number is rounded to the given precision in the
 direction specified by the rounding mode (see below if the precision is
@@ -4628,13 +4641,13 @@
 * mpfr_abs:                              Arithmetic Functions.
                                                               (line 145)
 * mpfr_acos:                             Transcendental Functions.
-                                                              (line 163)
+                                                              (line 168)
 * mpfr_acosh:                            Transcendental Functions.
-                                                              (line 253)
+                                                              (line 258)
 * mpfr_acospi:                           Transcendental Functions.
-                                                              (line 185)
+                                                              (line 190)
 * mpfr_acosu:                            Transcendental Functions.
-                                                              (line 175)
+                                                              (line 180)
 * mpfr_add:                              Arithmetic Functions.
                                                               (line   6)
 * mpfr_add_d:                            Arithmetic Functions.
@@ -4648,35 +4661,35 @@
 * mpfr_add_z:                            Arithmetic Functions.
                                                               (line  14)
 * mpfr_agm:                              Transcendental Functions.
-                                                              (line 350)
+                                                              (line 355)
 * mpfr_ai:                               Transcendental Functions.
-                                                              (line 361)
+                                                              (line 366)
 * mpfr_asin:                             Transcendental Functions.
-                                                              (line 164)
+                                                              (line 169)
 * mpfr_asinh:                            Transcendental Functions.
-                                                              (line 254)
+                                                              (line 259)
 * mpfr_asinpi:                           Transcendental Functions.
-                                                              (line 186)
+                                                              (line 191)
 * mpfr_asinu:                            Transcendental Functions.
-                                                              (line 177)
+                                                              (line 182)
 * mpfr_asprintf:                         Formatted Output Functions.
-                                                              (line 211)
+                                                              (line 215)
 * mpfr_atan:                             Transcendental Functions.
-                                                              (line 165)
+                                                              (line 170)
 * mpfr_atan2:                            Transcendental Functions.
-                                                              (line 191)
+                                                              (line 196)
 * mpfr_atan2pi:                          Transcendental Functions.
-                                                              (line 195)
+                                                              (line 200)
 * mpfr_atan2u:                           Transcendental Functions.
-                                                              (line 193)
+                                                              (line 198)
 * mpfr_atanh:                            Transcendental Functions.
-                                                              (line 255)
+                                                              (line 260)
 * mpfr_atanpi:                           Transcendental Functions.
-                                                              (line 187)
+                                                              (line 192)
 * mpfr_atanu:                            Transcendental Functions.
-                                                              (line 179)
+                                                              (line 184)
 * mpfr_beta:                             Transcendental Functions.
-                                                              (line 312)
+                                                              (line 317)
 * mpfr_buildopt_decimal_p:               Miscellaneous Functions.
                                                               (line 195)
 * mpfr_buildopt_float128_p:              Miscellaneous Functions.
@@ -4742,31 +4755,31 @@
 * mpfr_compound_si:                      Transcendental Functions.
                                                               (line 112)
 * mpfr_const_catalan:                    Transcendental Functions.
-                                                              (line 372)
+                                                              (line 377)
 * mpfr_const_euler:                      Transcendental Functions.
-                                                              (line 371)
+                                                              (line 376)
 * mpfr_const_log2:                       Transcendental Functions.
-                                                              (line 369)
+                                                              (line 374)
 * mpfr_const_pi:                         Transcendental Functions.

_service:tar_scm:mpfr-4.2.0.tar.xz/doc/mpfr.texi -> _service:tar_scm:mpfr-4.2.1.tar.xz/doc/mpfr.texi Changed

@@ -4,8 +4,8 @@
 @documentencoding UTF-8
 @c Note that the 5 occurrences of the version string in this file
 @c should be updated by the tools/update-version script.
-@set VERSION 4.2.0
-@set UPDATED-MONTH January 2023
+@set VERSION 4.2.1
+@set UPDATED-MONTH August 2023
 @settitle GNU MPFR @value{VERSION}
 @synindex tp fn
 @iftex
@@ -587,7 +587,7 @@
 Please report problems to the MPFR mailing-list @samp{mpfr@@inria.fr}.
 @xref{Reporting Bugs}.
 Some bug fixes are available on the
-MPFR@tie{}4.2.0 web page @url{https://www.mpfr.org/mpfr-4.2.0/}.
+MPFR@tie{}4.2.1 web page @url{https://www.mpfr.org/mpfr-4.2.1/}.
 
 @section Getting the Latest Version of MPFR
 
@@ -602,7 +602,7 @@
 @comment Warning! Do not split "MPFR ... @url{...}" across several lines
 @comment as this needs to be updated with update-version.
 If you think you have found a bug in the MPFR library, first have a look
-on the MPFR@tie{}4.2.0 web page @url{https://www.mpfr.org/mpfr-4.2.0/}
+on the MPFR@tie{}4.2.1 web page @url{https://www.mpfr.org/mpfr-4.2.1/}
 and the FAQ @url{https://www.mpfr.org/faq.html}:
 perhaps this bug is already known, in which case you may find there
 a workaround for it.
@@ -1577,7 +1577,7 @@
 Set @var{rop} to the value of the string @var{s} in base @var{base},
 rounded in the direction @var{rnd}.
 See the documentation of @code{mpfr_strtofr} for a detailed description
-of the valid string formats.
+of @var{base} (with its special value 0) and the valid string formats.
 Contrary to @code{mpfr_strtofr}, @code{mpfr_set_str} requires the
 @emph{whole} string to represent a valid floating-point number.
 @c Additionally, special values
@@ -2405,9 +2405,13 @@
 
 @deftypefun int mpfr_compound_si (mpfr_t @var{rop}, mpfr_t @var{op}, long int @var{n}, mpfr_rnd_t @var{rnd})
 Set @var{rop} to the power @var{n} of one plus @var{op},
-following IEEE@tie{}754 for the special cases and exceptions.
-When @var{n} is zero and @var{op} is NaN or greater or equal to @minus{}1,
-@var{rop} is set to 1.
+following IEEE@tie{}754 for the special cases and exceptions. In particular:
+@itemize @bullet
+@item When @tm{@var{op} < @minus{}1}, @var{rop} is set to NaN@.
+@item When @var{n} is zero and @var{op} is NaN (like any value greater or equal to @minus{}1), @var{rop} is set to 1.
+@item When @tm{@var{op} = @minus{}1}, @var{rop} is set to @mm{+}Inf for @tm{@var{n} < 0}, and to @mm{+}0 for @tm{@var{n} > 0}.
+@end itemize
+The other special cases follow the usual rules.
 @end deftypefun
 
 @deftypefun int mpfr_cos (mpfr_t @var{rop}, mpfr_t @var{op}, mpfr_rnd_t @var{rnd})
@@ -2771,8 +2775,10 @@
 @c written in decimal for the specified base, and in base 16, @samp{B} is the
 @c binary exponent written in decimal (i.e., it indicates the power of 2 by
 @c which the significand is to be scaled).
-This function reads a word (defined as a sequence of characters between
-whitespace) and parses it using @code{mpfr_set_str}.
+After skipping optional whitespace (as defined by @code{isspace}, which
+depends on the current locale), this function reads a word, defined as
+the longest sequence of non-whitespace characters, and parses it using
+@code{mpfr_set_str}.
 See the documentation of @code{mpfr_strtofr} for a detailed description
 of the valid string formats.
 @c Special values can be read as follows (the case does not matter):
@@ -2781,7 +2787,9 @@
 @c or equal to 16, the following strings are accepted too: @samp{NaN},
 @c @samp{Inf}, @samp{+Inf} and @samp{-Inf}.
 
-Return the number of bytes read, or if an error occurred, return 0.
+Return the number of bytes read (including the leading whitespace,
+if any), or if the string format is invalid or an error occurred,
+return 0.
 @end deftypefun
 
 @c @deftypefun void mpfr_inp_raw (mpfr_t @var{float}, FILE *@var{stream})
@@ -2945,7 +2953,7 @@
 mpfr_init (x);
 @dots{}
 p = mpfr_get_prec (x);
-mpfr_printf ("variable x with %Pu bits", p);
+mpfr_printf ("variable x with %Pd bits", p);
 @end example
 
 The @samp{R} type specifies that a following @samp{a}, @samp{A}, @samp{b},
@@ -3005,10 +3013,14 @@
 
 In case of non-decimal output, only the significand is written in the
 specified base, the exponent is always displayed in decimal.
-Special values are always displayed as @samp{nan}, @samp{-inf}, and @samp{inf}
-for @samp{a}, @samp{b}, @samp{e}, @samp{f}, and @samp{g} specifiers and
-@samp{NAN}, @samp{-INF}, and @samp{INF} for @samp{A}, @samp{E}, @samp{F}, and
-@samp{G} specifiers.
+
+Non-real values are always displayed as @samp{nan} / @samp{inf} for the
+@samp{a}, @samp{b}, @samp{e}, @samp{f}, and @samp{g} specifiers, and
+@samp{NAN} / @samp{INF} for @samp{A}, @samp{E}, @samp{F}, and @samp{G}
+specifiers, possibly preceded by a sign or a space (the minus sign
+when the value has a negative sign, the plus sign when the value has
+a positive sign and the @samp{+} flag is used, a space when the value
+has a positive sign and the @emph{space} flag is used).
 
 The @code{mpfr_t} number is rounded to the given precision in the direction
 specified by the rounding mode (see below if the precision is missing).

_service:tar_scm:mpfr-4.2.0.tar.xz/ltmain.sh -> _service:tar_scm:mpfr-4.2.1.tar.xz/ltmain.sh Changed

@@ -31,7 +31,7 @@
 
 PROGRAM=libtool
 PACKAGE=libtool
-VERSION="2.4.7 Debian-2.4.7-5"
+VERSION="2.4.7 Debian-2.4.7-7"
 package_revision=2.4.7
 
 
@@ -572,27 +572,15 @@
 # ---------------------
 # Append VALUE onto the existing contents of VAR.
 
-  # We should try to minimise forks, especially on Windows where they are
-  # unreasonably slow, so skip the feature probes when bash or zsh are
-  # being used:
-  if test set = "${BASH_VERSION+set}${ZSH_VERSION+set}"; then
-    : ${_G_HAVE_ARITH_OP="yes"}
-    : ${_G_HAVE_XSI_OPS="yes"}
-    # The += operator was introduced in bash 3.1
-    case $BASH_VERSION in
-      12.* | 3.0 | 3.0*) ;;
-      *)
-        : ${_G_HAVE_PLUSEQ_OP="yes"}
-        ;;
-    esac
-  fi
-
   # _G_HAVE_PLUSEQ_OP
   # Can be empty, in which case the shell is probed, "yes" if += is
   # useable or anything else if it does not work.
-  test -z "$_G_HAVE_PLUSEQ_OP" \
-    && (eval 'x=a; x+=" b"; test "a b" = "$x"') 2>/dev/null \
-    && _G_HAVE_PLUSEQ_OP=yes
+  if test -z "$_G_HAVE_PLUSEQ_OP" &&  \
+      __PLUSEQ_TEST="a" &&  \
+      __PLUSEQ_TEST+=" b" 2>/dev/null &&  \
+      test "a b" = "$__PLUSEQ_TEST"; then
+    _G_HAVE_PLUSEQ_OP=yes
+  fi
 
 if test yes = "$_G_HAVE_PLUSEQ_OP"
 then
@@ -2308,7 +2296,7 @@
        compiler:       $LTCC
        compiler flags: $LTCFLAGS
        linker:         $LD (gnu? $with_gnu_ld)
-       version:        $progname $scriptversion Debian-2.4.7-5
+       version:        $progname $scriptversion Debian-2.4.7-7
        automake:       `($AUTOMAKE --version) 2>/dev/null |$SED 1q`
        autoconf:       `($AUTOCONF --version) 2>/dev/null |$SED 1q`

_service:tar_scm:mpfr-4.2.0.tar.xz/src/Makefile.am -> _service:tar_scm:mpfr-4.2.1.tar.xz/src/Makefile.am Changed

_service:tar_scm:mpfr-4.2.0.tar.xz/src/Makefile.in -> _service:tar_scm:mpfr-4.2.1.tar.xz/src/Makefile.in Changed

_service:tar_scm:mpfr-4.2.0.tar.xz/src/acos.c -> _service:tar_scm:mpfr-4.2.1.tar.xz/src/acos.c Changed

_service:tar_scm:mpfr-4.2.0.tar.xz/src/acosh.c -> _service:tar_scm:mpfr-4.2.1.tar.xz/src/acosh.c Changed

_service:tar_scm:mpfr-4.2.0.tar.xz/src/acosu.c -> _service:tar_scm:mpfr-4.2.1.tar.xz/src/acosu.c Changed

_service:tar_scm:mpfr-4.2.0.tar.xz/src/add.c -> _service:tar_scm:mpfr-4.2.1.tar.xz/src/add.c Changed

_service:tar_scm:mpfr-4.2.0.tar.xz/src/add_d.c -> _service:tar_scm:mpfr-4.2.1.tar.xz/src/add_d.c Changed

_service:tar_scm:mpfr-4.2.0.tar.xz/src/add_ui.c -> _service:tar_scm:mpfr-4.2.1.tar.xz/src/add_ui.c Changed

_service:tar_scm:mpfr-4.2.0.tar.xz/src/agm.c -> _service:tar_scm:mpfr-4.2.1.tar.xz/src/agm.c Changed

_service:tar_scm:mpfr-4.2.0.tar.xz/src/ai.c -> _service:tar_scm:mpfr-4.2.1.tar.xz/src/ai.c Changed

@@ -70,8 +70,8 @@
 
   /* Logging */
   MPFR_LOG_FUNC (
-    ("x%Pu=%.*Rg rnd=%d", mpfr_get_prec (x), mpfr_log_prec, x, rnd),
-    ("y%Pu=%.*Rg", mpfr_get_prec (y), mpfr_log_prec, y) );
+    ("x%Pd=%.*Rg rnd=%d", mpfr_get_prec (x), mpfr_log_prec, x, rnd),
+    ("y%Pd=%.*Rg", mpfr_get_prec (y), mpfr_log_prec, y) );
 
   /* Save current exponents range */
   MPFR_SAVE_EXPO_MARK (expo);
@@ -198,7 +198,7 @@
   /* ZIV loop */
   for (;;)
     {
-      MPFR_LOG_MSG (("Working precision: %Pu\n", wprec));
+      MPFR_LOG_MSG (("Working precision: %Pd\n", wprec));
       mpfr_set_prec (ti, wprec);
       mpfr_set_prec (tip1, wprec);
       mpfr_set_prec (x3, wprec);
@@ -257,8 +257,8 @@
 
       /* err is the number of bits lost due to the evaluation error */
       /* wprec-(prec+1): number of bits lost due to the approximation error */
-      MPFR_LOG_MSG (("Roundoff error: %Pu\n", err));
-      MPFR_LOG_MSG (("Approxim error: %Pu\n", wprec-prec-1));
+      MPFR_LOG_MSG (("Roundoff error: %Pd\n", err));
+      MPFR_LOG_MSG (("Approxim error: %Pd\n", wprec-prec-1));
 
       if (wprec < err + 1)
         correct_bits = 0;
@@ -342,8 +342,8 @@
 
   /* Logging */
   MPFR_LOG_FUNC (
-    ("x%Pu=%.*Rg rnd=%d", mpfr_get_prec (x),  mpfr_log_prec, x, rnd),
-    ("y%Pu=%.*Rg", mpfr_get_prec (y), mpfr_log_prec, y));
+    ("x%Pd=%.*Rg rnd=%d", mpfr_get_prec (x),  mpfr_log_prec, x, rnd),
+    ("y%Pd=%.*Rg", mpfr_get_prec (y), mpfr_log_prec, y));
 
   /* Save current exponents range */
   MPFR_SAVE_EXPO_MARK (expo);
@@ -431,7 +431,7 @@
   /* ZIV loop */
   for (;;)
     {
-      MPFR_LOG_MSG (("working precision: %Pu\n", wprec));
+      MPFR_LOG_MSG (("working precision: %Pd\n", wprec));
 
       for (j=0; j<=L; j++)
         mpfr_set_prec (zj, wprec);
@@ -548,8 +548,8 @@
 
       /* err is the number of bits lost due to the evaluation error */
       /* wprec-(prec+1): number of bits lost due to the approximation error */
-      MPFR_LOG_MSG (("Roundoff error: %Pu\n", err));
-      MPFR_LOG_MSG (("Approxim error: %Pu\n", wprec - prec - 1));
+      MPFR_LOG_MSG (("Roundoff error: %Pd\n", err));
+      MPFR_LOG_MSG (("Approxim error: %Pd\n", wprec - prec - 1));
 
       if (wprec < err+1)
         correctBits = 0;

_service:tar_scm:mpfr-4.2.0.tar.xz/src/asin.c -> _service:tar_scm:mpfr-4.2.1.tar.xz/src/asin.c Changed

_service:tar_scm:mpfr-4.2.0.tar.xz/src/asinh.c -> _service:tar_scm:mpfr-4.2.1.tar.xz/src/asinh.c Changed

_service:tar_scm:mpfr-4.2.0.tar.xz/src/asinu.c -> _service:tar_scm:mpfr-4.2.1.tar.xz/src/asinu.c Changed

_service:tar_scm:mpfr-4.2.0.tar.xz/src/atan.c -> _service:tar_scm:mpfr-4.2.1.tar.xz/src/atan.c Changed

_service:tar_scm:mpfr-4.2.0.tar.xz/src/atan2.c -> _service:tar_scm:mpfr-4.2.1.tar.xz/src/atan2.c Changed

_service:tar_scm:mpfr-4.2.0.tar.xz/src/atan2u.c -> _service:tar_scm:mpfr-4.2.1.tar.xz/src/atan2u.c Changed

_service:tar_scm:mpfr-4.2.0.tar.xz/src/atanh.c -> _service:tar_scm:mpfr-4.2.1.tar.xz/src/atanh.c Changed

_service:tar_scm:mpfr-4.2.0.tar.xz/src/atanu.c -> _service:tar_scm:mpfr-4.2.1.tar.xz/src/atanu.c Changed

_service:tar_scm:mpfr-4.2.0.tar.xz/src/cbrt.c -> _service:tar_scm:mpfr-4.2.1.tar.xz/src/cbrt.c Changed

_service:tar_scm:mpfr-4.2.0.tar.xz/src/compound.c -> _service:tar_scm:mpfr-4.2.1.tar.xz/src/compound.c Changed

@@ -55,16 +55,16 @@
 mpfr_compound_si (mpfr_ptr y, mpfr_srcptr x, long n, mpfr_rnd_t rnd_mode)
 {
   int inexact, compared, k, nloop;
-  mpfr_t t;
-  mpfr_exp_t e;
-  mpfr_prec_t prec;
+  mpfr_t t, u;
+  mpfr_prec_t py, prec, extra;
+  mpfr_rnd_t rnd1;
   MPFR_ZIV_DECL (loop);
   MPFR_SAVE_EXPO_DECL (expo);
 
   MPFR_LOG_FUNC
-    (("x%Pu=%.*Rg n=%ld rnd=%d",
+    (("x%Pd=%.*Rg n=%ld rnd=%d",
       mpfr_get_prec(x), mpfr_log_prec, x, n, rnd_mode),
-     ("y%Pu=%.*Rg inexact=%d", mpfr_get_prec (y), mpfr_log_prec, y, inexact));
+     ("y%Pd=%.*Rg inexact=%d", mpfr_get_prec (y), mpfr_log_prec, y, inexact));
 
   /* Special cases */
   if (MPFR_IS_SINGULAR (x))
@@ -136,64 +136,181 @@
 
   MPFR_SAVE_EXPO_MARK (expo);
 
-  prec = MPFR_PREC(y);
-  prec += MPFR_INT_CEIL_LOG2 (prec) + 6;
+  py = MPFR_GET_PREC (y);
+  prec = py + MPFR_INT_CEIL_LOG2 (py) + 6;
 
   mpfr_init2 (t, prec);
+  mpfr_init2 (u, prec);
 
   k = MPFR_INT_CEIL_LOG2(SAFE_ABS (unsigned long, n));  /* thus |n| <= 2^k */
 
+  /* We compute u=log2p1(x) with prec+extra bits, since we lose some bits
+     in 2^u. */
+  extra = 0;
+  rnd1 = VSIGN (n) == MPFR_SIGN (x) ? MPFR_RNDD : MPFR_RNDU;
+
   MPFR_ZIV_INIT (loop, prec);
   for (nloop = 0; ; nloop++)
     {
-      /* we compute (1+x)^n as 2^(n*log2p1(x)) */
-      inexact = mpfr_log2p1 (t, x, MPFR_RNDN) != 0;
-      e = MPFR_GET_EXP(t);
-      /* |t - log2(1+x)| <= 1/2*ulp(t) = 2^(e-prec-1) */
-      inexact |= mpfr_mul_si (t, t, n, MPFR_RNDN) != 0;
-      /* |t - n*log2(1+x)| <= 2^(e2-prec-1) + |n|*2^(e-prec-1)
-                           <= 2^(e2-prec-1) + 2^(e+k-prec-1) <= 2^(e+k-prec)
-                          where |n| <= 2^k, and e2 is the new exponent of t. */
-      MPFR_ASSERTD(MPFR_GET_EXP(t) <= e + k);
-      e += k;
-      /* |t - n*log2(1+x)| <= 2^(e-prec) */
-      /* detect overflow */
-      if (nloop == 0 && mpfr_cmp_si (t, __gmpfr_emax) >= 0)
+      unsigned int inex;
+      mpfr_exp_t e, e2, ex;
+      mpfr_prec_t precu = MPFR_ADD_PREC (prec, extra);
+      mpfr_prec_t new_extra;
+      mpfr_rnd_t rnd2;
+
+      /* We compute (1+x)^n as 2^(n*log2p1(x)),
+         and we round toward 1, thus we round n*log2p1(x) toward 0,
+         thus for x*n > 0 we round log2p1(x) toward -Inf, and for x*n < 0
+         we round log2p1(x) toward +Inf. */
+      inex = mpfr_log2p1 (u, x, rnd1) != 0;
+      e = MPFR_GET_EXP (u);
+      /* |u - log2(1+x)| <= ulp(t) = 2^(e-precu) */
+      inex |= mpfr_mul_si (u, u, n, MPFR_RNDZ) != 0;
+      e2 = MPFR_GET_EXP (u);
+      /* |u - n*log2(1+x)| <= 2^(e2-precu) + |n|*2^(e-precu)
+                           <= 2^(e2-precu) + 2^(e+k-precu) <= 2^(e+k+1-precu)
+                          where |n| <= 2^k, and e2 is the new exponent of u. */
+      MPFR_ASSERTD (e2 <= e + k);
+      e += k + 1;
+      MPFR_ASSERTN (e2 <= MPFR_PREC_MAX);
+      new_extra = e2 > 0 ? e2 : 0;
+      /* |u - n*log2(1+x)| <= 2^(e-precu) */
+      /* detect overflow: since we rounded n*log2p1(x) toward 0,
+         if n*log2p1(x) >= __gmpfr_emax, we are sure there is overflow. */
+      if (mpfr_cmp_si (u, __gmpfr_emax) >= 0)
         {
           MPFR_ZIV_FREE (loop);
           mpfr_clear (t);
+          mpfr_clear (u);
           MPFR_SAVE_EXPO_FREE (expo);
           return mpfr_overflow (y, rnd_mode, 1);
         }
-      /* detect underflow */
-      if (nloop == 0 && mpfr_cmp_si (t, __gmpfr_emin - 1) <= 0)
+      /* detect underflow: similarly, since we rounded n*log2p1(x) toward 0,
+         if n*log2p1(x) < __gmpfr_emin-1, we are sure there is underflow. */
+      if (mpfr_cmp_si (u, __gmpfr_emin - 1) < 0)
         {
           MPFR_ZIV_FREE (loop);
           mpfr_clear (t);
+          mpfr_clear (u);
           MPFR_SAVE_EXPO_FREE (expo);
           return mpfr_underflow (y,
-                            (rnd_mode == MPFR_RNDN) ? MPFR_RNDZ : rnd_mode, 1);
+                            rnd_mode == MPFR_RNDN ? MPFR_RNDZ : rnd_mode, 1);
         }
       /* Detect cases where result is 1 or 1+ulp(1) or 1-1/2*ulp(1):
-         |2^t - 1| = |exp(t*log(2)) - 1| <= |t|*log(2) < |t| */
-      if (nloop == 0 && MPFR_GET_EXP(t) < - (mpfr_exp_t) MPFR_PREC(y))
+         |2^u - 1| = |exp(u*log(2)) - 1| <= |u|*log(2) < |u| */
+      if (nloop == 0 && MPFR_GET_EXP(u) < - py)
         {
-          /* since ulp(1) = 2^(1-PREC(y)), we have |t| < 1/4*ulp(1) */
+          /* since ulp(1) = 2^(1-py), we have |u| < 1/4*ulp(1) */
           /* mpfr_compound_near_one must be called in the extended
              exponent range, so that 1 is representable. */
-          inexact = mpfr_compound_near_one (y, MPFR_SIGN (t), rnd_mode);
+          inexact = mpfr_compound_near_one (y, MPFR_SIGN (u), rnd_mode);
           goto end;
         }
-      inexact |= mpfr_exp2 (t, t, MPFR_RNDA) != 0;
-      /* |t - (1+x)^n| <= ulp(t) + |t|*log(2)*2^(e-prec)
-                       < 2^(EXP(t)-prec) + 2^(EXP(t)+e-prec) */
-      e = (e >= 0) ? e + 1 : 1;
+      /* round 2^u toward 1 */
+      rnd2 = MPFR_IS_POS (u) ? MPFR_RNDD : MPFR_RNDU;
+      inex |= mpfr_exp2 (t, u, rnd2) != 0;
+      /* we had |u - n*log2(1+x)| < 2^(e-precu)
+         thus u = n*log2(1+x) + delta with |delta| < 2^(e-precu)
+         then 2^u = (1+x)^n * 2^delta with |delta| < 2^(e-precu).
+         For |delta| < 0.5, |2^delta - 1| <= |delta| thus
+         |t - (1+x)^n| <= ulp(t) + |t|*2^(e-precu)
+                       < 2^(EXP(t)-prec) + 2^(EXP(t)+e-precu) */
+      e = (precu - prec >= e) ? 1 : e + 1 - (precu - prec);
       /* now |t - (1+x)^n| < 2^(EXP(t)+e-prec) */
 
-      if (MPFR_LIKELY (inexact == 0 ||
-                       MPFR_CAN_ROUND (t, prec - e, MPFR_PREC(y), rnd_mode)))
+      if (MPFR_LIKELY (!inex || MPFR_CAN_ROUND (t, prec - e, py, rnd_mode)))
         break;
 
+      /* If t fits in the target precision (or with 1 more bit), then we can
+         round, assuming the working precision is large enough, but the above
+         MPFR_CAN_ROUND() will fail because we cannot determine the ternary
+         value. However since we rounded t toward 1, we can determine it.
+         Since the error in the approximation t is at most 2^e ulp(t),
+         this error should be less than 1/2 ulp(y), thus we should have
+         prec - py >= e + 1. */
+      if (mpfr_min_prec (t) <= py + 1 && prec - py >= e + 1)
+        {
+          /* we add/subtract one ulp to get the correct rounding */
+          if (rnd2 == MPFR_RNDD) /* t was rounded downwards */
+            mpfr_nextabove (t);
+          else
+            mpfr_nextbelow (t);
+          break;
+        }
+
+      /* Detect particular cases where Ziv's strategy may take too much
+         memory and be too long, i.e. when x^n fits in the target precision
+         (+ 1 additional bit for rounding to nearest) and the exact result
+         (1+x)^n is very close to x^n.
+         Necessarily, x is a large even integer and n > 0 (thus n > 1).
+         Since this does not depend on the working precision, we only
+         check this at the first iteration (nloop == 0).
+         Hence the first "if" below and the kx < ex test of the second "if"
+         (x is an even integer iff its least bit 1 has exponent >= 1).
+         The second test of the second "if" corresponds to another simple
+         condition that implies that x^n fits in the target precision.
+         Here are the details:
+         Let k be the minimum length of the significand of x, and x' the odd
+         (integer) significand of x. This means  that 2^(k-1) <= x' < 2^k.
+         Thus 2^(n*(k-1)) <= (x')^n < 2^(k*n), and x^n has between n*(k-1)+1
+         and k*n bits. So x^n can fit into p bits only if p >= n*(k-1)+1,
+         i.e. n*(k-1) <= p-1.
+         Note that x >= 2^k, so that x^n >= 2^(k*n). Since raw overflow
+         has already been detected, k*n cannot overflow if computed with
+         the mpfr_exp_t type. Hence the second test of the second "if",
+         which cannot overflow. */
+      MPFR_ASSERTD (n < 0 || n > 1);
+      if (nloop == 0 && n > 1 && (ex = MPFR_GET_EXP (x)) >= 17)
+        {
+          mpfr_prec_t kx = mpfr_min_prec (x);
+          mpfr_prec_t p = py + (rnd_mode == MPFR_RNDN);
+
+          MPFR_LOG_MSG (("Check if x^n fits... n=%ld kx=%Pd p=%Pd\n",
+                         n, kx, p));
+          if (kx < ex && n * (mpfr_exp_t) (kx - 1) <= p - 1)
+            {
+              mpfr_t v;
+
+              /* Check whether x^n really fits into p bits. */
+              mpfr_init2 (v, p);
+              inexact = mpfr_pow_ui (v, x, n, MPFR_RNDZ);
+              if (inexact == 0)
+                {
+                  MPFR_LOG_MSG (("x^n fits into p bits\n", 0));
+                  /* (x+1)^n = x^n * (1 + 1/x)^n
+                     For directed rounding, we can round when (1 + 1/x)^n
+                     < 1 + 2^-p, and then the result is x^n,
+                     except for rounding up. Indeed, if (1 + 1/x)^n < 1 + 2^-p,
+                     1 <= (x+1)^n < x^n * (1 + 2^-p) = x^n + x^n/2^p

_service:tar_scm:mpfr-4.2.0.tar.xz/src/const_catalan.c -> _service:tar_scm:mpfr-4.2.1.tar.xz/src/const_catalan.c Changed

_service:tar_scm:mpfr-4.2.0.tar.xz/src/const_log2.c -> _service:tar_scm:mpfr-4.2.1.tar.xz/src/const_log2.c Changed

_service:tar_scm:mpfr-4.2.0.tar.xz/src/const_pi.c -> _service:tar_scm:mpfr-4.2.1.tar.xz/src/const_pi.c Changed

_service:tar_scm:mpfr-4.2.0.tar.xz/src/cos.c -> _service:tar_scm:mpfr-4.2.1.tar.xz/src/cos.c Changed

_service:tar_scm:mpfr-4.2.0.tar.xz/src/cosh.c -> _service:tar_scm:mpfr-4.2.1.tar.xz/src/cosh.c Changed

_service:tar_scm:mpfr-4.2.0.tar.xz/src/cosu.c -> _service:tar_scm:mpfr-4.2.1.tar.xz/src/cosu.c Changed

_service:tar_scm:mpfr-4.2.0.tar.xz/src/d_div.c -> _service:tar_scm:mpfr-4.2.1.tar.xz/src/d_div.c Changed

_service:tar_scm:mpfr-4.2.0.tar.xz/src/d_sub.c -> _service:tar_scm:mpfr-4.2.1.tar.xz/src/d_sub.c Changed

_service:tar_scm:mpfr-4.2.0.tar.xz/src/digamma.c -> _service:tar_scm:mpfr-4.2.1.tar.xz/src/digamma.c Changed

@@ -122,8 +122,8 @@
   MPFR_ZIV_DECL (loop);
 
   MPFR_LOG_FUNC
-    (("x%Pu=%.*Rg rnd=%d", mpfr_get_prec(x), mpfr_log_prec, x, rnd_mode),
-     ("y%Pu=%.*Rg inexact=%d", mpfr_get_prec(y), mpfr_log_prec, y, inex));
+    (("x%Pd=%.*Rg rnd=%d", mpfr_get_prec(x), mpfr_log_prec, x, rnd_mode),
+     ("y%Pd=%.*Rg inexact=%d", mpfr_get_prec(y), mpfr_log_prec, y, inex));
 
   /* we want that 1-x is exact with precision q: if 0 < x < 1/2, then
      q = PREC(x)-EXP(x) is ok, otherwise if -1 <= x < 0, q = PREC(x)-EXP(x)
@@ -214,8 +214,8 @@
   MPFR_ZIV_DECL (loop);
 
   MPFR_LOG_FUNC
-    (("x%Pu=%.*Rg rnd=%d", mpfr_get_prec(x), mpfr_log_prec, x, rnd_mode),
-     ("y%Pu=%.*Rg inexact=%d", mpfr_get_prec(y), mpfr_log_prec, y, inex));
+    (("x%Pd=%.*Rg rnd=%d", mpfr_get_prec(x), mpfr_log_prec, x, rnd_mode),
+     ("y%Pd=%.*Rg inexact=%d", mpfr_get_prec(y), mpfr_log_prec, y, inex));
 
   /* For very large x, use |digamma(x) - log(x)| < 1/x < 2^(1-EXP(x)).
      However, for a fixed value of GUARD, MPFR_CAN_ROUND() might fail
@@ -259,7 +259,7 @@
     q = MPFR_PREC(x) + 1;
 
   /* FIXME: q can be much too large, e.g. equal to the maximum exponent! */
-  MPFR_LOG_MSG (("q=%Pu\n", q));
+  MPFR_LOG_MSG (("q=%Pd\n", q));
 
   mpfr_init2 (x_plus_j, q);
 
@@ -338,8 +338,8 @@
   MPFR_SAVE_EXPO_DECL (expo);
 
   MPFR_LOG_FUNC
-    (("x%Pu=%.*Rg rnd=%d", mpfr_get_prec(x), mpfr_log_prec, x, rnd_mode),
-     ("y%Pu=%.*Rg inexact=%d", mpfr_get_prec(y), mpfr_log_prec, y, inex));
+    (("x%Pd=%.*Rg rnd=%d", mpfr_get_prec(x), mpfr_log_prec, x, rnd_mode),
+     ("y%Pd=%.*Rg inexact=%d", mpfr_get_prec(y), mpfr_log_prec, y, inex));
 
   if (MPFR_UNLIKELY(MPFR_IS_SINGULAR(x)))
     {

_service:tar_scm:mpfr-4.2.0.tar.xz/src/div.c -> _service:tar_scm:mpfr-4.2.1.tar.xz/src/div.c Changed

_service:tar_scm:mpfr-4.2.0.tar.xz/src/div_2si.c -> _service:tar_scm:mpfr-4.2.1.tar.xz/src/div_2si.c Changed

_service:tar_scm:mpfr-4.2.0.tar.xz/src/div_2ui.c -> _service:tar_scm:mpfr-4.2.1.tar.xz/src/div_2ui.c Changed

_service:tar_scm:mpfr-4.2.0.tar.xz/src/div_d.c -> _service:tar_scm:mpfr-4.2.1.tar.xz/src/div_d.c Changed

_service:tar_scm:mpfr-4.2.0.tar.xz/src/div_ui.c -> _service:tar_scm:mpfr-4.2.1.tar.xz/src/div_ui.c Changed

_service:tar_scm:mpfr-4.2.0.tar.xz/src/eint.c -> _service:tar_scm:mpfr-4.2.1.tar.xz/src/eint.c Changed

@@ -47,8 +47,8 @@
   MPFR_GROUP_DECL (group);
 
   MPFR_LOG_FUNC (
-    ("x%Pu=%.*Rg", mpfr_get_prec (x), mpfr_log_prec, x),
-    ("y%Pu=%.*Rg", mpfr_get_prec (y), mpfr_log_prec, y));
+    ("x%Pd=%.*Rg", mpfr_get_prec (x), mpfr_log_prec, x),
+    ("y%Pd=%.*Rg", mpfr_get_prec (y), mpfr_log_prec, y));
 
   /* for |x| <= 1, we have S := sum(x^k/k/k!, k=1..infinity) = x + R(x)
      where |R(x)| <= (x/2)^2/(1-|x|/2) <= 2*(x/2)^2
@@ -182,7 +182,7 @@
   mpfr_exp_t err_exp;
 
   MPFR_LOG_FUNC (
-    ("x%Pu=%.*Rg", mpfr_get_prec (x), mpfr_log_prec, x),
+    ("x%Pd=%.*Rg", mpfr_get_prec (x), mpfr_log_prec, x),
     ("err_exp=%" MPFR_EXP_FSPEC "d", (mpfr_eexp_t) err_exp));
 
   mpfr_init2 (t, p);
@@ -232,8 +232,8 @@
   MPFR_ZIV_DECL (loop);
 
   MPFR_LOG_FUNC (
-    ("x%Pu=%.*Rg rnd=%d", mpfr_get_prec (x), mpfr_log_prec, x, rnd),
-    ("y%Pu=%.*Rg inexact=%d", mpfr_get_prec (y), mpfr_log_prec, y, inex));
+    ("x%Pd=%.*Rg rnd=%d", mpfr_get_prec (x), mpfr_log_prec, x, rnd),
+    ("y%Pd=%.*Rg inexact=%d", mpfr_get_prec (y), mpfr_log_prec, y, inex));
 
   if (MPFR_UNLIKELY (MPFR_IS_SINGULAR (x)))
     {

_service:tar_scm:mpfr-4.2.0.tar.xz/src/erf.c -> _service:tar_scm:mpfr-4.2.1.tar.xz/src/erf.c Changed

_service:tar_scm:mpfr-4.2.0.tar.xz/src/erfc.c -> _service:tar_scm:mpfr-4.2.1.tar.xz/src/erfc.c Changed

_service:tar_scm:mpfr-4.2.0.tar.xz/src/exceptions.c -> _service:tar_scm:mpfr-4.2.1.tar.xz/src/exceptions.c Changed

_service:tar_scm:mpfr-4.2.0.tar.xz/src/exp.c -> _service:tar_scm:mpfr-4.2.1.tar.xz/src/exp.c Changed

_service:tar_scm:mpfr-4.2.0.tar.xz/src/exp10m1.c -> _service:tar_scm:mpfr-4.2.1.tar.xz/src/exp10m1.c Changed

_service:tar_scm:mpfr-4.2.0.tar.xz/src/exp2.c -> _service:tar_scm:mpfr-4.2.1.tar.xz/src/exp2.c Changed

_service:tar_scm:mpfr-4.2.0.tar.xz/src/exp2m1.c -> _service:tar_scm:mpfr-4.2.1.tar.xz/src/exp2m1.c Changed

_service:tar_scm:mpfr-4.2.0.tar.xz/src/exp3.c -> _service:tar_scm:mpfr-4.2.1.tar.xz/src/exp3.c Changed

_service:tar_scm:mpfr-4.2.0.tar.xz/src/exp_2.c -> _service:tar_scm:mpfr-4.2.1.tar.xz/src/exp_2.c Changed

_service:tar_scm:mpfr-4.2.0.tar.xz/src/expm1.c -> _service:tar_scm:mpfr-4.2.1.tar.xz/src/expm1.c Changed

_service:tar_scm:mpfr-4.2.0.tar.xz/src/fma.c -> _service:tar_scm:mpfr-4.2.1.tar.xz/src/fma.c Changed

_service:tar_scm:mpfr-4.2.0.tar.xz/src/fmma.c -> _service:tar_scm:mpfr-4.2.1.tar.xz/src/fmma.c Changed

_service:tar_scm:mpfr-4.2.0.tar.xz/src/fmod_ui.c -> _service:tar_scm:mpfr-4.2.1.tar.xz/src/fmod_ui.c Changed

_service:tar_scm:mpfr-4.2.0.tar.xz/src/frexp.c -> _service:tar_scm:mpfr-4.2.1.tar.xz/src/frexp.c Changed

_service:tar_scm:mpfr-4.2.0.tar.xz/src/gamma.c -> _service:tar_scm:mpfr-4.2.1.tar.xz/src/gamma.c Changed

_service:tar_scm:mpfr-4.2.0.tar.xz/src/get_str.c -> _service:tar_scm:mpfr-4.2.1.tar.xz/src/get_str.c Changed

_service:tar_scm:mpfr-4.2.0.tar.xz/src/hypot.c -> _service:tar_scm:mpfr-4.2.1.tar.xz/src/hypot.c Changed

_service:tar_scm:mpfr-4.2.0.tar.xz/src/inp_str.c -> _service:tar_scm:mpfr-4.2.1.tar.xz/src/inp_str.c Changed

@@ -69,15 +69,25 @@
       if (c == EOF || isspace (c))
         break;
       strstr_size++ = (unsigned char) c;
+      /* If c is '\0' (while not being a whitespace character), the word will
+         not have a valid format. But in the context of a string in memory,
+         '\0' is a terminating null character. So, to avoid ending with a
+         valid string format (like "1" with ignored characters after the
+         terminating null character), we need to make sure that the string
+         does not have a valid format; so let's start it with '*'. Note
+         that we should read the full word, so we cannot break. */
+      if (MPFR_UNLIKELY (c == '\0'))
+        str0 = '*';
       if (str_size == (size_t) -1)
         break;
       c = getc (stream);
     }
-  /* FIXME: The use of ungetc has been deprecated since C99 when it
-     occurs at the beginning of a binary stream, and this may happen
-     on /dev/null. One could add a "if (c != EOF)" test, but let's
-     wait for some discussion in comp.std.c first... */
-  ungetc (c, stream);
+  /* The use of ungetc has been deprecated since C99 when it occurs at the
+     beginning of a binary stream, and this may happen on /dev/null. Here,
+     this is possible only for c == EOF. The condition "if (c != EOF)" below
+     is just there to handle this case. */
+  if (c != EOF)
+    ungetc (c, stream);
 
   if (MPFR_UNLIKELY (str_size == (size_t) -1 || str_size == 0 ||
                      (c == EOF && ! feof (stream))))

_service:tar_scm:mpfr-4.2.0.tar.xz/src/jn.c -> _service:tar_scm:mpfr-4.2.1.tar.xz/src/jn.c Changed

_service:tar_scm:mpfr-4.2.0.tar.xz/src/li2.c -> _service:tar_scm:mpfr-4.2.1.tar.xz/src/li2.c Changed

_service:tar_scm:mpfr-4.2.0.tar.xz/src/lngamma.c -> _service:tar_scm:mpfr-4.2.1.tar.xz/src/lngamma.c Changed

@@ -34,8 +34,8 @@
 mpfr_gamma_alpha (mpfr_ptr s, mpfr_prec_t p)
 {
   MPFR_LOG_FUNC
-    (("p=%Pu", p),
-     ("s%Pu=%.*Rg", mpfr_get_prec (s), mpfr_log_prec, s));
+    (("p=%Pd", p),
+     ("s%Pd=%.*Rg", mpfr_get_prec (s), mpfr_log_prec, s));
 
   if (p <= 100)
     mpfr_set_ui_2exp (s, 614, -10, MPFR_RNDN); /* about 0.6 */
@@ -179,8 +179,8 @@
   MPFR_ZIV_DECL (loop);
 
   MPFR_LOG_FUNC
-    (("x%Pu=%.*Rg rnd=%d", mpfr_get_prec (z0), mpfr_log_prec, z0, rnd),
-     ("y%Pu=%.*Rg inexact=%d",
+    (("x%Pd=%.*Rg rnd=%d", mpfr_get_prec (z0), mpfr_log_prec, z0, rnd),
+     ("y%Pd=%.*Rg inexact=%d",
       mpfr_get_prec (y), mpfr_log_prec, y, inexact));
 
   compared = mpfr_cmp_ui (z0, 1);
@@ -723,8 +723,8 @@
   int inex;
 
   MPFR_LOG_FUNC
-    (("x%Pu=%.*Rg rnd=%d", mpfr_get_prec (x), mpfr_log_prec, x, rnd),
-     ("y%Pu=%.*Rg inexact=%d",
+    (("x%Pd=%.*Rg rnd=%d", mpfr_get_prec (x), mpfr_log_prec, x, rnd),
+     ("y%Pd=%.*Rg inexact=%d",
       mpfr_get_prec (y), mpfr_log_prec, y, inex));
 
   /* special cases */
@@ -763,8 +763,8 @@
   int inex;
 
   MPFR_LOG_FUNC
-    (("x%Pu=%.*Rg rnd=%d", mpfr_get_prec (x), mpfr_log_prec, x, rnd),
-     ("y%Pu=%.*Rg signp=%d inexact=%d",
+    (("x%Pd=%.*Rg rnd=%d", mpfr_get_prec (x), mpfr_log_prec, x, rnd),
+     ("y%Pd=%.*Rg signp=%d inexact=%d",
       mpfr_get_prec (y), mpfr_log_prec, y, *signp, inex));
 
   *signp = 1;  /* most common case */

_service:tar_scm:mpfr-4.2.0.tar.xz/src/log.c -> _service:tar_scm:mpfr-4.2.1.tar.xz/src/log.c Changed

_service:tar_scm:mpfr-4.2.0.tar.xz/src/log10.c -> _service:tar_scm:mpfr-4.2.1.tar.xz/src/log10.c Changed

_service:tar_scm:mpfr-4.2.0.tar.xz/src/log10p1.c -> _service:tar_scm:mpfr-4.2.1.tar.xz/src/log10p1.c Changed

_service:tar_scm:mpfr-4.2.0.tar.xz/src/log1p.c -> _service:tar_scm:mpfr-4.2.1.tar.xz/src/log1p.c Changed

_service:tar_scm:mpfr-4.2.0.tar.xz/src/log2.c -> _service:tar_scm:mpfr-4.2.1.tar.xz/src/log2.c Changed

_service:tar_scm:mpfr-4.2.0.tar.xz/src/log2p1.c -> _service:tar_scm:mpfr-4.2.1.tar.xz/src/log2p1.c Changed

_service:tar_scm:mpfr-4.2.0.tar.xz/src/modf.c -> _service:tar_scm:mpfr-4.2.1.tar.xz/src/modf.c Changed

_service:tar_scm:mpfr-4.2.0.tar.xz/src/mpfr-gmp.h -> _service:tar_scm:mpfr-4.2.1.tar.xz/src/mpfr-gmp.h Changed

@@ -468,14 +468,22 @@
    and outputs may overlap.
 */
 #ifndef udiv_qr_3by2
-#define udiv_qr_3by2(q, r1, r0, n2, n1, n0, d1, d0, dinv)               \
+# ifdef MPFR_USE_MINI_GMP
+/* Avoid integer overflow on int in case of integer promotion
+   (when mp_limb_t is shorter than int). Note that unsigned long
+   may be longer than necessary, but GCC seems to optimize. */
+#  define OP_CAST (unsigned long)
+# else
+#  define OP_CAST
+# endif
+# define udiv_qr_3by2(q, r1, r0, n2, n1, n0, d1, d0, dinv)              \
   do {                                                                  \
     mp_limb_t _q0, _t1, _t0, _mask;                                     \
     umul_ppmm ((q), _q0, (n2), (dinv));                                 \
     add_ssaaaa ((q), _q0, (q), _q0, (n2), (n1));                        \
                                                                         \
     /* Compute the two most significant limbs of n - q'd */             \
-    (r1) = (n1) - (d1) * (q);                                           \
+    (r1) = (n1) - OP_CAST (d1) * (q);                                   \
     (r0) = (n0);                                                        \
     sub_ddmmss ((r1), (r0), (r1), (r0), (d1), (d0));                    \
     umul_ppmm (_t1, _t0, (d0), (q));                                    \

_service:tar_scm:mpfr-4.2.0.tar.xz/src/mpfr-impl.h -> _service:tar_scm:mpfr-4.2.1.tar.xz/src/mpfr-impl.h Changed

@@ -1655,8 +1655,10 @@
    this can be found in practice: https://reviews.llvm.org/D27167 says:
    "I found this problem on FreeBSD 11, where thousands_sep in fr_FR.UTF-8
    is a no-break space (U+00A0)."
-   Note, however, that this is not allowed by the C standard, which just
-   says "character" and not "multibyte character".
+   Under Linux, this is U+202F NARROW NO-BREAK SPACE (e2 80 af).
+   And in the ps_AF locale,
+     decimal_point = U+066B ARABIC DECIMAL SEPARATOR (d9 ab)
+     thousands_sep = U+066C ARABIC THOUSANDS SEPARATOR (d9 ac)
    In the mean time, in case of non-single-byte character, revert to the
    default value. */
 #if MPFR_LCONV_DPTS
@@ -2192,7 +2194,7 @@
   while (0)
 
 #define MPFR_LOG_VAR(x)                                                 \
-  LOG_PRINT (MPFR_LOG_INTERNAL_F, "%s.%d:%s%#Pu=%.*Rg\n", __func__,   \
+  LOG_PRINT (MPFR_LOG_INTERNAL_F, "%s.%d:%s%#Pd=%.*Rg\n", __func__,   \
              (int) __LINE__, #x, mpfr_get_prec (x), mpfr_log_prec, x)
 
 #define MPFR_LOG_MSG2(format, ...)                                      \

_service:tar_scm:mpfr-4.2.0.tar.xz/src/mpfr-thread.h -> _service:tar_scm:mpfr-4.2.1.tar.xz/src/mpfr-thread.h Changed

@@ -64,10 +64,13 @@
 #define MPFR_LOCK_DECL(_lock)                   \
   mtx_t _lock;
 
-#define MPFR_LOCK_C(E)                          \
-  do {                                          \
-    if ((E) != thrd_success)                    \
-      abort ();                                 \
+#define MPFR_LOCK_C(E)                                  \
+  do {                                                  \
+    if ((E) != thrd_success)                            \
+      {                                                 \
+        fprintf (stderr, "MPFR lock failure\n");        \
+        abort ();                                       \
+      }                                                 \
   } while (0)
 
 #define MPFR_LOCK_INIT(_lock)    MPFR_LOCK_C(mtx_init(&(_lock), mtx_plain))
@@ -107,10 +110,13 @@
 #define MPFR_LOCK_DECL(_lock)                   \
   pthread_rwlock_t _lock;
 
-#define MPFR_LOCK_C(E)                          \
-  do {                                          \
-    if ((E) != 0)                               \
-      abort ();                                 \
+#define MPFR_LOCK_C(E)                                  \
+  do {                                                  \
+    if ((E) != 0)                                       \
+      {                                                 \
+        fprintf (stderr, "MPFR lock failure\n");        \
+        abort ();                                       \
+      }                                                 \
   } while (0)
 
 #define MPFR_LOCK_INIT(_lock) MPFR_LOCK_C(pthread_rwlock_init(&(_lock), NULL))

_service:tar_scm:mpfr-4.2.0.tar.xz/src/mpfr.h -> _service:tar_scm:mpfr-4.2.1.tar.xz/src/mpfr.h Changed

_service:tar_scm:mpfr-4.2.0.tar.xz/src/mul.c -> _service:tar_scm:mpfr-4.2.1.tar.xz/src/mul.c Changed

_service:tar_scm:mpfr-4.2.0.tar.xz/src/mul_2si.c -> _service:tar_scm:mpfr-4.2.1.tar.xz/src/mul_2si.c Changed

_service:tar_scm:mpfr-4.2.0.tar.xz/src/mul_2ui.c -> _service:tar_scm:mpfr-4.2.1.tar.xz/src/mul_2ui.c Changed

_service:tar_scm:mpfr-4.2.0.tar.xz/src/mul_d.c -> _service:tar_scm:mpfr-4.2.1.tar.xz/src/mul_d.c Changed

_service:tar_scm:mpfr-4.2.0.tar.xz/src/pow.c -> _service:tar_scm:mpfr-4.2.1.tar.xz/src/pow.c Changed

@@ -64,7 +64,7 @@
   MPFR_ASSERTD (d < 0);
 
   /* Compute a,b such that x=a*2^b.
-     Since a comes from a regular MPFR number, due to the constrainst on the
+     Since a comes from a regular MPFR number, due to the constraints on the
      exponent and the precision, there can be no integer overflow below. */
   mpz_init (a);
   b = mpfr_get_z_2exp (a, x);
@@ -131,14 +131,13 @@
   /* Declaration of the size variable */
   mpfr_prec_t Nz = MPFR_PREC(z);               /* target precision */
   mpfr_prec_t Nt;                              /* working precision */
-  mpfr_exp_t err;                              /* error */
   MPFR_ZIV_DECL (ziv_loop);
 
   MPFR_LOG_FUNC
-    (("x%Pu=%.*Rg y%Pu=%.*Rg rnd=%d",
+    (("x%Pd=%.*Rg y%Pd=%.*Rg rnd=%d",
       mpfr_get_prec (x), mpfr_log_prec, x,
       mpfr_get_prec (y), mpfr_log_prec, y, rnd_mode),
-     ("z%Pu=%.*Rg inexact=%d",
+     ("z%Pd=%.*Rg inexact=%d",
       mpfr_get_prec (z), mpfr_log_prec, z, inexact));
 
   /* We put the absolute value of x in absx, pointing to the significand
@@ -171,12 +170,14 @@
   MPFR_ZIV_INIT (ziv_loop, Nt);
   for (;;)
     {
+      mpfr_exp_t err, exp_t;
       MPFR_BLOCK_DECL (flags1);
 
       /* compute exp(y*ln|x|), using MPFR_RNDU to get an upper bound, so
          that we can detect underflows. */
       mpfr_log (t, absx, MPFR_IS_NEG (y) ? MPFR_RNDD : MPFR_RNDU); /* ln|x| */
       mpfr_mul (t, y, t, MPFR_RNDU);                              /* y*ln|x| */
+      exp_t = MPFR_GET_EXP (t);
       if (k_non_zero)
         {
           MPFR_LOG_MSG (("subtract k * ln(2)\n", 0));
@@ -188,14 +189,16 @@
           MPFR_LOG_VAR (t);
         }
       /* estimate of the error -- see pow function in algorithms.tex.
-         The error on t is at most 1/2 + 3*2^(EXP(t)+1) ulps, which is
-         <= 2^(EXP(t)+3) for EXP(t) >= -1, and <= 2 ulps for EXP(t) <= -2.
+         The error on t before the subtraction of k*log(2) is at most
+         1/2 + 3*2^(EXP(t)+1) ulps, which is <= 2^(EXP(t)+3) for EXP(t) >= -1,
+         and <= 2 ulps for EXP(t) <= -2.
          Additional error if k_no_zero: treal = t * errk, with
          1 - |k| * 2^(-Nt) <= exp(-|k| * 2^(-Nt)) <= errk <= 1,
          i.e., additional absolute error <= 2^(EXP(k)+EXP(t)-Nt).
-         Total error <= 2^err1 + 2^err2 <= 2^(max(err1,err2)+1). */
-      err = MPFR_NOTZERO (t) && MPFR_GET_EXP (t) >= -1 ?
-        MPFR_GET_EXP (t) + 3 : 1;
+         Total ulp error <= 2^err1 + 2^err2 <= 2^(max(err1,err2)+1),
+         where err1 = EXP(t)+3 for EXP(t) >= -1, and 1 otherwise,
+         and err2 = EXP(k). */
+      err = MPFR_NOTZERO (t) && exp_t >= -1 ? exp_t + 3 : 1;
       if (k_non_zero)
         {
           if (MPFR_GET_EXP (k) > err)
@@ -328,11 +331,17 @@
        */
       if (rnd_mode == MPFR_RNDN && inexact < 0 && lk < 0 &&
           MPFR_GET_EXP (z) == __gmpfr_emin - 1 - lk && mpfr_powerof2_raw (z))
-        /* Rounding to nearest, real result > z * 2^k = 2^(emin - 2),
-         * underflow case: we will obtain the correct result and exceptions
-         *  by replacing z by nextabove(z).
-         */
-        mpfr_nextabove (z);
+        /* Rounding to nearest, exact result > z * 2^k = 2^(emin - 2),
+         * and underflow case because the rounded result assuming an
+         * unbounded exponent range is 2^(emin - 2). We need to round
+         * to 2^(emin - 1), i.e. to round toward +inf.
+         * Note: the old code was using "mpfr_nextabove (z);" instead of
+         * setting rnd_mode to MPFR_RNDU for the call to mpfr_mul_2si, but
+         * this was incorrect in precision 1 because in this precision,
+         * mpfr_nextabove gave 2^(emin - 1), which is representable,
+         * so that mpfr_mul_2si did not generate the wanted underflow
+         * (the value was correct, but the underflow flag was missing). */
+        rnd_mode = MPFR_RNDU;
       MPFR_CLEAR_FLAGS ();
       inex2 = mpfr_mul_2si (z, z, lk, rnd_mode);
       if (inex2)  /* underflow or overflow */
@@ -385,10 +394,10 @@
   MPFR_SAVE_EXPO_DECL (expo);
 
   MPFR_LOG_FUNC
-    (("x%Pu=%.*Rg y%Pu=%.*Rg rnd=%d",
+    (("x%Pd=%.*Rg y%Pd=%.*Rg rnd=%d",
       mpfr_get_prec (x), mpfr_log_prec, x,
       mpfr_get_prec (y), mpfr_log_prec, y, rnd_mode),
-     ("z%Pu=%.*Rg inexact=%d",
+     ("z%Pd=%.*Rg inexact=%d",
       mpfr_get_prec (z), mpfr_log_prec, z, inexact));
 
   if (MPFR_ARE_SINGULAR (x, y))

_service:tar_scm:mpfr-4.2.0.tar.xz/src/pow_si.c -> _service:tar_scm:mpfr-4.2.1.tar.xz/src/pow_si.c Changed

_service:tar_scm:mpfr-4.2.0.tar.xz/src/pow_ui.c -> _service:tar_scm:mpfr-4.2.1.tar.xz/src/pow_ui.c Changed

_service:tar_scm:mpfr-4.2.0.tar.xz/src/pow_z.c -> _service:tar_scm:mpfr-4.2.1.tar.xz/src/pow_z.c Changed

_service:tar_scm:mpfr-4.2.0.tar.xz/src/rec_sqrt.c -> _service:tar_scm:mpfr-4.2.1.tar.xz/src/rec_sqrt.c Changed

_service:tar_scm:mpfr-4.2.0.tar.xz/src/reldiff.c -> _service:tar_scm:mpfr-4.2.1.tar.xz/src/reldiff.c Changed

@@ -30,31 +30,25 @@
 
   if (MPFR_ARE_SINGULAR (b, c))
     {
-      if (MPFR_IS_NAN(b) || MPFR_IS_NAN(c))
+      if (MPFR_IS_NAN (b) || MPFR_IS_INF (b) || MPFR_IS_NAN (c) ||
+          (MPFR_IS_ZERO (b) && MPFR_IS_ZERO (c)))
         {
-          MPFR_SET_NAN(a);
+          MPFR_SET_NAN (a);
           return;
         }
-      else if (MPFR_IS_INF(b))
-        {
-          if (MPFR_IS_INF (c) && (MPFR_SIGN (c) == MPFR_SIGN (b)))
-            MPFR_SET_ZERO(a);
-          else
-            MPFR_SET_NAN(a);
-          return;
-        }
-      else if (MPFR_IS_INF(c))
+      if (MPFR_IS_ZERO (b) || MPFR_IS_INF (c))
         {
           MPFR_SET_SAME_SIGN (a, b);
           MPFR_SET_INF (a);
           return;
         }
-      else if (MPFR_IS_ZERO(b)) /* reldiff = abs(c)/c = sign(c) */
-        {
-          mpfr_set_si (a, MPFR_INT_SIGN (c), rnd_mode);
-          return;
-        }
-      /* Fall through */
+      /* The case c = 0 with b regular, which should give sign(b) exactly,
+         cannot be optimized here as it is documented in the MPFR manual
+         that this function just computes abs(b-c)/b using the precision
+         of a and the rounding mode rnd_mode for all operations. So let's
+         prefer the potentially "incorrect" result. Note that the correct
+         result is not necessarily better because if could break properties
+         (like monotonicity?) implied by the documentation. */
     }
 
   if (a == b)
@@ -64,8 +58,8 @@
     }
 
   mpfr_sub (a, b, c, rnd_mode);
-  mpfr_abs (a, a, rnd_mode); /* for compatibility with MPF */
-  mpfr_div (a, a, (a == b) ? b_copy : b, rnd_mode);
+  MPFR_SET_SIGN (a, 1);
+  mpfr_div (a, a, a == b ? b_copy : b, rnd_mode);
 
   if (a == b)
     mpfr_clear (b_copy);

_service:tar_scm:mpfr-4.2.0.tar.xz/src/root.c -> _service:tar_scm:mpfr-4.2.1.tar.xz/src/root.c Changed

@@ -54,9 +54,9 @@
   MPFR_SAVE_EXPO_DECL (expo);
 
   MPFR_LOG_FUNC
-    (("x%Pu=%.*Rg k=%lu rnd=%d",
+    (("x%Pd=%.*Rg k=%lu rnd=%d",
       mpfr_get_prec (x), mpfr_log_prec, x, k, rnd_mode),
-     ("y%Pu=%.*Rg inexact=%d",
+     ("y%Pd=%.*Rg inexact=%d",
       mpfr_get_prec (y), mpfr_log_prec, y, inexact));
 
   if (MPFR_UNLIKELY (k <= 1))
@@ -306,9 +306,9 @@
   MPFR_SAVE_EXPO_DECL (expo);
 
   MPFR_LOG_FUNC
-    (("x%Pu=%.*Rg k=%lu rnd=%d",
+    (("x%Pd=%.*Rg k=%lu rnd=%d",
       mpfr_get_prec (x), mpfr_log_prec, x, k, rnd_mode),
-     ("y%Pu=%.*Rg inexact=%d",
+     ("y%Pd=%.*Rg inexact=%d",
       mpfr_get_prec (y), mpfr_log_prec, y, inexact));
 
   if (k >= 0)
@@ -441,9 +441,9 @@
 mpfr_root (mpfr_ptr y, mpfr_srcptr x, unsigned long k, mpfr_rnd_t rnd_mode)
 {
   MPFR_LOG_FUNC
-    (("x%Pu=%.*Rg k=%lu rnd=%d",
+    (("x%Pd=%.*Rg k=%lu rnd=%d",
       mpfr_get_prec (x), mpfr_log_prec, x, k, rnd_mode),
-     ("y%Pu=%.*Rg",
+     ("y%Pd=%.*Rg",
       mpfr_get_prec (y), mpfr_log_prec, y));
 
   /* Like mpfr_rootn_ui... */

_service:tar_scm:mpfr-4.2.0.tar.xz/src/set_prec.c -> _service:tar_scm:mpfr-4.2.1.tar.xz/src/set_prec.c Changed

_service:tar_scm:mpfr-4.2.0.tar.xz/src/si_op.c -> _service:tar_scm:mpfr-4.2.1.tar.xz/src/si_op.c Changed

@@ -33,9 +33,9 @@
   int res;
 
   MPFR_LOG_FUNC
-    (("x%Pu=%.*Rg u=%ld rnd=%d",
+    (("x%Pd=%.*Rg u=%ld rnd=%d",
       mpfr_get_prec(x), mpfr_log_prec, x, u, rnd_mode),
-     ("y%Pu=%.*Rg inexact=%d",
+     ("y%Pd=%.*Rg inexact=%d",
       mpfr_get_prec(y), mpfr_log_prec, y, res));
 
   if (u >= 0)
@@ -52,9 +52,9 @@
   int res;
 
   MPFR_LOG_FUNC
-    (("x%Pu=%.*Rg u=%ld rnd=%d",
+    (("x%Pd=%.*Rg u=%ld rnd=%d",
       mpfr_get_prec(x), mpfr_log_prec, x, u, rnd_mode),
-     ("y%Pu=%.*Rg inexact=%d",
+     ("y%Pd=%.*Rg inexact=%d",
       mpfr_get_prec(y), mpfr_log_prec, y, res));
 
   if (u >= 0)
@@ -71,9 +71,9 @@
   int res;
 
   MPFR_LOG_FUNC
-    (("x%Pu=%.*Rg u=%ld rnd=%d",
+    (("x%Pd=%.*Rg u=%ld rnd=%d",
       mpfr_get_prec(x), mpfr_log_prec, x, u, rnd_mode),
-     ("y%Pu=%.*Rg inexact=%d",
+     ("y%Pd=%.*Rg inexact=%d",
       mpfr_get_prec(y), mpfr_log_prec, y, res));
 
   if (u >= 0)
@@ -95,9 +95,9 @@
   int res;
 
   MPFR_LOG_FUNC
-    (("x%Pu=%.*Rg u=%ld rnd=%d",
+    (("x%Pd=%.*Rg u=%ld rnd=%d",
       mpfr_get_prec(x), mpfr_log_prec, x, u, rnd_mode),
-     ("y%Pu=%.*Rg inexact=%d",
+     ("y%Pd=%.*Rg inexact=%d",
       mpfr_get_prec(y), mpfr_log_prec, y, res));
 
   if (u >= 0)
@@ -119,9 +119,9 @@
   int res;
 
   MPFR_LOG_FUNC
-    (("x%Pu=%.*Rg u=%ld rnd=%d",
+    (("x%Pd=%.*Rg u=%ld rnd=%d",
       mpfr_get_prec(x), mpfr_log_prec, x, u, rnd_mode),
-     ("y%Pu=%.*Rg inexact=%d",
+     ("y%Pd=%.*Rg inexact=%d",
       mpfr_get_prec(y), mpfr_log_prec, y, res));
 
   if (u >= 0)
@@ -142,9 +142,9 @@
   int res;
 
   MPFR_LOG_FUNC
-    (("x%Pu=%.*Rg u=%ld rnd=%d",
+    (("x%Pd=%.*Rg u=%ld rnd=%d",
       mpfr_get_prec(x), mpfr_log_prec, x, u, rnd_mode),
-     ("y%Pu=%.*Rg inexact=%d",
+     ("y%Pd=%.*Rg inexact=%d",
       mpfr_get_prec(y), mpfr_log_prec, y, res));
 
   if (u >= 0)

_service:tar_scm:mpfr-4.2.0.tar.xz/src/sin.c -> _service:tar_scm:mpfr-4.2.1.tar.xz/src/sin.c Changed

_service:tar_scm:mpfr-4.2.0.tar.xz/src/sin_cos.c -> _service:tar_scm:mpfr-4.2.1.tar.xz/src/sin_cos.c Changed

_service:tar_scm:mpfr-4.2.0.tar.xz/src/sinh.c -> _service:tar_scm:mpfr-4.2.1.tar.xz/src/sinh.c Changed

_service:tar_scm:mpfr-4.2.0.tar.xz/src/sinh_cosh.c -> _service:tar_scm:mpfr-4.2.1.tar.xz/src/sinh_cosh.c Changed

_service:tar_scm:mpfr-4.2.0.tar.xz/src/sinu.c -> _service:tar_scm:mpfr-4.2.1.tar.xz/src/sinu.c Changed

_service:tar_scm:mpfr-4.2.0.tar.xz/src/sqr.c -> _service:tar_scm:mpfr-4.2.1.tar.xz/src/sqr.c Changed

_service:tar_scm:mpfr-4.2.0.tar.xz/src/sqrt.c -> _service:tar_scm:mpfr-4.2.1.tar.xz/src/sqrt.c Changed

_service:tar_scm:mpfr-4.2.0.tar.xz/src/sqrt_ui.c -> _service:tar_scm:mpfr-4.2.1.tar.xz/src/sqrt_ui.c Changed

_service:tar_scm:mpfr-4.2.0.tar.xz/src/strtofr.c -> _service:tar_scm:mpfr-4.2.1.tar.xz/src/strtofr.c Changed

@@ -242,7 +242,10 @@
   pstr->mantissa = NULL;
 
   /* Optional leading whitespace */
-  while (isspace((unsigned char) *str)) str++;
+  /* For non-"C" locales, the ISO C standard allows isspace(0) to
+     return true. So we need to stop explicitly on '\0'. */
+  while (*str != '\0' && isspace ((unsigned char) *str))
+    str++;
 
   /* An optional sign `+' or `-' */
   pstr->negative = (*str == '-');
@@ -425,7 +428,8 @@
   /* Remove 0's at the beginning and end of mantissa0..prec-1 */
   mant = pstr->mantissa;
   for ( ; (pstr->prec > 0) && (*mant == 0) ; mant++, pstr->prec--)
-    pstr->exp_base--;
+    if (MPFR_LIKELY (pstr->exp_base != MPFR_EXP_MIN))
+      pstr->exp_base--;
   for ( ; (pstr->prec > 0) && (mantpstr->prec - 1 == 0); pstr->prec--);
   pstr->mant = mant;
 
@@ -738,7 +742,9 @@
           MPN_ZERO (y0, ysize);
 
           /* pstr_size - pstr->exp_base can overflow */
-          MPFR_SADD_OVERFLOW (exp_z, (mpfr_exp_t) pstr_size, -pstr->exp_base,
+          exp_z = pstr->exp_base == MPFR_EXP_MIN ?
+            MPFR_EXP_MAX : -pstr->exp_base;  /* avoid integer overflow */
+          MPFR_SADD_OVERFLOW (exp_z, (mpfr_exp_t) pstr_size, exp_z,
                               mpfr_exp_t, mpfr_uexp_t,
                               MPFR_EXP_MIN, MPFR_EXP_MAX,
                               goto underflow, goto overflow);
@@ -862,7 +868,7 @@
           err = 0;
         }
 
-      MPFR_LOG_MSG (("exact = %d, err = %d, precx = %Pu\n",
+      MPFR_LOG_MSG (("exact = %d, err = %d, precx = %Pd\n",
                      exact, err, precx));
 
       /* at this point, result is an approximation rounded toward zero

_service:tar_scm:mpfr-4.2.0.tar.xz/src/sub.c -> _service:tar_scm:mpfr-4.2.1.tar.xz/src/sub.c Changed

_service:tar_scm:mpfr-4.2.0.tar.xz/src/sub_d.c -> _service:tar_scm:mpfr-4.2.1.tar.xz/src/sub_d.c Changed

_service:tar_scm:mpfr-4.2.0.tar.xz/src/sub_ui.c -> _service:tar_scm:mpfr-4.2.1.tar.xz/src/sub_ui.c Changed

_service:tar_scm:mpfr-4.2.0.tar.xz/src/sum.c -> _service:tar_scm:mpfr-4.2.1.tar.xz/src/sum.c Changed

_service:tar_scm:mpfr-4.2.0.tar.xz/src/tan.c -> _service:tar_scm:mpfr-4.2.1.tar.xz/src/tan.c Changed

_service:tar_scm:mpfr-4.2.0.tar.xz/src/tanh.c -> _service:tar_scm:mpfr-4.2.1.tar.xz/src/tanh.c Changed

_service:tar_scm:mpfr-4.2.0.tar.xz/src/tanu.c -> _service:tar_scm:mpfr-4.2.1.tar.xz/src/tanu.c Changed

_service:tar_scm:mpfr-4.2.0.tar.xz/src/ubf.c -> _service:tar_scm:mpfr-4.2.1.tar.xz/src/ubf.c Changed

_service:tar_scm:mpfr-4.2.0.tar.xz/src/ui_div.c -> _service:tar_scm:mpfr-4.2.1.tar.xz/src/ui_div.c Changed

_service:tar_scm:mpfr-4.2.0.tar.xz/src/ui_pow_ui.c -> _service:tar_scm:mpfr-4.2.1.tar.xz/src/ui_pow_ui.c Changed

@@ -23,7 +23,7 @@
 #include "mpfr-impl.h"
 
 int
-mpfr_ui_pow_ui (mpfr_ptr x, unsigned long int y, unsigned long int n,
+mpfr_ui_pow_ui (mpfr_ptr x, unsigned long int k, unsigned long int n,
                 mpfr_rnd_t rnd)
 {
   mpfr_exp_t err;
@@ -35,22 +35,28 @@
   MPFR_ZIV_DECL (loop);
   MPFR_SAVE_EXPO_DECL (expo);
 
+  MPFR_LOG_FUNC
+    (("k=%lu n=%lu rnd=%d", k, n, rnd),
+     ("y%Pd=%.*Rg inexact=%d",
+      mpfr_get_prec (x), mpfr_log_prec, x, inexact));
+
   if (MPFR_UNLIKELY (n <= 1))
     {
       if (n == 1)
-        return mpfr_set_ui (x, y, rnd);     /* y^1 = y */
+        return mpfr_set_ui (x, k, rnd);     /* k^1 = k */
       else
-        return mpfr_set_ui (x, 1, rnd);     /* y^0 = 1 for any y */
+        return mpfr_set_ui (x, 1, rnd);     /* k^0 = 1 for any k */
     }
-  else if (MPFR_UNLIKELY (y <= 1))
+  else if (MPFR_UNLIKELY (k <= 1))
     {
-      if (y == 1)
+      if (k == 1)
         return mpfr_set_ui (x, 1, rnd);     /* 1^n = 1 for any n > 0 */
       else
         return mpfr_set_ui (x, 0, rnd);     /* 0^n = 0 for any n > 0 */
     }
 
-  for (size_n = 0, m = n; m; size_n++, m >>= 1);
+  for (size_n = 0, m = n; m != 0; size_n++, m >>= 1)
+    ;
 
   MPFR_SAVE_EXPO_MARK (expo);
   prec = MPFR_PREC (x) + 3 + size_n;
@@ -60,23 +66,55 @@
   for (;;)
     {
       int i = size_n;
+      unsigned int inex_res;
 
-      inexact = mpfr_set_ui (res, y, MPFR_RNDU);
+      inex_res = mpfr_set_ui (res, k, MPFR_RNDU);
       err = 1;
       /* now 2^(i-1) <= n < 2^i: i=1+floor(log2(n)) */
       for (i -= 2; i >= 0; i--)
         {
-          inexact |= mpfr_sqr (res, res, MPFR_RNDU);
+          inex_res |= mpfr_sqr (res, res, MPFR_RNDU);
           err++;
           if (n & (1UL << i))
-            inexact |= mpfr_mul_ui (res, res, y, MPFR_RNDU);
+            inex_res |= mpfr_mul_ui (res, res, k, MPFR_RNDU);
         }
+
+      if (MPFR_UNLIKELY (MPFR_IS_INF (res)))
+        {
+          mpfr_t kf;
+          mpz_t z;
+          int size_k;
+          MPFR_BLOCK_DECL (flags);
+
+          /* Let's handle the overflow by calling mpfr_pow_z.
+             Alternatively, we could call mpfr_pow_ui; this would
+             need a bit shorter code below, but mpfr_pow_ui handles
+             the overflow by calling mpfr_pow_z, so that calling
+             mpfr_pow_z directly should be a bit more efficient. */
+
+          MPFR_ZIV_FREE (loop);
+          mpfr_clear (res);
+          for (size_k = 0, m = k; m != 0; size_k++, m >>= 1)
+            ;
+          mpfr_init2 (kf, size_k);
+          inexact = mpfr_set_ui (kf, k, MPFR_RNDN);
+          MPFR_ASSERTD (inexact == 0);
+          mpz_init (z);
+          mpz_set_ui (z, n);
+          MPFR_BLOCK (flags, inexact = mpfr_pow_z (x, kf, z, rnd););
+          mpz_clear (z);
+          mpfr_clear (kf);
+          MPFR_SAVE_EXPO_UPDATE_FLAGS (expo, flags);
+          goto end;
+        }
+
       /* since the loop is executed floor(log2(n)) times,
          we have err = 1+floor(log2(n)).
          Since prec >= MPFR_PREC(x) + 4 + floor(log2(n)), prec > err */
       err = prec - err;
 
-      if (MPFR_LIKELY (inexact == 0
+      MPFR_LOG_VAR (res);
+      if (MPFR_LIKELY (!inex_res
                        || MPFR_CAN_ROUND (res, err, MPFR_PREC (x), rnd)))
         break;
 
@@ -90,6 +128,7 @@
 
   mpfr_clear (res);
 
+ end:
   MPFR_SAVE_EXPO_FREE (expo);
   return mpfr_check_range (x, inexact, rnd);
 }

_service:tar_scm:mpfr-4.2.0.tar.xz/src/ui_sub.c -> _service:tar_scm:mpfr-4.2.1.tar.xz/src/ui_sub.c Changed

_service:tar_scm:mpfr-4.2.0.tar.xz/src/vasprintf.c -> _service:tar_scm:mpfr-4.2.1.tar.xz/src/vasprintf.c Changed

@@ -880,7 +880,7 @@
   enum pad_t pad_type;    /* Padding type */
   mpfr_intmax_t pad_size; /* Number of padding characters */
 
-  char sign;              /* Sign character */
+  char sign;              /* Sign character ('-', '+', ' ', or '\0') */
 
   char *prefix_ptr;       /* Pointer to prefix part */
   size_t prefix_size;     /* Number of characters in *prefix_ptr */
@@ -1067,12 +1067,6 @@
 
   uppercase = spec.spec == 'A';
 
-  /* sign */
-  if (MPFR_IS_NEG (p))
-    np->sign = '-';
-  else if (spec.showsign || spec.space)
-    np->sign = spec.showsign ? '+' : ' ';
-
   if (spec.spec == 'a' || spec.spec == 'A')
     /* prefix part */
     {
@@ -1290,12 +1284,6 @@
 
   const int uppercase = spec.spec == 'E' || spec.spec == 'G';
 
-  /* sign */
-  if (MPFR_IS_NEG (p))
-    np->sign = '-';
-  else if (spec.showsign || spec.space)
-    np->sign = spec.showsign ? '+' : ' ';
-
   /* integral part */
   np->ip_size = 1;
   if (dec_info == NULL)
@@ -1425,12 +1413,6 @@
      and it should have been changed to 6 before the function call) */
   MPFR_ASSERTD (spec.prec >= 0);
 
-  /* sign */
-  if (MPFR_IS_NEG (p))
-    np->sign = '-';
-  else if (spec.showsign || spec.space)
-    np->sign = spec.showsign ? '+' : ' ';
-
   if (MPFR_GET_EXP (p) <= 0)
     /* 0 < |p| < 1 */
     {
@@ -1725,8 +1707,7 @@
   /* WARNING: left justification means right space padding */
   np->pad_type = spec.left ? RIGHT : spec.pad == '0' ? LEADING_ZEROS : LEFT;
   np->pad_size = 0;
-  np->sign = '\0';
-  np->prefix_ptr =NULL;
+  np->prefix_ptr = NULL;
   np->prefix_size = 0;
   np->thousands_sep = '\0';
   np->ip_ptr = NULL;
@@ -1746,6 +1727,12 @@
   uppercase = spec.spec == 'A' || spec.spec == 'E' || spec.spec == 'F'
     || spec.spec == 'G';
 
+  /* The sign/space rule is the same for all cases. */
+  np->sign =
+    MPFR_IS_NEG (p) ? '-' :
+    spec.showsign ? '+' :
+    spec.space ? ' ' : '\0';
+
   if (MPFR_UNLIKELY (MPFR_IS_SINGULAR (p)))
     {
       if (MPFR_IS_NAN (p))
@@ -1767,9 +1754,6 @@
                with left spaces instead */
             np->pad_type = LEFT;
 
-          if (MPFR_IS_NEG (p))
-            np->sign = '-';
-
           np->ip_size = MPFR_INF_STRING_LENGTH;
           str = (char *) mpfr_allocate_func (1 + np->ip_size);
           strcpy (str, uppercase ? MPFR_INF_STRING_UC : MPFR_INF_STRING_LC);
@@ -1781,11 +1765,6 @@
           /* note: for 'g' spec, zero is always displayed with 'f'-style with
              precision spec.prec - 1 and the trailing zeros are removed unless
              the flag '#' is used. */
-          if (MPFR_IS_NEG (p))
-            /* signed zero */
-            np->sign = '-';
-          else if (spec.showsign || spec.space)
-            np->sign = spec.showsign ? '+' : ' ';
 
           if (spec.spec == 'a' || spec.spec == 'A')
             /* prefix part */
@@ -1849,9 +1828,6 @@
         /* change to right justification padding with left spaces */
         np->pad_type = LEFT;
 
-      if (MPFR_IS_NEG (p))
-        np->sign = '-';
-
       np->ip_size = 3;
       str = (char *) mpfr_allocate_func (1 + np->ip_size);
       strcpy (str, uppercase ? "UBF" : "ubf");
@@ -1888,7 +1864,7 @@
              precision T-1.
              where T is the threshold computed below and X is the exponent
              that would be displayed with style 'e' and precision T-1. */
-          int threshold;
+          mpfr_intmax_t threshold;
           mpfr_exp_t x, e, k;
           struct decimal_info dec_info;
 
@@ -1920,9 +1896,15 @@
           e = e <= 0 ? k : (e + 2) / 3 + (k <= 0 ? 0 : k);
           MPFR_ASSERTD (e >= 1);
 
+          if (e > threshold)
+            e = threshold;
+
+          /* error if e does not fit in size_t (for mpfr_get_str) */
+          if (e > (size_t) -1)
+            goto error;
+
           dec_info.str = mpfr_get_str (NULL, &dec_info.exp, 10,
-                                       e < threshold ? e : threshold,
-                                       p, spec.rnd_mode);
+                                       e, p, spec.rnd_mode);
           register_string (np->sl, dec_info.str);
           /* mpfr_get_str corresponds to a significand between 0.1 and 1,
              whereas here we want a significand between 1 and 10. */
@@ -2030,7 +2012,7 @@
   if (np.pad_type == LEFT && np.pad_size != 0)
     buffer_pad (buf, ' ', np.pad_size);
 
-  /* sign character (may be '-', '+', or ' ') */
+  /* sign character (may be '-', '+', ' ', or '\0') */
   if (np.sign)
     buffer_pad (buf, np.sign, 1);

_service:tar_scm:mpfr-4.2.0.tar.xz/src/version.c -> _service:tar_scm:mpfr-4.2.1.tar.xz/src/version.c Changed

_service:tar_scm:mpfr-4.2.0.tar.xz/src/yn.c -> _service:tar_scm:mpfr-4.2.1.tar.xz/src/yn.c Changed

_service:tar_scm:mpfr-4.2.0.tar.xz/src/zeta.c -> _service:tar_scm:mpfr-4.2.1.tar.xz/src/zeta.c Changed

_service:tar_scm:mpfr-4.2.0.tar.xz/src/zeta_ui.c -> _service:tar_scm:mpfr-4.2.1.tar.xz/src/zeta_ui.c Changed

_service:tar_scm:mpfr-4.2.0.tar.xz/tests/Makefile.am -> _service:tar_scm:mpfr-4.2.1.tar.xz/tests/Makefile.am Changed

_service:tar_scm:mpfr-4.2.0.tar.xz/tests/Makefile.in -> _service:tar_scm:mpfr-4.2.1.tar.xz/tests/Makefile.in Changed

@@ -159,23 +159,24 @@
 	toutimpl$(EXEEXT) tpow$(EXEEXT) tpow3$(EXEEXT) tpowr$(EXEEXT) \
 	tpow_all$(EXEEXT) tpow_z$(EXEEXT) tprec_round$(EXEEXT) \
 	tprintf$(EXEEXT) trandom$(EXEEXT) trandom_deviate$(EXEEXT) \
-	trec_sqrt$(EXEEXT) tremquo$(EXEEXT) trint$(EXEEXT) \
-	trndna$(EXEEXT) troot$(EXEEXT) trootn_si$(EXEEXT) \
-	trootn_ui$(EXEEXT) tsec$(EXEEXT) tsech$(EXEEXT) \
-	tset_d$(EXEEXT) tset_f$(EXEEXT) tset_float128$(EXEEXT) \
-	tset_ld$(EXEEXT) tset_q$(EXEEXT) tset_si$(EXEEXT) \
-	tset_sj$(EXEEXT) tset_str$(EXEEXT) tset_z$(EXEEXT) \
-	tset_z_2exp$(EXEEXT) tsi_op$(EXEEXT) tsin$(EXEEXT) \
-	tsin_cos$(EXEEXT) tsinh$(EXEEXT) tsinh_cosh$(EXEEXT) \
-	tsinu$(EXEEXT) tsprintf$(EXEEXT) tsqr$(EXEEXT) tsqrt$(EXEEXT) \
-	tsqrt_ui$(EXEEXT) tstckintc$(EXEEXT) tstdint$(EXEEXT) \
-	tstrtofr$(EXEEXT) tsub$(EXEEXT) tsub1sp$(EXEEXT) \
-	tsub_d$(EXEEXT) tsub_ui$(EXEEXT) tsubnormal$(EXEEXT) \
-	tsum$(EXEEXT) tswap$(EXEEXT) ttan$(EXEEXT) ttanh$(EXEEXT) \
-	ttanu$(EXEEXT) ttotal_order$(EXEEXT) ttrunc$(EXEEXT) \
-	tui_div$(EXEEXT) tui_pow$(EXEEXT) tui_sub$(EXEEXT) \
-	turandom$(EXEEXT) tvalist$(EXEEXT) ty0$(EXEEXT) ty1$(EXEEXT) \
-	tyn$(EXEEXT) tzeta$(EXEEXT) tzeta_ui$(EXEEXT)
+	trec_sqrt$(EXEEXT) treldiff$(EXEEXT) tremquo$(EXEEXT) \
+	trint$(EXEEXT) trndna$(EXEEXT) troot$(EXEEXT) \
+	trootn_si$(EXEEXT) trootn_ui$(EXEEXT) tsec$(EXEEXT) \
+	tsech$(EXEEXT) tset_d$(EXEEXT) tset_f$(EXEEXT) \
+	tset_float128$(EXEEXT) tset_ld$(EXEEXT) tset_q$(EXEEXT) \
+	tset_si$(EXEEXT) tset_sj$(EXEEXT) tset_str$(EXEEXT) \
+	tset_z$(EXEEXT) tset_z_2exp$(EXEEXT) tsi_op$(EXEEXT) \
+	tsin$(EXEEXT) tsin_cos$(EXEEXT) tsinh$(EXEEXT) \
+	tsinh_cosh$(EXEEXT) tsinu$(EXEEXT) tsprintf$(EXEEXT) \
+	tsqr$(EXEEXT) tsqrt$(EXEEXT) tsqrt_ui$(EXEEXT) \
+	tstckintc$(EXEEXT) tstdint$(EXEEXT) tstrtofr$(EXEEXT) \
+	tsub$(EXEEXT) tsub1sp$(EXEEXT) tsub_d$(EXEEXT) \
+	tsub_ui$(EXEEXT) tsubnormal$(EXEEXT) tsum$(EXEEXT) \
+	tswap$(EXEEXT) ttan$(EXEEXT) ttanh$(EXEEXT) ttanu$(EXEEXT) \
+	ttotal_order$(EXEEXT) ttrunc$(EXEEXT) tui_div$(EXEEXT) \
+	tui_pow$(EXEEXT) tui_sub$(EXEEXT) turandom$(EXEEXT) \
+	tvalist$(EXEEXT) ty0$(EXEEXT) ty1$(EXEEXT) tyn$(EXEEXT) \
+	tzeta$(EXEEXT) tzeta_ui$(EXEEXT)
 libfrtests_la_LIBADD =
 am_libfrtests_la_OBJECTS = memory.lo rnd_mode.lo tests.lo cmp_str.lo \
 	random2.lo
@@ -885,6 +886,11 @@
 trec_sqrt_LDADD = $(LDADD)
 trec_sqrt_DEPENDENCIES = libfrtests.la $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1) $(top_builddir)/src/libmpfr.la
+treldiff_SOURCES = treldiff.c
+treldiff_OBJECTS = treldiff.$(OBJEXT)
+treldiff_LDADD = $(LDADD)
+treldiff_DEPENDENCIES = libfrtests.la $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1) $(top_builddir)/src/libmpfr.la
 tremquo_SOURCES = tremquo.c
 tremquo_OBJECTS = tremquo.$(OBJEXT)
 tremquo_LDADD = $(LDADD)
@@ -1252,17 +1258,18 @@
 	./$(DEPDIR)/tpow_z.Po ./$(DEPDIR)/tpowr.Po \
 	./$(DEPDIR)/tprec_round.Po ./$(DEPDIR)/tprintf.Po \
 	./$(DEPDIR)/trandom.Po ./$(DEPDIR)/trandom_deviate.Po \
-	./$(DEPDIR)/trec_sqrt.Po ./$(DEPDIR)/tremquo.Po \
-	./$(DEPDIR)/trint.Po ./$(DEPDIR)/trndna.Po \
-	./$(DEPDIR)/troot.Po ./$(DEPDIR)/trootn_si.Po \
-	./$(DEPDIR)/trootn_ui.Po ./$(DEPDIR)/tsec.Po \
-	./$(DEPDIR)/tsech.Po ./$(DEPDIR)/tset.Po ./$(DEPDIR)/tset_d.Po \
-	./$(DEPDIR)/tset_exp.Po ./$(DEPDIR)/tset_f.Po \
-	./$(DEPDIR)/tset_float128.Po ./$(DEPDIR)/tset_ld.Po \
-	./$(DEPDIR)/tset_q.Po ./$(DEPDIR)/tset_si.Po \
-	./$(DEPDIR)/tset_sj.Po ./$(DEPDIR)/tset_str.Po \
-	./$(DEPDIR)/tset_z.Po ./$(DEPDIR)/tset_z_2exp.Po \
-	./$(DEPDIR)/tsgn.Po ./$(DEPDIR)/tsi_op.Po ./$(DEPDIR)/tsin.Po \
+	./$(DEPDIR)/trec_sqrt.Po ./$(DEPDIR)/treldiff.Po \
+	./$(DEPDIR)/tremquo.Po ./$(DEPDIR)/trint.Po \
+	./$(DEPDIR)/trndna.Po ./$(DEPDIR)/troot.Po \
+	./$(DEPDIR)/trootn_si.Po ./$(DEPDIR)/trootn_ui.Po \
+	./$(DEPDIR)/tsec.Po ./$(DEPDIR)/tsech.Po ./$(DEPDIR)/tset.Po \
+	./$(DEPDIR)/tset_d.Po ./$(DEPDIR)/tset_exp.Po \
+	./$(DEPDIR)/tset_f.Po ./$(DEPDIR)/tset_float128.Po \
+	./$(DEPDIR)/tset_ld.Po ./$(DEPDIR)/tset_q.Po \
+	./$(DEPDIR)/tset_si.Po ./$(DEPDIR)/tset_sj.Po \
+	./$(DEPDIR)/tset_str.Po ./$(DEPDIR)/tset_z.Po \
+	./$(DEPDIR)/tset_z_2exp.Po ./$(DEPDIR)/tsgn.Po \
+	./$(DEPDIR)/tsi_op.Po ./$(DEPDIR)/tsin.Po \
 	./$(DEPDIR)/tsin_cos.Po ./$(DEPDIR)/tsinh.Po \
 	./$(DEPDIR)/tsinh_cosh.Po ./$(DEPDIR)/tsinu.Po \
 	./$(DEPDIR)/tsprintf.Po ./$(DEPDIR)/tsqr.Po \
@@ -1322,16 +1329,17 @@
 	tmodf.c tmul.c tmul_2exp.c tmul_d.c tmul_ui.c tnext.c \
 	tnrandom.c tnrandom_chisq.c tout_str.c toutimpl.c tpow.c \
 	tpow3.c tpow_all.c tpow_z.c tpowr.c tprec_round.c tprintf.c \
-	trandom.c trandom_deviate.c trec_sqrt.c tremquo.c trint.c \
-	trndna.c troot.c trootn_si.c trootn_ui.c tsec.c tsech.c tset.c \
-	tset_d.c tset_exp.c tset_f.c tset_float128.c tset_ld.c \
-	tset_q.c tset_si.c tset_sj.c tset_str.c tset_z.c tset_z_2exp.c \
-	tsgn.c tsi_op.c tsin.c tsin_cos.c tsinh.c tsinh_cosh.c tsinu.c \
-	tsprintf.c tsqr.c tsqrt.c tsqrt_ui.c tstckintc.c tstdint.c \
-	tstrtofr.c tsub.c tsub1sp.c tsub_d.c tsub_ui.c tsubnormal.c \
-	tsum.c tswap.c ttan.c ttanh.c ttanu.c ttotal_order.c ttrunc.c \
-	tui_div.c tui_pow.c tui_sub.c turandom.c tvalist.c tversion.c \
-	ty0.c ty1.c tyn.c tzeta.c tzeta_ui.c
+	trandom.c trandom_deviate.c trec_sqrt.c treldiff.c tremquo.c \
+	trint.c trndna.c troot.c trootn_si.c trootn_ui.c tsec.c \
+	tsech.c tset.c tset_d.c tset_exp.c tset_f.c tset_float128.c \
+	tset_ld.c tset_q.c tset_si.c tset_sj.c tset_str.c tset_z.c \
+	tset_z_2exp.c tsgn.c tsi_op.c tsin.c tsin_cos.c tsinh.c \
+	tsinh_cosh.c tsinu.c tsprintf.c tsqr.c tsqrt.c tsqrt_ui.c \
+	tstckintc.c tstdint.c tstrtofr.c tsub.c tsub1sp.c tsub_d.c \
+	tsub_ui.c tsubnormal.c tsum.c tswap.c ttan.c ttanh.c ttanu.c \
+	ttotal_order.c ttrunc.c tui_div.c tui_pow.c tui_sub.c \
+	turandom.c tvalist.c tversion.c ty0.c ty1.c tyn.c tzeta.c \
+	tzeta_ui.c
 DIST_SOURCES = $(libfrtests_la_SOURCES) mpf_compat.c mpfr_compat.c \
 	reuse.c tabort_defalloc1.c tabort_defalloc2.c \
 	tabort_prec_max.c tabs.c tacos.c tacosh.c tacosu.c tadd.c \
@@ -1357,11 +1365,11 @@
 	tmul_2exp.c tmul_d.c tmul_ui.c tnext.c tnrandom.c \
 	tnrandom_chisq.c tout_str.c toutimpl.c tpow.c tpow3.c \
 	tpow_all.c tpow_z.c tpowr.c tprec_round.c tprintf.c trandom.c \
-	trandom_deviate.c trec_sqrt.c tremquo.c trint.c trndna.c \
-	troot.c trootn_si.c trootn_ui.c tsec.c tsech.c tset.c tset_d.c \
-	tset_exp.c tset_f.c tset_float128.c tset_ld.c tset_q.c \
-	tset_si.c tset_sj.c tset_str.c tset_z.c tset_z_2exp.c tsgn.c \
-	tsi_op.c tsin.c tsin_cos.c tsinh.c tsinh_cosh.c tsinu.c \
+	trandom_deviate.c trec_sqrt.c treldiff.c tremquo.c trint.c \
+	trndna.c troot.c trootn_si.c trootn_ui.c tsec.c tsech.c tset.c \
+	tset_d.c tset_exp.c tset_f.c tset_float128.c tset_ld.c \
+	tset_q.c tset_si.c tset_sj.c tset_str.c tset_z.c tset_z_2exp.c \
+	tsgn.c tsi_op.c tsin.c tsin_cos.c tsinh.c tsinh_cosh.c tsinu.c \
 	tsprintf.c tsqr.c tsqrt.c tsqrt_ui.c tstckintc.c tstdint.c \
 	tstrtofr.c tsub.c tsub1sp.c tsub_d.c tsub_ui.c tsubnormal.c \
 	tsum.c tswap.c ttan.c ttanh.c ttanu.c ttotal_order.c ttrunc.c \
@@ -1781,7 +1789,7 @@
      tlog_ui tmin_prec tminmax tmodf tmul tmul_2exp tmul_d tmul_ui      \
      tnext tnrandom tnrandom_chisq tout_str toutimpl tpow tpow3 tpowr   \
      tpow_all tpow_z tprec_round tprintf trandom trandom_deviate        \
-     trec_sqrt tremquo trint trndna troot trootn_si trootn_ui           \
+     trec_sqrt treldiff tremquo trint trndna troot trootn_si trootn_ui  \
      tsec tsech tset_d tset_f tset_float128 tset_ld tset_q              \
      tset_si tset_sj tset_str tset_z tset_z_2exp tsi_op tsin tsin_cos   \
      tsinh tsinh_cosh tsinu tsprintf tsqr tsqrt tsqrt_ui tstckintc      \
@@ -2469,6 +2477,10 @@
 	@rm -f trec_sqrt$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(trec_sqrt_OBJECTS) $(trec_sqrt_LDADD) $(LIBS)
 
+treldiff$(EXEEXT): $(treldiff_OBJECTS) $(treldiff_DEPENDENCIES) $(EXTRA_treldiff_DEPENDENCIES) 
+	@rm -f treldiff$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(treldiff_OBJECTS) $(treldiff_LDADD) $(LIBS)
+
 tremquo$(EXEEXT): $(tremquo_OBJECTS) $(tremquo_DEPENDENCIES) $(EXTRA_tremquo_DEPENDENCIES) 
 	@rm -f tremquo$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(tremquo_OBJECTS) $(tremquo_LDADD) $(LIBS)
@@ -2848,6 +2860,7 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/trandom.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/trandom_deviate.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/trec_sqrt.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/treldiff.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tremquo.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/trint.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/trndna.Po@am__quote@ # am--include-marker
@@ -4143,6 +4156,13 @@
 	--log-file $$b.log --trs-file $$b.trs \
 	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
 	"$$tst" $(AM_TESTS_FD_REDIRECT)
+treldiff.log: treldiff$(EXEEXT)
+	@p='treldiff$(EXEEXT)'; \
+	b='treldiff'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 tremquo.log: tremquo$(EXEEXT)
 	@p='tremquo$(EXEEXT)'; \
 	b='tremquo'; \
@@ -4752,6 +4772,7 @@
 	-rm -f ./$(DEPDIR)/trandom.Po
 	-rm -f ./$(DEPDIR)/trandom_deviate.Po
 	-rm -f ./$(DEPDIR)/trec_sqrt.Po
+	-rm -f ./$(DEPDIR)/treldiff.Po
 	-rm -f ./$(DEPDIR)/tremquo.Po
 	-rm -f ./$(DEPDIR)/trint.Po
 	-rm -f ./$(DEPDIR)/trndna.Po
@@ -4999,6 +5020,7 @@
 	-rm -f ./$(DEPDIR)/trandom.Po
 	-rm -f ./$(DEPDIR)/trandom_deviate.Po
 	-rm -f ./$(DEPDIR)/trec_sqrt.Po
+	-rm -f ./$(DEPDIR)/treldiff.Po
 	-rm -f ./$(DEPDIR)/tremquo.Po
 	-rm -f ./$(DEPDIR)/trint.Po
 	-rm -f ./$(DEPDIR)/trndna.Po

_service:tar_scm:mpfr-4.2.0.tar.xz/tests/inp_str.dat -> _service:tar_scm:mpfr-4.2.1.tar.xz/tests/inp_str.dat Changed

_service:tar_scm:mpfr-4.2.0.tar.xz/tests/reuse.c -> _service:tar_scm:mpfr-4.2.1.tar.xz/tests/reuse.c Changed

@@ -78,22 +78,16 @@
       mpfr_const_pi (x, MPFR_RNDN);
       MPFR_SET_EXP (x, MPFR_GET_EXP (x)-1);
       break;
-    default:
+    case 11:
       mpfr_urandomb (x, RANDS);
       if (RAND_BOOL ())
         mpfr_neg (x, x, MPFR_RNDN);
       break;
+    default:
+      MPFR_ASSERTN (0);
     }
 }
 
-/* same as mpfr_cmp, but returns 0 for both NaN's */
-static int
-mpfr_compare (mpfr_srcptr a, mpfr_srcptr b)
-{
-  return (MPFR_IS_NAN(a)) ? !MPFR_IS_NAN(b) :
-    (MPFR_IS_NAN(b) || mpfr_cmp(a, b));
-}
-
 static void
 test3 (int (*testfunc)(mpfr_ptr, mpfr_srcptr, mpfr_srcptr, mpfr_rnd_t),
        const char *foo, mpfr_prec_t prec, mpfr_rnd_t rnd)
@@ -112,10 +106,10 @@
 
   /* for each variable, consider each of the following 6 possibilities:
      NaN, +Infinity, -Infinity, +0, -0 or a random number */
-  for (i=0; i < SPECIAL_MAX*SPECIAL_MAX ; i++)
+  for (i = 0; i < SPECIAL_MAX * SPECIAL_MAX; i++)
     {
-      set_special (ref2, i%SPECIAL_MAX);
-      set_special (ref3, i/SPECIAL_MAX);
+      set_special (ref2, i % SPECIAL_MAX);
+      set_special (ref3, i / SPECIAL_MAX);
 
       /* reference call: foo(a, b, c) */
       testfunc (ref1, ref2, ref3, rnd);
@@ -124,11 +118,11 @@
       mpfr_set (res1, ref2, rnd); /* exact operation */
       testfunc (res1, res1, ref3, rnd);
 
-      if (mpfr_compare (res1, ref1))
+      if (! SAME_VAL (res1, ref1))
         {
           printf ("Error for %s(a, a, c) with %s for ", foo,
                   mpfr_print_rnd_mode (rnd));
-          DISP("a=",ref2); DISP2(", c=",ref3);
+          DISP("a=", ref2); DISP2(", c=", ref3);
           printf ("expected "); mpfr_dump (ref1);
           printf ("got      "); mpfr_dump (res1);
           exit (1);
@@ -137,11 +131,12 @@
       /* foo(a, b, a) */
       mpfr_set (res1, ref3, rnd);
       testfunc (res1, ref2, res1, rnd);
-      if (mpfr_compare (res1, ref1))
+      if (! SAME_VAL (res1, ref1))
         {
           printf ("Error for %s(a, b, a) for ", foo);
-          DISP("b=",ref2); DISP2(", a=", ref3);
-          DISP("expected ", ref1); DISP2(", got ",res1);
+          DISP("b=", ref2); DISP2(", a=", ref3);
+          printf ("expected "); mpfr_dump (ref1);
+          printf ("got      "); mpfr_dump (res1);
           exit (1);
         }
 
@@ -151,11 +146,12 @@
       mpfr_set (res1, ref2, rnd);
       testfunc (res1, res1, res1, rnd);
 
-      if (mpfr_compare (res1, ref1))
+      if (! SAME_VAL (res1, ref1))
         {
           printf ("Error for %s(a, a, a) for ", foo);
-          DISP2("a=",ref2);
-          DISP("expected ", ref1); DISP2(", got ", res1);
+          DISP2("a=", ref2);
+          printf ("expected "); mpfr_dump (ref1);
+          printf ("got      "); mpfr_dump (res1);
           exit (1);
         }
     }
@@ -187,13 +183,13 @@
   /* for each variable, consider each of the following 6 possibilities:
      NaN, +Infinity, -Infinity, +0, -0 or a random number */
 
-  for (i=0; i<SPECIAL_MAX; i++)
+  for (i = 0; i < SPECIAL_MAX; i++)
     {
       set_special (op1, i);
-      for (j=0; j<SPECIAL_MAX; j++)
+      for (j = 0; j < SPECIAL_MAX; j++)
         {
           set_special (op2, j);
-          for (k=0; k<SPECIAL_MAX; k++)
+          for (k = 0; k < SPECIAL_MAX; k++)
             {
               set_special (op3, k);
 
@@ -204,11 +200,12 @@
               mpfr_set (res, op1, rnd); /* exact operation */
               testfunc (res, res, op2, op3, rnd);
 
-              if (mpfr_compare (res, ref))
+              if (! SAME_VAL (res, ref))
                 {
                   printf ("Error for %s(a, a, b, c) for ", foo);
                   DISP("a=", op1); DISP(", b=", op2); DISP2(", c=", op3);
-                  DISP("expected ", ref); DISP2(", got ", res);
+                  printf ("expected "); mpfr_dump (ref);
+                  printf ("got      "); mpfr_dump (res);
                   exit (1);
                 }
 
@@ -216,11 +213,12 @@
               mpfr_set (res, op2, rnd);
               testfunc (res, op1, res, op3, rnd);
 
-              if (mpfr_compare (res, ref))
+              if (! SAME_VAL (res, ref))
                 {
                   printf ("Error for %s(a, a, b, c) for ", foo);
                   DISP("a=", op1); DISP(", b=", op2); DISP2(", c=", op3);
-                  DISP("expected ", ref); DISP2(", got ", res);
+                  printf ("expected "); mpfr_dump (ref);
+                  printf ("got      "); mpfr_dump (res);
                   exit (1);
                 }
 
@@ -228,35 +226,38 @@
               mpfr_set (res, op3, rnd);
               testfunc (res, op1, op2, res, rnd);
 
-              if (mpfr_compare (res, ref))
+              if (! SAME_VAL (res, ref))
                 {
                   printf ("Error for %s(a, a, b, c) for ", foo);
                   DISP("a=", op1); DISP(", b=", op2); DISP2(", c=", op3);
-                  DISP("expected ", ref); DISP2(", got ", res);
+                  printf ("expected "); mpfr_dump (ref);
+                  printf ("got      "); mpfr_dump (res);
                   exit (1);
                 }
 
-              /* foo(a, a, a,c) */
+              /* foo(a, a, a, c) */
               testfunc (ref, op1, op1, op3, rnd);
               mpfr_set (res, op1, rnd);
               testfunc (res, res, res, op3, rnd);
-              if (mpfr_compare (res, ref))
+              if (! SAME_VAL (res, ref))
                 {
                   printf ("Error for %s(a, a, b, c) for ", foo);
                   DISP("a=", op1); DISP(", a=", op2); DISP2(", c=", op3);
-                  DISP("expected ", ref); DISP2(", got ", res);
+                  printf ("expected "); mpfr_dump (ref);
+                  printf ("got      "); mpfr_dump (res);
                   exit (1);
                 }
 
-              /* foo(a, a, b,a) */
+              /* foo(a, a, b, a) */
               testfunc (ref, op1, op2, op1, rnd);
               mpfr_set (res, op1, rnd);
               testfunc (res, res, op2, res, rnd);
-              if (mpfr_compare (res, ref))
+              if (! SAME_VAL (res, ref))
                 {
                   printf ("Error for %s(a, a, b, c) for ", foo);
                   DISP("a=", op1); DISP(", a=", op2); DISP2(", c=", op3);
-                  DISP("expected ", ref); DISP2(", got ", res);
+                  printf ("expected "); mpfr_dump (ref);
+                  printf ("got      "); mpfr_dump (res);
                   exit (1);
                 }
 
@@ -264,11 +265,12 @@
               testfunc (ref, op1, op2, op2, rnd);
               mpfr_set (res, op2, rnd);
               testfunc (res, op1, res, res, rnd);
-              if (mpfr_compare (res, ref))
+              if (! SAME_VAL (res, ref))
                 {
                   printf ("Error for %s(a, a, b, c) for ", foo);
                   DISP("a=", op1); DISP(", a=", op2); DISP2(", c=", op3);
-                  DISP("expected ", ref); DISP2(", got ", res);
+                  printf ("expected "); mpfr_dump (ref);
+                  printf ("got      "); mpfr_dump (res);
                   exit (1);
                 }
 
@@ -276,11 +278,12 @@
               testfunc (ref, op1, op1, op1, rnd);
               mpfr_set (res, op1, rnd);
               testfunc (res, res, res, res, rnd);
-              if (mpfr_compare (res, ref))

_service:tar_scm:mpfr-4.2.0.tar.xz/tests/tcompound.c -> _service:tar_scm:mpfr-4.2.1.tar.xz/tests/tcompound.c Changed

@@ -238,18 +238,263 @@
   mpfr_clear (y);
 }
 
-static int
-mpfr_compound2 (mpfr_ptr y, mpfr_srcptr x, mpfr_rnd_t rnd_mode)
+/* Failure with mpfr_compound_si from 2021-02-15 due to
+   incorrect underflow detection. */
+static void
+bug_20230206 (void)
+{
+  if (MPFR_PREC_MIN == 1)
+    {
+      mpfr_t x, y1, y2;
+      int inex1, inex2;
+      mpfr_flags_t flags1, flags2;
+#if MPFR_PREC_BITS >= 64
+      mpfr_exp_t emin;
+#endif
+
+      mpfr_inits2 (1, x, y1, y2, (mpfr_ptr) 0);
+      mpfr_set_ui_2exp (x, 1, -1, MPFR_RNDN);  /* x = 1/2 */
+
+      /* This first test is useful mainly for a 32-bit mpfr_exp_t type
+         (no failure with a 64-bit mpfr_exp_t type since the underflow
+         threshold in the extended exponent range is much lower). */
+
+      mpfr_set_ui_2exp (y1, 1, -1072124363, MPFR_RNDN);
+      inex1 = -1;
+      flags1 = MPFR_FLAGS_INEXACT;
+      mpfr_clear_flags ();
+      /* -1832808704 ~= -2^30 / log2(3/2) */
+      inex2 = mpfr_compound_si (y2, x, -1832808704, MPFR_RNDN);
+      flags2 = __gmpfr_flags;
+      if (!(mpfr_equal_p (y1, y2) &&
+            SAME_SIGN (inex1, inex2) &&
+            flags1 == flags2))
+        {
+          printf ("Error in bug_20230206 (1):\n");
+          printf ("Expected ");
+          mpfr_dump (y1);
+          printf ("  with inex = %d, flags =", inex1);
+          flags_out (flags1);
+          printf ("Got      ");
+          mpfr_dump (y2);
+          printf ("  with inex = %d, flags =", inex2);
+          flags_out (flags2);
+          exit (1);
+        }
+
+      /* This second test is for a 64-bit mpfr_exp_t type
+         (it is disabled with a 32-bit mpfr_exp_t type). */
+
+      /* The "#if" makes sure that 64-bit constants are supported, avoiding
+         a compilation failure. The "if" makes sure that the constant is
+         representable in a long (this would not be the case with 32-bit
+         unsigned long and 64-bit limb). It also ensures that mpfr_exp_t
+         has at least 64 bits. */
+#if MPFR_PREC_BITS >= 64
+      emin = mpfr_get_emin ();
+      set_emin (MPFR_EMIN_MIN);
+      mpfr_set_ui_2exp (y1, 1, -4611686018427366846, MPFR_RNDN);
+      inex1 = 1;
+      flags1 = MPFR_FLAGS_INEXACT;
+      mpfr_clear_flags ();
+      /* -7883729320669216768 ~= -2^62 / log2(3/2) */
+      inex2 = mpfr_compound_si (y2, x, -7883729320669216768, MPFR_RNDN);
+      flags2 = __gmpfr_flags;
+      if (!(mpfr_equal_p (y1, y2) &&
+            SAME_SIGN (inex1, inex2) &&
+            flags1 == flags2))
+        {
+          printf ("Error in bug_20230206 (2):\n");
+          printf ("Expected ");
+          mpfr_dump (y1);
+          printf ("  with inex = %d, flags =", inex1);
+          flags_out (flags1);
+          printf ("Got      ");
+          mpfr_dump (y2);
+          printf ("  with inex = %d, flags =", inex2);
+          flags_out (flags2);
+          exit (1);
+        }
+      set_emin (emin);
+#endif
+
+      mpfr_clears (x, y1, y2, (mpfr_ptr) 0);
+    }
+}
+
+/* Reported by Patrick Pelissier on 2023-02-11 for the master branch
+   (tgeneric_ui.c with GMP_CHECK_RANDOMIZE=1412991715).
+   On a 32-bit host, one gets Inf (overflow) instead of 0.1E1071805703.
+*/
+static void
+bug_20230211 (void)
 {
-  return mpfr_compound_si (y, x, 2, rnd_mode);
+  mpfr_t x, y1, y2;
+  int inex1, inex2;
+  mpfr_flags_t flags1, flags2;
+
+  mpfr_inits2 (1, x, y1, y2, (mpfr_ptr) 0);
+  mpfr_set_ui_2exp (x, 1, -1, MPFR_RNDN);  /* x = 1/2 */
+  mpfr_set_ui_2exp (y1, 1, 1071805702, MPFR_RNDN);
+  inex1 = 1;
+  flags1 = MPFR_FLAGS_INEXACT;
+  mpfr_clear_flags ();
+  inex2 = mpfr_compound_si (y2, x, 1832263949, MPFR_RNDN);
+  flags2 = __gmpfr_flags;
+  if (!(mpfr_equal_p (y1, y2) &&
+        SAME_SIGN (inex1, inex2) &&
+        flags1 == flags2))
+    {
+      printf ("Error in bug_20230211:\n");
+      printf ("Expected ");
+      mpfr_dump (y1);
+      printf ("  with inex = %d, flags =", inex1);
+      flags_out (flags1);
+      printf ("Got      ");
+      mpfr_dump (y2);
+      printf ("  with inex = %d, flags =", inex2);
+      flags_out (flags2);
+      exit (1);
+    }
+  mpfr_clears (x, y1, y2, (mpfr_ptr) 0);
+}
+
+/* Integer overflow with compound.c d04caeae04c6a83276916c4fbac1fe9b0cec3c8b
+   (2023-02-23) or 952fb0f5cc2df1fffde3eb54c462fdae5f123ea6 in the 4.2 branch
+   on "n * (kx - 1) + 1". Note: if the only effect is just a random value,
+   this probably doesn't affect the result (one might enter the "if" while
+   one shouldn't, but the real check is done inside the "if"). This test
+   fails if -fsanitize=undefined -fno-sanitize-recover is used or if the
+   processor emits a signal in case of integer overflow.
+   This test has been made obsolete by the "kx < ex" condition
+   in 2cb3123891dd46fe0258d4aec7f8655b8ec69aaf (master branch)
+   or f5cb40571bc3d1559f05b230cf4ffecaf0952852 (4.2 branch). */
+static void
+bug_20230517 (void)
+{
+  mpfr_exp_t old_emax;
+  mpfr_t x;
+
+  old_emax = mpfr_get_emax ();
+  set_emax (MPFR_EMAX_MAX);
+
+  mpfr_init2 (x, 123456);
+  mpfr_set_ui (x, 65536, MPFR_RNDN);
+  mpfr_nextabove (x);
+  mpfr_compound_si (x, x, LONG_MAX >> 16, MPFR_RNDN);
+  mpfr_clear (x);
+
+  set_emax (old_emax);
 }
 
+/* Inverse function on non-special cases...
+   One has x = (1+y)^n with y > -1 and x > 0. Thus y = x^(1/n) - 1.
+   The inverse function is useful
+     - to build and check hard-to-round cases (see bad_cases() in tests.c);
+     - to test the behavior close to the overflow and underflow thresholds.
+   The case x = 0 actually needs to be handled as it may occur with
+   bad_cases() due to rounding.
+*/
 static int
-mpfr_compound3 (mpfr_ptr y, mpfr_srcptr x, mpfr_rnd_t rnd_mode)
+inv_compound (mpfr_ptr y, mpfr_srcptr x, long n, mpfr_rnd_t rnd_mode)
 {
-  return mpfr_compound_si (y, x, 3, rnd_mode);
+  mpfr_t t;
+  int inexact;
+  mpfr_prec_t precy, prect;
+  MPFR_ZIV_DECL (loop);
+  MPFR_SAVE_EXPO_DECL (expo);
+
+  MPFR_ASSERTN (n != 0);
+
+  if (MPFR_UNLIKELY (MPFR_IS_ZERO (x)))
+    {
+      if (n > 0)
+        return mpfr_set_si (y, -1, rnd_mode);
+      else
+        {
+          MPFR_SET_INF (y);
+          MPFR_SET_POS (y);
+          MPFR_RET (0);
+        }
+    }
+
+  MPFR_SAVE_EXPO_MARK (expo);
+
+  if (mpfr_equal_p (x, __gmpfr_one))
+    {
+      MPFR_SAVE_EXPO_FREE (expo);
+      mpfr_set_zero (y, 1);
+      MPFR_RET (0);
+    }
+
+  precy = MPFR_GET_PREC (y);
+  prect = precy + 20;

_service:tar_scm:mpfr-4.2.0.tar.xz/tests/tests.c -> _service:tar_scm:mpfr-4.2.1.tar.xz/tests/tests.c Changed

@@ -1048,14 +1048,14 @@
       tests_default_random (y, pos, emin, emax, 0);
       if (dbg)
         {
-          printf ("bad_cases: yprec =%4ld, y = ", (long) py);
+          printf ("bad_cases: yprec =%6ld, y = ", (long) py);
           mpfr_out_str (stdout, 16, 0, y, MPFR_RNDN);
           printf ("\n");
         }
       px = py + psup;
       mpfr_set_prec (x, px);
       if (dbg)
-        printf ("bad_cases: xprec =%4ld\n", (long) px);
+        printf ("bad_cases: xprec =%6ld\n", (long) px);
       mpfr_clear_flags ();
       inex_inv = inv (x, y, MPFR_RNDN);
       if (mpfr_nanflag_p () || mpfr_overflow_p () || mpfr_underflow_p ())
@@ -1086,10 +1086,9 @@
                 }
               if (inex_inv)
                 {
-                  printf ("bad_cases: f exact while f^(-1) inexact,\n"
-                          "due to a poor choice of the parameters.\n");
-                  exit (1);
-                  /* alternatively, goto next_i */
+                  if (dbg)
+                    printf ("bad_cases: f exact while f^(-1) inexact\n");
+                  goto does_not_match;
                 }
               inex = 0;
               break;
@@ -1112,6 +1111,10 @@
           if (mpfr_nanflag_p () || mpfr_overflow_p () || mpfr_underflow_p ()
               || ! mpfr_equal_p (z, y))
             {
+              /* This may occur when psup is not large enough: evaluating
+                 x = (f^(-1))(y) then z = f(x) may not give back y if the
+                 precision of x is too small. */
+            does_not_match:
               if (dbg)
                 {
                   printf ("bad_cases: inverse doesn't match for %s\ny = ",
@@ -1164,7 +1167,7 @@
         }
       if (dbg)
         {
-          printf ("bad_cases: yprec =%4ld, y = ", (long) py);
+          printf ("bad_cases: yprec =%6ld, y = ", (long) py);
           mpfr_out_str (stdout, 16, 0, y, MPFR_RNDN);
           printf ("\n");
         }

_service:tar_scm:mpfr-4.2.0.tar.xz/tests/texp10.c -> _service:tar_scm:mpfr-4.2.1.tar.xz/tests/texp10.c Changed

@@ -190,6 +190,187 @@
   mpfr_clear (y);
 }
 
+/* Bug in mpfr_pow_general found by ofuf_thresholds (on 2023-02-13 for
+   a 32-bit exponent, changed on 2023-03-06 for a 64-bit exponent too),
+   fixed in commit b62966df913f73f08b3c5252e1d0c702bc20442f.
+   With a 32-bit exponent, failure for i=0.
+     expected 0.1111E1073741823
+     got      @Inf@
+     expected flags = inexact (8)
+     got flags      = overflow inexact (10)
+   With a 64-bit exponent, failure for i=1.
+     expected 0.11111111111111111111111E4611686018427387903
+     got      @Inf@
+     expected flags = inexact (8)
+     got flags      = overflow inexact (10)
+   Note: ofuf_thresholds was added to the master branch, but for the
+   time being, there are issues with these tests.
+*/
+static void
+bug20230213 (void)
+{
+  const char *s2 = {
+    "0x1.34413504b3ccdbd5dd8p+28",
+    "0x1.34413509f79fef2c4e0dd14a7ae0ecfbacdbp+60"
+  };
+  mpfr_t x1, x2, y1, y2;
+  mpfr_prec_t px2 = { 74, 147 };
+  mpfr_prec_t py2 = { 4, 23 };
+  mpfr_exp_t old_emax, emax;
+  mpfr_flags_t flags1, flags2;
+  int i;
+
+  old_emax = mpfr_get_emax ();
+
+  for (i = 0; i < 2; i++)
+    {
+      if (i != 0)
+        set_emax (MPFR_EMAX_MAX);
+
+      emax = mpfr_get_emax ();
+
+      mpfr_inits2 (pxi, x1, x2, (mpfr_ptr) 0);
+      mpfr_inits2 (pyi, y1, y2, (mpfr_ptr) 0);
+
+      mpfr_setmax (y1, emax);
+      mpfr_log10 (x1, y1, MPFR_RNDD);
+      mpfr_set_str (x2, si, 0, MPFR_RNDN);
+      /* For i == 0, emax == 2^30, so that the value can be checked.
+         For i != 0, check the value for the case emax == 2^62.
+         The "0UL" ensures that the shifts are valid. */
+      if (i == 0 || (((0UL + MPFR_EMAX_MAX) >> 31) >> 30) == 1)
+        {
+          /* printf ("Checking x1 for i=%d\n", i); */
+          MPFR_ASSERTN (mpfr_equal_p (x1, x2));
+        }
+
+      /* Let MAXF be the maximum finite value (y1 above).
+         Since x1 < log10(MAXF), one should have exp10(x1) < MAXF, and
+         therefore, y2 = RU(exp10(x1)) <= RU(MAXF) = MAXF (no overflow). */
+      flags1 = MPFR_FLAGS_INEXACT;
+      mpfr_clear_flags ();
+      mpfr_exp10 (y2, x1, MPFR_RNDU);
+      flags2 = __gmpfr_flags;
+
+      if (! (mpfr_lessequal_p (y2, y1) && flags2 == flags1))
+        {
+          printf ("Error in bug20230213 for i=%d\n", i);
+          printf ("emax = %" MPFR_EXP_FSPEC "d\n", (mpfr_eexp_t) emax);
+          printf ("expected "); mpfr_dump (y1);
+          printf ("got      "); mpfr_dump (y2);
+          printf ("expected flags =");
+          flags_out (flags1);
+          printf ("got flags      =");
+          flags_out (flags2);
+          exit (1);
+        }
+
+      mpfr_clears (x1, x2, y1, y2, (mpfr_ptr) 0);
+    }
+
+  set_emax (old_emax);
+}
+
+/* Bug in mpfr_pow_general in precision 1 in the particular case of
+   rounding to nearest, z * 2^k = 2^(emin - 2) and real result larger
+   than this value; fixed in ff5012b61d5e5fee5156c57b8aa8fc1739c2a771
+   (which is simplified in 4f5de980be290687ac1409aa02873e9e0dd1a030);
+   initially found by ofuf_thresholds (though the test was incorrect).
+   With a 32-bit exponent, failure for i=0.
+   With a 64-bit exponent, failure for i=1.
+   The result was correct, but the underflow flag was missing.
+   Note: ofuf_thresholds was added to the master branch, but for the
+   time being, there are issues with these tests.
+*/
+static void
+bug20230427 (void)
+{
+  const char *s2 = {
+    "-0.1001101000100000100110101000011E29",
+    "-0.100110100010000010011010100001001111101111001111111101111001101E61"
+  };
+  mpfr_t x, y, z, t1, t2;
+  mpfr_exp_t old_emin;
+  mpfr_flags_t flags, ex_flags;
+  int i, inex;
+
+  old_emin = mpfr_get_emin ();
+
+  mpfr_init2 (x, 63);
+  mpfr_inits2 (1, y, z, (mpfr_ptr) 0);
+  mpfr_inits2 (128, t1, t2, (mpfr_ptr) 0);
+
+  for (i = 0; i < 2; i++)
+    {
+      if (i == 0)
+        {
+          /* Basic check: the default emin should be -2^30 (exactly). */
+          if (mpfr_get_emin () != -1073741823)
+            abort ();
+        }
+      else
+        {
+          /* This test assumes that MPFR_EMIN_MIN = -2^62 (exactly).
+             The "0UL" ensures that the shifts are valid. */
+          if ((((0UL - MPFR_EMIN_MIN) >> 31) >> 30) != 1)
+            break;
+
+          set_emin (MPFR_EMIN_MIN);
+        }
+
+      mpfr_set_str_binary (x, si);
+
+      /* We will test 10^x rounded to nearest in precision 1.
+         Check that 2^(emin - 2) < 10^x < (3/2) * 2^(emin - 2).
+         This is approximate, but by outputting the values, one can check
+         that one is not too close to the boundaries:
+           emin - 2              = -4611686018427387905
+           log2(10^x)           ~= -4611686018427387904.598
+           emin - 2 + log2(3/2) ~= -4611686018427387904.415
+         Thus the result should be the smallest positive number 2^(emin - 1)
+         because 10^x is closer to this number than to 0, the midpoint being
+         2^(emin - 2). And there should be an underflow in precision 1 because
+         the result rounded to nearest in an unbounded exponent range should
+         have been 2^(emin - 2), the midpoint being (3/2) * 2^(emin - 2).
+      */
+      mpfr_set_ui (t1, 10, MPFR_RNDN);
+      mpfr_log2 (t2, t1, MPFR_RNDN);
+      mpfr_mul (t1, t2, x, MPFR_RNDN);
+      inex = mpfr_set_exp_t (t2, mpfr_get_emin () - 2, MPFR_RNDN);
+      MPFR_ASSERTN (inex == 0);
+      MPFR_ASSERTN (mpfr_greater_p (t1, t2));  /* log2(10^x) > emin - 2 */
+      inex = mpfr_sub (t1, t1, t2, MPFR_RNDN);
+      MPFR_ASSERTN (inex == 0);
+      mpfr_set_ui (t2, 3, MPFR_RNDN);
+      mpfr_log2 (t2, t2, MPFR_RNDN);
+      mpfr_sub_ui (t2, t2, 1, MPFR_RNDN);  /* log2(3/2) */
+      MPFR_ASSERTN (mpfr_less_p (t1, t2));
+
+      mpfr_clear_flags ();
+      mpfr_exp10 (y, x, MPFR_RNDN);
+      flags = __gmpfr_flags;
+      ex_flags = MPFR_FLAGS_UNDERFLOW | MPFR_FLAGS_INEXACT;
+
+      mpfr_setmin (z, mpfr_get_emin ());  /* z = 0.1@emin */
+      if (! (mpfr_equal_p (y, z) && flags == ex_flags))
+        {
+          printf ("Error in bug20230427 for i=%d\n", i);
+          printf ("expected "); mpfr_dump (z);
+          printf ("got      "); mpfr_dump (y);
+          printf ("emin =       %" MPFR_EXP_FSPEC "d\n",
+                  (mpfr_eexp_t) mpfr_get_emin ());
+          printf ("expected flags =");
+          flags_out (ex_flags);
+          printf ("got flags      =");
+          flags_out (flags);
+          exit (1);
+        }
+    }
+
+  mpfr_clears (x, y, z, t1, t2, (mpfr_ptr) 0);
+  set_emin (old_emin);
+}
+
 int
 main (int argc, char *argv)
 {
@@ -199,6 +380,9 @@
 
   tests_start_mpfr ();
 
+  bug20230213 ();
+  bug20230427 ();
+
   special_overflow ();
   emax_m_eps ();
   exp_range ();
@@ -310,6 +494,8 @@
   overfl_exp10_0 ();

_service:tar_scm:mpfr-4.2.0.tar.xz/tests/texp2.c -> _service:tar_scm:mpfr-4.2.1.tar.xz/tests/texp2.c Changed

_service:tar_scm:mpfr-4.2.0.tar.xz/tests/tfpif.c -> _service:tar_scm:mpfr-4.2.1.tar.xz/tests/tfpif.c Changed

_service:tar_scm:mpfr-4.2.0.tar.xz/tests/tfprintf.c -> _service:tar_scm:mpfr-4.2.1.tar.xz/tests/tfprintf.c Changed

@@ -55,12 +55,18 @@
 #define check_length_with_cmp(num_test, var, value, cmp, var_spec)      \
   if (cmp != 0)                                                         \
     {                                                                   \
-      mpfr_printf ("Error in test #%d, mpfr_vfprintf printed %"         \
+      mpfr_printf ("Error in test #%d: mpfr_vfprintf printed %"         \
                    QUOTE(var_spec) " characters instead of %d\n",       \
                    (num_test), (var), (value));                         \
       exit (1);                                                         \
     }
 
+#if MPFR_LCONV_DPTS
+#define DPLEN ((int) strlen (localeconv()->decimal_point))
+#else
+#define DPLEN 1
+#endif
+
 /* limit for random precision in random() */
 const int prec_max_printf = 5000;
 
@@ -195,12 +201,12 @@
                   lo, &ulo);
   check_length (2, ulo, 36, lu);
   check_vfprintf (fout, "a. %hi, b. %*f, c. %Re%hn", ush, 3, f, mpfr, &ush);
-  check_length (3, ush, 46, hu);
+  check_length (3, ush, 45 + DPLEN, hu);
   check_vfprintf (fout, "a. %hi, b. %f, c. %#.2Rf%n", sh, d, mpfr, &i);
-  check_length (4, i, 29, d);
+  check_length (4, i, 28 + DPLEN, d);
   check_vfprintf (fout, "a. %R*A, b. %Fe, c. %i%zn", rnd, mpfr, mpf, sz,
                   &sz);
-  check_length (5, (unsigned long) sz, 34, lu); /* no format specifier "%zu" in C90 */
+  check_length (5, (unsigned long) sz, 33 + DPLEN, lu); /* no format specifier "%zu" in C90 */
   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,
@@ -212,7 +218,9 @@
   check_vfprintf (fout, "%% a. %RNg, b. %Qx, c. %td%tn", mpfr, mpq, p, &p);
   if (p != 20)
     {
-      mpfr_fprintf (stderr, "Error in test 8, got '%% a. %RNg, b. %Qx, c. %td'\n", mpfr, mpq, saved_p);
+      mpfr_fprintf (stderr,
+                    "Error in test #8: got '%% a. %RNg, b. %Qx, c. %td'\n",
+                    mpfr, mpq, saved_p);
 #if defined(__MINGW32__) || defined(__MINGW64__)
       fprintf (stderr,
                "Your MinGW may be too old, in which case compiling GMP\n"
@@ -224,7 +232,7 @@
 
 #ifdef PRINTF_L
   check_vfprintf (fout, "a. %RA, b. %Lf, c. %QX%zn", mpfr, ld, mpq, &sz);
-  check_length (9, (unsigned long) sz, 30, lu); /* no format specifier "%zu" in C90 */
+  check_length (9, (unsigned long) sz, 29 + DPLEN, lu); /* no format specifier "%zu" in C90 */
 #endif
 
 #ifndef NPRINTF_HH

_service:tar_scm:mpfr-4.2.0.tar.xz/tests/tinp_str.c -> _service:tar_scm:mpfr-4.2.1.tar.xz/tests/tinp_str.c Changed

@@ -20,8 +20,14 @@
 https://www.gnu.org/licenses/ or write to the Free Software Foundation, Inc.,
 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. */
 
+#include <ctype.h>
+
 #include "mpfr-test.h"
 
+#ifdef HAVE_LOCALE_H
+#include <locale.h>
+#endif
+
 int
 main (int argc, char *argv)
 {
@@ -43,28 +49,26 @@
       exit (1);
     }
   i = mpfr_inp_str (x, f, 10, MPFR_RNDN);
-  if (i == 0 || mpfr_cmp_si (x, -1700))
+  if (i != 5 || mpfr_cmp_si0 (x, -1700))
     {
       printf ("Error in reading 1st line from file inp_str.dat (%d)\n", i);
       mpfr_dump (x);
       exit (1);
     }
   i = mpfr_inp_str (x, f, 10, MPFR_RNDN);
-  if (i == 0 || mpfr_cmp_ui (x, 31415))
+  if (i != 10 || mpfr_cmp_ui0 (x, 31415))
     {
       printf ("Error in reading 2nd line from file inp_str.dat (%d)\n", i);
       mpfr_dump (x);
       exit (1);
     }
-  getc (f);
   i = mpfr_inp_str (x, f, 10, MPFR_RNDN);
-  if (i == 0 || mpfr_cmp_ui (x, 31416))
+  if (i != 111 || mpfr_cmp_ui0 (x, 31416))
     {
       printf ("Error in reading 3rd line from file inp_str.dat (%d)\n", i);
       mpfr_dump (x);
       exit (1);
     }
-  getc (f);
   i = mpfr_inp_str (x, f, 10, MPFR_RNDN);
   if (i != 0)
     {
@@ -79,7 +83,6 @@
                 2, MPFR_RNDN);
   for (n = 2; n < 63; n++)
     {
-      getc (f);
       i = mpfr_inp_str (x, f, n, MPFR_RNDN);
       if (i == 0 || !mpfr_equal_p (x, y))
         {
@@ -91,6 +94,30 @@
       mpfr_set_ui (x, 0, MPFR_RNDN);
     }
 
+  /* This last test assumes that isspace(0) is false.
+     If it isn't, set the locale to "C" in order to ensure that;
+     but we check isspace(0) again, just in case. */
+  if (! isspace (0)
+#if defined(HAVE_LOCALE_H) && defined(HAVE_SETLOCALE)
+      || (setlocale (LC_ALL, "C"), ! isspace (0))
+#endif
+      )
+    {
+      i = mpfr_inp_str (x, f, 10, MPFR_RNDN);
+      if (i != 0)
+        {
+          printf ("Error in the '\\0' test (%d)\n", i);
+          exit (1);
+        }
+      i = mpfr_inp_str (x, f, 10, MPFR_RNDN);
+      if (i != 3 || mpfr_cmp_ui0 (x, 17))
+        {
+          printf ("Error following the '\\0' test (%d)\n", i);
+          mpfr_dump (x);
+          exit (1);
+        }
+    }
+
   fclose (f);
 
   mpfr_clear (x);

_service:tar_scm:mpfr-4.2.0.tar.xz/tests/tlog.c -> _service:tar_scm:mpfr-4.2.1.tar.xz/tests/tlog.c Changed

_service:tar_scm:mpfr-4.2.0.tar.xz/tests/tlog10.c -> _service:tar_scm:mpfr-4.2.1.tar.xz/tests/tlog10.c Changed

@@ -49,12 +49,66 @@
 #define TEST_RANDOM_POS 8
 #include "tgeneric.c"
 
+/* On 2023-02-13, one gets an infinite loop in mpfr_log10 on both
+   32-bit and 64-bit hosts when the precision is not large enough
+   (precision 12 and below). */
+static void
+bug20230213 (void)
+{
+  mpfr_exp_t old_emin, old_emax, e;
+  mpfr_t t, x, y0, y1, y2;
+  int prec;
+
+  old_emin = mpfr_get_emin ();
+  old_emax = mpfr_get_emax ();
+
+  set_emin (MPFR_EMIN_MIN);
+  set_emax (MPFR_EMAX_MAX);
+  e = mpfr_get_emax () - 1;
+
+  /* The precisions of t and y0 should be large enough to avoid
+     a hard-to-round case for the target precisions. */
+  mpfr_inits2 (64, t, y0, (mpfr_ptr) 0);
+  mpfr_set_exp_t (y0, e, MPFR_RNDN);
+  mpfr_log_ui (t, 10, MPFR_RNDN);
+  mpfr_div (y0, y0, t, MPFR_RNDN);
+  mpfr_log_ui (t, 2, MPFR_RNDN);
+  mpfr_mul (y0, y0, t, MPFR_RNDN);
+
+  for (prec = 16; prec >= MPFR_PREC_MIN; prec--)
+    {
+      mpfr_inits2 (prec, x, y1, y2, (mpfr_ptr) 0);
+      mpfr_set (y1, y0, MPFR_RNDN);
+
+      mpfr_set_ui_2exp (x, 1, e, MPFR_RNDN);
+      mpfr_log10 (y2, x, MPFR_RNDN);
+      MPFR_ASSERTN (MPFR_IS_PURE_FP (y2));
+      MPFR_ASSERTN (MPFR_IS_POS (y2));
+
+      if (! mpfr_equal_p (y1, y2))
+        {
+          printf ("Error in bug20230213.\n");
+          printf ("Expected ");
+          mpfr_dump (y1);
+          printf ("Got      ");
+          mpfr_dump (y2);
+          exit (1);
+        }
+      mpfr_clears (x, y1, y2, (mpfr_ptr) 0);
+    }
+
+  mpfr_clears (t, y0, (mpfr_ptr) 0);
+
+  set_emin (old_emin);
+  set_emax (old_emax);
+}
+
 int
 main (int argc, char *argv)
 {
   mpfr_t x, y;
   unsigned int n;
-  int inex;
+  int inex, r;
 
   tests_start_mpfr ();
 
@@ -63,56 +117,63 @@
   mpfr_init2 (x, 53);
   mpfr_init2 (y, 53);
 
-  /* check NaN */
-  mpfr_set_nan (x);
-  inex = test_log10 (y, x, MPFR_RNDN);
-  MPFR_ASSERTN (mpfr_nan_p (y) && inex == 0);
-
-  /* check Inf */
-  mpfr_set_inf (x, -1);
-  inex = test_log10 (y, x, MPFR_RNDN);
-  MPFR_ASSERTN (mpfr_nan_p (y) && inex == 0);
-
-  mpfr_set_inf (x, 1);
-  inex = test_log10 (y, x, MPFR_RNDN);
-  MPFR_ASSERTN (mpfr_inf_p (y) && mpfr_sgn (y) > 0 && inex == 0);
-
-  mpfr_set_ui (x, 0, MPFR_RNDN);
-  inex = test_log10 (x, x, MPFR_RNDN);
-  MPFR_ASSERTN (mpfr_inf_p (x) && mpfr_sgn (x) < 0 && inex == 0);
-  mpfr_set_ui (x, 0, MPFR_RNDN);
-  mpfr_neg (x, x, MPFR_RNDN);
-  inex = test_log10 (x, x, MPFR_RNDN);
-  MPFR_ASSERTN (mpfr_inf_p (x) && mpfr_sgn (x) < 0 && inex == 0);
-
-  /* check negative argument */
-  mpfr_set_si (x, -1, MPFR_RNDN);
-  inex = test_log10 (y, x, MPFR_RNDN);
-  MPFR_ASSERTN (mpfr_nan_p (y) && inex == 0);
-
-  /* check log10(1) = 0 */
-  mpfr_set_ui (x, 1, MPFR_RNDN);
-  inex = test_log10 (y, x, MPFR_RNDN);
-  MPFR_ASSERTN (mpfr_cmp_ui (y, 0) == 0 && MPFR_IS_POS (y) && inex == 0);
-
-  /* check log10(10^n)=n */
-  mpfr_set_ui (x, 1, MPFR_RNDN);
-  for (n = 1; n <= 15; n++)
+  RND_LOOP (r)
     {
-      mpfr_mul_ui (x, x, 10, MPFR_RNDN); /* x = 10^n */
-      inex = test_log10 (y, x, MPFR_RNDN);
-      if (mpfr_cmp_ui (y, n))
+      /* check NaN */
+      mpfr_set_nan (x);
+      inex = test_log10 (y, x, (mpfr_rnd_t) r);
+      MPFR_ASSERTN (mpfr_nan_p (y) && inex == 0);
+
+      /* check Inf */
+      mpfr_set_inf (x, -1);
+      inex = test_log10 (y, x, (mpfr_rnd_t) r);
+      MPFR_ASSERTN (mpfr_nan_p (y) && inex == 0);
+
+      mpfr_set_inf (x, 1);
+      inex = test_log10 (y, x, (mpfr_rnd_t) r);
+      MPFR_ASSERTN (mpfr_inf_p (y) && mpfr_sgn (y) > 0 && inex == 0);
+
+      mpfr_set_ui (x, 0, MPFR_RNDN);
+      inex = test_log10 (x, x, (mpfr_rnd_t) r);
+      MPFR_ASSERTN (mpfr_inf_p (x) && mpfr_sgn (x) < 0 && inex == 0);
+      mpfr_set_ui (x, 0, MPFR_RNDN);
+      mpfr_neg (x, x, MPFR_RNDN);
+      inex = test_log10 (x, x, (mpfr_rnd_t) r);
+      MPFR_ASSERTN (mpfr_inf_p (x) && mpfr_sgn (x) < 0 && inex == 0);
+
+      /* check negative argument */
+      mpfr_set_si (x, -1, MPFR_RNDN);
+      inex = test_log10 (y, x, (mpfr_rnd_t) r);
+      MPFR_ASSERTN (mpfr_nan_p (y) && inex == 0);
+
+      /* check log10(1) = 0 */
+      mpfr_set_ui (x, 1, MPFR_RNDN);
+      inex = test_log10 (y, x, (mpfr_rnd_t) r);
+      MPFR_ASSERTN (MPFR_IS_ZERO (y) && MPFR_IS_POS (y) && inex == 0);
+
+      /* check log10(10^n)=n */
+      mpfr_set_ui (x, 1, MPFR_RNDN);
+      for (n = 1; n <= 15; n++)
         {
-          printf ("log10(10^n) <> n for n=%u\n", n);
-          exit (1);
+          mpfr_mul_ui (x, x, 10, MPFR_RNDN); /* x = 10^n */
+          inex = test_log10 (y, x, (mpfr_rnd_t) r);
+          if (mpfr_cmp_ui (y, n))
+            {
+              printf ("log10(10^n) <> n for n=%u\n", n);
+              exit (1);
+            }
+          MPFR_ASSERTN (inex == 0);
         }
-      MPFR_ASSERTN (inex == 0);
     }
 
   mpfr_clear (x);
   mpfr_clear (y);
 
+  bug20230213 ();
+
   data_check ("data/log10", mpfr_log10, "mpfr_log10");
+  bad_cases (mpfr_log10, mpfr_exp10, "mpfr_log10",
+             256, -30, 30, 4, 128, 800, 50);
 
   tests_end_mpfr ();
   return 0;

_service:tar_scm:mpfr-4.2.0.tar.xz/tests/tlog2.c -> _service:tar_scm:mpfr-4.2.1.tar.xz/tests/tlog2.c Changed

@@ -30,37 +30,40 @@
 special (void)
 {
   mpfr_t x;
-  int inex;
+  int inex, r;
 
   mpfr_init (x);
 
-  mpfr_set_nan (x);
-  inex = mpfr_log2 (x, x, MPFR_RNDN);
-  MPFR_ASSERTN (mpfr_nan_p (x) && inex == 0);
-
-  mpfr_set_inf (x, -1);
-  inex = mpfr_log2 (x, x, MPFR_RNDN);
-  MPFR_ASSERTN (mpfr_nan_p (x) && inex == 0);
-
-  mpfr_set_inf (x, 1);
-  inex = mpfr_log2 (x, x, MPFR_RNDN);
-  MPFR_ASSERTN (mpfr_inf_p (x) && mpfr_sgn (x) > 0 && inex == 0);
-
-  mpfr_set_ui (x, 0, MPFR_RNDN);
-  inex = mpfr_log2 (x, x, MPFR_RNDN);
-  MPFR_ASSERTN (mpfr_inf_p (x) && mpfr_sgn (x) < 0 && inex == 0);
-  mpfr_set_ui (x, 0, MPFR_RNDN);
-  mpfr_neg (x, x, MPFR_RNDN);
-  inex = mpfr_log2 (x, x, MPFR_RNDN);
-  MPFR_ASSERTN (mpfr_inf_p (x) && mpfr_sgn (x) < 0 && inex == 0);
-
-  mpfr_set_si (x, -1, MPFR_RNDN);
-  inex = mpfr_log2 (x, x, MPFR_RNDN);
-  MPFR_ASSERTN (mpfr_nan_p (x) && inex == 0);
-
-  mpfr_set_si (x, 1, MPFR_RNDN);
-  inex = mpfr_log2 (x, x, MPFR_RNDN);
-  MPFR_ASSERTN (mpfr_cmp_ui (x, 0) == 0 && MPFR_IS_POS(x) && inex == 0);
+  RND_LOOP (r)
+    {
+      mpfr_set_nan (x);
+      inex = mpfr_log2 (x, x, (mpfr_rnd_t) r);
+      MPFR_ASSERTN (mpfr_nan_p (x) && inex == 0);
+
+      mpfr_set_inf (x, -1);
+      inex = mpfr_log2 (x, x, (mpfr_rnd_t) r);
+      MPFR_ASSERTN (mpfr_nan_p (x) && inex == 0);
+
+      mpfr_set_inf (x, 1);
+      inex = mpfr_log2 (x, x, (mpfr_rnd_t) r);
+      MPFR_ASSERTN (mpfr_inf_p (x) && mpfr_sgn (x) > 0 && inex == 0);
+
+      mpfr_set_ui (x, 0, MPFR_RNDN);
+      inex = mpfr_log2 (x, x, (mpfr_rnd_t) r);
+      MPFR_ASSERTN (mpfr_inf_p (x) && mpfr_sgn (x) < 0 && inex == 0);
+      mpfr_set_ui (x, 0, MPFR_RNDN);
+      mpfr_neg (x, x, MPFR_RNDN);
+      inex = mpfr_log2 (x, x, (mpfr_rnd_t) r);
+      MPFR_ASSERTN (mpfr_inf_p (x) && mpfr_sgn (x) < 0 && inex == 0);
+
+      mpfr_set_si (x, -1, MPFR_RNDN);
+      inex = mpfr_log2 (x, x, (mpfr_rnd_t) r);
+      MPFR_ASSERTN (mpfr_nan_p (x) && inex == 0);
+
+      mpfr_set_si (x, 1, MPFR_RNDN);
+      inex = mpfr_log2 (x, x, (mpfr_rnd_t) r);
+      MPFR_ASSERTN (MPFR_IS_ZERO (x) && MPFR_IS_POS (x) && inex == 0);
+    }
 
   mpfr_clear (x);
 }
@@ -75,6 +78,8 @@
   test_generic (MPFR_PREC_MIN, 100, 30);
 
   data_check ("data/log2", mpfr_log2, "mpfr_log2");
+  bad_cases (mpfr_log2, mpfr_exp2, "mpfr_log2",
+             256, -30, 30, 4, 128, 800, 50);
 
   tests_end_mpfr ();
   return 0;

_service:tar_scm:mpfr-4.2.0.tar.xz/tests/tprintf.c -> _service:tar_scm:mpfr-4.2.1.tar.xz/tests/tprintf.c Changed

@@ -62,12 +62,18 @@
 #define check_length_with_cmp(num_test, var, value, cmp, var_spec)      \
   if (cmp != 0)                                                         \
     {                                                                   \
-      mpfr_fprintf (stderr, "Error in test #%d, mpfr_printf printed %"  \
+      mpfr_fprintf (stderr, "Error in test #%d: mpfr_printf printed %"  \
                     QUOTE(var_spec)" characters instead of %d\n",       \
                     (num_test), (var), (value));                        \
       exit (1);                                                         \
     }
 
+#if MPFR_LCONV_DPTS
+#define DPLEN ((int) strlen (localeconv()->decimal_point))
+#else
+#define DPLEN 1
+#endif
+
 /* limit for random precision in random() */
 const int prec_max_printf = 5000;
 /* boolean: is stdout redirected to a file ? */
@@ -316,11 +322,11 @@
   check_vprintf ("a. %c, b. %Rb, c. %u, d. %li%ln", i, mpfr, i, lo, &ulo);
   check_length (2, ulo, 36, lu);
   check_vprintf ("a. %hi, b. %*f, c. %Re%hn", ush, 3, f, mpfr, &ush);
-  check_length (3, ush, 46, hu);
+  check_length (3, ush, 45 + DPLEN, hu);
   check_vprintf ("a. %hi, b. %f, c. %#.2Rf%n", sh, d, mpfr, &i);
-  check_length (4, i, 29, d);
+  check_length (4, i, 28 + DPLEN, d);
   check_vprintf ("a. %R*A, b. %Fe, c. %i%zn", rnd, mpfr, mpf, sz, &sz);
-  check_length (5, (unsigned long) sz, 34, lu); /* no format specifier '%zu' in C90 */
+  check_length (5, (unsigned long) sz, 33 + DPLEN, lu); /* no format specifier '%zu' in C90 */
   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",
@@ -332,7 +338,9 @@
   check_vprintf ("%% a. %RNg, b. %Qx, c. %td%tn", mpfr, mpq, p, &p);
   if (p != 20)
     {
-      mpfr_fprintf (stderr, "Error in test 8, got '%% a. %RNg, b. %Qx, c. %td'\n", mpfr, mpq, saved_p);
+      mpfr_fprintf (stderr,
+                    "Error in test #8: got '%% a. %RNg, b. %Qx, c. %td'\n",
+                    mpfr, mpq, saved_p);
 #if defined(__MINGW32__) || defined(__MINGW64__)
       fprintf (stderr,
                "Your MinGW may be too old, in which case compiling GMP\n"
@@ -344,7 +352,7 @@
 
 #ifdef PRINTF_L
   check_vprintf ("a. %RA, b. %Lf, c. %QX%zn", mpfr, ld, mpq, &sz);
-  check_length (9, (unsigned long) sz, 30, lu); /* no format specifier '%zu' in C90 */
+  check_length (9, (unsigned long) sz, 29 + DPLEN, lu); /* no format specifier '%zu' in C90 */
 #endif
 
 #ifndef NPRINTF_HH

_service:tar_scm:mpfr-4.2.0.tar.xz/tests/trec_sqrt.c -> _service:tar_scm:mpfr-4.2.1.tar.xz/tests/trec_sqrt.c Changed

@@ -176,6 +176,38 @@
       }
 }
 
+/* Before commits 270f4df6b3a49caae1cf564dcdc1c55b1c5989eb (master) and
+   934dd8842b4bdeb919a73123203bc8ce56db38d1 (4.2 branch) on 2023-04-17,
+   this was giving a stack overflow in mpfr_rec_sqrt due to a Ziv loop
+   where the working precision was increased additively instead of the
+   standard Ziv loop using the MPFR_ZIV_* macros.
+*/
+static void
+bad_case3 (void)
+{
+  mpfr_t x, y;
+  int inex;
+
+  mpfr_init2 (x, 123456);
+  mpfr_init2 (y, 4);
+  mpfr_set_ui (y, 9, MPFR_RNDN);
+  mpfr_ui_div (x, 1, y, MPFR_RNDN);
+  inex = mpfr_rec_sqrt (y, x, MPFR_RNDN);
+  /* Let's also check the result, though this is not the real purpose
+     of this test (a stack overflow just makes the program crash).
+     1/9 = 0.111000111000111000111000111000111000...E-3 and since the
+     precision 123456 is divisible by 6, x > 1/9. Thus 1/sqrt(x) < 3. */
+  if (mpfr_cmp_ui0 (y, 3) != 0 || inex <= 0)
+    {
+      printf ("Error in bad_case3: expected 3 with inex > 0, got ");
+      mpfr_out_str (stdout, 10, 0, y, MPFR_RNDN);
+      printf (" with inex=%d\n", inex);
+      exit (1);
+    }
+  mpfr_clear (x);
+  mpfr_clear (y);
+}
+
 /* timing test for n limbs (so that we can compare with GMP speed -s n) */
 static void
 test (unsigned long n)
@@ -237,11 +269,14 @@
   special ();
   bad_case1 ();
   bad_case2 ();
+  bad_case3 ();
   test_generic (MPFR_PREC_MIN, 300, 15);
 
   data_check ("data/rec_sqrt", mpfr_rec_sqrt, "mpfr_rec_sqrt");
   bad_cases (mpfr_rec_sqrt, pm2, "mpfr_rec_sqrt", 0, -256, 255, 4, 128,
              800, 50);
+  bad_cases (mpfr_rec_sqrt, pm2, "mpfr_rec_sqrt", 0, -256, 255, 9999, 9999,
+             120000, 1);
 
  end:
   tests_end_mpfr ();

_service:tar_scm:mpfr-4.2.1.tar.xz/tests/treldiff.c Added

@@ -0,0 +1,140 @@
+/* Test file for mpfr_reldiff.
+
+Copyright 2000-2023 Free Software Foundation, Inc.
+Contributed by the AriC and Caramba projects, INRIA.
+
+This file is part of the GNU MPFR Library.
+
+The GNU MPFR Library is free software; you can redistribute it and/or modify
+it under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation; either version 3 of the License, or (at your
+option) any later version.
+
+The GNU MPFR Library is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
+License for more details.
+
+You should have received a copy of the GNU Lesser General Public License
+along with the GNU MPFR Library; see the file COPYING.LESSER.  If not, see
+https://www.gnu.org/licenses/ or write to the Free Software Foundation, Inc.,
+51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. */
+
+#include "mpfr-test.h"
+
+#define SPECIAL_MAX 12
+
+/* copied from reuse.c */
+static void
+set_special (mpfr_ptr x, unsigned int select)
+{
+  MPFR_ASSERTN (select < SPECIAL_MAX);
+  switch (select)
+    {
+    case 0:
+      MPFR_SET_NAN (x);
+      break;
+    case 1:
+      MPFR_SET_INF (x);
+      MPFR_SET_POS (x);
+      break;
+    case 2:
+      MPFR_SET_INF (x);
+      MPFR_SET_NEG (x);
+      break;
+    case 3:
+      MPFR_SET_ZERO (x);
+      MPFR_SET_POS  (x);
+      break;
+    case 4:
+      MPFR_SET_ZERO (x);
+      MPFR_SET_NEG  (x);
+      break;
+    case 5:
+      mpfr_set_str_binary (x, "1");
+      break;
+    case 6:
+      mpfr_set_str_binary (x, "-1");
+      break;
+    case 7:
+      mpfr_set_str_binary (x, "1e-1");
+      break;
+    case 8:
+      mpfr_set_str_binary (x, "1e+1");
+      break;
+    case 9:
+      mpfr_const_pi (x, MPFR_RNDN);
+      break;
+    case 10:
+      mpfr_const_pi (x, MPFR_RNDN);
+      MPFR_SET_EXP (x, MPFR_GET_EXP (x)-1);
+      break;
+    case 11:
+      mpfr_urandomb (x, RANDS);
+      if (RAND_BOOL ())
+        mpfr_neg (x, x, MPFR_RNDN);
+      break;
+    default:
+      MPFR_ASSERTN (0);
+    }
+}
+
+int
+main (void)
+{
+  mpfr_t a1, a2, b, c;
+  int pa, pb, pc, i, j, r;
+  int prec = { MPFR_PREC_MIN, 3, 16, 32, 53 };
+
+  tests_start_mpfr ();
+
+  /* Just check that mpfr_reldiff(a,b,c,rnd) computes |b-c|/b using the
+     precision of a, without any optimization. */
+
+  for (pa = 0; pa < numberof(prec); pa++)
+    {
+      mpfr_inits2 (precpa, a1, a2, (mpfr_ptr) 0);
+      for (pb = 0; pb < numberof(prec); pb++)
+        {
+          mpfr_init2 (b, precpb);
+          for (pc = 0; pc < numberof(prec); pc++)
+            {
+              mpfr_init2 (c, precpc);
+              for (i = 0; i < SPECIAL_MAX; i++)
+                {
+                  set_special (b, i);
+                  for (j = 0; j < SPECIAL_MAX; j++)
+                    {
+                      set_special (c, j);
+                      RND_LOOP (r)
+                        {
+                          mpfr_rnd_t rnd = (mpfr_rnd_t) r;
+
+                          mpfr_sub (a1, b, c, rnd);
+                          mpfr_abs (a1, a1, rnd);
+                          mpfr_div (a1, a1, b, rnd);
+                          mpfr_reldiff (a2, b, c, rnd);
+                          if (! SAME_VAL (a1, a2))
+                            {
+                              printf ("Error for pa=%d pb=%d pc=%d "
+                                      "i=%d j=%d rnd=%s\n", pa, pb, pc,
+                                      i, j, mpfr_print_rnd_mode (rnd));
+                              printf ("expected ");
+                              mpfr_dump (a1);
+                              printf ("got      ");
+                              mpfr_dump (a2);
+                              exit (1);
+                            }
+                        }
+                    }
+                }
+              mpfr_clear (c);
+            }
+          mpfr_clear (b);
+        }
+      mpfr_clears (a1, a2, (mpfr_ptr) 0);
+    }
+
+  tests_end_mpfr ();
+  return 0;
+}

_service:tar_scm:mpfr-4.2.0.tar.xz/tests/trint.c -> _service:tar_scm:mpfr-4.2.1.tar.xz/tests/trint.c Changed

@@ -307,8 +307,23 @@
 
 #if __MPFR_STDC (199901L)
 
+typedef int (*F2)(mpfr_ptr, mpfr_srcptr);
+
+/* The argument g below will be of type F2 with args (mpfr_ptr, mpfr_srcptr),
+   except for mpfr_rint, with args (mpfr_ptr, mpfr_srcptr, mpfr_rnd_t). So,
+   when passing mpfr_rint, we need a cast: "(F2) &mpfr_rint". The cast will
+   also be needed to compare the pointers: "g == (F2) &mpfr_rint", and that's
+   all. */
+
+#if defined(__GNUC__)
+#pragma GCC diagnostic push
+#if __GNUC__ >= 8 || __clang_major__ >= 13
+#pragma GCC diagnostic ignored "-Wcast-function-type"
+#endif
+#endif
+
 static void
-test_fct (double (*f)(double), int (*g)(), const char *s, mpfr_rnd_t r)
+test_fct (double (*f)(double), F2 g, const char *s, mpfr_rnd_t r)
 {
   double d, y;
   mpfr_t dd, yy;
@@ -319,7 +334,7 @@
     {
       mpfr_set_d (dd, d, r);
       y = (*f)(d);
-      if (g == &mpfr_rint)
+      if (g == (F2) &mpfr_rint)
         mpfr_rint (yy, dd, r);
       else
         (*g)(yy, dd);
@@ -360,10 +375,14 @@
 #if HAVE_NEARBYINT
   RND_LOOP (r)
     if (mpfr_set_machine_rnd_mode ((mpfr_rnd_t) r) == 0)
-      test_fct (&nearbyint, &mpfr_rint, "rint", (mpfr_rnd_t) r);
+      test_fct (&nearbyint, (F2) &mpfr_rint, "rint", (mpfr_rnd_t) r);
 #endif
 }
 
+#if defined(__GNUC__)
+#pragma GCC diagnostic pop
+#endif
+
 #endif
 
 static void

_service:tar_scm:mpfr-4.2.0.tar.xz/tests/tset_float128.c -> _service:tar_scm:mpfr-4.2.1.tar.xz/tests/tset_float128.c Changed

@@ -45,6 +45,8 @@
   if (! mpfr_nan_p (x))
     {
       printf ("Error in mpfr_set_float128(x, NaN)\n");
+      printf ("got ");
+      mpfr_dump (x);
       exit (1);
     }
   f = mpfr_get_float128 (x, MPFR_RNDN);
@@ -61,12 +63,15 @@
   if (! mpfr_inf_p (x) || MPFR_IS_NEG (x))
     {
       printf ("Error in mpfr_set_float128(x, +Inf)\n");
+      printf ("got ");
+      mpfr_dump (x);
       exit (1);
     }
   f = mpfr_get_float128 (x, MPFR_RNDN);
   if (f != MPFR_DBL_INFP)
     {
       printf ("Error in mpfr_get_float128(+Inf)\n");
+      printf ("got %f\n", (double) f);
       exit (1);
     }
 
@@ -76,12 +81,15 @@
   if (! mpfr_inf_p (x) || MPFR_IS_POS (x))
     {
       printf ("Error in mpfr_set_float128(x, -Inf)\n");
+      printf ("got ");
+      mpfr_dump (x);
       exit (1);
     }
   f = mpfr_get_float128 (x, MPFR_RNDN);
   if (f != MPFR_DBL_INFM)
     {
       printf ("Error in mpfr_get_float128(-Inf)\n");
+      printf ("got %f\n", (double) f);
       exit (1);
     }
 #endif
@@ -92,18 +100,22 @@
   if (! mpfr_zero_p (x) || MPFR_IS_NEG (x))
     {
       printf ("Error in mpfr_set_float128(x, +0)\n");
+      printf ("got ");
+      mpfr_dump (x);
       exit (1);
     }
   f = mpfr_get_float128 (x, MPFR_RNDN);
   if (f != 0.0)  /* the sign is not checked */
     {
       printf ("Error in mpfr_get_float128(+0.0)\n");
+      printf ("got %f\n", (double) f);
       exit (1);
     }
 #if !defined(MPFR_ERRDIVZERO) && defined(HAVE_SIGNEDZ)
   if (1 / f != MPFR_DBL_INFP)  /* check the sign */
     {
       printf ("Error in mpfr_get_float128(+0.0)\n");
+      printf ("got %f\n", (double) f);
       exit (1);
     }
 #endif
@@ -114,12 +126,16 @@
   if (! mpfr_zero_p (x))
     {
       printf ("Error in mpfr_set_float128(x, -0)\n");
+      printf ("got ");
+      mpfr_dump (x);
       exit (1);
     }
 #if defined(HAVE_SIGNEDZ)
   if (MPFR_IS_POS (x))
     {
       printf ("Error in mpfr_set_float128(x, -0)\n");
+      printf ("got ");
+      mpfr_dump (x);
       exit (1);
     }
 #endif
@@ -127,12 +143,14 @@
   if (f != -0.0)  /* the sign is not checked */
     {
       printf ("Error in mpfr_get_float128(-0.0)\n");
+      printf ("got %f\n", (double) f);
       exit (1);
     }
 #if !defined(MPFR_ERRDIVZERO) && defined(HAVE_SIGNEDZ)
   if (1 / f != MPFR_DBL_INFM)  /* check the sign */
     {
       printf ("Error in mpfr_get_float128(-0.0)\n");
+      printf ("got %f\n", (double) f);
       exit (1);
     }
 #endif

_service:tar_scm:mpfr-4.2.0.tar.xz/tests/tsprintf.c -> _service:tar_scm:mpfr-4.2.1.tar.xz/tests/tsprintf.c Changed

@@ -50,19 +50,13 @@
 #include <locale.h>
 #endif
 
+#define MPFR_NEED_INTMAX_H
 #include "mpfr-test.h"
 
 const int prec_max_printf = 5000; /* limit for random precision in
                                      random_double() */
 #define BUF_SIZE 65536
 
-const char pinf_str = "inf";
-const char pinf_uc_str = "INF";
-const char minf_str = "-inf";
-const char minf_uc_str = "-INF";
-const char nan_str = "nan";
-const char nan_uc_str = "NAN";
-
 int randsize;
 
 /* 1. compare expected string with the string BUFFER returned by
@@ -283,6 +277,80 @@
 }
 
 static void
+special (void)
+{
+  mpfr_t x;
+  const char *ns = { "nan", "NAN", "inf", "INF" };
+  const char *ps = { "", " ", "+", "+ ", " +" };
+  const char *rs = { "", "U", "D", "Y", "Z", "N" };
+  const char *fs = { "efgab", "EFGA" };
+  int ntests = 0, neg, psflag, r, f;
+  unsigned int i;
+
+  mpfr_init2 (x, 128);  /* initialized to NaN */
+
+  for (i = 0; i < numberof (ns); i++)
+    {
+      if (i == 2)
+        MPFR_SET_INF (x);
+
+      for (neg = 0; neg < 2; neg++)
+        {
+          MPFR_SET_SIGN (x, neg ? MPFR_SIGN_NEG : MPFR_SIGN_POS);
+          for (psflag = 0; psflag < 3; psflag++)
+            for (r = 0; r < numberof (rs); r++)
+              for (f = 0; fsi & 1f != '\0'; f++)
+                {
+                  int fmtpsflags = psflag;
+                  int zeroflag, width;
+                  char ws4, fmt20, expected20, sign, *p;
+                  int sp;
+
+                  /* In case of '+' flag, let's randomly test an additional
+                     space flag, which should be ignored. */
+                  if (psflag == 2)
+                    fmtpsflags += randlimb () % 3;
+
+                  /* '0' flag ignored for NaN and Inf; use it randomly. */
+                  zeroflag = RAND_BOOL ();
+
+                  width = randlimb () % 12;
+                  if (width != 0)
+                    sprintf (ws, "%d", width);
+                  else
+                    ws0 = '\0';
+
+                  /* The following is a common prefix to better identify
+                     error messages produced in this function. */
+                  strcpy (expected, "special ");
+
+                  sprintf (fmt, "%s%%%s%s%sR%s%c", expected, psfmtpsflags,
+                           zeroflag ? "0" : "", ws, rsr, fsi & 1f);
+                  /* printf ("Format string: \"%s\"\n", fmt); */
+
+                  p = expected + 8;
+                  sign = neg ? '-' : pspsflag0;
+                  for (sp = width - (sign != '\0') - 3; sp > 0; sp--)
+                    *p++ = ' ';
+                  if (sign != '\0')
+                    *p++ = sign;
+                  strcpy (p, nsi);
+
+                  check_sprintf (expected, fmt, x);
+                  ntests++;
+                }
+        }
+    }
+
+  /* 2 base values (NaN and Inf), 2 signs (positive and negative),
+     3 possible '+'/space flag cases, 6 cases for the rounding mode,
+     9 format specifiers (efgab / EFGA). */
+  MPFR_ASSERTN (ntests == 2 * 2 * 3 * 6 * 9);
+
+  mpfr_clear (x);
+}
+
+static void
 decimal (void)
 {
   mpfr_prec_t p = 128;
@@ -318,53 +386,7 @@
   mpfr_init (z);
   mpfr_init2 (x, 128);
 
-  /* special numbers */
-  mpfr_set_inf (x, 1);
-  check_sprintf (pinf_str, "%Re", x);
-  check_sprintf (pinf_str, "%RUe", x);
-  check_sprintf (pinf_uc_str, "%RE", x);
-  check_sprintf (pinf_uc_str, "%RDE", x);
-  check_sprintf (pinf_str, "%Rf", x);
-  check_sprintf (pinf_str, "%RYf", x);
-  check_sprintf (pinf_uc_str, "%RF", x);
-  check_sprintf (pinf_uc_str, "%RZF", x);
-  check_sprintf (pinf_str, "%Rg", x);
-  check_sprintf (pinf_str, "%RNg", x);
-  check_sprintf (pinf_uc_str, "%RG", x);
-  check_sprintf (pinf_uc_str, "%RUG", x);
-  check_sprintf ("       inf", "%010Re", x);
-  check_sprintf ("       inf", "%010RDe", x);
-
-  mpfr_set_inf (x, -1);
-  check_sprintf (minf_str, "%Re", x);
-  check_sprintf (minf_str, "%RYe", x);
-  check_sprintf (minf_uc_str, "%RE", x);
-  check_sprintf (minf_uc_str, "%RZE", x);
-  check_sprintf (minf_str, "%Rf", x);
-  check_sprintf (minf_str, "%RNf", x);
-  check_sprintf (minf_uc_str, "%RF", x);
-  check_sprintf (minf_uc_str, "%RUF", x);
-  check_sprintf (minf_str, "%Rg", x);
-  check_sprintf (minf_str, "%RDg", x);
-  check_sprintf (minf_uc_str, "%RG", x);
-  check_sprintf (minf_uc_str, "%RYG", x);
-  check_sprintf ("      -inf", "%010Re", x);
-  check_sprintf ("      -inf", "%010RZe", x);
-
-  mpfr_set_nan (x);
-  check_sprintf (nan_str, "%Re", x);
-  check_sprintf (nan_str, "%RNe", x);
-  check_sprintf (nan_uc_str, "%RE", x);
-  check_sprintf (nan_uc_str, "%RUE", x);
-  check_sprintf (nan_str, "%Rf", x);
-  check_sprintf (nan_str, "%RDf", x);
-  check_sprintf (nan_uc_str, "%RF", x);
-  check_sprintf (nan_uc_str, "%RYF", x);
-  check_sprintf (nan_str, "%Rg", x);
-  check_sprintf (nan_str, "%RZg", x);
-  check_sprintf (nan_uc_str, "%RG", x);
-  check_sprintf (nan_uc_str, "%RNG", x);
-  check_sprintf ("       nan", "%010Re", x);
+  /* special numbers: tested in special() */
 
   /* positive numbers */
   mpfr_set_str (x, "18993474.61279296875", 10, MPFR_RNDN);
@@ -689,28 +711,7 @@
 
   mpfr_inits2 (64, x, z, (mpfr_ptr) 0);
 
-  /* special */
-  mpfr_set_inf (x, 1);
-  check_sprintf (pinf_str, "%Ra", x);
-  check_sprintf (pinf_str, "%RUa", x);
-  check_sprintf (pinf_str, "%RDa", x);
-  check_sprintf (pinf_uc_str, "%RA", x);
-  check_sprintf (pinf_uc_str, "%RYA", x);
-  check_sprintf (pinf_uc_str, "%RZA", x);
-  check_sprintf (pinf_uc_str, "%RNA", x);
-
-  mpfr_set_inf (x, -1);
-  check_sprintf (minf_str, "%Ra", x);
-  check_sprintf (minf_str, "%RYa", x);
-  check_sprintf (minf_str, "%RZa", x);
-  check_sprintf (minf_str, "%RNa", x);
-  check_sprintf (minf_uc_str, "%RA", x);
-  check_sprintf (minf_uc_str, "%RUA", x);
-  check_sprintf (minf_uc_str, "%RDA", x);
-
-  mpfr_set_nan (x);
-  check_sprintf (nan_str, "%Ra", x);
-  check_sprintf (nan_uc_str, "%RA", x);
+  /* special numbers: tested in special() */
 
   /* regular numbers */
   mpfr_set_str (x, "FEDCBA9.87654321", 16, MPFR_RNDN);
@@ -835,15 +836,7 @@
 
   mpfr_inits2 (64, x, z, (mpfr_ptr) 0);
 
-  /* special */
-  mpfr_set_inf (x, 1);
-  check_sprintf (pinf_str, "%Rb", x);
-
-  mpfr_set_inf (x, -1);
-  check_sprintf (minf_str, "%Rb", x);
-
-  mpfr_set_nan (x);
-  check_sprintf (nan_str, "%Rb", x);

_service:tar_scm:mpfr-4.2.0.tar.xz/tests/tstrtofr.c -> _service:tar_scm:mpfr-4.2.1.tar.xz/tests/tstrtofr.c Changed

@@ -1363,6 +1363,63 @@
   mpfr_clears (x, y, (mpfr_ptr) 0);
 }
 
+/* Bug reported by Michael Jones (case i = 0 below)
+     https://sympa.inria.fr/sympa/arc/mpfr/2023-06/msg00000.html
+   This yields an integer overflow -LONG_MIN. The result might still
+   be correct, but a runtime error is obtained with an UB sanitizer:
+     strtofr.c:745:11: runtime error: negation of -9223372036854775808 ...
+   Details after an analysis:
+   With GCC 4.9.4 and tcc, one gets an assertion failure:
+     mpn_exp.c:94: MPFR assertion failed: e > 0
+   And if all assertions are disabled with
+     ./configure --enable-assert=none CC=gcc-4.9
+   one gets an incorrect result:
+     Error in bug20230606 for i = 0
+     Expected x = 0
+     Got      x = 0.11001100110011001E-3
+   This issue is not visible with GCC 8.4.0 and later, even with -O0,
+   because GCC now transforms "-X >= 0" to "X <= 0" (which is valid
+   under the ISO C rules). Note that such an optimization generally
+   makes buggy code (which assumes "wrapping") fail; here, it makes
+   the bug invisible!
+
+   Case i = 1 should be identical.
+
+   Case i = 2 shows another bug (probably with all compilers):
+     Error in bug20230606 for i = 2
+     Expected x = 0
+     Got      x = 0.11111111111111111E1073741823
+   or with an UB sanitizer:
+     strtofr.c:428:19: runtime error: signed integer overflow: ...
+   This is the bug mentioned at
+     https://sympa.inria.fr/sympa/arc/mpfr/2023-06/msg00001.html
+*/
+static void
+bug20230606 (void)
+{
+  const char *const s = {
+    "0.1E-99999999999999999999",
+    ".1E-99999999999999999999",
+    ".01E-99999999999999999999" };
+  mpfr_t x;
+  int i;
+
+  mpfr_init2 (x, 17);
+  for (i = 0; i < numberof (s); i++)
+    {
+      mpfr_strtofr (x, si, NULL, 10, MPFR_RNDZ);
+      if (!mpfr_zero_p (x) || mpfr_signbit (x) != 0)
+        {
+          printf ("Error in bug20230606 for i = %d\n", i);
+          printf ("Expected x = 0\n");
+          printf ("Got      x = ");
+          mpfr_dump (x);
+          exit (1);
+        }
+    }
+  mpfr_clear (x);
+}
+
 static void
 coverage (void)
 {
@@ -1563,6 +1620,7 @@
   bug20161217 ();
   bug20170308 ();
   bug20181127 ();
+  bug20230606 ();
   random_tests ();
 
   tests_end_mpfr ();

_service:tar_scm:mpfr-4.2.0.tar.xz/tests/tui_pow.c -> _service:tar_scm:mpfr-4.2.1.tar.xz/tests/tui_pow.c Changed

@@ -142,54 +142,49 @@
   mpfr_clear (t);
 }
 
-int
-main (int argc, char *argv)
+static void
+huge (void)
 {
-  mpfr_t x, y;
-  unsigned long int n;
+  mpfr_exp_t old_emin, old_emax;
+  mpfr_t x;
 
-  tests_start_mpfr ();
+  old_emin = mpfr_get_emin ();
+  old_emax = mpfr_get_emax ();
 
-  mpfr_init (x);
-  mpfr_init (y);
+  set_emin (MPFR_EMIN_MIN);
+  set_emax (MPFR_EMAX_MAX);
 
-  do n = randlimb (); while (n <= 1);
+  mpfr_init2 (x, 8);
 
-  MPFR_SET_INF(x);
-  mpfr_ui_pow (y, n, x, MPFR_RNDN);
-  if(!MPFR_IS_INF(y))
-    {
-      printf ("evaluation of function at INF does not return INF\n");
-      exit (1);
-    }
-
-  MPFR_CHANGE_SIGN(x);
-  mpfr_ui_pow (y, n, x, MPFR_RNDN);
-  if(!MPFR_IS_ZERO(y))
-    {
-      printf ("evaluation of function in -INF does not return 0");
-      exit (1);
-    }
+  /* The purpose of this test is more to check that mpfr_ui_pow_ui
+     terminates (without taking much memory) rather than checking
+     the value of x. On 2023-02-13, the +Inf case was not handled
+     in the Ziv iteration, yielding an infinite loop, affecting
+     mpfr_log10 in particular. See
+       commit 90de094f0d9c309daca707aa227470d810866616
+  */
+  mpfr_ui_pow_ui (x, 5, ULONG_MAX, MPFR_RNDN);
+  if (MPFR_EMAX_MAX <= ULONG_MAX)  /* true with default _MPFR_EXP_FORMAT */
+    MPFR_ASSERTN (MPFR_IS_INF (x));
 
-  MPFR_SET_NAN(x);
-  mpfr_ui_pow (y, n, x, MPFR_RNDN);
-  if(!MPFR_IS_NAN(y))
-    {
-      printf ("evaluation of function in NAN does not return NAN");
-      exit (1);
-    }
+  mpfr_clear (x);
 
-  test1 ();
+  set_emin (old_emin);
+  set_emax (old_emax);
+}
 
-  {
-  mpfr_t z, t;
+static void
+test2 (void)
+{
+  mpfr_t x, y, z, t;
   mpfr_prec_t prec;
   mpfr_rnd_t rnd;
   unsigned int n;
+  mpfr_prec_t p0 = 2, p1 = 100;
+  unsigned int N = 20;
 
-  mpfr_prec_t p0=2, p1=100;
-  unsigned int N=20;
-
+  mpfr_init2 (x, 2);
+  mpfr_init2 (y, 2);
   mpfr_init2 (z, 38);
   mpfr_init2 (t, 6);
 
@@ -197,38 +192,30 @@
   mpfr_set_str_binary (t, "0.110000E5");
   mpfr_ui_pow (z, 3, t, MPFR_RNDN);
 
-  mpfr_set_prec (x, 2);
-  mpfr_set_prec (y, 2);
   mpfr_set_str (x, "-0.5", 10, MPFR_RNDZ);
   mpfr_ui_pow (y, 4, x, MPFR_RNDD);
-  if (mpfr_cmp_ui_2exp(y, 1, -1))
+  if (mpfr_cmp_ui_2exp (y, 1, -1))
     {
-      fprintf (stderr, "Error for 4^(-0.5), prec=2, MPFR_RNDD\n");
-      fprintf (stderr, "expected 0.5, got ");
-      mpfr_out_str (stderr, 2, 0, y, MPFR_RNDN);
-      fprintf (stderr, "\n");
+      printf ("Error for 4^(-0.5), prec=2, MPFR_RNDD\n");
+      printf ("expected 0.5, got ");
+      mpfr_out_str (stdout, 2, 0, y, MPFR_RNDN);
+      printf ("\n");
       exit (1);
     }
 
   /* problem found by Kevin on spe175.testdrive.compaq.com
      (03 Sep 2003), ia64 under HP-UX */
-  mpfr_set_prec (x, 2);
-  mpfr_set_prec (y, 2);
   mpfr_set_str (x, "0.5", 10, MPFR_RNDN);
   mpfr_ui_pow (y, 398441521, x, MPFR_RNDN);
-  if (mpfr_cmp_ui_2exp(y, 1, 14))
+  if (mpfr_cmp_ui_2exp (y, 1, 14))
     {
-      fprintf (stderr, "Error for 398441521^(0.5), prec=2, MPFR_RNDN\n");
-      fprintf (stderr, "expected 1.0e14, got ");
-      mpfr_out_str (stderr, 2, 0, y, MPFR_RNDN);
-      fprintf (stderr, "\n");
+      printf ("Error for 398441521^(0.5), prec=2, MPFR_RNDN\n");
+      printf ("expected 1.0e14, got ");
+      mpfr_out_str (stdout, 2, 0, y, MPFR_RNDN);
+      printf ("\n");
       exit (1);
     }
 
-  mpfr_clear (z);
-  mpfr_clear (t);
-
-  mpfr_set_prec (x, 2);
   mpfr_set_str (x, "0.5", 10, MPFR_RNDN);
   check1 (x, 2, 398441521, MPFR_RNDN);  /* 398441521 = 19961^2 */
 
@@ -245,11 +232,70 @@
           check1 (x, prec, nt, rnd);
         }
     }
-  }
+
+  mpfr_clears (x, y, z, t, (mpfr_ptr) 0);
+}
+
+/* reverse the arguments n and x for tgeneric_ui.c */
+static int
+ui_pow_rev (mpfr_ptr y, mpfr_srcptr x, unsigned long n, mpfr_rnd_t rnd)
+{
+  return mpfr_ui_pow (y, n, x, rnd);
+}
+
+#define TEST_FUNCTION ui_pow_rev
+#define INTEGER_TYPE  unsigned long
+#define RAND_FUNCTION(x) mpfr_random2(x, MPFR_LIMB_SIZE (x), 1, RANDS)
+#define INT_RAND_FUNCTION() \
+  (randlimb () % 16 == 0 ? randulong () : (unsigned long) (randlimb () % 32))
+#include "tgeneric_ui.c"
+
+int
+main (int argc, char *argv)
+{
+  mpfr_t x, y;
+  unsigned long int n;
+
+  tests_start_mpfr ();
+
+  mpfr_init (x);
+  mpfr_init (y);
+
+  do n = randlimb (); while (n <= 1);
+
+  MPFR_SET_INF (x);
+  mpfr_ui_pow (y, n, x, MPFR_RNDN);
+  if (! MPFR_IS_INF (y))
+    {
+      printf ("evaluation of function at INF does not return INF\n");
+      exit (1);
+    }
+
+  MPFR_CHANGE_SIGN (x);
+  mpfr_ui_pow (y, n, x, MPFR_RNDN);
+  if (! MPFR_IS_ZERO (y))
+    {
+      printf ("evaluation of function in -INF does not return 0\n");
+      exit (1);
+    }
+
+  MPFR_SET_NAN (x);
+  mpfr_ui_pow (y, n, x, MPFR_RNDN);
+  if (! MPFR_IS_NAN (y))
+    {
+      printf ("evaluation of function in NAN does not return NAN\n");
+      exit (1);
+    }
 
   mpfr_clear (x);
   mpfr_clear (y);
 
+  test1 ();
+  test2 ();

Changes of Revision 3