summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--add1.c4
-rw-r--r--add1sp.c4
-rw-r--r--cmp2.c6
-rw-r--r--fma.c4
-rw-r--r--fms.c4
-rw-r--r--get_z_exp.c4
-rw-r--r--hypot.c4
-rw-r--r--mpn_exp.c2
-rw-r--r--round_prec.c6
-rw-r--r--strtofr.c20
-rw-r--r--sub1.c4
-rw-r--r--sub1sp.c6
-rw-r--r--tests/texp10.c4
-rw-r--r--tests/texp2.c4
-rw-r--r--vasprintf.c8
15 files changed, 42 insertions, 42 deletions
diff --git a/add1.c b/add1.c
index f8b480ae5..75411e01b 100644
--- a/add1.c
+++ b/add1.c
@@ -32,7 +32,7 @@ mpfr_add1 (mpfr_ptr a, mpfr_srcptr b, mpfr_srcptr c, mpfr_rnd_t rnd_mode)
mp_size_t an, bn, cn;
mp_exp_t difw, exp;
int sh, rb, fb, inex;
- mp_exp_unsigned_t diff_exp;
+ mpfr_uexp_t diff_exp;
MPFR_TMP_DECL(marker);
MPFR_ASSERTD(MPFR_IS_PURE_FP(b) && MPFR_IS_PURE_FP(c));
@@ -71,7 +71,7 @@ mpfr_add1 (mpfr_ptr a, mpfr_srcptr b, mpfr_srcptr c, mpfr_rnd_t rnd_mode)
MPFR_SET_SAME_SIGN(a, b);
MPFR_UPDATE2_RND_MODE(rnd_mode, MPFR_SIGN(b));
/* now rnd_mode is either MPFR_RNDN, MPFR_RNDZ or MPFR_RNDA */
- diff_exp = (mp_exp_unsigned_t) exp - MPFR_GET_EXP(c);
+ diff_exp = (mpfr_uexp_t) exp - MPFR_GET_EXP(c);
/*
* 1. Compute the significant part A', the non-significant bits of A
diff --git a/add1sp.c b/add1sp.c
index c54b43839..a4d4dbfd9 100644
--- a/add1sp.c
+++ b/add1sp.c
@@ -86,7 +86,7 @@ int mpfr_add1sp (mpfr_ptr a, mpfr_srcptr b, mpfr_srcptr c, mpfr_rnd_t rnd_mode)
int
mpfr_add1sp (mpfr_ptr a, mpfr_srcptr b, mpfr_srcptr c, mpfr_rnd_t rnd_mode)
{
- mp_exp_unsigned_t d;
+ mpfr_uexp_t d;
mp_prec_t p;
unsigned int sh;
mp_size_t n;
@@ -208,7 +208,7 @@ mpfr_add1sp (mpfr_ptr a, mpfr_srcptr b, mpfr_srcptr c, mpfr_rnd_t rnd_mode)
/* Shift c in temporary allocated place */
{
- mp_exp_unsigned_t dm;
+ mpfr_uexp_t dm;
mp_size_t m;
dm = d % BITS_PER_MP_LIMB;
diff --git a/cmp2.c b/cmp2.c
index ac5f77773..2b16f4b3a 100644
--- a/cmp2.c
+++ b/cmp2.c
@@ -38,7 +38,7 @@ mpfr_cmp2 (mpfr_srcptr b, mpfr_srcptr c, mp_prec_t *cancel)
{
mp_limb_t *bp, *cp, bb, cc = 0, lastc = 0, dif, high_dif = 0;
mp_size_t bn, cn;
- mp_exp_unsigned_t diff_exp;
+ mpfr_uexp_t diff_exp;
mp_prec_t res = 0;
int sign;
@@ -55,7 +55,7 @@ mpfr_cmp2 (mpfr_srcptr b, mpfr_srcptr c, mp_prec_t *cancel)
if (MPFR_GET_EXP (b) >= MPFR_GET_EXP (c))
{
sign = 1;
- diff_exp = (mp_exp_unsigned_t) MPFR_GET_EXP (b) - MPFR_GET_EXP (c);
+ diff_exp = (mpfr_uexp_t) MPFR_GET_EXP (b) - MPFR_GET_EXP (c);
bp = MPFR_MANT(b);
cp = MPFR_MANT(c);
@@ -119,7 +119,7 @@ mpfr_cmp2 (mpfr_srcptr b, mpfr_srcptr c, mp_prec_t *cancel)
else /* MPFR_EXP(b) < MPFR_EXP(c) */
{
sign = -1;
- diff_exp = (mp_exp_unsigned_t) MPFR_GET_EXP (c) - MPFR_GET_EXP (b);
+ diff_exp = (mpfr_uexp_t) MPFR_GET_EXP (c) - MPFR_GET_EXP (b);
bp = MPFR_MANT(c);
cp = MPFR_MANT(b);
diff --git a/fma.c b/fma.c
index 90a331237..b6484920d 100644
--- a/fma.c
+++ b/fma.c
@@ -208,11 +208,11 @@ mpfr_fma (mpfr_ptr s, mpfr_srcptr x, mpfr_srcptr y, mpfr_srcptr z,
pzs = MAX (MPFR_PREC (z), MPFR_PREC (s) + 1);
if (diffexp <= pzs)
{
- mp_exp_unsigned_t uscale;
+ mpfr_uexp_t uscale;
mpfr_t scaled_v;
MPFR_BLOCK_DECL (flags);
- uscale = (mp_exp_unsigned_t) pzs - diffexp + 1;
+ uscale = (mpfr_uexp_t) pzs - diffexp + 1;
MPFR_ASSERTN (uscale > 0);
MPFR_ASSERTN (uscale <= ULONG_MAX);
scale = uscale;
diff --git a/fms.c b/fms.c
index 05e2abde6..cb6ac937a 100644
--- a/fms.c
+++ b/fms.c
@@ -210,11 +210,11 @@ mpfr_fms (mpfr_ptr s, mpfr_srcptr x, mpfr_srcptr y, mpfr_srcptr z,
pzs = MAX (MPFR_PREC (z), MPFR_PREC (s) + 1);
if (diffexp <= pzs)
{
- mp_exp_unsigned_t uscale;
+ mpfr_uexp_t uscale;
mpfr_t scaled_v;
MPFR_BLOCK_DECL (flags);
- uscale = (mp_exp_unsigned_t) pzs - diffexp + 1;
+ uscale = (mpfr_uexp_t) pzs - diffexp + 1;
MPFR_ASSERTN (uscale > 0);
MPFR_ASSERTN (uscale <= ULONG_MAX);
scale = uscale;
diff --git a/get_z_exp.c b/get_z_exp.c
index 035a56c4b..3934259ef 100644
--- a/get_z_exp.c
+++ b/get_z_exp.c
@@ -66,8 +66,8 @@ mpfr_get_z_exp (mpz_ptr z, mpfr_srcptr f)
/* Test if the result is representable. Later, we could choose
to return MPFR_EXP_MIN if it isn't, or perhaps MPFR_EXP_MAX
to signal an error. The significand would still be meaningful. */
- MPFR_ASSERTD ((mp_exp_unsigned_t) MPFR_GET_EXP (f) - MPFR_EXP_MIN
- >= (mp_exp_unsigned_t) MPFR_PREC(f));
+ MPFR_ASSERTD ((mpfr_uexp_t) MPFR_GET_EXP (f) - MPFR_EXP_MIN
+ >= (mpfr_uexp_t) MPFR_PREC(f));
return MPFR_GET_EXP (f) - MPFR_PREC (f);
}
diff --git a/hypot.c b/hypot.c
index 95117772e..55c16b2ed 100644
--- a/hypot.c
+++ b/hypot.c
@@ -35,7 +35,7 @@ mpfr_hypot (mpfr_ptr z, mpfr_srcptr x, mpfr_srcptr y, mpfr_rnd_t rnd_mode)
mp_prec_t Nt; /* precision of the intermediary variable */
mp_prec_t threshold;
mp_exp_t Ex, sh;
- mp_exp_unsigned_t diff_exp;
+ mpfr_uexp_t diff_exp;
MPFR_SAVE_EXPO_DECL (expo);
MPFR_ZIV_DECL (loop);
@@ -73,7 +73,7 @@ mpfr_hypot (mpfr_ptr z, mpfr_srcptr x, mpfr_srcptr y, mpfr_rnd_t rnd_mode)
/* now |x| >= |y| */
Ex = MPFR_GET_EXP (x);
- diff_exp = (mp_exp_unsigned_t) Ex - MPFR_GET_EXP (y);
+ diff_exp = (mpfr_uexp_t) Ex - MPFR_GET_EXP (y);
N = MPFR_PREC (x); /* Precision of input variable */
Nz = MPFR_PREC (z); /* Precision of output variable */
diff --git a/mpn_exp.c b/mpn_exp.c
index b5c05cf28..72ca49e7c 100644
--- a/mpn_exp.c
+++ b/mpn_exp.c
@@ -106,7 +106,7 @@ mpfr_mpn_exp (mp_limb_t *a, mp_exp_t *exp_r, int b, mp_exp_t e, size_t n)
/* FIXME: Could f = 2*f + n * BITS_PER_MP_LIMB be used? */
f = 2*f;
MPFR_SADD_OVERFLOW (f, f, n * BITS_PER_MP_LIMB,
- mp_exp_t, mp_exp_unsigned_t,
+ mp_exp_t, mpfr_uexp_t,
MPFR_EXP_MIN, MPFR_EXP_MAX,
goto overflow, goto overflow);
if ((c[2*n - 1] & MPFR_LIMB_HIGHBIT) == 0)
diff --git a/round_prec.c b/round_prec.c
index 4b662ed0a..68c13b073 100644
--- a/round_prec.c
+++ b/round_prec.c
@@ -139,11 +139,11 @@ mpfr_can_round_raw (const mp_limb_t *bp, mp_size_t bn, int neg, mp_exp_t err0,
mp_limb_t *tmp;
MPFR_TMP_DECL(marker);
- if (MPFR_UNLIKELY(err0 < 0 || (mp_exp_unsigned_t) err0 <= prec))
+ if (MPFR_UNLIKELY(err0 < 0 || (mpfr_uexp_t) err0 <= prec))
return 0; /* can't round */
else if (MPFR_UNLIKELY (prec > (mp_prec_t) bn * BITS_PER_MP_LIMB))
{ /* then ulp(b) < precision < error */
- return rnd2 == MPFR_RNDN && (mp_exp_unsigned_t) err0 - 2 >= prec;
+ return rnd2 == MPFR_RNDN && (mpfr_uexp_t) err0 - 2 >= prec;
/* can round only in rounding to the nearest and err0 >= prec + 2 */
}
@@ -152,7 +152,7 @@ mpfr_can_round_raw (const mp_limb_t *bp, mp_size_t bn, int neg, mp_exp_t err0,
/* if the error is smaller than ulp(b), then anyway it will propagate
up to ulp(b) */
- err = ((mp_exp_unsigned_t) err0 > (mp_prec_t) bn * BITS_PER_MP_LIMB) ?
+ err = ((mpfr_uexp_t) err0 > (mp_prec_t) bn * BITS_PER_MP_LIMB) ?
(mp_prec_t) bn * BITS_PER_MP_LIMB : (mp_prec_t) err0;
/* warning: if k = m*BITS_PER_MP_LIMB, consider limb m-1 and not m */
diff --git a/strtofr.c b/strtofr.c
index 24e709f70..51e1c0690 100644
--- a/strtofr.c
+++ b/strtofr.c
@@ -389,7 +389,7 @@ parse_string (mpfr_t x, struct parsed_string *pstr,
str = endptr[0];
MPFR_ASSERTN (read_exp == (long) read_exp);
MPFR_SADD_OVERFLOW (sum, read_exp, pstr->exp_base,
- mp_exp_t, mp_exp_unsigned_t,
+ mp_exp_t, mpfr_uexp_t,
MPFR_EXP_MIN, MPFR_EXP_MAX,
res = 2, res = 3);
/* Since exp_base was positive, read_exp + exp_base can't
@@ -557,7 +557,7 @@ parsed_string_to_mpfr (mpfr_t x, struct parsed_string *pstr, mpfr_rnd_t rnd)
with overflow checking
and check that we can add/substract 2 to exp without overflow */
MPFR_SADD_OVERFLOW (tmp, pstr->exp_base, -(mp_exp_t) pstr_size,
- mp_exp_t, mp_exp_unsigned_t,
+ mp_exp_t, mpfr_uexp_t,
MPFR_EXP_MIN, MPFR_EXP_MAX,
goto overflow, goto underflow);
/* On some FreeBsd/Alpha, LONG_MIN/1 produces an exception
@@ -568,11 +568,11 @@ parsed_string_to_mpfr (mpfr_t x, struct parsed_string *pstr, mpfr_rnd_t rnd)
goto underflow;
tmp *= pow2;
MPFR_SADD_OVERFLOW (tmp, tmp, pstr->exp_bin,
- mp_exp_t, mp_exp_unsigned_t,
+ mp_exp_t, mpfr_uexp_t,
MPFR_EXP_MIN, MPFR_EXP_MAX,
goto overflow, goto underflow);
MPFR_SADD_OVERFLOW (exp, exp, tmp,
- mp_exp_t, mp_exp_unsigned_t,
+ mp_exp_t, mpfr_uexp_t,
MPFR_EXP_MIN+2, MPFR_EXP_MAX-2,
goto overflow, goto underflow);
result = y;
@@ -614,11 +614,11 @@ parsed_string_to_mpfr (mpfr_t x, struct parsed_string *pstr, mpfr_rnd_t rnd)
/* exp += exp_z + ysize_bits with overflow checking
and check that we can add/substract 2 to exp without overflow */
MPFR_SADD_OVERFLOW (exp_z, exp_z, ysize_bits,
- mp_exp_t, mp_exp_unsigned_t,
+ mp_exp_t, mpfr_uexp_t,
MPFR_EXP_MIN, MPFR_EXP_MAX,
goto overflow, goto underflow);
MPFR_SADD_OVERFLOW (exp, exp, exp_z,
- mp_exp_t, mp_exp_unsigned_t,
+ mp_exp_t, mpfr_uexp_t,
MPFR_EXP_MIN+2, MPFR_EXP_MAX-2,
goto overflow, goto underflow);
@@ -651,7 +651,7 @@ parsed_string_to_mpfr (mpfr_t x, struct parsed_string *pstr, mpfr_rnd_t rnd)
/* pstr_size - pstr->exp_base can overflow */
MPFR_SADD_OVERFLOW (exp_z, (mp_exp_t) pstr_size, -pstr->exp_base,
- mp_exp_t, mp_exp_unsigned_t,
+ mp_exp_t, mpfr_uexp_t,
MPFR_EXP_MIN, MPFR_EXP_MAX,
goto underflow, goto overflow);
@@ -672,11 +672,11 @@ parsed_string_to_mpfr (mpfr_t x, struct parsed_string *pstr, mpfr_rnd_t rnd)
/* exp -= exp_z + ysize_bits with overflow checking
and check that we can add/substract 2 to exp without overflow */
MPFR_SADD_OVERFLOW (exp_z, exp_z, ysize_bits,
- mp_exp_t, mp_exp_unsigned_t,
+ mp_exp_t, mpfr_uexp_t,
MPFR_EXP_MIN, MPFR_EXP_MAX,
goto underflow, goto overflow);
MPFR_SADD_OVERFLOW (exp, exp, -exp_z,
- mp_exp_t, mp_exp_unsigned_t,
+ mp_exp_t, mpfr_uexp_t,
MPFR_EXP_MIN+2, MPFR_EXP_MAX-2,
goto overflow, goto underflow);
err += 2;
@@ -749,7 +749,7 @@ parsed_string_to_mpfr (mpfr_t x, struct parsed_string *pstr, mpfr_rnd_t rnd)
/* DO NOT USE MPFR_SET_EXP. The exp may be out of range! */
MPFR_SADD_OVERFLOW (exp, exp, ysize_bits,
- mp_exp_t, mp_exp_unsigned_t,
+ mp_exp_t, mpfr_uexp_t,
MPFR_EXP_MIN, MPFR_EXP_MAX,
goto overflow, goto underflow);
MPFR_EXP (x) = exp;
diff --git a/sub1.c b/sub1.c
index 8c19e8b78..e813981ee 100644
--- a/sub1.c
+++ b/sub1.c
@@ -32,7 +32,7 @@ int
mpfr_sub1 (mpfr_ptr a, mpfr_srcptr b, mpfr_srcptr c, mpfr_rnd_t rnd_mode)
{
int sign;
- mp_exp_unsigned_t diff_exp;
+ mpfr_uexp_t diff_exp;
mp_prec_t cancel, cancel1;
mp_size_t cancel2, an, bn, cn, cn0;
mp_limb_t *ap, *bp, *cp;
@@ -141,7 +141,7 @@ mpfr_sub1 (mpfr_ptr a, mpfr_srcptr b, mpfr_srcptr c, mpfr_rnd_t rnd_mode)
}
}
- diff_exp = (mp_exp_unsigned_t) MPFR_GET_EXP (b) - MPFR_GET_EXP (c);
+ diff_exp = (mpfr_uexp_t) MPFR_GET_EXP (b) - MPFR_GET_EXP (c);
/* reserve a space to store b aligned with the result, i.e. shifted by
(-cancel) % BITS_PER_MP_LIMB to the right */
diff --git a/sub1sp.c b/sub1sp.c
index ca02c501b..eea112c79 100644
--- a/sub1sp.c
+++ b/sub1sp.c
@@ -135,7 +135,7 @@ int
mpfr_sub1sp (mpfr_ptr a, mpfr_srcptr b, mpfr_srcptr c, mpfr_rnd_t rnd_mode)
{
mp_exp_t bx,cx;
- mp_exp_unsigned_t d;
+ mpfr_uexp_t d;
mp_prec_t p, sh, cnt;
mp_size_t n;
mp_limb_t *ap, *bp, *cp;
@@ -206,7 +206,7 @@ mpfr_sub1sp (mpfr_ptr a, mpfr_srcptr b, mpfr_srcptr c, mpfr_rnd_t rnd_mode)
/* Now b > c */
MPFR_ASSERTD(bx >= cx);
- d = (mp_exp_unsigned_t) bx - cx;
+ d = (mpfr_uexp_t) bx - cx;
DEBUG (printf ("New with diff=%lu\n", (unsigned long) d));
if (MPFR_UNLIKELY(d <= 1))
@@ -489,7 +489,7 @@ mpfr_sub1sp (mpfr_ptr a, mpfr_srcptr b, mpfr_srcptr c, mpfr_rnd_t rnd_mode)
}
else
{
- mp_exp_unsigned_t dm;
+ mpfr_uexp_t dm;
mp_size_t m;
mp_limb_t mask;
diff --git a/tests/texp10.c b/tests/texp10.c
index 71a5e8190..0b709f867 100644
--- a/tests/texp10.c
+++ b/tests/texp10.c
@@ -285,8 +285,8 @@ main (int argc, char *argv[])
exit (1);
}
- if ((mp_exp_unsigned_t) 8 << 31 != 0 ||
- mpfr_get_emax () <= (mp_exp_unsigned_t) 100000 * 100000)
+ if ((mpfr_uexp_t) 8 << 31 != 0 ||
+ mpfr_get_emax () <= (mpfr_uexp_t) 100000 * 100000)
{
/* emax <= 10000000000 */
mpfr_set_prec (x, 40);
diff --git a/tests/texp2.c b/tests/texp2.c
index 88b2c42a9..6862c0e5c 100644
--- a/tests/texp2.c
+++ b/tests/texp2.c
@@ -338,8 +338,8 @@ main (int argc, char *argv[])
exit (1);
}
- if ((mp_exp_unsigned_t) 8 << 31 != 0 ||
- mpfr_get_emax () <= (mp_exp_unsigned_t) 100000 * 100000)
+ if ((mpfr_uexp_t) 8 << 31 != 0 ||
+ mpfr_get_emax () <= (mpfr_uexp_t) 100000 * 100000)
{
/* emax <= 10000000000 */
mpfr_set_prec (x, 40);
diff --git a/vasprintf.c b/vasprintf.c
index ed3d251d4..bad24c4a7 100644
--- a/vasprintf.c
+++ b/vasprintf.c
@@ -1131,9 +1131,9 @@ regular_ab (struct number_parts *np, mpfr_srcptr p,
We assume that |EXP| < 10^INT_MAX. */
np->exp_size = 3;
{
- mp_exp_unsigned_t x;
+ mpfr_uexp_t x;
- x = SAFE_ABS (mp_exp_unsigned_t, exp);
+ x = SAFE_ABS (mpfr_uexp_t, exp);
while (x > 9)
{
np->exp_size++;
@@ -1248,9 +1248,9 @@ regular_eg (struct number_parts *np, mpfr_srcptr p,
We assume that |EXP| < 10^INT_MAX. */
np->exp_size = 3;
{
- mp_exp_unsigned_t x;
+ mpfr_uexp_t x;
- x = SAFE_ABS (mp_exp_unsigned_t, exp);
+ x = SAFE_ABS (mpfr_uexp_t, exp);
while (x > 9)
{
np->exp_size++;
View Lorry Controller Status