Updated atan2.c and cosh.c.

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

2 files changed, 10 insertions, 6 deletions

diff --git a/atan2.c b/atan2.c
index 613ea874f..d7de1695c 100644
--- a/atan2.c
+++ b/atan2.c
@@ -170,8 +170,11 @@ mpfr_atan2 (mpfr_ptr dest, mpfr_srcptr y, mpfr_srcptr x, mp_rnd_t rnd_mode)
     /* use atan2(y,x) = atan(y/x) */
     for (;;)
       {
-        mpfr_clear_flags ();
-        if (mpfr_div (tmp, y, x, GMP_RNDN) == 0)
+        int div_inex;
+        MPFR_BLOCK_DECL (flags);
+
+        MPFR_BLOCK (flags, div_inex = mpfr_div (tmp, y, x, GMP_RNDN));
+        if (div_inex == 0)
           {
             /* Result is exact. */
             inexact = mpfr_atan (dest, tmp, rnd_mode);
@@ -182,7 +185,7 @@ mpfr_atan2 (mpfr_ptr dest, mpfr_srcptr y, mpfr_srcptr x, mp_rnd_t rnd_mode)
 
         /* If the division underflowed, since |atan(z)/z| < 1, we have
            an underflow. */
-        if (MPFR_UNLIKELY (mpfr_underflow_p ()))
+        if (MPFR_UNDERFLOW (flags))
           {
             int sign;
 
diff --git a/cosh.c b/cosh.c
index 3c45c09f6..6a2b06564 100644
--- a/cosh.c
+++ b/cosh.c
@@ -87,12 +87,13 @@ mpfr_cosh (mpfr_ptr y, mpfr_srcptr xt , mp_rnd_t rnd_mode)
     MPFR_ZIV_INIT (loop, Nt);
     for (;;)
       {
+        MPFR_BLOCK_DECL (flags);
+
         /* Compute cosh */
-        mpfr_clear_flags ();
-        mpfr_exp (te, x, GMP_RNDD);         /* exp(x) */
+        MPFR_BLOCK (flags, mpfr_exp (te, x, GMP_RNDD));  /* exp(x) */
         /* exp can overflow (but not underflow since x>0) */
         /* BUG/TODO/FIXME: exp can overflow but cosh may be representable! */
-        if (MPFR_UNLIKELY (mpfr_overflow_p ()))
+        if (MPFR_OVERFLOW (flags))
           {
             inexact = mpfr_overflow (y, rnd_mode, MPFR_SIGN_POS);
             MPFR_SAVE_EXPO_UPDATE_FLAGS (expo, MPFR_FLAGS_OVERFLOW);