Fixed bugs (like those in mpfr_get_ui).

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

1 files changed, 14 insertions, 7 deletions

diff --git a/get_si.c b/get_si.c
index 44c5d092f..845b08ea5 100644
--- a/get_si.c
+++ b/get_si.c
@@ -39,14 +39,21 @@ mpfr_get_si (mpfr_srcptr f, mp_rnd_t rnd)
 
   /* first round to prec bits */
   mpfr_init2 (x, prec);
-  mpfr_set (x, f, rnd);
-
-  /* now the result is in the most significant limb of x */
-  exp = MPFR_GET_EXP (x); /* since |x| >= 1, exp >= 1 */
-  n = MPFR_LIMB_SIZE(x);
-  s = MPFR_MANT(x)[n - 1] >> (BITS_PER_MP_LIMB - exp);
+  mpfr_rint (x, f, rnd);
+
+  /* warning: if x=0, taking its exponent is illegal */
+  if (MPFR_IS_ZERO(x))
+    s = 0;
+  else
+    {
+      /* now the result is in the most significant limb of x */
+      exp = MPFR_GET_EXP (x); /* since |x| >= 1, exp >= 1 */
+      n = MPFR_LIMB_SIZE(x);
+      s = MPFR_MANT(x)[n - 1] >> (BITS_PER_MP_LIMB - exp);
+      s *= MPFR_SIGN(f);
+    }
 
   mpfr_clear (x);
 
-  return MPFR_SIGN(f) * s;
+  return s;
 }