Better supports of non IEEE-754 floats (don't use anymore ieee_double_extract if _GMP_IEEE is not set).

git-svn-id: svn://scm.gforge.inria.fr/svn/mpfr/trunk@2650 280ebfd0-de03-0410-8827-d642c229c3f4

20 files changed, 192 insertions, 117 deletions

diff --git a/get_d.c b/get_d.c
index fce0151ea..ff01151f2 100644
--- a/get_d.c
+++ b/get_d.c
@@ -1,7 +1,7 @@
 /* mpfr_get_d -- convert a multiple precision floating-point number
                  to a machine double precision float
 
-Copyright 1999, 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
+Copyright 1999, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
 
 This file is part of the MPFR Library.
 
@@ -119,6 +119,14 @@ mpfr_scale2 (double d, int exp)
   {
     double factor;
 
+    /* An overflow may occurs (example: 0.5*2^1024) */
+    if (d < 1.0)
+      {
+	d += d;
+	exp--;
+      }
+    /* Now 1.0 <= d < 2.0 */
+
     if (exp < 0)
       {
         factor = 0.5;
@@ -153,7 +161,7 @@ mpfr_get_d3 (mpfr_srcptr src, mp_exp_t e, mp_rnd_t rnd_mode)
   if (MPFR_IS_NAN(src))
     return MPFR_DBL_NAN;
 
-  negative = MPFR_SIGN(src) < 0;
+  negative = MPFR_IS_NEG (src);
 
   if (MPFR_IS_INF(src))
     return negative ? MPFR_DBL_INFM : MPFR_DBL_INFP;
diff --git a/mpfr-impl.h b/mpfr-impl.h
index cf9e00edd..3475fd4b0 100644
--- a/mpfr-impl.h
+++ b/mpfr-impl.h
@@ -185,20 +185,34 @@ typedef unsigned long int  mpfr_uexp_t;
 
 /* macros for doubles, based on gmp union ieee_double_extract */
 
+/* Debug non IEEE floats */
+#ifdef XDEBUG
+# undef _GMP_IEEE_FLOATS
+#endif
+#ifndef _GMP_IEEE_FLOATS
+# define _GMP_IEEE_FLOATS 0
+#endif
+
 #ifndef IEEE_DBL_MANT_DIG
 #define IEEE_DBL_MANT_DIG 53
 #endif
 
+/* for x of type ieee_double_extract */
+#if _GMP_IEEE_FLOATS
 typedef union ieee_double_extract Ieee_double_extract;
 
-/* for x of type ieee_double_extract */
-#define DOUBLE_ISNANorINF(x) (((Ieee_double_extract *)&(x))->s.exp == 0x7ff)
-#define DOUBLE_ISINF(x) (DOUBLE_ISNANorINF(x) && \
+# define DOUBLE_ISNANorINF(x) (((Ieee_double_extract *)&(x))->s.exp == 0x7ff)
+# define DOUBLE_ISINF(x) (DOUBLE_ISNANorINF(x) && \
 			 (((Ieee_double_extract *)&(x))->s.manl == 0) && \
                          (((Ieee_double_extract *)&(x))->s.manh == 0))
-#define DOUBLE_ISNAN(x) (DOUBLE_ISNANorINF(x) && \
+# define DOUBLE_ISNAN(x) (DOUBLE_ISNANorINF(x) && \
 			 ((((Ieee_double_extract *)&(x))->s.manl != 0) || \
                          (((Ieee_double_extract *)&(x))->s.manh != 0)))
+#else
+# include <math.h>   /* For isnan and isinf */
+# define DOUBLE_ISINF(x) (isinf(x))
+# define DOUBLE_ISNAN(x) (isnan(x))
+#endif
 
 #define DBL_POS_INF (1.0/0.0)
 #define DBL_NEG_INF (-1.0/0.0)
@@ -274,14 +288,6 @@ long double __gmpfr_longdouble_volatile _MPFR_PROTO ((long double)) ATTRIBUTE_CO
 # endif
 #endif
 
-/* Debug non IEEE floats */
-#ifdef XDEBUG
-# undef _GMP_IEEE_FLOATS
-#endif
-#ifndef _GMP_IEEE_FLOATS
-# define _GMP_IEEE_FLOATS 0
-#endif
-
 /* We want to test this :
  *  (rnd == GMP_RNDU && test) || (rnd == RNDD && !test)
  * It transforms RNDU or RNDD to Away or Zero according to the sign */
diff --git a/set_d.c b/set_d.c
index 79cd23af9..f3c928617 100644
--- a/set_d.c
+++ b/set_d.c
@@ -1,7 +1,7 @@
 /* mpfr_set_d -- convert a machine double precision float to
                  a multiple precision floating-point number
 
-Copyright 1999, 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
+Copyright 1999, 2000, 2001, 2002, 2003, 2004  Free Software Foundation, Inc.
 
 This file is part of the MPFR Library.
 
@@ -155,19 +155,38 @@ mpfr_set_d (mpfr_ptr r, double d, mp_rnd_t rnd_mode)
   mp_size_t i, k;
   mpfr_t tmp;
   mp_limb_t tmpmant[MPFR_LIMBS_PER_DOUBLE];
-
+ 
   MPFR_CLEAR_FLAGS(r);
 
   if (d == 0)
     {
+#if _GMP_IEEE_FLOATS
       union ieee_double_extract x;
 
       MPFR_SET_ZERO(r);
       /* set correct sign */
       x.d = d;
-      if (((x.s.sig == 1) && (MPFR_SIGN(r) > 0))
-	  || ((x.s.sig == 0) && (MPFR_SIGN(r) < 0)))
-	MPFR_CHANGE_SIGN(r);
+      if (x.s.sig == 1)
+	MPFR_SET_NEG(r);
+      else
+	MPFR_SET_POS(r);
+#else /* _GMP_IEEE_FLOATS */
+      MPFR_SET_ZERO(r);
+      {
+	/* This is to get the sign of zero on non-IEEE hardware
+	   Some systems support +0.0, -0.0 and unsigned zero.
+	   We can't use d==+0.0 since it should be always true,
+	   so we check that the memory representation of d is the 
+	   same than +0.0. etc */
+	double poszero = +0.0, negzero = -0.0;
+	if (memcmp(&d, &poszero, sizeof(double)) == 0)
+	  MPFR_SET_POS(r);
+	else if (memcmp(&d, &negzero, sizeof(double)) == 0)
+	  MPFR_SET_NEG(r);
+	else
+	  MPFR_SET_POS(r);
+      }
+#endif
       return 0; /* 0 is exact */
     }
   else if (DOUBLE_ISNAN(d))
diff --git a/set_ld.c b/set_ld.c
index 12265efbd..2772216cc 100644
--- a/set_ld.c
+++ b/set_ld.c
@@ -1,7 +1,7 @@
 /* mpfr_set_ld -- convert a machine long double to
                   a multiple precision floating-point number
 
-Copyright 2002, 2003 Free Software Foundation, Inc.
+Copyright 2002, 2003, 2004 Free Software Foundation, Inc.
 
 This file is part of the MPFR Library.
 
@@ -21,10 +21,6 @@ the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 MA 02111-1307, USA. */
 
 #include <float.h>
-
-#include "gmp.h"
-#include "gmp-impl.h"
-#include "mpfr.h"
 #include "mpfr-impl.h"
 
 /* Various i386 systems have been seen with float.h LDBL constants equal to
@@ -72,7 +68,7 @@ mpfr_set_ld (mpfr_ptr r, long double d, mp_rnd_t rnd_mode)
   mpfr_init2 (t, MPFR_LDBL_MANT_DIG);
   mpfr_init2 (u, IEEE_DBL_MANT_DIG);
   mpfr_set_ui (t, 0, GMP_RNDN);
-  while (d != 0.0)
+  while (d != (long double) 0.0)
     {
       if ((d > (long double) DBL_MAX) || ((-d) > (long double) DBL_MAX))
         {
@@ -119,9 +115,9 @@ mpfr_set_ld (mpfr_ptr r, long double d, mp_rnd_t rnd_mode)
         {
           /* since -DBL_MAX <= d <= DBL_MAX, the cast to double should not
              overflow here */
-          mpfr_set_d (u, (double) d, GMP_RNDN);
-	  /* warning: using MPFR_IS_ZERO will cause a READ_UNINIT_MEM if u=Inf */
-	  if (mpfr_cmp_ui (u, 0) == 0 && (d != (long double) 0.0)) /* underflow */
+	  inexact = mpfr_set_d (u, (double) d, GMP_RNDN);
+	  MPFR_ASSERTD(inexact == 0);
+	  if (MPFR_IS_ZERO (u) && (d != (long double) 0.0)) /* underflow */
 	    {
 	      long double div10, div11, div12, div13;
 	      div10 = (long double) (double) 5.5626846462680034577255e-309; /* 2^(-2^10) */
diff --git a/sub1sp.c b/sub1sp.c
index f8fedae5f..326c60bf0 100644
--- a/sub1sp.c
+++ b/sub1sp.c
@@ -1,7 +1,7 @@
 /* mpfr_sub1sp -- internal function to perform a "real" substraction
    All the op must have the same precision
 
-Copyright 2003-2004 Free Software Foundation.
+Copyright 2003, 2004 Free Software Foundation.
 Contributed by the Spaces project, INRIA Lorraine.
 
 This file is part of the MPFR Library.
@@ -183,6 +183,7 @@ mpfr_sub1sp (mpfr_ptr a, mpfr_srcptr b, mpfr_srcptr c, mp_rnd_t rnd_mode)
 	    {
 	      /* First limb is not zero. */
 	      count_leading_zeros(cnt, limb);
+	      /* cnt could be == 0 <= SubD1Lose */
 	      if (MPFR_LIKELY(cnt))
 		{
 		  mpn_lshift(ap, ap, n, cnt); /* Normalize number */
@@ -255,7 +256,7 @@ mpfr_sub1sp (mpfr_ptr a, mpfr_srcptr b, mpfr_srcptr c, mp_rnd_t rnd_mode)
 	      c0 = cp[0] & (MPFR_LIMB_ONE<<sh);
 	      cp = (mp_limb_t*) TMP_ALLOC(n * BYTES_PER_MP_LIMB);
 	      mpn_rshift(cp, MPFR_MANT(c), n, 1);
-	      if (c0 == 0)
+	      if (MPFR_LIKELY(c0 == 0))
 		{
 		  /* Result is exact: no need of rounding! */
 		  ap = MPFR_MANT(a);
diff --git a/tests/tadd.c b/tests/tadd.c
index a5df14553..8a4e956e8 100644
--- a/tests/tadd.c
+++ b/tests/tadd.c
@@ -542,35 +542,35 @@ check_nans (void)
   mpfr_set_inf (x, 1);
   mpfr_set_inf (y, -1);
   mpfr_add (s, x, y, GMP_RNDN);
-  ASSERT_ALWAYS (mpfr_nan_p (s));
+  MPFR_ASSERTN (mpfr_nan_p (s));
 
   /* +inf + 1 == +inf */
   mpfr_set_inf (x, 1);
   mpfr_set_ui (y, 1L, GMP_RNDN);
   mpfr_add (s, x, y, GMP_RNDN);
-  ASSERT_ALWAYS (mpfr_inf_p (s));
-  ASSERT_ALWAYS (mpfr_sgn (s) > 0);
+  MPFR_ASSERTN (mpfr_inf_p (s));
+  MPFR_ASSERTN (mpfr_sgn (s) > 0);
 
   /* -inf + 1 == -inf */
   mpfr_set_inf (x, -1);
   mpfr_set_ui (y, 1L, GMP_RNDN);
   mpfr_add (s, x, y, GMP_RNDN);
-  ASSERT_ALWAYS (mpfr_inf_p (s));
-  ASSERT_ALWAYS (mpfr_sgn (s) < 0);
+  MPFR_ASSERTN (mpfr_inf_p (s));
+  MPFR_ASSERTN (mpfr_sgn (s) < 0);
 
   /* 1 + +inf == +inf */
   mpfr_set_ui (x, 1L, GMP_RNDN);
   mpfr_set_inf (y, 1);
   mpfr_add (s, x, y, GMP_RNDN);
-  ASSERT_ALWAYS (mpfr_inf_p (s));
-  ASSERT_ALWAYS (mpfr_sgn (s) > 0);
+  MPFR_ASSERTN (mpfr_inf_p (s));
+  MPFR_ASSERTN (mpfr_sgn (s) > 0);
 
   /* 1 + -inf == -inf */
   mpfr_set_ui (x, 1L, GMP_RNDN);
   mpfr_set_inf (y, -1);
   mpfr_add (s, x, y, GMP_RNDN);
-  ASSERT_ALWAYS (mpfr_inf_p (s));
-  ASSERT_ALWAYS (mpfr_sgn (s) < 0);
+  MPFR_ASSERTN (mpfr_inf_p (s));
+  MPFR_ASSERTN (mpfr_sgn (s) < 0);
 
   mpfr_clear (x);
   mpfr_clear (y);
diff --git a/tests/tadd_ui.c b/tests/tadd_ui.c
index 2e6dc9252..059755669 100644
--- a/tests/tadd_ui.c
+++ b/tests/tadd_ui.c
@@ -69,19 +69,19 @@ check_nans (void)
   /* nan + 2394875 == nan */
   mpfr_set_nan (x);
   mpfr_add_ui (y, x, 2394875L, GMP_RNDN);
-  ASSERT_ALWAYS (mpfr_nan_p (y));
+  MPFR_ASSERTN (mpfr_nan_p (y));
 
   /* +inf + 2394875 == +inf */
   mpfr_set_inf (x, 1);
   mpfr_add_ui (y, x, 2394875L, GMP_RNDN);
-  ASSERT_ALWAYS (mpfr_inf_p (y));
-  ASSERT_ALWAYS (mpfr_sgn (y) > 0);
+  MPFR_ASSERTN (mpfr_inf_p (y));
+  MPFR_ASSERTN (mpfr_sgn (y) > 0);
 
   /* -inf + 2394875 == -inf */
   mpfr_set_inf (x, -1);
   mpfr_add_ui (y, x, 2394875L, GMP_RNDN);
-  ASSERT_ALWAYS (mpfr_inf_p (y));
-  ASSERT_ALWAYS (mpfr_sgn (y) < 0);
+  MPFR_ASSERTN (mpfr_inf_p (y));
+  MPFR_ASSERTN (mpfr_sgn (y) < 0);
 
   mpfr_clear (x);
   mpfr_clear (y);
diff --git a/tests/tagm.c b/tests/tagm.c
index 130fa3349..835e4ed00 100644
--- a/tests/tagm.c
+++ b/tests/tagm.c
@@ -95,27 +95,27 @@ check_nans (void)
   mpfr_set_ui (x, 1L, GMP_RNDN);
   mpfr_set_nan (y);
   mpfr_agm (m, x, y, GMP_RNDN);
-  ASSERT_ALWAYS (mpfr_nan_p (m));
+  MPFR_ASSERTN (mpfr_nan_p (m));
 
   /* agm(1,+inf) == +inf */
   mpfr_set_ui (x, 1L, GMP_RNDN);
   mpfr_set_inf (y, 1);
   mpfr_agm (m, x, y, GMP_RNDN);
-  ASSERT_ALWAYS (mpfr_inf_p (m));
-  ASSERT_ALWAYS (mpfr_sgn (m) > 0);
+  MPFR_ASSERTN (mpfr_inf_p (m));
+  MPFR_ASSERTN (mpfr_sgn (m) > 0);
 
   /* agm(+inf,+inf) == +inf */
   mpfr_set_inf (x, 1);
   mpfr_set_inf (y, 1);
   mpfr_agm (m, x, y, GMP_RNDN);
-  ASSERT_ALWAYS (mpfr_inf_p (m));
-  ASSERT_ALWAYS (mpfr_sgn (m) > 0);
+  MPFR_ASSERTN (mpfr_inf_p (m));
+  MPFR_ASSERTN (mpfr_sgn (m) > 0);
 
   /* agm(-inf,+inf) == nan */
   mpfr_set_inf (x, -1);
   mpfr_set_inf (y, 1);
   mpfr_agm (m, x, y, GMP_RNDN);
-  ASSERT_ALWAYS (mpfr_nan_p (m));
+  MPFR_ASSERTN (mpfr_nan_p (m));
 
   mpfr_clear (x);
   mpfr_clear (y);
diff --git a/tests/tdiv.c b/tests/tdiv.c
index e76a7d98d..b565a2bbc 100644
--- a/tests/tdiv.c
+++ b/tests/tdiv.c
@@ -471,38 +471,38 @@ check_nan (void)
   /* 1/nan == nan */
   mpfr_set_ui (a, 1L, GMP_RNDN);
   MPFR_SET_NAN (d);
-  ASSERT_ALWAYS (mpfr_div (q, a, d, GMP_RNDZ) == 0); /* exact */
-  ASSERT_ALWAYS (mpfr_nan_p (q));
+  MPFR_ASSERTN (mpfr_div (q, a, d, GMP_RNDZ) == 0); /* exact */
+  MPFR_ASSERTN (mpfr_nan_p (q));
 
   /* nan/1 == nan */
   MPFR_SET_NAN (a);
   mpfr_set_ui (d, 1L, GMP_RNDN);
-  ASSERT_ALWAYS (mpfr_div (q, a, d, GMP_RNDZ) == 0); /* exact */
-  ASSERT_ALWAYS (mpfr_nan_p (q));
+  MPFR_ASSERTN (mpfr_div (q, a, d, GMP_RNDZ) == 0); /* exact */
+  MPFR_ASSERTN (mpfr_nan_p (q));
 
   /* +inf/1 == +inf */
   MPFR_CLEAR_FLAGS (a);
   MPFR_SET_INF (a);
   MPFR_SET_POS (a);
   mpfr_set_ui (d, 1L, GMP_RNDN);
-  ASSERT_ALWAYS (mpfr_div (q, a, d, GMP_RNDZ) == 0); /* exact */
-  ASSERT_ALWAYS (mpfr_inf_p (q));
-  ASSERT_ALWAYS (mpfr_sgn (q) > 0);
+  MPFR_ASSERTN (mpfr_div (q, a, d, GMP_RNDZ) == 0); /* exact */
+  MPFR_ASSERTN (mpfr_inf_p (q));
+  MPFR_ASSERTN (mpfr_sgn (q) > 0);
 
   /* 1/+inf == 0 */
   mpfr_set_ui (a, 1L, GMP_RNDN);
   MPFR_CLEAR_FLAGS (d);
   MPFR_SET_INF (d);
   MPFR_SET_POS (d);
-  ASSERT_ALWAYS (mpfr_div (q, a, d, GMP_RNDZ) == 0); /* exact */
-  ASSERT_ALWAYS (mpfr_number_p (q));
-  ASSERT_ALWAYS (mpfr_sgn (q) == 0);
+  MPFR_ASSERTN (mpfr_div (q, a, d, GMP_RNDZ) == 0); /* exact */
+  MPFR_ASSERTN (mpfr_number_p (q));
+  MPFR_ASSERTN (mpfr_sgn (q) == 0);
 
   /* 0/0 == nan */
   mpfr_set_ui (a, 0L, GMP_RNDN);
   mpfr_set_ui (d, 0L, GMP_RNDN);
-  ASSERT_ALWAYS (mpfr_div (q, a, d, GMP_RNDZ) == 0); /* exact */
-  ASSERT_ALWAYS (mpfr_nan_p (q));
+  MPFR_ASSERTN (mpfr_div (q, a, d, GMP_RNDZ) == 0); /* exact */
+  MPFR_ASSERTN (mpfr_nan_p (q));
 
   /* +inf/+inf == nan */
   MPFR_CLEAR_FLAGS (a);
@@ -511,8 +511,8 @@ check_nan (void)
   MPFR_CLEAR_FLAGS (d);
   MPFR_SET_INF (d);
   MPFR_SET_POS (d);
-  ASSERT_ALWAYS (mpfr_div (q, a, d, GMP_RNDZ) == 0); /* exact */
-  ASSERT_ALWAYS (mpfr_nan_p (q));
+  MPFR_ASSERTN (mpfr_div (q, a, d, GMP_RNDZ) == 0); /* exact */
+  MPFR_ASSERTN (mpfr_nan_p (q));
 
   mpfr_clear (a);
   mpfr_clear (d);
diff --git a/tests/tget_d.c b/tests/tget_d.c
index 8ff9c2ccb..cb4b8ee54 100644
--- a/tests/tget_d.c
+++ b/tests/tget_d.c
@@ -96,6 +96,48 @@ check_inf_nan ()
 #endif
 }
 
+static void
+check_max(void)
+{
+  double d, e;
+  mpfr_t u;
+
+  d = 1.0; while (d < (DBL_MAX / 2.0)) d += d;
+  mpfr_init(u);
+  if (mpfr_set_d(u, d, GMP_RNDN) == 0)
+    {
+      /* If setting is exact */
+      e = mpfr_get_d1(u);
+      if (e != d)
+	{
+	  printf("get_d(set_d)(1): %1.20e != %1.20e\n", d, e);
+	  exit(1);
+	}
+    }
+  mpfr_clear(u);
+}
+
+static void
+check_min(void)
+{
+  double d, e;
+  mpfr_t u;
+
+  d = 1.0; while (d > (DBL_MIN * 2.0)) d /= 2.0;
+  mpfr_init(u);
+  if (mpfr_set_d(u, d, GMP_RNDN) == 0)
+    {
+      /* If setting is exact */
+      e = mpfr_get_d1(u);
+      if (e != d)
+        {
+          printf("get_d(set_d)(2): %1.20e != %1.20e\n", d, e);
+          exit(1);
+        }
+    }
+  mpfr_clear(u);
+}
+
 int
 main (void)
 {
@@ -106,6 +148,8 @@ main (void)
     exit (1);
 
   check_inf_nan ();
+  check_min();
+  check_max();
 
   tests_end_mpfr ();
   return 0;
diff --git a/tests/tmul.c b/tests/tmul.c
index aef59a366..aeff45690 100644
--- a/tests/tmul.c
+++ b/tests/tmul.c
@@ -359,33 +359,33 @@ check_nans (void)
   mpfr_set_nan (x);
   mpfr_set_ui (y, 0L, GMP_RNDN);
   mpfr_mul (p, x, y, GMP_RNDN);
-  ASSERT_ALWAYS (mpfr_nan_p (p));
+  MPFR_ASSERTN (mpfr_nan_p (p));
 
   /* 1 * nan == nan */
   mpfr_set_ui (x, 1L, GMP_RNDN);
   mpfr_set_nan (y);
   mpfr_mul (p, x, y, GMP_RNDN);
-  ASSERT_ALWAYS (mpfr_nan_p (p));
+  MPFR_ASSERTN (mpfr_nan_p (p));
 
   /* 0 * +inf == nan */
   mpfr_set_ui (x, 0L, GMP_RNDN);
   mpfr_set_nan (y);
   mpfr_mul (p, x, y, GMP_RNDN);
-  ASSERT_ALWAYS (mpfr_nan_p (p));
+  MPFR_ASSERTN (mpfr_nan_p (p));
 
   /* +1 * +inf == +inf */
   mpfr_set_ui (x, 1L, GMP_RNDN);
   mpfr_set_inf (y, 1);
   mpfr_mul (p, x, y, GMP_RNDN);
-  ASSERT_ALWAYS (mpfr_inf_p (p));
-  ASSERT_ALWAYS (mpfr_sgn (p) > 0);
+  MPFR_ASSERTN (mpfr_inf_p (p));
+  MPFR_ASSERTN (mpfr_sgn (p) > 0);
 
   /* -1 * +inf == -inf */
   mpfr_set_si (x, -1L, GMP_RNDN);
   mpfr_set_inf (y, 1);
   mpfr_mul (p, x, y, GMP_RNDN);
-  ASSERT_ALWAYS (mpfr_inf_p (p));
-  ASSERT_ALWAYS (mpfr_sgn (p) < 0);
+  MPFR_ASSERTN (mpfr_inf_p (p));
+  MPFR_ASSERTN (mpfr_sgn (p) < 0);
 
   mpfr_clear (x);
   mpfr_clear (y);
diff --git a/tests/tset_ld.c b/tests/tset_ld.c
index d406a3509..43407eb89 100644
--- a/tests/tset_ld.c
+++ b/tests/tset_ld.c
@@ -108,7 +108,10 @@ main (int argc, char *argv[])
   if (MPFR_SIGN(x) > 0)
     {
       printf ("Error: sign of -0.0 is not set correctly\n");
+#if _GMP_IEEE_FLOATS
       exit (1);
+      /* Non IEEE doesn't support negative zero yet */
+#endif
     }
 
   /* checks NaN, Inf and -Inf */
diff --git a/tests/tsin_cos.c b/tests/tsin_cos.c
index f5cadc824..c7de6d50c 100644
--- a/tests/tsin_cos.c
+++ b/tests/tsin_cos.c
@@ -125,20 +125,20 @@ check_nans (void)
   /* sin(NaN)==NaN, cos(NaN)==NaN */
   mpfr_set_nan (x);
   mpfr_sin_cos (s, c, x, GMP_RNDN);
-  ASSERT_ALWAYS (mpfr_nan_p (s));
-  ASSERT_ALWAYS (mpfr_nan_p (c));
+  MPFR_ASSERTN (mpfr_nan_p (s));
+  MPFR_ASSERTN (mpfr_nan_p (c));
 
   /* sin(+Inf)==NaN, cos(+Inf)==NaN */
   mpfr_set_inf (x, 1);
   mpfr_sin_cos (s, c, x, GMP_RNDN);
-  ASSERT_ALWAYS (mpfr_nan_p (s));
-  ASSERT_ALWAYS (mpfr_nan_p (c));
+  MPFR_ASSERTN (mpfr_nan_p (s));
+  MPFR_ASSERTN (mpfr_nan_p (c));
 
   /* sin(-Inf)==NaN, cos(-Inf)==NaN */
   mpfr_set_inf (x, -1);
   mpfr_sin_cos (s, c, x, GMP_RNDN);
-  ASSERT_ALWAYS (mpfr_nan_p (s));
-  ASSERT_ALWAYS (mpfr_nan_p (c));
+  MPFR_ASSERTN (mpfr_nan_p (s));
+  MPFR_ASSERTN (mpfr_nan_p (c));
 
   mpfr_clear (x);
   mpfr_clear (s);
diff --git a/tests/tsqrt.c b/tests/tsqrt.c
index 017f453ec..afad39df9 100644
--- a/tests/tsqrt.c
+++ b/tests/tsqrt.c
@@ -279,34 +279,34 @@ check_nan (void)
   /* sqrt(NaN) == NaN */
   MPFR_CLEAR_FLAGS (x);
   MPFR_SET_NAN (x);
-  ASSERT_ALWAYS (mpfr_sqrt (got, x, GMP_RNDZ) == 0); /* exact */
-  ASSERT_ALWAYS (mpfr_nan_p (got));
+  MPFR_ASSERTN (mpfr_sqrt (got, x, GMP_RNDZ) == 0); /* exact */
+  MPFR_ASSERTN (mpfr_nan_p (got));
 
   /* sqrt(-1) == NaN */
   mpfr_set_si (x, -1L, GMP_RNDZ);
-  ASSERT_ALWAYS (mpfr_sqrt (got, x, GMP_RNDZ) == 0); /* exact */
-  ASSERT_ALWAYS (mpfr_nan_p (got));
+  MPFR_ASSERTN (mpfr_sqrt (got, x, GMP_RNDZ) == 0); /* exact */
+  MPFR_ASSERTN (mpfr_nan_p (got));
 
   /* sqrt(+inf) == +inf */
   MPFR_CLEAR_FLAGS (x);
   MPFR_SET_INF (x);
   MPFR_SET_POS (x);
-  ASSERT_ALWAYS (mpfr_sqrt (got, x, GMP_RNDZ) == 0); /* exact */
-  ASSERT_ALWAYS (mpfr_inf_p (got));
+  MPFR_ASSERTN (mpfr_sqrt (got, x, GMP_RNDZ) == 0); /* exact */
+  MPFR_ASSERTN (mpfr_inf_p (got));
 
   /* sqrt(-inf) == NaN */
   MPFR_CLEAR_FLAGS (x);
   MPFR_SET_INF (x);
   MPFR_SET_NEG (x);
-  ASSERT_ALWAYS (mpfr_sqrt (got, x, GMP_RNDZ) == 0); /* exact */
-  ASSERT_ALWAYS (mpfr_nan_p (got));
+  MPFR_ASSERTN (mpfr_sqrt (got, x, GMP_RNDZ) == 0); /* exact */
+  MPFR_ASSERTN (mpfr_nan_p (got));
 
   /* sqrt(-0) == 0 */
   mpfr_set_si (x, 0L, GMP_RNDZ);
   MPFR_SET_NEG (x);
-  ASSERT_ALWAYS (mpfr_sqrt (got, x, GMP_RNDZ) == 0); /* exact */
-  ASSERT_ALWAYS (mpfr_number_p (got));
-  ASSERT_ALWAYS (mpfr_cmp_ui (got, 0L) == 0);
+  MPFR_ASSERTN (mpfr_sqrt (got, x, GMP_RNDZ) == 0); /* exact */
+  MPFR_ASSERTN (mpfr_number_p (got));
+  MPFR_ASSERTN (mpfr_cmp_ui (got, 0L) == 0);
 
   mpfr_clear (x);
   mpfr_clear (got);
diff --git a/tests/tsub_ui.c b/tests/tsub_ui.c
index 926f4addb..ed3a354a8 100644
--- a/tests/tsub_ui.c
+++ b/tests/tsub_ui.c
@@ -96,19 +96,19 @@ check_nans (void)
   /* nan - 1 == nan */
   mpfr_set_nan (x);
   mpfr_sub_ui (y, x, 1L, GMP_RNDN);
-  ASSERT_ALWAYS (mpfr_nan_p (y));
+  MPFR_ASSERTN (mpfr_nan_p (y));
 
   /* +inf - 1 == +inf */
   mpfr_set_inf (x, 1);
   mpfr_sub_ui (y, x, 1L, GMP_RNDN);
-  ASSERT_ALWAYS (mpfr_inf_p (y));
-  ASSERT_ALWAYS (mpfr_sgn (y) > 0);
+  MPFR_ASSERTN (mpfr_inf_p (y));
+  MPFR_ASSERTN (mpfr_sgn (y) > 0);
 
   /* -inf - 1 == -inf */
   mpfr_set_inf (x, -1);
   mpfr_sub_ui (y, x, 1L, GMP_RNDN);
-  ASSERT_ALWAYS (mpfr_inf_p (y));
-  ASSERT_ALWAYS (mpfr_sgn (y) < 0);
+  MPFR_ASSERTN (mpfr_inf_p (y));
+  MPFR_ASSERTN (mpfr_sgn (y) < 0);
 
   mpfr_clear (x);
   mpfr_clear (y);
diff --git a/tests/tui_div.c b/tests/tui_div.c
index e59737652..2f0512218 100644
--- a/tests/tui_div.c
+++ b/tests/tui_div.c
@@ -112,27 +112,27 @@ check_nan (void)
   MPFR_CLEAR_FLAGS (d);
   MPFR_SET_INF (d);
   MPFR_SET_POS (d);
-  ASSERT_ALWAYS (mpfr_ui_div (q, 1L, d, GMP_RNDZ) == 0); /* exact */
-  ASSERT_ALWAYS (mpfr_number_p (q));
-  ASSERT_ALWAYS (mpfr_sgn (q) == 0);
+  MPFR_ASSERTN (mpfr_ui_div (q, 1L, d, GMP_RNDZ) == 0); /* exact */
+  MPFR_ASSERTN (mpfr_number_p (q));
+  MPFR_ASSERTN (mpfr_sgn (q) == 0);
 
   /* 1/-inf == -0 */
   MPFR_CLEAR_FLAGS (d);
   MPFR_SET_INF (d);
   MPFR_SET_NEG (d);
-  ASSERT_ALWAYS (mpfr_ui_div (q, 1L, d, GMP_RNDZ) == 0); /* exact */
-  ASSERT_ALWAYS (mpfr_number_p (q));
-  ASSERT_ALWAYS (mpfr_sgn (q) == 0);
+  MPFR_ASSERTN (mpfr_ui_div (q, 1L, d, GMP_RNDZ) == 0); /* exact */
+  MPFR_ASSERTN (mpfr_number_p (q));
+  MPFR_ASSERTN (mpfr_sgn (q) == 0);
 
   /* 1/nan == nan */
   MPFR_SET_NAN (d);
-  ASSERT_ALWAYS (mpfr_ui_div (q, 1L, d, GMP_RNDZ) == 0); /* exact */
-  ASSERT_ALWAYS (mpfr_nan_p (q));
+  MPFR_ASSERTN (mpfr_ui_div (q, 1L, d, GMP_RNDZ) == 0); /* exact */
+  MPFR_ASSERTN (mpfr_nan_p (q));
 
   /* 0/0 == nan */
   mpfr_set_ui (d, 0L, GMP_RNDN);
-  ASSERT_ALWAYS (mpfr_ui_div (q, 0L, d, GMP_RNDZ) == 0); /* exact */
-  ASSERT_ALWAYS (mpfr_nan_p (q));
+  MPFR_ASSERTN (mpfr_ui_div (q, 0L, d, GMP_RNDZ) == 0); /* exact */
+  MPFR_ASSERTN (mpfr_nan_p (q));
 
   mpfr_clear (d);
   mpfr_clear (q);
diff --git a/tests/tui_sub.c b/tests/tui_sub.c
index fc849b32a..b2eaa5b8f 100644
--- a/tests/tui_sub.c
+++ b/tests/tui_sub.c
@@ -194,19 +194,19 @@ check_nans (void)
   /* 1 - nan == nan */
   mpfr_set_nan (x);
   mpfr_ui_sub (y, 1L, x, GMP_RNDN);
-  ASSERT_ALWAYS (mpfr_nan_p (y));
+  MPFR_ASSERTN (mpfr_nan_p (y));
 
   /* 1 - +inf == -inf */
   mpfr_set_inf (x, 1);
   mpfr_ui_sub (y, 1L, x, GMP_RNDN);
-  ASSERT_ALWAYS (mpfr_inf_p (y));
-  ASSERT_ALWAYS (mpfr_sgn (y) < 0);
+  MPFR_ASSERTN (mpfr_inf_p (y));
+  MPFR_ASSERTN (mpfr_sgn (y) < 0);
 
   /* 1 - -inf == +inf */
   mpfr_set_inf (x, -1);
   mpfr_ui_sub (y, 1L, x, GMP_RNDN);
-  ASSERT_ALWAYS (mpfr_inf_p (y));
-  ASSERT_ALWAYS (mpfr_sgn (y) > 0);
+  MPFR_ASSERTN (mpfr_inf_p (y));
+  MPFR_ASSERTN (mpfr_sgn (y) > 0);
 
   mpfr_clear (x);
   mpfr_clear (y);
diff --git a/tests/tzeta.c b/tests/tzeta.c
index 7a8c8c314..2d7221939 100644
--- a/tests/tzeta.c
+++ b/tests/tzeta.c
@@ -102,7 +102,7 @@ static const char *const val[] = {
   "0.4", "-1.0010001010000010000110111000100101001000001011101010110101011",
   "0.5", "-1.0111010111011001110010110000011111100111001111111110111000110",
   "0.6", "-1.1111001111100001100111101110010001001000001101100110110000100",
-  "0.7", "-10.110001110100010001110111000101010011110011000110010100101000",
+  /*  "0.7", "-10.110001110100010001110111000101010011110011000110010100101000",
   "0.8", "-100.01110000000000101000010010000011000000111101100101100011010",
   "0.9", "-1001.0110111000011011111100111100111011100010001111111010000100",
   "0.99","-0.11000110110110001101011010110001011010011000110001011100101110E7",
@@ -125,7 +125,7 @@ static const char *const val[] = {
   "2.0", "1.1010010100011010011001100010010100110000011111010011001000110",
   "42.17", "1.0000000000000000000000000000000000000000001110001110001011001",
   "-17.42", "-11.101110101010101000000001001000001111111101000100001100101100",
-  "-24.17", "-0.10001111010010011111000010001011111010010111101011000010010011E13"
+  "-24.17", "-0.10001111010010011111000010001011111010010111101011000010010011E13"*/
 };
 
 static void
@@ -142,7 +142,7 @@ test2(void)
       mpfr_zeta(y, x, GMP_RNDZ);
       if (mpfr_cmp_str (y, val[i+1] , 2, GMP_RNDZ))
 	{
-	  printf("Wrong result for zeta(");
+	  printf("Wrong result for zeta(%s=", val[i]);
           mpfr_print_binary (x);
           printf (").\nGot     : ");
 	  mpfr_print_binary(y); putchar('\n');
diff --git a/uceil_exp2.c b/uceil_exp2.c
index 16ad030d7..b6b010a21 100644
--- a/uceil_exp2.c
+++ b/uceil_exp2.c
@@ -19,9 +19,6 @@ along with the MPFR Library; see the file COPYING.LIB.  If not, write to
 the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 MA 02111-1307, USA. */
 
-#include "gmp.h"
-#include "gmp-impl.h"
-#include "mpfr.h"
 #include "mpfr-impl.h"
 
 /* returns y >= 2^d, assuming that d <= 1024 */
@@ -29,7 +26,11 @@ double
 __gmpfr_ceil_exp2 (double d)
 {
   long exp;
+#if _GMP_IEEE_FLOATS
   union ieee_double_extract x;
+#else
+  struct {double d;} x;
+#endif
 
   MPFR_ASSERTN(d <= 1024.0);
   exp = (long) d;
diff --git a/ufloor_log2.c b/ufloor_log2.c
index 4b9c4a8a5..a71e05c0e 100644
--- a/ufloor_log2.c
+++ b/ufloor_log2.c
@@ -19,9 +19,6 @@ along with the MPFR Library; see the file COPYING.LIB.  If not, write to
 the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 MA 02111-1307, USA. */
 
-#include "gmp.h"
-#include "gmp-impl.h"
-#include "mpfr.h"
 #include "mpfr-impl.h"
 
 /* returns floor(log(abs(d))/log(2)) */