texlive[42168] Build/source/libs/mpfr: mpfr 3.1.5
commits+kakuto at tug.org
commits+kakuto at tug.org
Wed Sep 28 10:13:29 CEST 2016
Revision: 42168
http://tug.org/svn/texlive?view=revision&revision=42168
Author: kakuto
Date: 2016-09-28 10:13:29 +0200 (Wed, 28 Sep 2016)
Log Message:
-----------
mpfr 3.1.5
Modified Paths:
--------------
trunk/Build/source/libs/mpfr/ChangeLog
trunk/Build/source/libs/mpfr/configure
trunk/Build/source/libs/mpfr/mpfr-PATCHES/ChangeLog
trunk/Build/source/libs/mpfr/mpfr-PATCHES/TL-Changes
trunk/Build/source/libs/mpfr/mpfr-PATCHES/patch-01-TL
trunk/Build/source/libs/mpfr/mpfr-src/ChangeLog
trunk/Build/source/libs/mpfr/mpfr-src/INSTALL
trunk/Build/source/libs/mpfr/mpfr-src/NEWS
trunk/Build/source/libs/mpfr/mpfr-src/VERSION
trunk/Build/source/libs/mpfr/mpfr-src/configure.ac
trunk/Build/source/libs/mpfr/mpfr-src/src/Makefile.am
trunk/Build/source/libs/mpfr/mpfr-src/src/add_ui.c
trunk/Build/source/libs/mpfr/mpfr-src/src/get_ld.c
trunk/Build/source/libs/mpfr/mpfr-src/src/mpfr-impl.h
trunk/Build/source/libs/mpfr/mpfr-src/src/mpfr.h
trunk/Build/source/libs/mpfr/mpfr-src/src/powerof2.c
trunk/Build/source/libs/mpfr/mpfr-src/src/round_p.c
trunk/Build/source/libs/mpfr/mpfr-src/src/round_prec.c
trunk/Build/source/libs/mpfr/mpfr-src/src/sub1.c
trunk/Build/source/libs/mpfr/mpfr-src/src/sub_ui.c
trunk/Build/source/libs/mpfr/mpfr-src/src/version.c
trunk/Build/source/libs/mpfr/version.ac
Modified: trunk/Build/source/libs/mpfr/ChangeLog
===================================================================
--- trunk/Build/source/libs/mpfr/ChangeLog 2016-09-28 06:28:43 UTC (rev 42167)
+++ trunk/Build/source/libs/mpfr/ChangeLog 2016-09-28 08:13:29 UTC (rev 42168)
@@ -1,3 +1,8 @@
+2016-09-28 Akira Kakuto <kakuto at fuk.kindai.ac.jp>
+
+ Import mpfr-3.1.5.
+ * version.ac: Adjust.
+
2016-03-07 Akira Kakuto <kakuto at fuk.kindai.ac.jp>
Import mpfr-3.1.4.
Modified: trunk/Build/source/libs/mpfr/configure
===================================================================
--- trunk/Build/source/libs/mpfr/configure 2016-09-28 06:28:43 UTC (rev 42167)
+++ trunk/Build/source/libs/mpfr/configure 2016-09-28 08:13:29 UTC (rev 42168)
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for mpfr (TeX Live) 3.1.4.
+# Generated by GNU Autoconf 2.69 for mpfr (TeX Live) 3.1.5.
#
# Report bugs to <tex-k at tug.org>.
#
@@ -580,8 +580,8 @@
# Identity of this package.
PACKAGE_NAME='mpfr (TeX Live)'
PACKAGE_TARNAME='mpfr--tex-live-'
-PACKAGE_VERSION='3.1.4'
-PACKAGE_STRING='mpfr (TeX Live) 3.1.4'
+PACKAGE_VERSION='3.1.5'
+PACKAGE_STRING='mpfr (TeX Live) 3.1.5'
PACKAGE_BUGREPORT='tex-k at tug.org'
PACKAGE_URL=''
@@ -1295,7 +1295,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 (TeX Live) 3.1.4 to adapt to many kinds of systems.
+\`configure' configures mpfr (TeX Live) 3.1.5 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1365,7 +1365,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of mpfr (TeX Live) 3.1.4:";;
+ short | recursive ) echo "Configuration of mpfr (TeX Live) 3.1.5:";;
esac
cat <<\_ACEOF
@@ -1469,7 +1469,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-mpfr (TeX Live) configure 3.1.4
+mpfr (TeX Live) configure 3.1.5
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1938,7 +1938,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 (TeX Live) $as_me 3.1.4, which was
+It was created by mpfr (TeX Live) $as_me 3.1.5, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -3861,7 +3861,7 @@
# Define the identity of the package.
PACKAGE='mpfr--tex-live-'
- VERSION='3.1.4'
+ VERSION='3.1.5'
cat >>confdefs.h <<_ACEOF
@@ -7607,7 +7607,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by mpfr (TeX Live) $as_me 3.1.4, which was
+This file was extended by mpfr (TeX Live) $as_me 3.1.5, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -7677,7 +7677,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-mpfr (TeX Live) config.status 3.1.4
+mpfr (TeX Live) config.status 3.1.5
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
Modified: trunk/Build/source/libs/mpfr/mpfr-PATCHES/ChangeLog
===================================================================
--- trunk/Build/source/libs/mpfr/mpfr-PATCHES/ChangeLog 2016-09-28 06:28:43 UTC (rev 42167)
+++ trunk/Build/source/libs/mpfr/mpfr-PATCHES/ChangeLog 2016-09-28 08:13:29 UTC (rev 42168)
@@ -1,3 +1,9 @@
+2016-09-28 Akira Kakuto <kakuto at fuk.kindai.ac.jp>
+
+ Imported mpfr-3.1.5 source tree from:
+ http://ftp.gnu.org/gnu/mpfr/
+ * patch-01-TL: Adapted.
+
2016-03-07 Akira Kakuto <kakuto at fuk.kindai.ac.jp>
Imported mpfr-3.1.4 source tree from:
Modified: trunk/Build/source/libs/mpfr/mpfr-PATCHES/TL-Changes
===================================================================
--- trunk/Build/source/libs/mpfr/mpfr-PATCHES/TL-Changes 2016-09-28 06:28:43 UTC (rev 42167)
+++ trunk/Build/source/libs/mpfr/mpfr-PATCHES/TL-Changes 2016-09-28 08:13:29 UTC (rev 42168)
@@ -1,4 +1,4 @@
-Changes applied to the mpfr-3.1.4/ tree as obtained from:
+Changes applied to the mpfr-3.1.5/ tree as obtained from:
http://ftp.gnu.org/gnu/mpfr/
Removed:
@@ -23,4 +23,3 @@
tests/
tools/
tune/
-
Modified: trunk/Build/source/libs/mpfr/mpfr-PATCHES/patch-01-TL
===================================================================
--- trunk/Build/source/libs/mpfr/mpfr-PATCHES/patch-01-TL 2016-09-28 06:28:43 UTC (rev 42167)
+++ trunk/Build/source/libs/mpfr/mpfr-PATCHES/patch-01-TL 2016-09-28 08:13:29 UTC (rev 42168)
@@ -1,6 +1,6 @@
-diff -ur mpfr-3.1.4.orig/src/mparam_h.in mpfr-3.1.4/src/mparam_h.in
---- mpfr-3.1.4.orig/src/mparam_h.in Sun Mar 06 20:33:05 2016
-+++ mpfr-3.1.4/src/mparam_h.in Mon Mar 07 21:52:59 2016
+diff -ur mpfr-3.1.5.orig/src/mparam_h.in mpfr-3.1.5/src/mparam_h.in
+--- mpfr-3.1.5.orig/src/mparam_h.in Tue Sep 27 16:58:15 2016
++++ mpfr-3.1.5/src/mparam_h.in Wed Sep 28 16:53:41 2016
@@ -27,7 +27,9 @@
for example with gcc -dM -E -xc /dev/null
As of gcc 4.2, you can also use: -march=native or -mtune=native */
@@ -12,9 +12,9 @@
#define MPFR_TUNE_CASE "src/x86_64/pentium4/mparam.h"
#include "x86_64/pentium4/mparam.h"
-diff -ur mpfr-3.1.4.orig/src/mpfr-impl.h mpfr-3.1.4/src/mpfr-impl.h
---- mpfr-3.1.4.orig/src/mpfr-impl.h Sun Mar 06 20:33:04 2016
-+++ mpfr-3.1.4/src/mpfr-impl.h Mon Mar 07 21:55:06 2016
+diff -ur mpfr-3.1.5.orig/src/mpfr-impl.h mpfr-3.1.5/src/mpfr-impl.h
+--- mpfr-3.1.5.orig/src/mpfr-impl.h Tue Sep 27 16:58:15 2016
++++ mpfr-3.1.5/src/mpfr-impl.h Wed Sep 28 16:55:05 2016
@@ -23,6 +23,11 @@
#ifndef __MPFR_IMPL_H__
#define __MPFR_IMPL_H__
Modified: trunk/Build/source/libs/mpfr/mpfr-src/ChangeLog
===================================================================
--- trunk/Build/source/libs/mpfr/mpfr-src/ChangeLog 2016-09-28 06:28:43 UTC (rev 42167)
+++ trunk/Build/source/libs/mpfr/mpfr-src/ChangeLog 2016-09-28 08:13:29 UTC (rev 42168)
@@ -1,4 +1,285 @@
------------------------------------------------------------------------
+r10891 | vlefevre | 2016-09-27 07:48:20 +0000 (Tue, 27 Sep 2016) | 1 line
+Changed paths:
+ M /branches/3.1/VERSION
+ M /branches/3.1/configure.ac
+ M /branches/3.1/doc/mpfr.texi
+ M /branches/3.1/src/mpfr.h
+ M /branches/3.1/src/version.c
+
+Updated version to 3.1.5.
+------------------------------------------------------------------------
+r10889 | vlefevre | 2016-09-23 14:09:21 +0000 (Fri, 23 Sep 2016) | 2 lines
+Changed paths:
+ M /branches/3.1
+ M /branches/3.1/examples/version.c
+
+[examples/version.c] A bit more output.
+(merged changeset r10888 from the trunk)
+------------------------------------------------------------------------
+r10887 | vlefevre | 2016-09-23 13:57:32 +0000 (Fri, 23 Sep 2016) | 2 lines
+Changed paths:
+ M /branches/3.1
+ M /branches/3.1/examples/version.c
+
+[examples/version.c] Update from the trunk (with svn merge on
+changesets r8034,8036,8128,10885-10886).
+------------------------------------------------------------------------
+r10873 | vlefevre | 2016-09-14 08:09:05 +0000 (Wed, 14 Sep 2016) | 4 lines
+Changed paths:
+ M /branches/3.1
+ M /branches/3.1/tests/tdiv.c
+
+[tests/tdiv.c] Improved code readability, fixing a small bug
+(found by David Binderman using cppcheck) at the same time.
+This bug could only affect the error message if the test failed.
+(merged changesets r10871-10872 from the trunk)
+------------------------------------------------------------------------
+r10868 | vlefevre | 2016-09-13 17:17:12 +0000 (Tue, 13 Sep 2016) | 1 line
+Changed paths:
+ M /branches/3.1/ChangeLog
+
+ChangeLog update with "TZ=UTC svn log -rHEAD:0 -v" (in UTF-8 locales).
+------------------------------------------------------------------------
+r10867 | vlefevre | 2016-09-13 17:09:26 +0000 (Tue, 13 Sep 2016) | 1 line
+Changed paths:
+ M /branches/3.1/doc/mpfr.texi
+
+[doc/mpfr.texi] Updated the month.
+------------------------------------------------------------------------
+r10866 | vlefevre | 2016-09-13 17:08:30 +0000 (Tue, 13 Sep 2016) | 2 lines
+Changed paths:
+ M /branches/3.1/VERSION
+ M /branches/3.1/configure.ac
+ M /branches/3.1/doc/mpfr.texi
+ M /branches/3.1/src/Makefile.am
+ M /branches/3.1/src/mpfr.h
+ M /branches/3.1/src/version.c
+
+Updated version to 3.1.5-rc1 and updated libmpfr_la_LDFLAGS in
+src/Makefile.am for the next release.
+------------------------------------------------------------------------
+r10857 | vlefevre | 2016-09-12 12:22:08 +0000 (Mon, 12 Sep 2016) | 1 line
+Changed paths:
+ M /branches/3.1/src/get_ld.c
+
+[src/get_ld.c] Re-added a blank line that disappeared in a merge.
+------------------------------------------------------------------------
+r10856 | vlefevre | 2016-09-12 12:17:31 +0000 (Mon, 12 Sep 2016) | 2 lines
+Changed paths:
+ M /branches/3.1/src/get_ld.c
+
+[src/get_ld.c] Removed a "see below", which refers to a comment that
+is in the trunk but not in this branch.
+------------------------------------------------------------------------
+r10855 | vlefevre | 2016-09-12 12:00:15 +0000 (Mon, 12 Sep 2016) | 3 lines
+Changed paths:
+ M /branches/3.1
+ M /branches/3.1/tests/tset_ld.c
+
+[tests/tset_ld.c] In bug_20160907, fixed the method to get the smallest
+subnormal (now, OK with gcc -mpc64 or under NetBSD 6-).
+(merged changesets r10835-10839 from the trunk)
+------------------------------------------------------------------------
+r10854 | vlefevre | 2016-09-12 11:30:20 +0000 (Mon, 12 Sep 2016) | 2 lines
+Changed paths:
+ M /branches/3.1
+ M /branches/3.1/tests/tabs.c
+
+[tests/tabs.c] Removed mpfr_test_init (not needed here).
+(merged changeset r10822 from the trunk)
+------------------------------------------------------------------------
+r10853 | vlefevre | 2016-09-12 11:28:24 +0000 (Mon, 12 Sep 2016) | 2 lines
+Changed paths:
+ M /branches/3.1
+ M /branches/3.1/tests/tset_ld.c
+
+[tests/tset_ld.c] Move tests_start_mpfr and mpfr_test_init earlier.
+(merged changesets r8688,10821 from the trunk)
+------------------------------------------------------------------------
+r10852 | vlefevre | 2016-09-12 11:25:44 +0000 (Mon, 12 Sep 2016) | 3 lines
+Changed paths:
+ M /branches/3.1
+ M /branches/3.1/tests/tset_ld.c
+
+[tests/tset_ld.c] Corrected a type (due to a printf with %ld) and fixed
+a loop in case an extended range is used.
+(merged changesets r10818-10819 from the trunk)
+------------------------------------------------------------------------
+r10815 | vlefevre | 2016-09-08 09:53:52 +0000 (Thu, 08 Sep 2016) | 3 lines
+Changed paths:
+ M /branches/3.1
+ M /branches/3.1/src
+ M /branches/3.1/src/get_ld.c
+ M /branches/3.1/tests/tset_ld.c
+
+[src/get_ld.c] Fixed bug for little-endian x86 extended precision.
+[tests/tset_ld.c] Added test case.
+(merged changesets r10807-10809,10811-10812 from the trunk)
+------------------------------------------------------------------------
+r10814 | vlefevre | 2016-09-08 09:05:08 +0000 (Thu, 08 Sep 2016) | 1 line
+Changed paths:
+ M /branches/3.1/NEWS
+
+[NEWS] Update for GNU MPFR 3.1.5.
+------------------------------------------------------------------------
+r10792 | vlefevre | 2016-09-05 12:04:43 +0000 (Mon, 05 Sep 2016) | 10 lines
+Changed paths:
+ M /branches/3.1
+ M /branches/3.1/src
+ M /branches/3.1/src/mpfr-impl.h
+ M /branches/3.1/src/powerof2.c
+ M /branches/3.1/src/round_p.c
+ M /branches/3.1/src/round_prec.c
+ M /branches/3.1/tests/tcan_round.c
+
+Fixed various bugs in mpfr_can_round_raw, which affected mpfr_can_round:
+there could still be false positives (i.e. mpfr_can_round could say that
+rounding was possible while correct rounding was not guaranteed), and
+also false negatives, some of which could yield infinite Ziv loops in
+user code in practice.
+Added tests triggering these bugs, in particular a comprehensive test
+against a naive implementation.
+(merged changesets
+ r10679-10686,10717-10718,10743,10746-10748,10752,10754,10756
+from the trunk)
+------------------------------------------------------------------------
+r10791 | vlefevre | 2016-09-05 09:31:14 +0000 (Mon, 05 Sep 2016) | 3 lines
+Changed paths:
+ M /branches/3.1/tests/tzeta.c
+
+[tests/tzeta.c] Updated test_generic invocation based on the trunk
+in order to reduce the test time (increased since r9849).
+(merged changesets r9955,10667,10672,10790 from the trunk)
+------------------------------------------------------------------------
+r10742 | vlefevre | 2016-08-22 11:42:38 +0000 (Mon, 22 Aug 2016) | 2 lines
+Changed paths:
+ M /branches/3.1/tests/tmul.c
+
+[tests/tmul.c] Added underflow test from the trunk (merged changesets
+from r10601 to r10716 for tmul.c only).
+------------------------------------------------------------------------
+r10728 | vlefevre | 2016-08-04 20:31:01 +0000 (Thu, 04 Aug 2016) | 3 lines
+Changed paths:
+ M /branches/3.1
+ M /branches/3.1/tests/tsi_op.c
+
+[tests/tsi_op.c] Fixed a macro. There were no consequences except
+spurious null statements.
+(merged changeset r10724 from the trunk)
+------------------------------------------------------------------------
+r10722 | vlefevre | 2016-08-04 12:18:54 +0000 (Thu, 04 Aug 2016) | 3 lines
+Changed paths:
+ M /branches/3.1
+ M /branches/3.1/tests/tset_si.c
+ M /branches/3.1/tests/tset_sj.c
+
+[tests/tset_{si,sj}.c] Fixed macros. There were no consequences except
+spurious null statements.
+(merged changeset r10721 from the trunk)
+------------------------------------------------------------------------
+r10720 | vlefevre | 2016-08-04 01:52:45 +0000 (Thu, 04 Aug 2016) | 6 lines
+Changed paths:
+ M /branches/3.1
+ M /branches/3.1/tests/tpow_z.c
+ M /branches/3.1/tests/tset_si.c
+ M /branches/3.1/tests/tset_sj.c
+ M /branches/3.1/tests/tsi_op.c
+
+[tests] C++ compatibility: avoid errors with "g++ -std=c++11" or later.
+Note that as of GCC 6, "the default mode for C++ is now -std=gnu++14
+instead of -std=gnu++98" <https://gcc.gnu.org/gcc-6/changes.html>.
+So, this fixes the failures in the build of the MPFR tests with g++
+from GCC 6 without particular options.
+(merged changeset r10719 from the trunk)
+------------------------------------------------------------------------
+r10387 | vlefevre | 2016-05-30 07:55:29 +0000 (Mon, 30 May 2016) | 2 lines
+Changed paths:
+ M /branches/3.1
+ M /branches/3.1/tests/tsub.c
+
+[tests/tsub.c] Added comments for check_max_almosteven.
+(merged changeset r10386 from the trunk)
+------------------------------------------------------------------------
+r10384 | vlefevre | 2016-05-29 18:55:04 +0000 (Sun, 29 May 2016) | 12 lines
+Changed paths:
+ M /branches/3.1
+ M /branches/3.1/src
+ M /branches/3.1/src/sub1.c
+ M /branches/3.1/tests/tsub.c
+
+[src/sub1.c] Fixed bug in mpfr_sub1 (real subtraction a = b - c, with
+ |b| > |c|): In MPFR_RNDN (round-to-nearest mode), when
+ * |b| is the midpoint between the maximum finite number in the
+ precision of a and 2^emax (the maximum finite number + 1 ulp),
+ which is possible only if PREC(b) > PREC(a),
+ * c is small enough (i.e. no overlap with a and b),
+ mpfr_sub1 returns an infinity (with overflow flag set) instead of
+ ± the maximum number (no overflow). The cause is that an overflow
+ is generated too early, in an intermediate rounding.
+[tests/tsub.c] Added test cases.
+(merged changeset r10383 from the trunk, with conflict resolved in
+src/sub1.c and mpfr_flags_t replaced by unsigned int)
+------------------------------------------------------------------------
+r10304 | vlefevre | 2016-05-22 10:05:37 +0000 (Sun, 22 May 2016) | 5 lines
+Changed paths:
+ M /branches/3.1
+ M /branches/3.1/src/add_ui.c
+ M /branches/3.1/src/sub_ui.c
+ M /branches/3.1/tests/tadd_ui.c
+ M /branches/3.1/tests/tsub_ui.c
+
+For mpfr_add_ui and mpfr_sub_ui, make sure that all the expected flags
+are set (in practice, only NaN was affected). Added testcases from the
+trunk (merged r10298 and r10303).
+Note: the trunk was fixed with a partial rewrite for some optimization
+and to improve consistency, but here, the changes are kept minimal.
+------------------------------------------------------------------------
+r10264 | vlefevre | 2016-04-13 21:17:07 +0000 (Wed, 13 Apr 2016) | 9 lines
+Changed paths:
+ M /branches/3.1
+ M /branches/3.1/src
+ M /branches/3.1/src/mpfr-impl.h
+
+[src/mpfr-impl.h] Removed the detection of possible inconsistencies
+under Unix because the tests could yield spurious errors with Cygwin32
+or other similar implementations. Moreover, such tests were used for
+debugging purpose or to detect potential problems in the environment,
+thus were not really useful for the end user. They were initially
+added in the win-thread-safe-dll branch (r9682, following a problem
+found in r9680). One alternative for checking by the MPFR developers
+would be to output the status of some internal macros in tversion.
+(merged changeset r10260 from the trunk)
+------------------------------------------------------------------------
+r10234 | vlefevre | 2016-03-15 12:17:53 +0000 (Tue, 15 Mar 2016) | 5 lines
+Changed paths:
+ M /branches/3.1
+ M /branches/3.1/src
+ M /branches/3.1/src/mpfr-impl.h
+
+[src/mpfr-impl.h] Fixed and improved some sign-related macros
+(some parentheses were missing). Note: the code in the 3.1 branch
+was not affected by these missing parentheses; however this could
+break later patches or ports of new functions using MPFR internals.
+(merged changeset r9295 from the trunk)
+------------------------------------------------------------------------
+r10204 | vlefevre | 2016-03-06 13:09:13 +0000 (Sun, 06 Mar 2016) | 1 line
+Changed paths:
+ M /branches/3.1/INSTALL
+ M /branches/3.1/VERSION
+ M /branches/3.1/configure.ac
+ M /branches/3.1/doc/mpfr.texi
+ M /branches/3.1/src/mpfr.h
+ M /branches/3.1/src/version.c
+
+Updated version to 3.1.5-dev.
+------------------------------------------------------------------------
+r10201 | vlefevre | 2016-03-06 11:22:21 +0000 (Sun, 06 Mar 2016) | 1 line
+Changed paths:
+ M /branches/3.1/ChangeLog
+
+ChangeLog update with "TZ=UTC svn log -rHEAD:0 -v" (in UTF-8 locales).
+------------------------------------------------------------------------
r10200 | vlefevre | 2016-03-06 11:20:09 +0000 (Sun, 06 Mar 2016) | 1 line
Changed paths:
M /branches/3.1/doc/mpfr.texi
Modified: trunk/Build/source/libs/mpfr/mpfr-src/INSTALL
===================================================================
--- trunk/Build/source/libs/mpfr/mpfr-src/INSTALL 2016-09-28 06:28:43 UTC (rev 42167)
+++ trunk/Build/source/libs/mpfr/mpfr-src/INSTALL 2016-09-28 08:13:29 UTC (rev 42168)
@@ -37,17 +37,17 @@
not been done yet and if patches are available. You can check
on the release page:
- http://www.mpfr.org/mpfr-3.1.4/
+ http://www.mpfr.org/mpfr-3.1.5/
which may have additional information. The patches can be applied
with commands like:
- wget http://www.mpfr.org/mpfr-3.1.4/allpatches
+ wget http://www.mpfr.org/mpfr-3.1.5/allpatches
patch -N -Z -p1 < allpatches
or
- curl http://www.mpfr.org/mpfr-3.1.4/allpatches | patch -N -Z -p1
+ curl http://www.mpfr.org/mpfr-3.1.5/allpatches | patch -N -Z -p1
(Those instructions are for the GNU patch command, for example
/usr/bin/gpatch on Solaris.)
@@ -338,7 +338,7 @@
* the FAQ (either the FAQ.html file distributed with MPFR, or the
on-line version <http://www.mpfr.org/faq.html>, which may be more
up-to-date);
- * the MPFR web page for this version <http://www.mpfr.org/mpfr-3.1.4/>,
+ * the MPFR web page for this version <http://www.mpfr.org/mpfr-3.1.5/>,
which lists bugs found in this version and provides some patches.
If the "configure" fails, please check that the C compiler and its
Modified: trunk/Build/source/libs/mpfr/mpfr-src/NEWS
===================================================================
--- trunk/Build/source/libs/mpfr/mpfr-src/NEWS 2016-09-28 06:28:43 UTC (rev 42167)
+++ trunk/Build/source/libs/mpfr/mpfr-src/NEWS 2016-09-28 08:13:29 UTC (rev 42168)
@@ -20,6 +20,11 @@
##############################################################################
+Changes from version 3.1.4 to version 3.1.5:
+- C++11 compatibility.
+- Bug fixes (see <http://www.mpfr.org/mpfr-3.1.4/#fixed> and ChangeLog file).
+- More tests.
+
Changes from version 3.1.3 to version 3.1.4:
- Improved MPFR manual.
- Bug fixes (see <http://www.mpfr.org/mpfr-3.1.3/#fixed> and ChangeLog file).
Modified: trunk/Build/source/libs/mpfr/mpfr-src/VERSION
===================================================================
--- trunk/Build/source/libs/mpfr/mpfr-src/VERSION 2016-09-28 06:28:43 UTC (rev 42167)
+++ trunk/Build/source/libs/mpfr/mpfr-src/VERSION 2016-09-28 08:13:29 UTC (rev 42168)
@@ -1 +1 @@
-3.1.4
+3.1.5
Modified: trunk/Build/source/libs/mpfr/mpfr-src/configure.ac
===================================================================
--- trunk/Build/source/libs/mpfr/mpfr-src/configure.ac 2016-09-28 06:28:43 UTC (rev 42167)
+++ trunk/Build/source/libs/mpfr/mpfr-src/configure.ac 2016-09-28 08:13:29 UTC (rev 42168)
@@ -23,7 +23,7 @@
])
dnl Add check-news when it checks for more than 15 lines
-AC_INIT([MPFR],[3.1.4])
+AC_INIT([MPFR],[3.1.5])
dnl Older Automake versions than 1.13 may still be supported, but no longer
dnl tested, and many things have changed in 1.13. Moreover the INSTALL file
Modified: trunk/Build/source/libs/mpfr/mpfr-src/src/Makefile.am
===================================================================
--- trunk/Build/source/libs/mpfr/mpfr-src/src/Makefile.am 2016-09-28 06:28:43 UTC (rev 42167)
+++ trunk/Build/source/libs/mpfr/mpfr-src/src/Makefile.am 2016-09-28 08:13:29 UTC (rev 42168)
@@ -75,7 +75,7 @@
# 2.4.x 3:x:2
# 3.0.x 4:x:0
# 3.1.x 5:x:1
-libmpfr_la_LDFLAGS = $(MPFR_LDFLAGS) $(LIBMPFR_LDFLAGS) -version-info 5:4:1
+libmpfr_la_LDFLAGS = $(MPFR_LDFLAGS) $(LIBMPFR_LDFLAGS) -version-info 5:5:1
# Important note: If for some reason, srcdir is read-only at build time
# (and you use objdir != srcdir), then you need to rebuild get_patches.c
Modified: trunk/Build/source/libs/mpfr/mpfr-src/src/add_ui.c
===================================================================
--- trunk/Build/source/libs/mpfr/mpfr-src/src/add_ui.c 2016-09-28 06:28:43 UTC (rev 42167)
+++ trunk/Build/source/libs/mpfr/mpfr-src/src/add_ui.c 2016-09-28 08:13:29 UTC (rev 42168)
@@ -49,6 +49,7 @@
MPFR_SAVE_EXPO_MARK (expo);
MPFR_SET_EXP (uu, GMP_NUMB_BITS - cnt);
inex = mpfr_add(y, x, uu, rnd_mode);
+ MPFR_SAVE_EXPO_UPDATE_FLAGS (expo, __gmpfr_flags);
MPFR_SAVE_EXPO_FREE (expo);
return mpfr_check_range(y, inex, rnd_mode);
}
Modified: trunk/Build/source/libs/mpfr/mpfr-src/src/get_ld.c
===================================================================
--- trunk/Build/source/libs/mpfr/mpfr-src/src/get_ld.c 2016-09-28 06:28:43 UTC (rev 42167)
+++ trunk/Build/source/libs/mpfr/mpfr-src/src/get_ld.c 2016-09-28 08:13:29 UTC (rev 42168)
@@ -122,7 +122,7 @@
mpfr_init2 (tmp, MPFR_LDBL_MANT_DIG);
inex = mpfr_set (tmp, x, rnd_mode);
- mpfr_set_emin (-16382-63);
+ mpfr_set_emin (-16381-63); /* emin=-16444 */
mpfr_set_emax (16384);
mpfr_subnormalize (tmp, mpfr_check_range (tmp, inex, rnd_mode), rnd_mode);
mpfr_prec_round (tmp, 64, MPFR_RNDZ); /* exact */
Modified: trunk/Build/source/libs/mpfr/mpfr-src/src/mpfr-impl.h
===================================================================
--- trunk/Build/source/libs/mpfr/mpfr-src/src/mpfr-impl.h 2016-09-28 06:28:43 UTC (rev 42167)
+++ trunk/Build/source/libs/mpfr/mpfr-src/src/mpfr-impl.h 2016-09-28 08:13:29 UTC (rev 42168)
@@ -251,19 +251,6 @@
# define MPFR_WIN_THREAD_SAFE_DLL 1
#endif
-/* Detect some possible inconsistencies under Unix. */
-#if defined(__unix__)
-# if defined(_WIN32)
-# error "Both __unix__ and _WIN32 are defined"
-# endif
-# if __GMP_LIBGMP_DLL
-# error "__unix__ is defined and __GMP_LIBGMP_DLL is true"
-# endif
-# if defined(MPFR_WIN_THREAD_SAFE_DLL)
-# error "Both __unix__ and MPFR_WIN_THREAD_SAFE_DLL are defined"
-# endif
-#endif
-
#if defined(__MPFR_WITHIN_MPFR) || !defined(MPFR_WIN_THREAD_SAFE_DLL)
extern MPFR_THREAD_ATTR unsigned int __gmpfr_flags;
extern MPFR_THREAD_ATTR mpfr_exp_t __gmpfr_emin;
@@ -861,8 +848,8 @@
(MPFR_ASSERTD((s) == MPFR_SIGN_POS || (s) == MPFR_SIGN_NEG))
#define MPFR_SET_SIGN(x, s) \
(MPFR_ASSERT_SIGN(s), MPFR_SIGN(x) = s)
-#define MPFR_IS_POS_SIGN(s1) (s1 > 0)
-#define MPFR_IS_NEG_SIGN(s1) (s1 < 0)
+#define MPFR_IS_POS_SIGN(s1) ((s1) > 0)
+#define MPFR_IS_NEG_SIGN(s1) ((s1) < 0)
#define MPFR_MULT_SIGN(s1, s2) ((s1) * (s2))
/* Transform a sign to 1 or -1 */
#define MPFR_FROM_SIGN_TO_INT(s) (s)
@@ -914,33 +901,37 @@
/* We want to test if rnd = Zero, or Away.
'test' is 1 if negative, and 0 if positive. */
#define MPFR_IS_LIKE_RNDZ(rnd, test) \
- ((rnd==MPFR_RNDZ) || MPFR_IS_RNDUTEST_OR_RNDDNOTTEST (rnd, test))
+ ((rnd) == MPFR_RNDZ || MPFR_IS_RNDUTEST_OR_RNDDNOTTEST (rnd, test))
-#define MPFR_IS_LIKE_RNDU(rnd, sign) \
- ((rnd==MPFR_RNDU) || (rnd==MPFR_RNDZ && sign<0) || (rnd==MPFR_RNDA && sign>0))
+#define MPFR_IS_LIKE_RNDU(rnd, sign) \
+ (((rnd) == MPFR_RNDU) || \
+ ((rnd) == MPFR_RNDZ && MPFR_IS_NEG_SIGN (sign)) || \
+ ((rnd) == MPFR_RNDA && MPFR_IS_POS_SIGN (sign)))
-#define MPFR_IS_LIKE_RNDD(rnd, sign) \
- ((rnd==MPFR_RNDD) || (rnd==MPFR_RNDZ && sign>0) || (rnd==MPFR_RNDA && sign<0))
+#define MPFR_IS_LIKE_RNDD(rnd, sign) \
+ (((rnd) == MPFR_RNDD) || \
+ ((rnd) == MPFR_RNDZ && MPFR_IS_POS_SIGN (sign)) || \
+ ((rnd) == MPFR_RNDA && MPFR_IS_NEG_SIGN (sign)))
/* Invert a rounding mode, RNDN, RNDZ and RNDA are unchanged */
-#define MPFR_INVERT_RND(rnd) ((rnd == MPFR_RNDU) ? MPFR_RNDD : \
- ((rnd == MPFR_RNDD) ? MPFR_RNDU : rnd))
+#define MPFR_INVERT_RND(rnd) ((rnd) == MPFR_RNDU ? MPFR_RNDD : \
+ (rnd) == MPFR_RNDD ? MPFR_RNDU : (rnd))
/* Transform RNDU and RNDD to RNDZ according to test */
-#define MPFR_UPDATE_RND_MODE(rnd, test) \
- do { \
- if (MPFR_UNLIKELY(MPFR_IS_RNDUTEST_OR_RNDDNOTTEST(rnd, test))) \
+#define MPFR_UPDATE_RND_MODE(rnd, test) \
+ do { \
+ if (MPFR_UNLIKELY(MPFR_IS_RNDUTEST_OR_RNDDNOTTEST(rnd, test))) \
rnd = MPFR_RNDZ; \
} while (0)
/* Transform RNDU and RNDD to RNDZ or RNDA according to sign,
leave the other modes unchanged */
-#define MPFR_UPDATE2_RND_MODE(rnd, sign) \
- do { \
- if (rnd == MPFR_RNDU) \
- rnd = (sign > 0) ? MPFR_RNDA : MPFR_RNDZ; \
- else if (rnd == MPFR_RNDD) \
- rnd = (sign < 0) ? MPFR_RNDA : MPFR_RNDZ; \
+#define MPFR_UPDATE2_RND_MODE(rnd, sign) \
+ do { \
+ if (rnd == MPFR_RNDU) \
+ rnd = MPFR_IS_POS_SIGN (sign) ? MPFR_RNDA : MPFR_RNDZ; \
+ else if (rnd == MPFR_RNDD) \
+ rnd = MPFR_IS_NEG_SIGN (sign) ? MPFR_RNDA : MPFR_RNDZ; \
} while (0)
@@ -1897,6 +1888,7 @@
__MPFR_DECLSPEC int mpfr_exp_2 _MPFR_PROTO ((mpfr_ptr, mpfr_srcptr,mpfr_rnd_t));
__MPFR_DECLSPEC int mpfr_exp_3 _MPFR_PROTO ((mpfr_ptr, mpfr_srcptr,mpfr_rnd_t));
__MPFR_DECLSPEC int mpfr_powerof2_raw _MPFR_PROTO ((mpfr_srcptr));
+__MPFR_DECLSPEC int mpfr_powerof2_raw2 (const mp_limb_t *, mp_size_t);
__MPFR_DECLSPEC int mpfr_pow_general _MPFR_PROTO ((mpfr_ptr, mpfr_srcptr,
mpfr_srcptr, mpfr_rnd_t, int, mpfr_save_expo_t *));
Modified: trunk/Build/source/libs/mpfr/mpfr-src/src/mpfr.h
===================================================================
--- trunk/Build/source/libs/mpfr/mpfr-src/src/mpfr.h 2016-09-28 06:28:43 UTC (rev 42167)
+++ trunk/Build/source/libs/mpfr/mpfr-src/src/mpfr.h 2016-09-28 08:13:29 UTC (rev 42168)
@@ -26,8 +26,8 @@
/* Define MPFR version number */
#define MPFR_VERSION_MAJOR 3
#define MPFR_VERSION_MINOR 1
-#define MPFR_VERSION_PATCHLEVEL 4
-#define MPFR_VERSION_STRING "3.1.4"
+#define MPFR_VERSION_PATCHLEVEL 5
+#define MPFR_VERSION_STRING "3.1.5"
/* Macros dealing with MPFR VERSION */
#define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c))
Modified: trunk/Build/source/libs/mpfr/mpfr-src/src/powerof2.c
===================================================================
--- trunk/Build/source/libs/mpfr/mpfr-src/src/powerof2.c 2016-09-28 06:28:43 UTC (rev 42167)
+++ trunk/Build/source/libs/mpfr/mpfr-src/src/powerof2.c 2016-09-28 08:13:29 UTC (rev 42168)
@@ -31,16 +31,17 @@
int
mpfr_powerof2_raw (mpfr_srcptr x)
{
- mp_limb_t *xp;
- mp_size_t xn;
-
/* This is an internal function, and we may call it with some
wrong numbers (ie good mantissa but wrong flags or exp)
So we don't want to test if it is a pure FP.
MPFR_ASSERTN(MPFR_IS_PURE_FP(x)); */
- xp = MPFR_MANT(x);
- xn = (MPFR_PREC(x) - 1) / GMP_NUMB_BITS;
- if (xp[xn] != MPFR_LIMB_HIGHBIT)
+ return mpfr_powerof2_raw2 (MPFR_MANT(x), MPFR_LIMB_SIZE(x));
+}
+
+int
+mpfr_powerof2_raw2 (const mp_limb_t *xp, mp_size_t xn)
+{
+ if (xp[--xn] != MPFR_LIMB_HIGHBIT)
return 0;
while (xn > 0)
if (xp[--xn] != 0)
Modified: trunk/Build/source/libs/mpfr/mpfr-src/src/round_p.c
===================================================================
--- trunk/Build/source/libs/mpfr/mpfr-src/src/round_p.c 2016-09-28 06:28:43 UTC (rev 42167)
+++ trunk/Build/source/libs/mpfr/mpfr-src/src/round_p.c 2016-09-28 08:13:29 UTC (rev 42168)
@@ -35,10 +35,16 @@
i1 = mpfr_round_p_2 (bp, bn, err0, prec);
- /* compare with mpfr_can_round_raw */
+ /* Note: since revision 10747, mpfr_can_round_raw is supposed to be always
+ correct, whereas mpfr_round_p_2 might return 0 in some cases where one
+ could round, for example with err0=67 and prec=54:
+ b = 1111101101010001100011111011100010100011101111011011101111111111
+ thus we cannot compare i1 and i2, we only can check that we don't have
+ i1 <> 0 and i2 = 0.
+ */
i2 = mpfr_can_round_raw (bp, bn, MPFR_SIGN_POS, err0,
MPFR_RNDN, MPFR_RNDZ, prec);
- if (i1 != i2)
+ if (i1 && (i2 == 0))
{
fprintf (stderr, "mpfr_round_p(%d) != mpfr_can_round(%d)!\n"
"bn = %lu, err0 = %ld, prec = %lu\nbp = ", i1, i2,
Modified: trunk/Build/source/libs/mpfr/mpfr-src/src/round_prec.c
===================================================================
--- trunk/Build/source/libs/mpfr/mpfr-src/src/round_prec.c 2016-09-28 06:28:43 UTC (rev 42167)
+++ trunk/Build/source/libs/mpfr/mpfr-src/src/round_prec.c 2016-09-28 08:13:29 UTC (rev 42168)
@@ -138,47 +138,173 @@
}
int
-mpfr_can_round_raw (const mp_limb_t *bp, mp_size_t bn, int neg, mpfr_exp_t err0,
+mpfr_can_round_raw (const mp_limb_t *bp, mp_size_t bn, int neg, mpfr_exp_t err,
mpfr_rnd_t rnd1, mpfr_rnd_t rnd2, mpfr_prec_t prec)
{
- mpfr_prec_t err, prec0 = prec;
+ mpfr_prec_t prec2;
mp_size_t k, k1, tn;
int s, s1;
mp_limb_t cc, cc2;
mp_limb_t *tmp;
+ mp_limb_t cy = 0, tmp_hi;
+ int res;
MPFR_TMP_DECL(marker);
+ /* Since mpfr_can_round is a function in the API, use MPFR_ASSERTN.
+ The specification makes sense only for prec >= 1. */
+ MPFR_ASSERTN (prec >= 1);
+
MPFR_ASSERTD(bp[bn - 1] & MPFR_LIMB_HIGHBIT);
- if (MPFR_UNLIKELY(err0 < 0 || (mpfr_uexp_t) err0 <= prec))
- return 0; /* can't round */
-
MPFR_ASSERT_SIGN(neg);
neg = MPFR_IS_NEG_SIGN(neg);
/* Transform RNDD and RNDU to Zero / Away */
- MPFR_ASSERTD((neg == 0) || (neg == 1));
+ MPFR_ASSERTD (neg == 0 || neg == 1);
if (rnd1 != MPFR_RNDN)
rnd1 = MPFR_IS_LIKE_RNDZ(rnd1, neg) ? MPFR_RNDZ : MPFR_RNDA;
if (rnd2 != MPFR_RNDN)
rnd2 = MPFR_IS_LIKE_RNDZ(rnd2, neg) ? MPFR_RNDZ : MPFR_RNDA;
+ /* For err < prec (+1 for rnd1=RNDN), we can never round correctly, since
+ the error is at least 2*ulp(b) >= ulp(round(b)).
+ However for err = prec (+1 for rnd1=RNDN), we can round correctly in some
+ rare cases where ulp(b) = 1/2*ulp(U) [see below for the definition of U],
+ which implies rnd1 = RNDZ or RNDN, and rnd2 = RNDA or RNDN. */
+
+ if (MPFR_UNLIKELY (err < prec + (rnd1 == MPFR_RNDN) ||
+ (err == prec + (rnd1 == MPFR_RNDN) &&
+ (rnd1 == MPFR_RNDA ||
+ rnd2 == MPFR_RNDZ))))
+ return 0; /* can't round */
+
+ /* As a consequence... */
+ MPFR_ASSERTD (err >= prec);
+
+ /* The bound c on the error |x-b| is: c = 2^(MPFR_EXP(b)-err) <= b/2.
+ * So, we now know that x and b have the same sign. By symmetry,
+ * assume x > 0 and b > 0. We have: L <= x <= U, where, depending
+ * on rnd1:
+ * MPFR_RNDN: L = b-c, U = b+c
+ * MPFR_RNDZ: L = b, U = b+c
+ * MPFR_RNDA: L = b-c, U = b
+ *
+ * We can round x iff round(L,prec,rnd2) = round(U,prec,rnd2).
+ */
+
if (MPFR_UNLIKELY (prec > (mpfr_prec_t) bn * GMP_NUMB_BITS))
- { /* Then prec < PREC(b): we can round:
- (i) in rounding to the nearest iff err0 >= prec + 2
+ { /* Then prec > PREC(b): we can round:
+ (i) in rounding to the nearest as long as err >= prec + 2.
+ When err = prec + 1 and b is not a power
+ of two (so that a change of binade cannot occur), then one
+ can round to nearest thanks to the even rounding rule (in the
+ target precision prec, the significand of b ends with a 0).
+ When err = prec + 1 and b is a power of two, when rnd1 = RNDZ one
+ can round too.
(ii) in directed rounding mode iff rnd1 is compatible with rnd2
- and err0 >= prec + 1, unless b = 2^k and rnd1=rnd2=RNDA in
- which case we need err0 >= prec + 2. */
+ and err >= prec + 1, unless b = 2^k and rnd1 = RNDA or RNDN in
+ which case we need err >= prec + 2.
+ */
+ if ((rnd1 == rnd2 || rnd2 == MPFR_RNDN) && err >= prec + 1)
+ {
+ if (rnd1 != MPFR_RNDZ &&
+ err == prec + 1 &&
+ mpfr_powerof2_raw2 (bp, bn))
+ return 0;
+ else
+ return 1;
+ }
+ return 0;
+ }
+
+ /* now prec <= bn * GMP_NUMB_BITS */
+
+ if (MPFR_UNLIKELY (err > (mpfr_prec_t) bn * GMP_NUMB_BITS))
+ {
+ /* we distinguish the case where b is a power of two:
+ rnd1 rnd2 can round?
+ RNDZ RNDZ ok
+ RNDZ RNDA no
+ RNDZ RNDN ok
+ RNDA RNDZ no
+ RNDA RNDA ok except when err = prec + 1
+ RNDA RNDN ok except when err = prec + 1
+ RNDN RNDZ no
+ RNDN RNDA no
+ RNDN RNDN ok except when err = prec + 1 */
+ if (mpfr_powerof2_raw2 (bp, bn))
+ {
+ if ((rnd2 == MPFR_RNDZ || rnd2 == MPFR_RNDA) && rnd1 != rnd2)
+ return 0;
+ else if (rnd1 == MPFR_RNDZ)
+ return 1; /* RNDZ RNDZ and RNDZ RNDN */
+ else
+ return err > prec + 1;
+ }
+
+ /* now the general case where b is not a power of two:
+ rnd1 rnd2 can round?
+ RNDZ RNDZ ok
+ RNDZ RNDA except when b is representable in precision 'prec'
+ RNDZ RNDN except when b is the middle of two representable numbers in
+ precision 'prec' and b ends with 'xxx0[1]',
+ or b is representable in precision 'prec'
+ and err = prec + 1 and b ends with '1'.
+ RNDA RNDZ except when b is representable in precision 'prec'
+ RNDA RNDA ok
+ RNDA RNDN except when b is the middle of two representable numbers in
+ precision 'prec' and b ends with 'xxx1[1]',
+ or b is representable in precision 'prec'
+ and err = prec + 1 and b ends with '1'.
+ RNDN RNDZ except when b is representable in precision 'prec'
+ RNDN RNDA except when b is representable in precision 'prec'
+ RNDN RNDN except when b is the middle of two representable numbers in
+ precision 'prec', or b is representable in precision 'prec'
+ and err = prec + 1 and b ends with '1'. */
if (rnd2 == MPFR_RNDN)
- return (mpfr_uexp_t) err0 - 2 >= prec;
+ {
+ if (err == prec + 1 && (bp[0] & 1))
+ return 0; /* err == prec + 1 implies prec = bn * GMP_NUMB_BITS */
+ if (prec < (mpfr_prec_t) bn * GMP_NUMB_BITS)
+ {
+ k1 = MPFR_PREC2LIMBS (prec + 1);
+ MPFR_UNSIGNED_MINUS_MODULO(s1, prec + 1);
+ if (((bp[bn - k1] >> s1) & 1) &&
+ mpfr_round_raw2 (bp, bn, neg, MPFR_RNDA, prec + 1) == 0)
+ { /* b is the middle of two representable numbers */
+ if (rnd1 == MPFR_RNDN)
+ return 0;
+ k1 = MPFR_PREC2LIMBS (prec);
+ MPFR_UNSIGNED_MINUS_MODULO(s1, prec);
+ return (rnd1 == MPFR_RNDZ) ^
+ (((bp[bn - k1] >> s1) & 1) == 0);
+ }
+ }
+ return 1;
+ }
+ else if (rnd1 == rnd2)
+ {
+ if (rnd1 == MPFR_RNDN && prec < (mpfr_prec_t) bn * GMP_NUMB_BITS)
+ {
+ /* then rnd2 = RNDN, and for prec = bn * GMP_NUMB_BITS we cannot
+ have b the middle of two representable numbers */
+ k1 = MPFR_PREC2LIMBS (prec + 1);
+ MPFR_UNSIGNED_MINUS_MODULO(s1, prec + 1);
+ if (((bp[bn - k1] >> s1) & 1) &&
+ mpfr_round_raw2 (bp, bn, neg, MPFR_RNDA, prec + 1) == 0)
+ /* b is representable in precision prec+1 and ends with a 1 */
+ return 0;
+ else
+ return 1;
+ }
+ else
+ return 1;
+ }
else
- return (rnd1 == rnd2) && (mpfr_uexp_t) err0 - 2 >= prec;
+ return mpfr_round_raw2 (bp, bn, neg, MPFR_RNDA, prec) != 0;
}
- /* if the error is smaller than ulp(b), then anyway it will propagate
- up to ulp(b) */
- err = ((mpfr_uexp_t) err0 > (mpfr_prec_t) bn * GMP_NUMB_BITS) ?
- (mpfr_prec_t) bn * GMP_NUMB_BITS : (mpfr_prec_t) err0;
+ /* now err <= bn * GMP_NUMB_BITS */
/* warning: if k = m*GMP_NUMB_BITS, consider limb m-1 and not m */
k = (err - 1) / GMP_NUMB_BITS;
@@ -196,7 +322,7 @@
Warning! The number with updated bn may no longer be normalized. */
k -= k1;
bn -= k1;
- prec -= (mpfr_prec_t) k1 * GMP_NUMB_BITS;
+ prec2 = prec - (mpfr_prec_t) k1 * GMP_NUMB_BITS;
/* We can decide of the correct rounding if rnd2(b-eps) and rnd2(b+eps)
give the same result to the target precision 'prec', i.e., if when
@@ -215,56 +341,141 @@
switch (rnd1)
{
case MPFR_RNDZ:
- /* Round to Zero */
+ /* rnd1 = Round to Zero */
cc = (bp[bn - 1] >> s1) & 1;
/* mpfr_round_raw2 returns 1 if one should add 1 at ulp(b,prec),
and 0 otherwise */
- cc ^= mpfr_round_raw2 (bp, bn, neg, rnd2, prec);
+ cc ^= mpfr_round_raw2 (bp, bn, neg, rnd2, prec2);
/* cc is the new value of bit s1 in bp[bn-1] after rounding 'rnd2' */
/* now round b + 2^(MPFR_EXP(b)-err) */
- mpn_add_1 (tmp + bn - k, bp + bn - k, k, MPFR_LIMB_ONE << s);
- /* if there was a carry here, then necessarily bit s1 of bp[bn-1]
- changed, thus we surely cannot round for directed rounding, but this
- will be detected below, with cc2 != cc */
+ cy = mpn_add_1 (tmp + bn - k, bp + bn - k, k, MPFR_LIMB_ONE << s);
+ /* propagate carry up to most significant limb */
+ for (tn = 0; tn + 1 < k1 && cy != 0; tn ++)
+ cy = ~bp[bn + tn] == 0;
+ if (cy == 0 && err == prec)
+ {
+ res = 0;
+ goto end;
+ }
+ if (MPFR_UNLIKELY(cy))
+ {
+ /* when a carry occurs, we have b < 2^h <= b+c, we can round iff:
+ rnd2 = RNDZ: never, since b and b+c round to different values;
+ rnd2 = RNDA: when b+c is an exact power of two, and err > prec
+ (since for err = prec, b = 2^h - 1/2*ulp(2^h) is
+ exactly representable and thus rounds to itself);
+ rnd2 = RNDN: whenever cc = 0, since err >= prec implies
+ c <= ulp(b) = 1/2*ulp(2^h), thus b+c rounds to 2^h,
+ and b+c >= 2^h implies that bit 'prec' of b is 1,
+ thus cc = 0 means that b is rounded to 2^h too. */
+ res = (rnd2 == MPFR_RNDZ) ? 0
+ : (rnd2 == MPFR_RNDA) ? (err > prec && k == bn && tmp[0] == 0)
+ : cc == 0;
+ goto end;
+ }
break;
case MPFR_RNDN:
- /* Round to nearest */
+ /* rnd1 = Round to nearest */
/* first round b+2^(MPFR_EXP(b)-err) */
- mpn_add_1 (tmp + bn - k, bp + bn - k, k, MPFR_LIMB_ONE << s);
- /* same remark as above in case a carry occurs in mpn_add_1() */
+ cy = mpn_add_1 (tmp + bn - k, bp + bn - k, k, MPFR_LIMB_ONE << s);
+ /* propagate carry up to most significant limb */
+ for (tn = 0; tn + 1 < k1 && cy != 0; tn ++)
+ cy = ~bp[bn + tn] == 0;
cc = (tmp[bn - 1] >> s1) & 1; /* gives 0 when cc=1 */
- cc ^= mpfr_round_raw2 (tmp, bn, neg, rnd2, prec);
+ cc ^= mpfr_round_raw2 (tmp, bn, neg, rnd2, prec2);
/* cc is the new value of bit s1 in bp[bn-1]+eps after rounding 'rnd2' */
-
+ if (MPFR_UNLIKELY (cy != 0))
+ {
+ /* when a carry occurs, we have b-c < b < 2^h <= b+c, we can round
+ iff:
+ rnd2 = RNDZ: never, since b-c and b+c round to different values;
+ rnd2 = RNDA: when b+c is an exact power of two, and
+ err > prec + 1 (since for err <= prec + 1,
+ b-c <= 2^h - 1/2*ulp(2^h) is exactly representable
+ and thus rounds to itself);
+ rnd2 = RNDN: whenever err > prec + 1, since for err = prec + 1,
+ b+c rounds to 2^h, and b-c rounds to nextbelow(2^h).
+ For err > prec + 1, c <= 1/4*ulp(b) <= 1/8*ulp(2^h),
+ thus
+ 2^h - 1/4*ulp(b) <= b-c < b+c <= 2^h + 1/8*ulp(2^h),
+ therefore both b-c and b+c round to 2^h. */
+ res = (rnd2 == MPFR_RNDZ) ? 0
+ : (rnd2 == MPFR_RNDA) ? (err > prec + 1 && k == bn && tmp[0] == 0)
+ : err > prec + 1;
+ goto end;
+ }
subtract_eps:
- /* now round b-2^(MPFR_EXP(b)-err) */
- cc2 = mpn_sub_1 (tmp + bn - k, bp + bn - k, k, MPFR_LIMB_ONE << s);
+ /* now round b-2^(MPFR_EXP(b)-err), this happens for
+ rnd1 = RNDN or RNDA */
+ MPFR_ASSERTD(rnd1 == MPFR_RNDN || rnd1 == MPFR_RNDA);
+ cy = mpn_sub_1 (tmp + bn - k, bp + bn - k, k, MPFR_LIMB_ONE << s);
/* propagate the potential borrow up to the most significant limb
(it cannot propagate further since the most significant limb is
- at least MPFR_LIMB_HIGHBIT) */
- for (tn = 0; tn + 1 < k1 && (cc2 != 0); tn ++)
- cc2 = bp[bn + tn] == 0;
- /* We have an exponent decrease when either:
- (i) k1 = 0 and tmp[bn-1] < MPFR_LIMB_HIGHBIT
- (ii) k1 > 0 and cc <> 0 and bp[bn + tn] = MPFR_LIMB_HIGHBIT
- (then necessarily tn = k1-1).
- Then for directed rounding we cannot round,
- and for rounding to nearest we cannot round when err = prec + 1.
+ at least MPFR_LIMB_HIGHBIT).
+ Note: we use the same limb tmp[bn-1] to subtract. */
+ tmp_hi = tmp[bn - 1];
+ for (tn = 0; tn < k1 && cy != 0; tn ++)
+ cy = mpn_sub_1 (&tmp_hi, bp + bn + tn, 1, cy);
+ /* We have an exponent decrease when tn = k1 and
+ tmp[bn-1] < MPFR_LIMB_HIGHBIT:
+ b-c < 2^h <= b (for RNDA) or b+c (for RNDN).
+ Then we surely cannot round when rnd2 = RNDZ, since b or b+c round to
+ a value >= 2^h, and b-c rounds to a value < 2^h.
+ We also surely cannot round when (rnd1,rnd2) = (RNDN,RNDA), since
+ b-c rounds to a value <= 2^h, and b+c > 2^h rounds to a value > 2^h.
+ It thus remains:
+ (rnd1,rnd2) = (RNDA,RNDA), (RNDA,RNDN) and (RNDN,RNDN).
+ For (RNDA,RNDA) we can round only when b-c and b round to 2^h, which
+ implies b = 2^h and err > prec (which is true in that case):
+ a necessary condition is that cc = 0.
+ For (RNDA,RNDN) we can round only when b-c and b round to 2^h, which
+ implies b-c >= 2^h - 1/4*ulp(2^h), and b <= 2^h + 1/2*ulp(2^h);
+ since ulp(2^h) = ulp(b), this implies c <= 3/4*ulp(b), thus
+ err > prec.
+ For (RNDN,RNDN) we can round only when b-c and b+c round to 2^h,
+ which implies b-c >= 2^h - 1/4*ulp(2^h), and
+ b+c <= 2^h + 1/2*ulp(2^h);
+ since ulp(2^h) = ulp(b), this implies 2*c <= 3/4*ulp(b), thus
+ err > prec+1.
*/
- if (((k1 == 0 && tmp[bn - 1] < MPFR_LIMB_HIGHBIT) ||
- (k1 != 0 && cc2 != 0 && bp[bn + tn] == MPFR_LIMB_HIGHBIT)) &&
- (rnd2 != MPFR_RNDN || err0 == prec0 + 1))
+ if (tn == k1 && tmp_hi < MPFR_LIMB_HIGHBIT) /* exponent decrease */
{
- MPFR_TMP_FREE(marker);
- return 0;
+ if (rnd2 == MPFR_RNDZ || (rnd1 == MPFR_RNDN && rnd2 == MPFR_RNDA) ||
+ cc != 0 /* b or b+c does not round to 2^h */)
+ {
+ res = 0;
+ goto end;
+ }
+ /* in that case since the most significant bit of tmp is 0, we
+ should consider one more bit; res = 0 when b-c does not round
+ to 2^h. */
+ res = mpfr_round_raw2 (tmp, bn, neg, rnd2, prec2 + 1) != 0;
+ goto end;
}
+ if (err == prec + (rnd1 == MPFR_RNDN))
+ {
+ /* No exponent increase nor decrease, thus we have |U-L| = ulp(b).
+ For rnd2 = RNDZ or RNDA, either [L,U] contains one representable
+ number in the target precision, and then L and U round
+ differently; or both L and U are representable: they round
+ differently too; thus in all cases we cannot round.
+ For rnd2 = RNDN, the only case where we can round is when the
+ middle of [L,U] (i.e. b) is representable, and ends with a 0. */
+ res = (rnd2 == MPFR_RNDN && (((bp[bn - 1] >> s1) & 1) == 0) &&
+ mpfr_round_raw2 (bp, bn, neg, MPFR_RNDZ, prec2) ==
+ mpfr_round_raw2 (bp, bn, neg, MPFR_RNDA, prec2));
+ goto end;
+ }
break;
default:
- /* Round away */
+ /* rnd1 = Round away */
+ MPFR_ASSERTD (rnd1 == MPFR_RNDA);
cc = (bp[bn - 1] >> s1) & 1;
- cc ^= mpfr_round_raw2 (bp, bn, neg, rnd2, prec);
+ /* the mpfr_round_raw2() call below returns whether one should add 1 or
+ not for rounding */
+ cc ^= mpfr_round_raw2 (bp, bn, neg, rnd2, prec2);
/* cc is the new value of bit s1 in bp[bn-1]+eps after rounding 'rnd2' */
goto subtract_eps;
@@ -271,8 +482,9 @@
}
cc2 = (tmp[bn - 1] >> s1) & 1;
- cc2 ^= mpfr_round_raw2 (tmp, bn, neg, rnd2, prec);
+ res = cc == (cc2 ^ mpfr_round_raw2 (tmp, bn, neg, rnd2, prec2));
+ end:
MPFR_TMP_FREE(marker);
- return cc == cc2;
+ return res;
}
Modified: trunk/Build/source/libs/mpfr/mpfr-src/src/sub1.c
===================================================================
--- trunk/Build/source/libs/mpfr/mpfr-src/src/sub1.c 2016-09-28 06:28:43 UTC (rev 42167)
+++ trunk/Build/source/libs/mpfr/mpfr-src/src/sub1.c 2016-09-28 08:13:29 UTC (rev 42168)
@@ -96,10 +96,7 @@
/* A = S*ABS(B) +/- ulp(a) */
MPFR_SET_EXP (a, MPFR_GET_EXP (b));
MPFR_RNDRAW_EVEN (inexact, a, MPFR_MANT (b), MPFR_PREC (b),
- rnd_mode, MPFR_SIGN (a),
- if (MPFR_UNLIKELY ( ++MPFR_EXP (a) > __gmpfr_emax))
- inexact = mpfr_overflow (a, rnd_mode, MPFR_SIGN (a)));
- /* inexact = mpfr_set4 (a, b, rnd_mode, MPFR_SIGN (a)); */
+ rnd_mode, MPFR_SIGN (a), ++ MPFR_EXP (a));
if (inexact == 0)
{
/* a = b (Exact)
@@ -106,6 +103,8 @@
But we know it isn't (Since we have to remove `c')
So if we round to Zero, we have to remove one ulp.
Otherwise the result is correctly rounded. */
+ /* An overflow is not possible. */
+ MPFR_ASSERTD (MPFR_EXP (a) <= __gmpfr_emax);
if (MPFR_IS_LIKE_RNDZ (rnd_mode, MPFR_IS_NEG (a)))
{
mpfr_nexttozero (a);
@@ -136,9 +135,14 @@
i.e. inexact= MPFR_EVEN_INEX */
if (MPFR_UNLIKELY (inexact == MPFR_EVEN_INEX*MPFR_INT_SIGN (a)))
{
- mpfr_nexttozero (a);
+ if (MPFR_UNLIKELY (MPFR_EXP (a) > __gmpfr_emax))
+ mpfr_setmax (a, __gmpfr_emax);
+ else
+ mpfr_nexttozero (a);
inexact = -MPFR_INT_SIGN (a);
}
+ else if (MPFR_UNLIKELY (MPFR_EXP (a) > __gmpfr_emax))
+ inexact = mpfr_overflow (a, rnd_mode, MPFR_SIGN (a));
MPFR_RET (inexact);
}
}
Modified: trunk/Build/source/libs/mpfr/mpfr-src/src/sub_ui.c
===================================================================
--- trunk/Build/source/libs/mpfr/mpfr-src/src/sub_ui.c 2016-09-28 06:28:43 UTC (rev 42167)
+++ trunk/Build/source/libs/mpfr/mpfr-src/src/sub_ui.c 2016-09-28 08:13:29 UTC (rev 42168)
@@ -52,6 +52,7 @@
MPFR_SAVE_EXPO_MARK (expo);
MPFR_SET_EXP (uu, GMP_NUMB_BITS - cnt);
inex = mpfr_sub (y, x, uu, rnd_mode);
+ MPFR_SAVE_EXPO_UPDATE_FLAGS (expo, __gmpfr_flags);
MPFR_SAVE_EXPO_FREE (expo);
return mpfr_check_range (y, inex, rnd_mode);
}
Modified: trunk/Build/source/libs/mpfr/mpfr-src/src/version.c
===================================================================
--- trunk/Build/source/libs/mpfr/mpfr-src/src/version.c 2016-09-28 06:28:43 UTC (rev 42167)
+++ trunk/Build/source/libs/mpfr/mpfr-src/src/version.c 2016-09-28 08:13:29 UTC (rev 42168)
@@ -25,5 +25,5 @@
const char *
mpfr_get_version (void)
{
- return "3.1.4";
+ return "3.1.5";
}
Modified: trunk/Build/source/libs/mpfr/version.ac
===================================================================
--- trunk/Build/source/libs/mpfr/version.ac 2016-09-28 06:28:43 UTC (rev 42167)
+++ trunk/Build/source/libs/mpfr/version.ac 2016-09-28 08:13:29 UTC (rev 42168)
@@ -8,4 +8,4 @@
dnl --------------------------------------------------------
dnl
dnl m4-include this file to define the current mpfr version
-m4_define([mpfr_version], [3.1.4])
+m4_define([mpfr_version], [3.1.5])
More information about the tex-live-commits
mailing list