add latest gmp-impl.h changes

This commit is contained in:
gladman 2012-03-17 08:48:09 +00:00
parent 263c9abdc9
commit f4d883f252

View File

@ -2661,6 +2661,35 @@ mp_limb_t mpn_invert_limb _PROTO ((mp_limb_t)) ATTRIBUTE_CONST;
} while (0) } while (0)
#endif #endif
// This macro is only for compatibility with undocumented GMP macros , do not use
#define invert_pi1(dinv, d1, d0) \
do { \
mp_limb_t v, p, t1, t0, mask; \
invert_limb (v, d1); \
p = d1 * v; \
p += d0; \
if (p < d0) \
{ \
v--; \
mask = -(p >= d1); \
p -= d1; \
v += mask; \
p -= mask & d1; \
} \
umul_ppmm (t1, t0, d0, v); \
p += t1; \
if (p < t1) \
{ \
v--; \
if (UNLIKELY (p >= d1)) \
{ \
if (p > d1 || t0 >= d0) \
v--; \
} \
} \
(dinv).inv32 = v; \
} while (0)
#define invert_1(dinv, d1, d0) \ #define invert_1(dinv, d1, d0) \
do { \ do { \
mp_limb_t v, p, t1, t0, mask; \ mp_limb_t v, p, t1, t0, mask; \
@ -2802,6 +2831,43 @@ mp_limb_t mpn_invert_limb _PROTO ((mp_limb_t)) ATTRIBUTE_CONST;
} while (0) } while (0)
// This macro is only for compatibility with undocumented GMP macros , do not use
/* Compute quotient the quotient and remainder for n / d. Requires d
>= B^2 / 2 and n < d B. di is the inverse
floor ((B^3 - 1) / (d0 + d1 B)) - B.
NOTE: Output variables are updated multiple times. Only some inputs
and outputs may overlap.
*/
#define udiv_qr_3by2(q, r1, r0, n2, n1, n0, d1, d0, dinv) \
do { \
mp_limb_t _q0, _t1, _t0, _mask; \
umul_ppmm ((q), _q0, (n2), (dinv)); \
add_ssaaaa ((q), _q0, (q), _q0, (n2), (n1)); \
\
/* Compute the two most significant limbs of n - q'd */ \
(r1) = (n1) - (d1) * (q); \
(r0) = (n0); \
sub_ddmmss ((r1), (r0), (r1), (r0), (d1), (d0)); \
umul_ppmm (_t1, _t0, (d0), (q)); \
sub_ddmmss ((r1), (r0), (r1), (r0), _t1, _t0); \
(q)++; \
\
/* Conditionally adjust q and the remainders */ \
_mask = - (mp_limb_t) ((r1) >= _q0); \
(q) += _mask; \
add_ssaaaa ((r1), (r0), (r1), (r0), _mask & (d1), _mask & (d0)); \
if (UNLIKELY ((r1) >= (d1))) \
{ \
if ((r1) > (d1) || (r0) >= (d0)) \
{ \
(q)++; \
sub_ddmmss ((r1), (r0), (r1), (r0), (d1), (d0)); \
} \
} \
} while (0)
#ifndef mpn_preinv_divrem_1 /* if not done with cpuvec in a fat binary */ #ifndef mpn_preinv_divrem_1 /* if not done with cpuvec in a fat binary */
#define mpn_preinv_divrem_1 __MPN(preinv_divrem_1) #define mpn_preinv_divrem_1 __MPN(preinv_divrem_1)
__GMP_DECLSPEC mp_limb_t mpn_preinv_divrem_1 _PROTO ((mp_ptr, mp_size_t, mp_srcptr, mp_size_t, mp_limb_t, mp_limb_t, int)); __GMP_DECLSPEC mp_limb_t mpn_preinv_divrem_1 _PROTO ((mp_ptr, mp_size_t, mp_srcptr, mp_size_t, mp_limb_t, mp_limb_t, int));