Skip to content

Commit 67e3da4

Browse files
committed
Fix unused variable warnings by using new umulhigh_pmm
1 parent 741b017 commit 67e3da4

15 files changed

Lines changed: 53 additions & 46 deletions

File tree

src/acb_hypgeom/dilog_zero_taylor.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -155,8 +155,8 @@ acb_hypgeom_dilog_taylor_sum(acb_t res, const acb_t z, slong n, slong prec)
155155

156156
while (qk > 1)
157157
{
158-
ulong hi, lo;
159-
umul_ppmm(hi, lo, q, qk * qk);
158+
ulong hi;
159+
umulhigh_pmm(hi, q, qk * qk);
160160
if (hi != 0)
161161
break;
162162
q *= qk * qk;

src/arb/exp_arf_rs_generic.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ arb_exp_taylor_sum_rs_generic(arb_t res, const arb_t x, slong N, slong prec)
4040
{
4141
arb_ptr tpow;
4242
slong j, k, m, M, tp, xmag;
43-
ulong c, d, chi, clo;
43+
ulong c, d, chi;
4444

4545
xmag = arf_abs_bound_lt_2exp_si(arb_midref(x));
4646

@@ -74,7 +74,7 @@ arb_exp_taylor_sum_rs_generic(arb_t res, const arb_t x, slong N, slong prec)
7474

7575
if (k != 0)
7676
{
77-
umul_ppmm(chi, clo, c, d);
77+
umulhigh_pmm(chi, c, d);
7878

7979
if (chi != 0)
8080
{

src/arb/sin_cos_arf_generic.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ arb_sin_cos_taylor_sum_rs(arb_t s, const arb_t x, slong N, int cosine, slong pre
5656
{
5757
arb_ptr tpow;
5858
slong j, k, m, M, tp, xmag;
59-
ulong c, d, chi, clo;
59+
ulong c, d, chi;
6060

6161
xmag = arf_abs_bound_lt_2exp_si(arb_midref(x));
6262

@@ -96,7 +96,7 @@ arb_sin_cos_taylor_sum_rs(arb_t s, const arb_t x, slong N, int cosine, slong pre
9696

9797
if (k != 0)
9898
{
99-
umul_ppmm(chi, clo, c, d);
99+
umulhigh_pmm(chi, c, d);
100100

101101
if (chi != 0)
102102
{

src/arb_hypgeom/gamma_lower_sum_rs.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ _arb_hypgeom_gamma_lower_sum_rs_1(arb_t res, ulong p, ulong q, const arb_t z, sl
3838
{
3939
slong m, j, k, jlen, jbot, wp;
4040
double dz, logdz;
41-
ulong c, chi, clo;
41+
ulong c, chi;
4242
arb_t s;
4343
arb_ptr zpow;
4444
nn_ptr cs;
@@ -83,7 +83,7 @@ _arb_hypgeom_gamma_lower_sum_rs_1(arb_t res, ulong p, ulong q, const arb_t z, sl
8383
if (k != 0)
8484
{
8585
/* Check if new coefficient will overflow limb */
86-
umul_ppmm(chi, clo, c, p + (k - 1) * q);
86+
umulhigh_pmm(chi, c, p + (k - 1) * q);
8787

8888
if (chi != 0)
8989
{

src/fmpz_mod/mul.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ void _fmpz_mod_mul2(fmpz_t a, const fmpz_t b, const fmpz_t c,
7171
ulong a1, a0, b1, b0, c1, c0;
7272
ulong x3, x2, x1, x0;
7373
ulong q2, q1, q0;
74-
ulong z4, z3, z2, z1, z0;
74+
ulong z4, z3, z2, z1;
7575
ulong t4, t3, t2, t1;
7676
ulong s3, s2, s1;
7777
ulong u4, u3, u2, u1;
@@ -93,7 +93,7 @@ void _fmpz_mod_mul2(fmpz_t a, const fmpz_t b, const fmpz_t c,
9393
add_sssaaaaaa(x3, x2, x1, x3, x2, x1, t3, t2, t1);
9494

9595
/* z[5:0] = x[3:1] * ninv[2:0], z[5] should end up zero */
96-
umul_ppmm(z1, z0, x1, ctx->ninv_limbs[0]);
96+
umulhigh_pmm(z1, x1, ctx->ninv_limbs[0]);
9797
umul_ppmm(z3, z2, x2, ctx->ninv_limbs[1]);
9898
z4 = x3 * ctx->ninv_limbs[2];
9999
umul_ppmm(t3, t2, x3, ctx->ninv_limbs[0]);

src/longlong.h

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -287,6 +287,13 @@ flint_bitcnt_t FLINT_BIT_COUNT(ulong x)
287287
} while (0)
288288
#endif
289289

290+
#define umulhigh_pmm(w1, u, v) \
291+
do { \
292+
ulong __w0; \
293+
umul_ppmm(w1, __w0, u, v); \
294+
(void) __w0; \
295+
} while (0)
296+
290297
/* Division */
291298
#if !defined(udiv_qrnnd)
292299
# define udiv_qrnnd_int(q, r, n1, n0, d) \

src/mpn_extras.h

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -347,15 +347,15 @@ char * flint_mpn_get_str(char * res, int base, mp_srcptr x, mp_size_t xn, int ne
347347
/* Like NN_DOTREV_S3_1X1 but summing only over the high parts of the products. */
348348
#define NN_DOTREV_S3_1X1_HIGH(s2, s1, u, v, n) \
349349
do { \
350-
mp_limb_t __dt0, __dt1, __ds0, __ds1, __ds2; \
350+
mp_limb_t __dt1, __ds1, __ds2; \
351351
slong __i; \
352352
FLINT_ASSERT((n) >= 2); \
353-
umul_ppmm(__ds1, __ds0, (u)[0], (v)[(n) - 1]); \
354-
umul_ppmm(__dt1, __dt0, (u)[1], (v)[(n) - 2]); \
353+
umulhigh_pmm(__ds1, (u)[0], (v)[(n) - 1]); \
354+
umulhigh_pmm(__dt1, (u)[1], (v)[(n) - 2]); \
355355
add_ssaaaa(__ds2, __ds1, 0, __ds1, 0, __dt1); \
356356
for (__i = 2; __i < (n); __i++) \
357357
{ \
358-
umul_ppmm(__dt1, __dt0, (u)[__i], (v)[(n) - 1 - __i]); \
358+
umulhigh_pmm(__dt1, (u)[__i], (v)[(n) - 1 - __i]); \
359359
add_ssaaaa(__ds2, __ds1, __ds2, __ds1, 0, __dt1); \
360360
} \
361361
(s1) = __ds1; (s2) = __ds2; \
@@ -389,9 +389,9 @@ char * flint_mpn_get_str(char * res, int base, mp_srcptr x, mp_size_t xn, int ne
389389

390390
#define flint_mpn_divrem21_preinv(q, a_hi, a_lo, dinv) \
391391
do { \
392-
mp_limb_t __q2, __q3, __q4; \
392+
mp_limb_t __q2, __q3; \
393393
umul_ppmm((q), __q2, (a_hi), (dinv)); \
394-
umul_ppmm(__q3, __q4, (a_lo), (dinv)); \
394+
umulhigh_pmm(__q3, (a_lo), (dinv)); \
395395
add_ssaaaa((q), __q2, (q), __q2, 0, __q3); \
396396
add_ssaaaa((q), __q2, (q), __q2, (a_hi), (a_lo)); \
397397
} while (0)

src/mpn_extras/mulhigh.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -161,15 +161,15 @@ _flint_mpn_mulhigh_n_mulders_recursive(mp_ptr rp, mp_srcptr np, mp_srcptr mp, mp
161161
/* Corrections for precise high product (not needed for the
162162
original Mulders). */
163163
{
164-
mp_limb_t hi, lo;
164+
mp_limb_t hi;
165165

166166
/* Note: if we relax the condition on k, we will need
167167
a branch for k == l here to avoid double counting. */
168168
FLINT_ASSERT(k != l);
169169

170-
umul_ppmm(hi, lo, np[k - 1], mp[l - 1]);
170+
umulhigh_pmm(hi, np[k - 1], mp[l - 1]);
171171
MPN_INCR_U(rp + n - 1, n + 1, hi);
172-
umul_ppmm(hi, lo, np[l - 1], mp[k - 1]);
172+
umulhigh_pmm(hi, np[l - 1], mp[k - 1]);
173173
MPN_INCR_U(rp + n - 1, n + 1, hi);
174174
}
175175
}

src/mpn_extras/mulhigh_basecase.c

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,11 @@ mp_limb_t flint_mpn_mulhigh_9(mp_ptr, mp_srcptr, mp_srcptr);
2525

2626
static mp_limb_t flint_mpn_mulhigh_10(nn_ptr r, nn_srcptr x, nn_srcptr y)
2727
{
28-
mp_limb_t w0, w1, lo, w2, cy;
28+
mp_limb_t w0, w1, w2, cy;
2929

3030
w0 = flint_mpn_mulhigh_9(r, x + 1, y);
3131
r[9] = mpn_addmul_1(r, x + 1, 9, y[9]);
32-
umul_ppmm(w1, lo, x[0], y[8]);
32+
umulhigh_pmm(w1, x[0], y[8]);
3333
umul_ppmm(cy, w2, x[0], y[9]);
3434
add_ssaaaa(cy, w0, cy, w0, 0, w1);
3535
add_ssaaaa(cy, w0, cy, w0, 0, w2);
@@ -40,22 +40,22 @@ static mp_limb_t flint_mpn_mulhigh_10(nn_ptr r, nn_srcptr x, nn_srcptr y)
4040

4141
static mp_limb_t flint_mpn_mulhigh_11(nn_ptr r, nn_srcptr x, nn_srcptr y)
4242
{
43-
mp_limb_t w0, w1, lo, w2, cy;
43+
mp_limb_t w0, w1, w2, cy;
4444

4545
#if 0
4646
w0 = flint_mpn_mulhigh_10(r, x + 1, y);
4747
#else
4848
w0 = flint_mpn_mulhigh_9(r, x + 2, y);
4949
r[9] = mpn_addmul_1(r, x + 2, 9, y[9]);
50-
umul_ppmm(w1, lo, x[1], y[8]);
50+
umulhigh_pmm(w1, x[1], y[8]);
5151
umul_ppmm(cy, w2, x[1], y[9]);
5252
add_ssaaaa(cy, w0, cy, w0, 0, w1);
5353
add_ssaaaa(cy, w0, cy, w0, 0, w2);
5454
MPN_INCR_U(r, 10, cy);
5555
#endif
5656

5757
r[10] = mpn_addmul_1(r, x + 1, 10, y[10]);
58-
umul_ppmm(w1, lo, x[0], y[9]);
58+
umulhigh_pmm(w1, x[0], y[9]);
5959
umul_ppmm(cy, w2, x[0], y[10]);
6060
add_ssaaaa(cy, w0, cy, w0, 0, w1);
6161
add_ssaaaa(cy, w0, cy, w0, 0, w2);
@@ -68,29 +68,29 @@ static mp_limb_t flint_mpn_mulhigh_11(nn_ptr r, nn_srcptr x, nn_srcptr y)
6868

6969
static mp_limb_t flint_mpn_mulhigh_12(nn_ptr r, nn_srcptr x, nn_srcptr y)
7070
{
71-
mp_limb_t w0, w1, lo, w2, cy;
71+
mp_limb_t w0, w1, w2, cy;
7272

7373
#if 0
7474
w0 = flint_mpn_mulhigh_11(r, x + 1, y);
7575
#else
7676
w0 = flint_mpn_mulhigh_9(r, x + 3, y);
7777
r[9] = mpn_addmul_1(r, x + 3, 9, y[9]);
78-
umul_ppmm(w1, lo, x[2], y[8]);
78+
umulhigh_pmm(w1, x[2], y[8]);
7979
umul_ppmm(cy, w2, x[2], y[9]);
8080
add_ssaaaa(cy, w0, cy, w0, 0, w1);
8181
add_ssaaaa(cy, w0, cy, w0, 0, w2);
8282
MPN_INCR_U(r, 10, cy);
8383

8484
r[10] = mpn_addmul_1(r, x + 2, 10, y[10]);
85-
umul_ppmm(w1, lo, x[1], y[9]);
85+
umulhigh_pmm(w1, x[1], y[9]);
8686
umul_ppmm(cy, w2, x[1], y[10]);
8787
add_ssaaaa(cy, w0, cy, w0, 0, w1);
8888
add_ssaaaa(cy, w0, cy, w0, 0, w2);
8989
MPN_INCR_U(r, 11, cy);
9090
#endif
9191

9292
r[11] = mpn_addmul_1(r, x + 1, 11, y[11]);
93-
umul_ppmm(w1, lo, x[0], y[10]);
93+
umulhigh_pmm(w1, x[0], y[10]);
9494
umul_ppmm(cy, w2, x[0], y[11]);
9595
add_ssaaaa(cy, w0, cy, w0, 0, w1);
9696
add_ssaaaa(cy, w0, cy, w0, 0, w2);
@@ -101,11 +101,11 @@ static mp_limb_t flint_mpn_mulhigh_12(nn_ptr r, nn_srcptr x, nn_srcptr y)
101101

102102
static mp_limb_t flint_mpn_mulhigh_13(nn_ptr r, nn_srcptr x, nn_srcptr y)
103103
{
104-
mp_limb_t w0, w1, lo, w2, cy;
104+
mp_limb_t w0, w1, w2, cy;
105105

106106
w0 = flint_mpn_mulhigh_12(r, x + 1, y);
107107
r[12] = mpn_addmul_1(r, x + 1, 12, y[12]);
108-
umul_ppmm(w1, lo, x[0], y[11]);
108+
umulhigh_pmm(w1, x[0], y[11]);
109109
umul_ppmm(cy, w2, x[0], y[12]);
110110
add_ssaaaa(cy, w0, cy, w0, 0, w1);
111111
add_ssaaaa(cy, w0, cy, w0, 0, w2);

src/mpn_extras/mulhigh_recursive.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ _flint_mpn_mulhigh_n_recursive(mp_ptr r, mp_srcptr x, mp_srcptr y, mp_size_t n)
2525

2626
mp_size_t m1 = n - FLINT_MPN_MULHIGH_BEST_TAB_N;
2727
mp_size_t m2 = FLINT_MPN_MULHIGH_BEST_TAB_N;
28-
mp_limb_t cy, lo, w0, w1, w2;
28+
mp_limb_t cy, w0, w1, w2;
2929

3030
FLINT_ASSERT(FLINT_MPN_MULHIGH_BEST_TAB_N <= FLINT_MPN_MULHIGH_FUNC_TAB_WIDTH);
3131

@@ -37,7 +37,7 @@ _flint_mpn_mulhigh_n_recursive(mp_ptr r, mp_srcptr x, mp_srcptr y, mp_size_t n)
3737
cy = mpn_add_n(r, r, t, m1);
3838
MPN_INCR_U(r + m1, m2, cy);
3939

40-
umul_ppmm(w2, lo, x[m1 - 1], y[m2 - 1]);
40+
umulhigh_pmm(w2, x[m1 - 1], y[m2 - 1]);
4141
add_ssaaaa(cy, w0, 0, w0, 0, w1);
4242
add_ssaaaa(cy, w0, cy, w0, 0, w2);
4343
MPN_INCR_U(r, n, cy);
@@ -47,7 +47,7 @@ _flint_mpn_mulhigh_n_recursive(mp_ptr r, mp_srcptr x, mp_srcptr y, mp_size_t n)
4747
else
4848
{
4949
mp_ptr t;
50-
mp_limb_t cy, lo, w0, w1, w2;
50+
mp_limb_t cy, w0, w1, w2;
5151
mp_size_t m1 = n / 2;
5252
mp_size_t m2 = n - m1;
5353
TMP_INIT;
@@ -75,7 +75,7 @@ _flint_mpn_mulhigh_n_recursive(mp_ptr r, mp_srcptr x, mp_srcptr y, mp_size_t n)
7575
MPN_INCR_U(r + m1, m2, cy);
7676
}
7777

78-
umul_ppmm(w2, lo, x[m1 - 1], y[m2 - 1]);
78+
umulhigh_pmm(w2, x[m1 - 1], y[m2 - 1]);
7979
add_ssaaaa(cy, w0, 0, w0, 0, w1);
8080
add_ssaaaa(cy, w0, cy, w0, 0, w2);
8181
MPN_INCR_U(r, n, cy);

0 commit comments

Comments
 (0)