cheng/mpir
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Removed a couple of duplicated macros.

Browse Source
This commit is contained in:
William Hart 2013-04-11 01:24:45 +01:00
parent e967731486
commit 188955ab2a
7 changed files with 74 additions and 135 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

189
gmp-impl.h
View File

@ -2688,62 +2688,37 @@ 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_1(dinv, d1, d0) \
#define invert_pi1(dinv, d1, d0) \ do { \
do { \ mp_limb_t _v, _p, _t1, _t0, _mask; \
mp_limb_t v, p, t1, t0, mask; \ invert_limb (_v, d1); \
invert_limb (v, d1); \ _p = (d1) * _v; \
p = d1 * v; \ _p += (d0); \
p += d0; \ if (_p < (d0)) \
if (p < d0) \ { \
{ \ _v--; \
v--; \ _mask = -(mp_limb_t) (_p >= (d1)); \
mask = -(p >= d1); \ _p -= (d1); \
p -= d1; \ _v += _mask; \
v += mask; \ _p -= _mask & (d1); \
p -= mask & d1; \ } \
} \ umul_ppmm (_t1, _t0, d0, _v); \
umul_ppmm (t1, t0, d0, v); \ _p += _t1; \
p += t1; \ if (_p < _t1) \
if (p < t1) \ { \
{ \ _v--; \
v--; \ if (UNLIKELY (_p >= (d1))) \
if (UNLIKELY (p >= d1)) \ { \
{ \ if (_p > (d1) || _t0 >= (d0)) \
if (p > d1 || t0 >= d0) \ _v--; \
v--; \ } \
} \ } \
} \ dinv = _v; \
(dinv).inv32 = v; \
} while (0) } while (0)
#define invert_1(dinv, d1, d0) \ /* For compatibility with GMP only */
do { \ #define invert_pi1(dinv, d1, d0) \
mp_limb_t v, p, t1, t0, mask; \ invert_1((dinv).inv32, d1, d0)
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 = v; \
} while (0)
#define mpir_invert_pi2(dinv, d1, d2) \ #define mpir_invert_pi2(dinv, d1, d2) \
do { \ do { \
@ -2769,6 +2744,41 @@ do { \
} \ } \
} while (0) } while (0)
/* 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; \
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); \
sub_ddmmss ((r1), (r0), (r1), (n0), (d1), (d0)); \
umul_ppmm (_t1, _t0, (d0), (q)); \
sub_ddmmss ((r1), (r0), (r1), (r0), _t1, _t0); \
(q)++; \
\
/* Conditionally adjust q and the remainders */ \
if ((r1) >= _q0) { \
(q)--; \
add_ssaaaa ((r1), (r0), (r1), (r0), (d1), (d0)); } \
if (UNLIKELY ((r1) >= (d1))) \
{ \
if ((r1) > (d1) || (r0) >= (d0)) \
{ \
(q)++; \
sub_ddmmss ((r1), (r0), (r1), (r0), (d1), (d0)); \
} \
} \
} while (0)
#define mpir_divapprox32_preinv2(q, a_hi, a_lo, dinv) \ #define mpir_divapprox32_preinv2(q, a_hi, a_lo, dinv) \
do { \ do { \
mp_limb_t __q2, __q3, __q4; \ mp_limb_t __q2, __q3, __q4; \
@ -2800,41 +2810,6 @@ do { \
} \ } \
} while (0) } while (0)
/* 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 tdiv_qr_3by2(q, r1, r0, n2, n1, n0, d1, d0, dinv) \
do { \
mp_limb_t _q0, _t1, _t0; \
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); \
sub_ddmmss ((r1), (r0), (r1), (n0), (d1), (d0)); \
umul_ppmm (_t1, _t0, (d0), (q)); \
sub_ddmmss ((r1), (r0), (r1), (r0), _t1, _t0); \
(q)++; \
\
/* Conditionally adjust q and the remainders */ \
if ((r1) >= _q0) { \
(q)--; \
add_ssaaaa ((r1), (r0), (r1), (r0), (d1), (d0)); } \
if (UNLIKELY ((r1) >= (d1))) \
{ \
if ((r1) > (d1) || (r0) >= (d0)) \
{ \
(q)++; \
sub_ddmmss ((r1), (r0), (r1), (r0), (d1), (d0)); \
} \
} \
} while (0)
#ifndef udiv_qrnnd_preinv #ifndef udiv_qrnnd_preinv
#define udiv_qrnnd_preinv udiv_qrnnd_preinv2 #define udiv_qrnnd_preinv udiv_qrnnd_preinv2
#endif #endif
@ -2912,42 +2887,6 @@ do { \
} 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; \
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); \
sub_ddmmss ((r1), (r0), (r1), (n0), (d1), (d0)); \
umul_ppmm (_t1, _t0, (d0), (q)); \
sub_ddmmss ((r1), (r0), (r1), (r0), _t1, _t0); \
(q)++; \
\
/* Conditionally adjust q and the remainders */ \
if ((r1) >= _q0) { \
(q)--; \
add_ssaaaa ((r1), (r0), (r1), (r0), (d1), (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));

2
mpn/generic/dc_div_qr.c
View File

@ -93,7 +93,7 @@ mpn_dc_div_qr (mp_ptr qp,
} }
else else
{ {
tdiv_qr_3by2 (q, n1, n0, n2, n1, n0, d1, d0, dinv); udiv_qr_3by2 (q, n1, n0, n2, n1, n0, d1, d0, dinv);
if (dn > 2) if (dn > 2)
{ {

2
mpn/generic/dc_divappr_q.c
View File

@ -92,7 +92,7 @@ mpn_dc_divappr_q (mp_ptr qp, mp_ptr np, mp_size_t nn,
} }
else else
{ {
tdiv_qr_3by2 (q, n1, n0, n2, n1, n0, d1, d0, dinv); udiv_qr_3by2 (q, n1, n0, n2, n1, n0, d1, d0, dinv);
if (dn > 2) if (dn > 2)
{ {

2
mpn/generic/inv_div_qr.c
View File

@ -95,7 +95,7 @@ mpn_inv_div_qr (mp_ptr qp,
} }
else else
{ {
tdiv_qr_3by2 (q, n1, n0, n2, n1, n0, d1, d0, dinv2); udiv_qr_3by2 (q, n1, n0, n2, n1, n0, d1, d0, dinv2);
if (dn > 2) if (dn > 2)
{ {

2
mpn/generic/inv_divappr_q.c
View File

@ -94,7 +94,7 @@ mpn_inv_divappr_q (mp_ptr qp, mp_ptr np, mp_size_t nn,
else else
{ {
invert_1(dinv2, d1, d0); invert_1(dinv2, d1, d0);
tdiv_qr_3by2 (q, n1, n0, n2, n1, n0, d1, d0, dinv2); udiv_qr_3by2 (q, n1, n0, n2, n1, n0, d1, d0, dinv2);
if (dn > 2) if (dn > 2)
{ {

6
mpn/generic/sb_div_q.c
View File

@ -88,7 +88,7 @@ mpn_sb_div_q (mp_ptr qp,
} }
else else
{ {
tdiv_qr_3by2 (q, n1, n0, n1, np[1], np[0], d1, d0, dinv); udiv_qr_3by2 (q, n1, n0, n1, np[1], np[0], d1, d0, dinv);
cy = mpn_submul_1 (np - dn, dp, dn, q); cy = mpn_submul_1 (np - dn, dp, dn, q);
@ -134,7 +134,7 @@ mpn_sb_div_q (mp_ptr qp,
} }
else else
{ {
tdiv_qr_3by2 (q, n1, n0, n1, np[1], np[0], d1, d0, dinv); udiv_qr_3by2 (q, n1, n0, n1, np[1], np[0], d1, d0, dinv);
cy = mpn_submul_1 (np - dn, dp, dn, q); cy = mpn_submul_1 (np - dn, dp, dn, q);
@ -178,7 +178,7 @@ mpn_sb_div_q (mp_ptr qp,
} }
else else
{ {
tdiv_qr_3by2 (q, n1, n0, n1, np[1], np[0], d1, d0, dinv); udiv_qr_3by2 (q, n1, n0, n1, np[1], np[0], d1, d0, dinv);
np[0] = n0; np[0] = n0;
np[1] = n1; np[1] = n1;

6
mpn/generic/sb_divappr_q.c
View File

@ -85,7 +85,7 @@ mpn_sb_divappr_q (mp_ptr qp,
} }
else else
{ {
tdiv_qr_3by2 (q, n1, n0, n1, np[1], np[0], d1, d0, dinv); udiv_qr_3by2 (q, n1, n0, n1, np[1], np[0], d1, d0, dinv);
cy = mpn_submul_1 (np - dn, dp, dn, q); cy = mpn_submul_1 (np - dn, dp, dn, q);
@ -131,7 +131,7 @@ mpn_sb_divappr_q (mp_ptr qp,
} }
else else
{ {
tdiv_qr_3by2 (q, n1, n0, n1, np[1], np[0], d1, d0, dinv); udiv_qr_3by2 (q, n1, n0, n1, np[1], np[0], d1, d0, dinv);
cy = mpn_submul_1 (np - dn, dp, dn, q); cy = mpn_submul_1 (np - dn, dp, dn, q);
@ -175,7 +175,7 @@ mpn_sb_divappr_q (mp_ptr qp,
} }
else else
{ {
tdiv_qr_3by2 (q, n1, n0, n1, np[1], np[0], d1, d0, dinv); udiv_qr_3by2 (q, n1, n0, n1, np[1], np[0], d1, d0, dinv);
np[1] = n1; np[1] = n1;
np[0] = n0; np[0] = n0;