Merged changesets r12046-12048 from the trunk (bug fix and test).

git-svn-id: svn://scm.gforge.inria.fr/svn/mpfr/branches/4.0@12049 280ebfd0-de03-0410-8827-d642c229c3f4

2 files changed, 11 insertions, 7 deletions

diff --git a/src/exp_2.c b/src/exp_2.c
index a9439b8b0..64a9fd286 100644
--- a/src/exp_2.c
+++ b/src/exp_2.c
@@ -198,14 +198,15 @@ mpfr_exp_2 (mpfr_ptr y, mpfr_srcptr x, mpfr_rnd_t rnd_mode)
 
       mpfr_sub (r, x, r, MPFR_RNDU);
 
+      while (MPFR_IS_PURE_FP(r) && MPFR_IS_NEG (r))
+        { /* initial approximation n was too large */
+          n--;
+          mpfr_add (r, r, s, MPFR_RNDU);
+        }
+
+      /* if r is 0, we cannot round correctly */
       if (MPFR_LIKELY(MPFR_IS_PURE_FP (r)))
         {
-          while (MPFR_IS_NEG (r))
-            { /* initial approximation n was too large */
-              n--;
-              mpfr_add (r, r, s, MPFR_RNDU);
-            }
-
           /* since there was a cancellation in x - n*log(2), the low error_r
              bits from r are zero and thus non significant, thus we can reduce
              the working precision */
diff --git a/src/subnormal.c b/src/subnormal.c
index 0a135aa9f..1b75ce8b7 100644
--- a/src/subnormal.c
+++ b/src/subnormal.c
@@ -145,7 +145,10 @@ mpfr_subnormalize (mpfr_ptr y, int old_inexact, mpfr_rnd_t rnd)
                   if (SAME_SIGN (inexact, MPFR_INT_SIGN (y)))
                     mpfr_nexttozero (dest);
                   else  /* subnormal range, thus no overflow */
-                    mpfr_nexttoinf (dest);
+                    {
+                      mpfr_nexttoinf (dest);
+                      MPFR_ASSERTD(!MPFR_IS_INF (dest));
+                    }
                   inexact = -inexact;
                 }
             }