Skip to content

Commit

Permalink
Switched to using WORD/UWORD instead of L and UL.
Browse files Browse the repository at this point in the history
  • Loading branch information
@wbhart
wbhart committed Oct 4, 2013
1 parent 6e1c352 commit 2f7b153
Show file tree
Hide file tree
Showing 616 changed files with 1,812 additions and 1,804 deletions.
2 changes: 1 addition & 1 deletion NEWS
View file
Expand Up @@ -250,7 +250,7 @@ v 1.3.0 -- 09-Jun-09
* Knocked optimisation level back to -O2 because it miscompiles on sage.math
* Changed tables to use uint64_t's instead of ulongs which are not 64 bits on a 32 bit machine
* Only checked MAX_HOLF on 64 bit machine
* Changed MAX_SQUFOF to -1L
* Changed MAX_SQUFOF to WORD(-1)
* Check constant 0x3FFFFFFFFUL only on a 64 bit machine
* Fixed a bug in z_oddprime_lt_4096 on 32 bit machines
* Fixed some TLS issues with Cygwin
Expand Down
14 changes: 7 additions & 7 deletions arith.h
View file
Expand Up @@ -118,11 +118,11 @@ void arith_bell_number_nmod_vec_series(mp_ptr b, slong n, nmod_t mod);
#endif

static const mp_limb_t euler_number_small[] = {
1UL, 1UL, 5UL, 61UL, 1385UL, 50521UL, 2702765UL,
199360981UL,
UWORD(1), UWORD(1), UWORD(5), UWORD(61), UWORD(1385), UWORD(50521), UWORD(2702765),
UWORD(199360981),
#if FLINT64
19391512145UL, 2404879675441UL, 370371188237525UL,
69348874393137901UL, 15514534163557086905UL
UWORD(19391512145), UWORD(2404879675441), UWORD(370371188237525),
UWORD(69348874393137901), UWORD(15514534163557086905)
#endif
};

Expand All @@ -144,10 +144,10 @@ void arith_euler_polynomial(fmpq_poly_t poly, ulong n);
#endif

static const slong _bernoulli_numer_small[] = {
1L, 1L, -1L, 1L, -1L, 5L, -691L, 7L, -3617L, 43867L, -174611L, 854513L,
-236364091L, 8553103L,
WORD(1), WORD(1), WORD(-1), WORD(1), WORD(-1), WORD(5), WORD(-691), WORD(7), WORD(-3617), WORD(43867), WORD(-174611), WORD(854513),
WORD(-236364091), WORD(8553103),
#if FLINT64
-23749461029L, 8615841276005L, -7709321041217L, 2577687858367L
WORD(-23749461029), WORD(8615841276005), WORD(-7709321041217), WORD(2577687858367)
#endif
};

Expand Down
6 changes: 3 additions & 3 deletions arith/bell_number_bsplit.c
View file
Expand Up @@ -54,9 +54,9 @@ _mpz_bell_bsplit(mpz_t P, mpz_t Q, slong a, slong b, slong n, slong bmax)
mpz_t u;
slong k;
mpz_init(u);
mpz_set_ui(P, 0UL);
mpz_set_ui(Q, 0UL);
mpz_set_ui(Q, (b - 1 == bmax) ? 1UL : b);
mpz_set_ui(P, UWORD(0));
mpz_set_ui(Q, UWORD(0));
mpz_set_ui(Q, (b - 1 == bmax) ? UWORD(1) : b);
for (k = b - 1; k >= a; k--)
{
mpz_set_ui(u, k);
Expand Down
2 changes: 1 addition & 1 deletion arith/bell_number_multi_mod.c
View file
Expand Up @@ -42,7 +42,7 @@ arith_bell_number_multi_mod(fmpz_t res, ulong n)
primes = flint_malloc(num_primes * sizeof(mp_limb_t));
residues = flint_malloc(num_primes * sizeof(mp_limb_t));

primes[0] = n_nextprime(1UL << prime_bits, 0);
primes[0] = n_nextprime(UWORD(1) << prime_bits, 0);
for (k = 1; k < num_primes; k++)
primes[k] = n_nextprime(primes[k-1], 0);

Expand Down
12 changes: 6 additions & 6 deletions arith/bell_number_nmod.c
View file
Expand Up @@ -27,13 +27,13 @@

const mp_limb_t bell_number_tab[] =
{
1UL, 1UL, 2UL, 5UL, 15UL, 52UL, 203UL, 877UL, 4140UL, 21147UL, 115975UL,
678570UL, 4213597UL, 27644437UL, 190899322UL, 1382958545UL,
UWORD(1), UWORD(1), UWORD(2), UWORD(5), UWORD(15), UWORD(52), UWORD(203), UWORD(877), UWORD(4140), UWORD(21147), UWORD(115975),
UWORD(678570), UWORD(4213597), UWORD(27644437), UWORD(190899322), UWORD(1382958545),
#if FLINT64
10480142147UL, 82864869804UL, 682076806159UL, 5832742205057UL,
51724158235372UL, 474869816156751UL, 4506715738447323UL,
44152005855084346UL, 445958869294805289UL,
4638590332229999353UL,
UWORD(10480142147), UWORD(82864869804), UWORD(682076806159), UWORD(5832742205057),
UWORD(51724158235372), UWORD(474869816156751), UWORD(4506715738447323),
UWORD(44152005855084346), UWORD(445958869294805289),
UWORD(4638590332229999353),
#endif
};

Expand Down
4 changes: 2 additions & 2 deletions arith/bell_number_nmod_vec_series.c
View file
Expand Up @@ -46,12 +46,12 @@ arith_bell_number_nmod_vec_series(mp_ptr res, slong n, nmod_t mod)
tmp[k] = c;
c = n_mulmod2_preinv(c, k, mod.n, mod.ninv);
}
tmp[0] = 0UL;
tmp[0] = UWORD(0);

_nmod_poly_exp_series(res, tmp, n, mod);

/* Multiply by factorials */
c = 1UL;
c = UWORD(1);
for (k = 1; k < n; k++)
{
c = n_mulmod2_preinv(c, k, mod.n, mod.ninv);
Expand Down
2 changes: 1 addition & 1 deletion arith/bell_number_vec_multi_mod.c
View file
Expand Up @@ -53,7 +53,7 @@ arith_bell_number_vec_multi_mod(fmpz * res, slong n)
polys = flint_malloc(num_primes * sizeof(mp_ptr));

/* Compute Bell numbers mod p */
primes[0] = n_nextprime(1UL<<prime_bits, 0);
primes[0] = n_nextprime(UWORD(1)<<prime_bits, 0);
for (k = 1; k < num_primes; k++)
primes[k] = n_nextprime(primes[k-1], 0);

Expand Down
24 changes: 12 additions & 12 deletions arith/bernoulli_number_denom.c
View file
Expand Up @@ -35,17 +35,17 @@

static const __u32 __bernoulli_denom_small[] =
{
1UL, 6UL, 30UL, 42UL, 30UL, 66UL, 2730UL, 6UL, 510UL, 798UL, 330UL,
138UL, 2730UL, 6UL, 870UL, 14322UL, 510UL, 6UL, 1919190UL, 6UL, 13530UL,
1806UL, 690UL, 282UL, 46410UL, 66UL, 1590UL, 798UL, 870UL, 354UL,
56786730UL, 6UL, 510UL, 64722UL, 30UL, 4686UL, 140100870UL, 6UL, 30UL,
3318UL, 230010UL, 498UL, 3404310UL, 6UL, 61410UL, 272118UL, 1410UL, 6UL,
4501770UL, 6UL, 33330UL, 4326UL, 1590UL, 642UL, 209191710UL, 1518UL,
1671270UL, 42UL, 1770UL, 6UL, 2328255930UL, 6UL, 30UL, 4357878UL, 510UL,
8646UL, 4206930UL, 6UL, 4110UL, 274386UL, 679470UL, 6UL, 2381714790UL,
6UL, 4470UL, 2162622UL, 30UL, 138UL, 1794590070UL, 6UL, 230010UL,
130074UL, 2490UL, 1002UL, 3404310UL, 66UL, 5190UL, 2478UL, 1043970UL,
1074UL,
UWORD(1), UWORD(6), UWORD(30), UWORD(42), UWORD(30), UWORD(66), UWORD(2730), UWORD(6), UWORD(510), UWORD(798), UWORD(330),
UWORD(138), UWORD(2730), UWORD(6), UWORD(870), UWORD(14322), UWORD(510), UWORD(6), UWORD(1919190), UWORD(6), UWORD(13530),
UWORD(1806), UWORD(690), UWORD(282), UWORD(46410), UWORD(66), UWORD(1590), UWORD(798), UWORD(870), UWORD(354),
UWORD(56786730), UWORD(6), UWORD(510), UWORD(64722), UWORD(30), UWORD(4686), UWORD(140100870), UWORD(6), UWORD(30),
UWORD(3318), UWORD(230010), UWORD(498), UWORD(3404310), UWORD(6), UWORD(61410), UWORD(272118), UWORD(1410), UWORD(6),
UWORD(4501770), UWORD(6), UWORD(33330), UWORD(4326), UWORD(1590), UWORD(642), UWORD(209191710), UWORD(1518),
UWORD(1671270), UWORD(42), UWORD(1770), UWORD(6), UWORD(2328255930), UWORD(6), UWORD(30), UWORD(4357878), UWORD(510),
UWORD(8646), UWORD(4206930), UWORD(6), UWORD(4110), UWORD(274386), UWORD(679470), UWORD(6), UWORD(2381714790),
UWORD(6), UWORD(4470), UWORD(2162622), UWORD(30), UWORD(138), UWORD(1794590070), UWORD(6), UWORD(230010),
UWORD(130074), UWORD(2490), UWORD(1002), UWORD(3404310), UWORD(66), UWORD(5190), UWORD(2478), UWORD(1043970),
UWORD(1074),
};

void arith_bernoulli_number_denom(fmpz_t den, ulong n)
Expand All @@ -67,7 +67,7 @@ void arith_bernoulli_number_denom(fmpz_t den, ulong n)
n_prime_pi_bounds(&p, &p, n);
primes = n_primes_arr_readonly(p + 1);

fmpz_set_ui(den, 6UL);
fmpz_set_ui(den, UWORD(6));
for (i = 2; i < n; i++)
{
p = primes[i];
Expand Down
8 changes: 4 additions & 4 deletions arith/bernoulli_number_vec_multi_mod.c
View file
Expand Up @@ -45,10 +45,10 @@ __bernoulli_number_vec_mod_p(mp_ptr res, mp_ptr tmp, const fmpz * den,
}

_nmod_poly_inv_series(res, tmp, m, mod);
res[0] = 1UL;
res[0] = UWORD(1);

/* N_(2k) = -1 * D_(2k) * (2k)! / (2k-1) */
c = n_negmod(1UL, mod.n);
c = n_negmod(UWORD(1), mod.n);
for (k = 1; k < m; k++)
{
t = fmpz_fdiv_ui(den + 2*k, mod.n);
Expand Down Expand Up @@ -93,7 +93,7 @@ void _arith_bernoulli_number_vec_multi_mod(fmpz * num, fmpz * den, slong n)
polys = flint_malloc(num_primes * sizeof(mp_ptr));

/* Compute Bernoulli numbers mod p */
primes[0] = n_nextprime(1UL<<prime_bits, 0);
primes[0] = n_nextprime(UWORD(1)<<prime_bits, 0);
for (k = 1; k < num_primes; k++)
primes[k] = n_nextprime(primes[k-1], 0);
temppoly = _nmod_vec_init(m);
Expand All @@ -113,7 +113,7 @@ void _arith_bernoulli_number_vec_multi_mod(fmpz * num, fmpz * den, slong n)

/* Trivial entries */
if (n > 1)
fmpz_set_si(num + 1, -1L);
fmpz_set_si(num + 1, WORD(-1));
for (k = 3; k < n; k += 2)
fmpz_zero(num + k);

Expand Down
26 changes: 13 additions & 13 deletions arith/bernoulli_number_vec_recursive.c
View file
Expand Up @@ -57,36 +57,36 @@ __ramanujan_even_common_denom(fmpz * num, fmpz * den, slong start, slong n)
{
mcase = m % 6;

fmpz_mul_ui(num + m, cden, m + 3UL);
fmpz_divexact_ui(num + m, num + m, 3UL);
fmpz_mul_ui(num + m, cden, m + UWORD(3));
fmpz_divexact_ui(num + m, num + m, UWORD(3));

if (mcase == 4)
{
fmpz_neg(num + m, num + m);
fmpz_divexact_ui(num + m, num + m, 2UL);
fmpz_divexact_ui(num + m, num + m, UWORD(2));
}

/* All factors are strictly smaller than m + 4; choose prodsize such
that (m + 4)^prodsize fits in an slong. */
{
#if FLINT64
if (m < 1444L) prodsize = 6;
else if (m < 2097148L) prodsize = 3;
else if (m < 3037000495L) prodsize = 2; /* not very likely... */
if (m < WORD(1444)) prodsize = 6;
else if (m < WORD(2097148)) prodsize = 3;
else if (m < WORD(3037000495)) prodsize = 2; /* not very likely... */
else abort();
#else
if (m < 32L) prodsize = 6;
else if (m < 1286L) prodsize = 3;
else if (m < 46336L) prodsize = 2;
if (m < WORD(32)) prodsize = 6;
else if (m < WORD(1286)) prodsize = 3;
else if (m < WORD(46336)) prodsize = 2;
else abort();
#endif
}

/* c = t = binomial(m+3, m) */
fmpz_set_ui(t, m + 1UL);
fmpz_mul_ui(t, t, m + 2UL);
fmpz_mul_ui(t, t, m + 3UL);
fmpz_divexact_ui(t, t, 6UL);
fmpz_set_ui(t, m + UWORD(1));
fmpz_mul_ui(t, t, m + UWORD(2));
fmpz_mul_ui(t, t, m + UWORD(3));
fmpz_divexact_ui(t, t, UWORD(6));
fmpz_set(c, t);

for (j = 6; j <= m; j += 6)
Expand Down
2 changes: 1 addition & 1 deletion arith/bernoulli_polynomial.c
View file
Expand Up @@ -33,7 +33,7 @@ void arith_bernoulli_polynomial(fmpq_poly_t poly, ulong n)

if (n == 0)
{
fmpq_poly_set_ui(poly, 1UL);
fmpq_poly_set_ui(poly, UWORD(1));
return;
}

Expand Down
2 changes: 1 addition & 1 deletion arith/chebyshev_t_polynomial.c
View file
Expand Up @@ -54,7 +54,7 @@ arith_chebyshev_t_polynomial(fmpz_poly_t poly, ulong n)
{
if (n == 0)
{
fmpz_poly_set_ui(poly, 1UL);
fmpz_poly_set_ui(poly, UWORD(1));
return;
}

Expand Down
4 changes: 2 additions & 2 deletions arith/chebyshev_u_polynomial.c
View file
Expand Up @@ -54,7 +54,7 @@ arith_chebyshev_u_polynomial(fmpz_poly_t poly, ulong n)
{
if (n == 0)
{
fmpz_poly_set_ui(poly, 1UL);
fmpz_poly_set_ui(poly, UWORD(1));
return;
}

Expand All @@ -63,7 +63,7 @@ arith_chebyshev_u_polynomial(fmpz_poly_t poly, ulong n)
if (n == 1)
{
fmpz_zero(poly->coeffs);
fmpz_set_ui(poly->coeffs + 1, 2UL);
fmpz_set_ui(poly->coeffs + 1, UWORD(2));
}
else
_arith_chebyshev_u_polynomial(poly->coeffs, n);
Expand Down
10 changes: 5 additions & 5 deletions arith/cyclotomic_cos_polynomial.c
View file
Expand Up @@ -177,19 +177,19 @@ _arith_cos_minpoly(fmpz * coeffs, slong d, ulong n)
switch (s % 4)
{
case 0:
fmpz_set_si(coeffs, 1L);
fmpz_set_si(coeffs, WORD(1));
fmpz_set_si(coeffs + 1, -s);
break;
case 1:
fmpz_set_si(coeffs, 1L);
fmpz_set_si(coeffs, WORD(1));
fmpz_set_si(coeffs + 1, s + 1);
break;
case 2:
fmpz_set_si(coeffs, -1L);
fmpz_set_si(coeffs, WORD(-1));
fmpz_set_si(coeffs + 1, s);
break;
case 3:
fmpz_set_si(coeffs, -1L);
fmpz_set_si(coeffs, WORD(-1));
fmpz_set_si(coeffs + 1, -s - 1);
break;
}
Expand Down Expand Up @@ -255,7 +255,7 @@ arith_cos_minpoly(fmpz_poly_t poly, ulong n)
{
if (n == 0)
{
fmpz_poly_set_ui(poly, 1UL);
fmpz_poly_set_ui(poly, UWORD(1));
}
else
{
Expand Down
18 changes: 9 additions & 9 deletions arith/cyclotomic_polynomial.c
View file
Expand Up @@ -44,7 +44,7 @@ _arith_cyclotomic_polynomial(fmpz * a, ulong n, mp_ptr factors,
}

/* Phi_{2n}(x) = Phi_n(-x)*/
if (factors[0] == 2UL)
if (factors[0] == UWORD(2))
{
_arith_cyclotomic_polynomial(a, n / 2, factors + 1,
num_factors - 1, phi);
Expand All @@ -59,17 +59,17 @@ _arith_cyclotomic_polynomial(fmpz * a, ulong n, mp_ptr factors,

/* Coefficients are guaranteed not to overflow an fmpz */
small = (num_factors == 2) || /* Always +1/0/-1*/
(n < 10163195L) || /* At most 27 bits */
(FLINT_BITS == 64 && n < 169828113L); /* At most 60 bits */
(n < WORD(10163195)) || /* At most 27 bits */
(FLINT_BITS == 64 && n < WORD(169828113)); /* At most 60 bits */

/* Iterate over all divisors of n */
for (k = 0; k < (1L << num_factors); k++)
for (k = 0; k < (WORD(1) << num_factors); k++)
{
int mu;
ulong d;

mu = (num_factors & 1) ? -1 : 1;
d = 1L;
d = WORD(1);
for (i = 0; i < num_factors; i++)
{
if ((k >> i) & 1)
Expand Down Expand Up @@ -108,13 +108,13 @@ arith_cyclotomic_polynomial(fmpz_poly_t poly, ulong n)
{
if (n == 0)
{
fmpz_poly_set_ui(poly, 1UL);
fmpz_poly_set_ui(poly, UWORD(1));
}
else
{
fmpz_poly_fit_length(poly, 2);
fmpz_set_si(poly->coeffs, (n == 1) ? -1L : 1L);
fmpz_set_si(poly->coeffs + 1, 1L);
fmpz_set_si(poly->coeffs, (n == 1) ? WORD(-1) : WORD(1));
fmpz_set_si(poly->coeffs + 1, WORD(1));
_fmpz_poly_set_length(poly, 2);
}
return;
Expand All @@ -124,7 +124,7 @@ arith_cyclotomic_polynomial(fmpz_poly_t poly, ulong n)
and compute phi(s) which determines the degree of the polynomial. */
n_factor_init(&factors);
n_factor(&factors, n, 1);
s = phi = 1UL;
s = phi = UWORD(1);
for (i = 0; i < factors.num; i++)
{
phi *= factors.p[i] - 1;
Expand Down
8 changes: 4 additions & 4 deletions arith/dedekind_cosine_sum_factored.c
View file
Expand Up @@ -56,7 +56,7 @@ n_sqrtmod_2exp(mp_limb_t a, int k)
x += (a - x * x) / 2;

if (k < FLINT_BITS)
x &= ((1UL << k) - 1);
x &= ((UWORD(1) << k) - 1);

return x;
}
Expand Down Expand Up @@ -212,7 +212,7 @@ solve_n1(mp_limb_t n, mp_limb_t k1, mp_limb_t k2,
inv = n_preinvert_limb(k1);

umul_ppmm(t[1], t[0], k2, k2);
sub_ddmmss(t[1], t[0], t[1], t[0], 0UL, 1UL);
sub_ddmmss(t[1], t[0], t[1], t[0], UWORD(0), UWORD(1));
mpn_divrem_1(t, 0, t, 2, d1);

n1 = n_ll_mod_preinv(t[1], t[0], k1, inv);
Expand Down Expand Up @@ -249,7 +249,7 @@ arith_hrr_expsum_factored(trig_prod_t prod, mp_limb_t k, mp_limb_t n)
p = fac.p[i];

/* k = 2 * k1 with k1 odd */
if (p == 2UL && fac.exp[i] == 1)
if (p == UWORD(2) && fac.exp[i] == 1)
{
k2 = k / 2;
inv = n_preinvert_limb(k2);
Expand All @@ -264,7 +264,7 @@ arith_hrr_expsum_factored(trig_prod_t prod, mp_limb_t k, mp_limb_t n)
n = n2;
}
/* k = 4 * k1 with k1 odd */
else if (p == 2UL && fac.exp[i] == 2)
else if (p == UWORD(2) && fac.exp[i] == 2)
{
k2 = k / 4;
inv = n_preinvert_limb(k2);
Expand Down

0 comments on commit 2f7b153

Please sign in to comment.