summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--cache.c2
-rw-r--r--clears.c2
-rw-r--r--cos.c3
-rw-r--r--fits_intmax.c2
-rw-r--r--fits_uintmax.c2
-rw-r--r--frac.c9
-rw-r--r--get_ld.c11
-rw-r--r--get_sj.c2
-rw-r--r--get_uj.c2
-rw-r--r--hypot.c6
-rw-r--r--inits.c2
-rw-r--r--inits2.c2
-rw-r--r--mpfr-impl.h108
-rw-r--r--mul.c8
-rw-r--r--set_sj.c2
-rw-r--r--set_uj.c2
-rw-r--r--tests/tfits.c2
-rw-r--r--tests/tget_sj.c2
-rw-r--r--tests/tset_sj.c2
-rw-r--r--volatile.c2
20 files changed, 78 insertions, 95 deletions
diff --git a/cache.c b/cache.c
index 04fe26e45..99b6f91c3 100644
--- a/cache.c
+++ b/cache.c
@@ -75,7 +75,7 @@ mpfr_cache (mpfr_ptr dest, mpfr_cache_t cache, mp_rnd_t rnd)
MPFR_MANT (cache->x), MPFR_PREC (cache->x), rnd, sign,
if (MPFR_UNLIKELY (cache->inexact == 0))
{
- if ((sp[0] & ulp) == 0)
+ if ((_sp[0] & _ulp) == 0)
{
inexact = -sign;
goto trunc_doit;
diff --git a/clears.c b/clears.c
index bdb26ffdd..439a5f87f 100644
--- a/clears.c
+++ b/clears.c
@@ -21,7 +21,7 @@ along with the MPFR Library; see the file COPYING.LIB. If not, write to
the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
MA 02110-1301, USA. */
-#if HAVE_CONFIG_H
+#ifdef HAVE_CONFIG_H
#undef HAVE_STDARG
#include "config.h" /* for a build within gmp */
#endif
diff --git a/cos.c b/cos.c
index ed7b6be61..168570587 100644
--- a/cos.c
+++ b/cos.c
@@ -120,7 +120,7 @@ mpfr_cos2_aux (mpfr_ptr f, mpfr_srcptr r)
int
mpfr_cos (mpfr_ptr y, mpfr_srcptr x, mp_rnd_t rnd_mode)
{
- mp_prec_t K0, K, precy, m, k, l, precx;
+ mp_prec_t K0, K, precy, m, k, l;
int inexact, reduce = 0;
mpfr_t r, s, xr, c;
mp_exp_t exps, cancel = 0, expx;
@@ -154,7 +154,6 @@ mpfr_cos (mpfr_ptr y, mpfr_srcptr x, mp_rnd_t rnd_mode)
/* Compute initial precision */
precy = MPFR_PREC (y);
- precx = MPFR_PREC (x);
K0 = __gmpfr_isqrt (precy / 3);
m = precy + 2 * MPFR_INT_CEIL_LOG2 (precy) + 2 * K0;
diff --git a/fits_intmax.c b/fits_intmax.c
index 1d2c50fb2..b8b3add45 100644
--- a/fits_intmax.c
+++ b/fits_intmax.c
@@ -20,7 +20,7 @@ along with the MPFR Library; see the file COPYING.LIB. If not, write to
the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
MA 02110-1301, USA. */
-#if HAVE_CONFIG_H
+#ifdef HAVE_CONFIG_H
# include "config.h" /* for a build within gmp */
#endif
diff --git a/fits_uintmax.c b/fits_uintmax.c
index 824fff10b..8892221b3 100644
--- a/fits_uintmax.c
+++ b/fits_uintmax.c
@@ -20,7 +20,7 @@ along with the MPFR Library; see the file COPYING.LIB. If not, write to
the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
MA 02110-1301, USA. */
-#if HAVE_CONFIG_H
+#ifdef HAVE_CONFIG_H
# include "config.h" /* for a build within gmp */
#endif
diff --git a/frac.c b/frac.c
index 77687bb6b..6d6e83077 100644
--- a/frac.c
+++ b/frac.c
@@ -31,7 +31,7 @@ int
mpfr_frac (mpfr_ptr r, mpfr_srcptr u, mp_rnd_t rnd_mode)
{
mp_exp_t re, ue;
- mp_prec_t uq, fq;
+ mp_prec_t uq;
mp_size_t un, tn, t0;
mp_limb_t *up, *tp, k;
int sh;
@@ -92,12 +92,7 @@ mpfr_frac (mpfr_ptr r, mpfr_srcptr u, mp_rnd_t rnd_mode)
/* The exponent of r will be re */
/* un: index of the limb of u that contains the first bit 1 of the FP */
- ue -= re; /* number of bits of u to discard */
- fq = uq - ue; /* number of bits of the fractional part of u */
-
- /* Temporary fix */
- t = /* fq > MPFR_PREC(r) */
- (mp_size_t) (MPFR_PREC(r) - 1) / BITS_PER_MP_LIMB < un ?
+ t = (mp_size_t) (MPFR_PREC(r) - 1) / BITS_PER_MP_LIMB < un ?
(mpfr_init2 (tmp, (un + 1) * BITS_PER_MP_LIMB), tmp) : r;
/* t has enough precision to contain the fractional part of u */
/* If we use a temporary variable, we take the non-significant bits
diff --git a/get_ld.c b/get_ld.c
index 1b9f164d7..cd48e22af 100644
--- a/get_ld.c
+++ b/get_ld.c
@@ -102,17 +102,6 @@ mpfr_get_ld (mpfr_srcptr x, mp_rnd_t rnd_mode)
#else
-static const struct {
- char bytes[10];
- long double dummy; /* for memory alignment */
-} ldbl_max_struct = {
- { '\377','\377','\377','\377',
- '\377','\377','\377','\377',
- '\376','\177' }, 0.0
-};
-
-#define MPFR_LDBL_MAX (* (const long double *) ldbl_max_struct.bytes)
-
long double
mpfr_get_ld (mpfr_srcptr x, mp_rnd_t rnd_mode)
{
diff --git a/get_sj.c b/get_sj.c
index aeecb5a60..1f131a9e1 100644
--- a/get_sj.c
+++ b/get_sj.c
@@ -20,7 +20,7 @@ along with the MPFR Library; see the file COPYING.LIB. If not, write to
the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
MA 02110-1301, USA. */
-#if HAVE_CONFIG_H
+#ifdef HAVE_CONFIG_H
# include "config.h" /* for a build within gmp */
#endif
diff --git a/get_uj.c b/get_uj.c
index a548d3155..4f7e732e1 100644
--- a/get_uj.c
+++ b/get_uj.c
@@ -20,7 +20,7 @@ along with the MPFR Library; see the file COPYING.LIB. If not, write to
the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
MA 02110-1301, USA. */
-#if HAVE_CONFIG_H
+#ifdef HAVE_CONFIG_H
# include "config.h" /* for a build within gmp */
#endif
diff --git a/hypot.c b/hypot.c
index 782be4e8c..950ef2769 100644
--- a/hypot.c
+++ b/hypot.c
@@ -65,10 +65,10 @@ mpfr_hypot (mpfr_ptr z, mpfr_srcptr x, mpfr_srcptr y, mp_rnd_t rnd_mode)
if (mpfr_cmpabs (x, y) < 0)
{
- mpfr_srcptr t;
- t = x;
+ mpfr_srcptr u;
+ u = x;
x = y;
- y = t;
+ y = u;
}
/* now |x| >= |y| */
diff --git a/inits.c b/inits.c
index 2f168b267..27f466add 100644
--- a/inits.c
+++ b/inits.c
@@ -20,7 +20,7 @@ along with the MPFR Library; see the file COPYING.LIB. If not, write to
the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
MA 02110-1301, USA. */
-#if HAVE_CONFIG_H
+#ifdef HAVE_CONFIG_H
#undef HAVE_STDARG
#include "config.h" /* for a build within gmp */
#endif
diff --git a/inits2.c b/inits2.c
index 0a36bc1a1..1a6153a90 100644
--- a/inits2.c
+++ b/inits2.c
@@ -21,7 +21,7 @@ along with the MPFR Library; see the file COPYING.LIB. If not, write to
the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
MA 02110-1301, USA. */
-#if HAVE_CONFIG_H
+#ifdef HAVE_CONFIG_H
#undef HAVE_STDARG
#include "config.h" /* for a build within gmp */
#endif
diff --git a/mpfr-impl.h b/mpfr-impl.h
index a05c32304..ccae5002b 100644
--- a/mpfr-impl.h
+++ b/mpfr-impl.h
@@ -51,10 +51,8 @@ MA 02110-1301, USA. */
/* Include 'config.h' before using ANY configure macros if needed
NOTE: It isn't MPFR 'config.h', but GMP's one! */
-#if defined(HAVE_CONFIG_H)
-#if HAVE_CONFIG_H
-#include "config.h"
-#endif
+#ifdef HAVE_CONFIG_H
+# include "config.h"
#endif
#ifdef MPFR_HAVE_GMP_IMPL /* Build with gmp internals*/
@@ -1055,79 +1053,81 @@ typedef struct {
#define MPFR_RNDRAW_GEN(inexact, dest, srcp, sprec, rnd, sign, \
MIDDLE_HANDLER, OVERFLOW_HANDLER) \
do { \
- mp_size_t dests, srcs; \
- mp_limb_t *destp; \
- mp_prec_t destprec, srcprec; \
+ mp_size_t _dests, _srcs; \
+ mp_limb_t *_destp; \
+ mp_prec_t _destprec, _srcprec; \
\
/* Check Trivial Case when Dest Mantissa has more bits than source */ \
- srcprec = sprec; \
- destprec = MPFR_PREC (dest); \
- destp = MPFR_MANT (dest); \
- if (MPFR_UNLIKELY (destprec >= srcprec)) \
+ _srcprec = sprec; \
+ _destprec = MPFR_PREC (dest); \
+ _destp = MPFR_MANT (dest); \
+ if (MPFR_UNLIKELY (_destprec >= _srcprec)) \
{ \
- srcs = (srcprec + BITS_PER_MP_LIMB-1)/BITS_PER_MP_LIMB; \
- dests = (destprec + BITS_PER_MP_LIMB-1)/BITS_PER_MP_LIMB - srcs; \
- MPN_COPY (destp + dests, srcp, srcs); \
- MPN_ZERO (destp, dests); \
+ _srcs = (_srcprec + BITS_PER_MP_LIMB-1)/BITS_PER_MP_LIMB; \
+ _dests = (_destprec + BITS_PER_MP_LIMB-1)/BITS_PER_MP_LIMB - _srcs; \
+ MPN_COPY (_destp + _dests, srcp, _srcs); \
+ MPN_ZERO (_destp, _dests); \
inexact = 0; \
} \
else \
{ \
/* Non trivial case: rounding needed */ \
- mp_prec_t sh; \
- mp_limb_t *sp; \
- mp_limb_t rb, sb, ulp; \
+ mp_prec_t _sh; \
+ mp_limb_t *_sp; \
+ mp_limb_t _rb, _sb, _ulp; \
\
/* Compute Position and shift */ \
- srcs = (srcprec + BITS_PER_MP_LIMB-1)/BITS_PER_MP_LIMB; \
- dests = (destprec + BITS_PER_MP_LIMB-1)/BITS_PER_MP_LIMB; \
- MPFR_UNSIGNED_MINUS_MODULO (sh, destprec); \
- sp = srcp + srcs - dests; \
+ _srcs = (_srcprec + BITS_PER_MP_LIMB-1)/BITS_PER_MP_LIMB; \
+ _dests = (_destprec + BITS_PER_MP_LIMB-1)/BITS_PER_MP_LIMB; \
+ MPFR_UNSIGNED_MINUS_MODULO (_sh, _destprec); \
+ _sp = srcp + _srcs - _dests; \
\
/* General case when prec % BITS_PER_MP_LIMB != 0 */ \
- if (MPFR_LIKELY (sh != 0)) \
+ if (MPFR_LIKELY (_sh != 0)) \
{ \
- mp_limb_t mask; \
+ mp_limb_t _mask; \
/* Compute Rounding Bit and Sticky Bit */ \
- mask = MPFR_LIMB_ONE << (sh-1); \
- rb = sp[0] & mask; \
- sb = sp[0] & (mask-1); \
- if (MPFR_UNLIKELY (sb == 0)) \
+ _mask = MPFR_LIMB_ONE << (_sh - 1); \
+ _rb = _sp[0] & _mask; \
+ _sb = _sp[0] & (_mask - 1); \
+ if (MPFR_UNLIKELY (_sb == 0)) \
{ /* TODO: Improve it */ \
- mp_limb_t *tmp; \
- mp_size_t n; \
- for (tmp = sp, n = srcs - dests ; n != 0 && sb == 0 ; n--) \
- sb = *--tmp; \
+ mp_limb_t *_tmp; \
+ mp_size_t _n; \
+ for (_tmp = _sp, _n = _srcs - _dests ; \
+ _n != 0 && _sb == 0 ; _n--) \
+ _sb = *--_tmp; \
} \
- ulp = 2*mask; \
+ _ulp = 2 * _mask; \
} \
- else /* sh == 0 */ \
+ else /* _sh == 0 */ \
{ \
- MPFR_ASSERTD (dests < srcs); \
+ MPFR_ASSERTD (_dests < _srcs); \
/* Compute Rounding Bit and Sticky Bit */ \
- rb = sp[-1] & MPFR_LIMB_HIGHBIT; \
- sb = sp[-1] & (MPFR_LIMB_HIGHBIT-1); \
- if (MPFR_UNLIKELY (sb == 0)) \
+ _rb = _sp[-1] & MPFR_LIMB_HIGHBIT; \
+ _sb = _sp[-1] & (MPFR_LIMB_HIGHBIT-1); \
+ if (MPFR_UNLIKELY (_sb == 0)) \
{ \
- mp_limb_t *tmp; \
- mp_size_t n; \
- for (tmp = sp-1, n = srcs - dests-1 ; n!=0 && sb==0 ; n--) \
- sb = *--tmp; \
+ mp_limb_t *_tmp; \
+ mp_size_t _n; \
+ for (_tmp = _sp - 1, _n = _srcs - _dests - 1 ; \
+ _n != 0 && _sb == 0 ; _n--) \
+ _sb = *--_tmp; \
} \
- ulp = MPFR_LIMB_ONE; \
+ _ulp = MPFR_LIMB_ONE; \
} \
/* Rounding */ \
if (MPFR_LIKELY (rnd == GMP_RNDN)) \
{ \
- if (rb == 0) \
+ if (_rb == 0) \
{ \
trunc: \
- inexact = MPFR_LIKELY ((sb | rb) != 0) ? -sign : 0; \
+ inexact = MPFR_LIKELY ((_sb | _rb) != 0) ? -sign : 0; \
trunc_doit: \
- MPN_COPY (destp, sp, dests); \
- destp[0] &= ~(ulp-1); \
+ MPN_COPY (_destp, _sp, _dests); \
+ _destp[0] &= ~(_ulp - 1); \
} \
- else if (MPFR_UNLIKELY (sb == 0)) \
+ else if (MPFR_UNLIKELY (_sb == 0)) \
{ /* Middle of two consecutive representable numbers */ \
MIDDLE_HANDLER; \
} \
@@ -1138,12 +1138,12 @@ typedef struct {
addoneulp: \
inexact = sign; \
addoneulp_doit: \
- if (MPFR_UNLIKELY (mpn_add_1 (destp, sp, dests, ulp))) \
+ if (MPFR_UNLIKELY (mpn_add_1 (_destp, _sp, _dests, _ulp))) \
{ \
- destp[dests-1] = MPFR_LIMB_HIGHBIT; \
+ _destp[_dests - 1] = MPFR_LIMB_HIGHBIT; \
OVERFLOW_HANDLER; \
} \
- destp[0] &= ~(ulp-1); \
+ _destp[0] &= ~(_ulp - 1); \
} \
} \
else \
@@ -1151,7 +1151,7 @@ typedef struct {
if (MPFR_LIKELY (MPFR_IS_LIKE_RNDZ (rnd, \
MPFR_IS_NEG_SIGN (sign)))) \
goto trunc; \
- else if (MPFR_UNLIKELY ((sb | rb) == 0)) \
+ else if (MPFR_UNLIKELY ((_sb | _rb) == 0)) \
{ \
inexact = 0; \
goto trunc_doit; \
@@ -1169,7 +1169,7 @@ typedef struct {
*/
#define MPFR_RNDRAW(inexact, dest, srcp, sprec, rnd, sign, OVERFLOW_HANDLER) \
MPFR_RNDRAW_GEN (inexact, dest, srcp, sprec, rnd, sign, \
- if ((sp[0] & ulp) == 0) \
+ if ((_sp[0] & _ulp) == 0) \
{ \
inexact = -sign; \
goto trunc_doit; \
@@ -1187,7 +1187,7 @@ typedef struct {
#define MPFR_RNDRAW_EVEN(inexact, dest, srcp, sprec, rnd, sign, \
OVERFLOW_HANDLER) \
MPFR_RNDRAW_GEN (inexact, dest, srcp, sprec, rnd, sign, \
- if ((sp[0] & ulp) == 0) \
+ if ((_sp[0] & _ulp) == 0) \
{ \
inexact = -MPFR_EVEN_INEX * sign; \
goto trunc_doit; \
diff --git a/mul.c b/mul.c
index 3655753ae..87fb28d71 100644
--- a/mul.c
+++ b/mul.c
@@ -299,12 +299,12 @@ mpfr_mul (mpfr_ptr a, mpfr_srcptr b, mpfr_srcptr c, mp_rnd_t rnd_mode)
/* multiplies two mantissa in temporary allocated space */
if (MPFR_UNLIKELY (bn < cn))
{
- mpfr_srcptr tmp = b;
- mp_size_t tn = bn;
+ mpfr_srcptr z = b;
+ mp_size_t zn = bn;
b = c;
bn = cn;
- c = tmp;
- cn = tn;
+ c = z;
+ cn = zn;
}
MPFR_ASSERTD (bn >= cn);
if (MPFR_LIKELY (bn <= 2))
diff --git a/set_sj.c b/set_sj.c
index b70fd6e95..8413ffd92 100644
--- a/set_sj.c
+++ b/set_sj.c
@@ -20,7 +20,7 @@ along with the MPFR Library; see the file COPYING.LIB. If not, write to
the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
MA 02110-1301, USA. */
-#if HAVE_CONFIG_H
+#ifdef HAVE_CONFIG_H
# include "config.h" /* for a build within gmp */
#endif
diff --git a/set_uj.c b/set_uj.c
index 8f5518a57..3b037b5b6 100644
--- a/set_uj.c
+++ b/set_uj.c
@@ -20,7 +20,7 @@ along with the MPFR Library; see the file COPYING.LIB. If not, write to
the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
MA 02110-1301, USA. */
-#if HAVE_CONFIG_H
+#ifdef HAVE_CONFIG_H
# include "config.h" /* for a build within gmp */
#endif
diff --git a/tests/tfits.c b/tests/tfits.c
index 75cb2c65e..a58e178f0 100644
--- a/tests/tfits.c
+++ b/tests/tfits.c
@@ -22,7 +22,7 @@ along with the MPFR Library; see the file COPYING.LIB. If not, write to
the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
MA 02110-1301, USA. */
-#if HAVE_CONFIG_H
+#ifdef HAVE_CONFIG_H
# include "config.h" /* for a build within gmp */
#endif
diff --git a/tests/tget_sj.c b/tests/tget_sj.c
index c0b09c274..07aed6e79 100644
--- a/tests/tget_sj.c
+++ b/tests/tget_sj.c
@@ -20,7 +20,7 @@ along with the MPFR Library; see the file COPYING.LIB. If not, write to
the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
MA 02110-1301, USA. */
-#if HAVE_CONFIG_H
+#ifdef HAVE_CONFIG_H
# include "config.h" /* for a build within gmp */
#endif
diff --git a/tests/tset_sj.c b/tests/tset_sj.c
index bee04095e..a4c6d488d 100644
--- a/tests/tset_sj.c
+++ b/tests/tset_sj.c
@@ -21,7 +21,7 @@ along with the MPFR Library; see the file COPYING.LIB. If not, write to
the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
MA 02110-1301, USA. */
-#if HAVE_CONFIG_H
+#ifdef HAVE_CONFIG_H
# include "config.h" /* for a build within gmp */
#endif
diff --git a/volatile.c b/volatile.c
index 13c046293..49ad67580 100644
--- a/volatile.c
+++ b/volatile.c
@@ -27,7 +27,7 @@ MA 02110-1301, USA. */
#include "mpfr-impl.h"
/* Only needed sometimes. */
-#if WANT_GMPFR_LONGDOUBLE_VOLATILE
+#ifdef WANT_GMPFR_LONGDOUBLE_VOLATILE
long double
__gmpfr_longdouble_volatile (long double x)
{
View Lorry Controller Status