summaryrefslogtreecommitdiff
path: root/mpz
diff options
context:
space:
mode:
Diffstat (limited to 'mpz')
-rw-r--r--mpz/and.c8
-rw-r--r--mpz/aorsmul.c6
-rw-r--r--mpz/aorsmul_i.c12
-rw-r--r--mpz/cdiv_q.c6
-rw-r--r--mpz/cdiv_qr.c6
-rw-r--r--mpz/cdiv_r.c6
-rw-r--r--mpz/cdiv_r_ui.c6
-rw-r--r--mpz/cdiv_ui.c6
-rw-r--r--mpz/cong.c6
-rw-r--r--mpz/divexact.c6
-rw-r--r--mpz/fdiv_q.c6
-rw-r--r--mpz/fdiv_qr.c6
-rw-r--r--mpz/fdiv_r.c6
-rw-r--r--mpz/fdiv_r_ui.c6
-rw-r--r--mpz/fdiv_ui.c6
-rw-r--r--mpz/fib_ui.c6
-rw-r--r--mpz/gcd.c6
-rw-r--r--mpz/gcdext.c6
-rw-r--r--mpz/get_str.c6
-rw-r--r--mpz/inp_raw.c6
-rw-r--r--mpz/invert.c8
-rw-r--r--mpz/ior.c8
-rw-r--r--mpz/jacobi.c8
-rw-r--r--mpz/lcm.c6
-rw-r--r--mpz/lucnum2_ui.c6
-rw-r--r--mpz/lucnum_ui.c6
-rw-r--r--mpz/millerrabin.c8
-rw-r--r--mpz/mod.c6
-rw-r--r--mpz/mul.c6
-rw-r--r--mpz/n_pow_ui.c6
-rw-r--r--mpz/out_str.c6
-rw-r--r--mpz/perfpow.c24
-rw-r--r--mpz/powm.c14
-rw-r--r--mpz/powm_ui.c14
-rw-r--r--mpz/set_str.c8
-rw-r--r--mpz/sqrt.c6
-rw-r--r--mpz/sqrtrem.c6
-rw-r--r--mpz/tdiv_q.c6
-rw-r--r--mpz/tdiv_qr.c6
-rw-r--r--mpz/tdiv_r.c6
-rw-r--r--mpz/tdiv_r_ui.c6
-rw-r--r--mpz/tdiv_ui.c6
-rw-r--r--mpz/xor.c8
43 files changed, 156 insertions, 156 deletions
diff --git a/mpz/and.c b/mpz/and.c
index 106cf52d5..b776ab83c 100644
--- a/mpz/and.c
+++ b/mpz/and.c
@@ -31,9 +31,9 @@ mpz_and (mpz_ptr res, mpz_srcptr op1, mpz_srcptr op2)
mp_ptr res_ptr;
mp_size_t res_size;
mp_size_t i;
- TMP_DECL (marker);
+ TMP_DECL;
- TMP_MARK (marker);
+ TMP_MARK;
op1_size = op1->_mp_size;
op2_size = op2->_mp_size;
@@ -137,7 +137,7 @@ mpz_and (mpz_ptr res, mpz_srcptr op1, mpz_srcptr op2)
}
res->_mp_size = -res_size;
- TMP_FREE (marker);
+ TMP_FREE;
return;
}
else
@@ -265,5 +265,5 @@ mpz_and (mpz_ptr res, mpz_srcptr op1, mpz_srcptr op2)
}
#endif
}
- TMP_FREE (marker);
+ TMP_FREE;
}
diff --git a/mpz/aorsmul.c b/mpz/aorsmul.c
index c523dde76..d586e92df 100644
--- a/mpz/aorsmul.c
+++ b/mpz/aorsmul.c
@@ -45,7 +45,7 @@ mpz_aorsmul (mpz_ptr w, mpz_srcptr x, mpz_srcptr y, mp_size_t sub)
mp_size_t xsize, ysize, tsize, wsize, wsize_signed;
mp_ptr wp, tp;
mp_limb_t c, high;
- TMP_DECL (marker);
+ TMP_DECL;
/* w unaffected if x==0 or y==0 */
xsize = SIZ(x);
@@ -91,7 +91,7 @@ mpz_aorsmul (mpz_ptr w, mpz_srcptr x, mpz_srcptr y, mp_size_t sub)
return;
}
- TMP_MARK (marker);
+ TMP_MARK;
tp = TMP_ALLOC_LIMBS (tsize);
high = mpn_mul (tp, PTR(x),xsize, PTR(y),ysize);
@@ -139,7 +139,7 @@ mpz_aorsmul (mpz_ptr w, mpz_srcptr x, mpz_srcptr y, mp_size_t sub)
SIZ(w) = (wsize_signed >= 0 ? wsize : -wsize);
- TMP_FREE (marker);
+ TMP_FREE;
}
diff --git a/mpz/aorsmul_i.c b/mpz/aorsmul_i.c
index 7ebd30b09..3a2d872c9 100644
--- a/mpz/aorsmul_i.c
+++ b/mpz/aorsmul_i.c
@@ -200,8 +200,8 @@ mpz_addmul_ui (mpz_ptr w, mpz_srcptr x, unsigned long y)
mpz_t t;
mp_ptr tp;
mp_size_t xn;
- TMP_DECL (mark);
- TMP_MARK (mark);
+ TMP_DECL;
+ TMP_MARK;
xn = SIZ (x);
MPZ_TMP_INIT (t, ABS (xn) + 1);
tp = PTR (t);
@@ -212,7 +212,7 @@ mpz_addmul_ui (mpz_ptr w, mpz_srcptr x, unsigned long y)
PTR(t) = tp + 1;
SIZ(t) = xn;
mpz_aorsmul_1 (w, t, (mp_limb_t) y & GMP_NUMB_MASK, (mp_size_t) 0);
- TMP_FREE (mark);
+ TMP_FREE;
return;
}
#endif
@@ -228,8 +228,8 @@ mpz_submul_ui (mpz_ptr w, mpz_srcptr x, unsigned long y)
mpz_t t;
mp_ptr tp;
mp_size_t xn;
- TMP_DECL (mark);
- TMP_MARK (mark);
+ TMP_DECL;
+ TMP_MARK;
xn = SIZ (x);
MPZ_TMP_INIT (t, ABS (xn) + 1);
tp = PTR (t);
@@ -240,7 +240,7 @@ mpz_submul_ui (mpz_ptr w, mpz_srcptr x, unsigned long y)
PTR(t) = tp + 1;
SIZ(t) = xn;
mpz_aorsmul_1 (w, t, (mp_limb_t) y & GMP_NUMB_MASK, (mp_size_t) -1);
- TMP_FREE (mark);
+ TMP_FREE;
return;
}
#endif
diff --git a/mpz/cdiv_q.c b/mpz/cdiv_q.c
index 3f71e56bb..b6c00719b 100644
--- a/mpz/cdiv_q.c
+++ b/mpz/cdiv_q.c
@@ -29,9 +29,9 @@ mpz_cdiv_q (mpz_ptr quot, mpz_srcptr dividend, mpz_srcptr divisor)
mp_size_t dividend_size = dividend->_mp_size;
mp_size_t divisor_size = divisor->_mp_size;
mpz_t rem;
- TMP_DECL (marker);
+ TMP_DECL;
- TMP_MARK (marker);
+ TMP_MARK;
MPZ_TMP_INIT (rem, ABS (divisor_size));
@@ -40,5 +40,5 @@ mpz_cdiv_q (mpz_ptr quot, mpz_srcptr dividend, mpz_srcptr divisor)
if ((divisor_size ^ dividend_size) >= 0 && rem->_mp_size != 0)
mpz_add_ui (quot, quot, 1L);
- TMP_FREE (marker);
+ TMP_FREE;
}
diff --git a/mpz/cdiv_qr.c b/mpz/cdiv_qr.c
index eacd75480..92a3df863 100644
--- a/mpz/cdiv_qr.c
+++ b/mpz/cdiv_qr.c
@@ -29,9 +29,9 @@ mpz_cdiv_qr (mpz_ptr quot, mpz_ptr rem, mpz_srcptr dividend, mpz_srcptr divisor)
mp_size_t divisor_size = divisor->_mp_size;
mp_size_t xsize;
mpz_t temp_divisor; /* N.B.: lives until function returns! */
- TMP_DECL (marker);
+ TMP_DECL;
- TMP_MARK (marker);
+ TMP_MARK;
/* We need the original value of the divisor after the quotient and
remainder have been preliminary calculated. We have to copy it to
@@ -52,5 +52,5 @@ mpz_cdiv_qr (mpz_ptr quot, mpz_ptr rem, mpz_srcptr dividend, mpz_srcptr divisor)
mpz_sub (rem, rem, divisor);
}
- TMP_FREE (marker);
+ TMP_FREE;
}
diff --git a/mpz/cdiv_r.c b/mpz/cdiv_r.c
index 37e974a5a..5524bddad 100644
--- a/mpz/cdiv_r.c
+++ b/mpz/cdiv_r.c
@@ -28,9 +28,9 @@ mpz_cdiv_r (mpz_ptr rem, mpz_srcptr dividend, mpz_srcptr divisor)
{
mp_size_t divisor_size = divisor->_mp_size;
mpz_t temp_divisor; /* N.B.: lives until function returns! */
- TMP_DECL (marker);
+ TMP_DECL;
- TMP_MARK (marker);
+ TMP_MARK;
/* We need the original value of the divisor after the remainder has been
preliminary calculated. We have to copy it to temporary space if it's
@@ -48,5 +48,5 @@ mpz_cdiv_r (mpz_ptr rem, mpz_srcptr dividend, mpz_srcptr divisor)
if ((divisor_size ^ dividend->_mp_size) >= 0 && rem->_mp_size != 0)
mpz_sub (rem, rem, divisor);
- TMP_FREE (marker);
+ TMP_FREE;
}
diff --git a/mpz/cdiv_r_ui.c b/mpz/cdiv_r_ui.c
index 70f338ff7..5b47952f7 100644
--- a/mpz/cdiv_r_ui.c
+++ b/mpz/cdiv_r_ui.c
@@ -50,7 +50,7 @@ mpz_cdiv_r_ui (mpz_ptr rem, mpz_srcptr dividend, unsigned long int divisor)
mp_limb_t dp[2];
mp_ptr rp, qp;
mp_size_t rn;
- TMP_DECL (mark);
+ TMP_DECL;
MPZ_REALLOC (rem, 2);
rp = PTR(rem);
@@ -62,12 +62,12 @@ mpz_cdiv_r_ui (mpz_ptr rem, mpz_srcptr dividend, unsigned long int divisor)
}
else
{
- TMP_MARK (mark);
+ TMP_MARK;
dp[0] = divisor & GMP_NUMB_MASK;
dp[1] = divisor >> GMP_NUMB_BITS;
qp = TMP_ALLOC_LIMBS (nn - 2 + 1);
mpn_tdiv_qr (qp, rp, (mp_size_t) 0, np, nn, dp, (mp_size_t) 2);
- TMP_FREE (mark);
+ TMP_FREE;
rl = rp[0] + (rp[1] << GMP_NUMB_BITS);
}
diff --git a/mpz/cdiv_ui.c b/mpz/cdiv_ui.c
index bd2666deb..f64918113 100644
--- a/mpz/cdiv_ui.c
+++ b/mpz/cdiv_ui.c
@@ -49,7 +49,7 @@ mpz_cdiv_ui (mpz_srcptr dividend, unsigned long int divisor)
mp_limb_t dp[2], rp[2];
mp_ptr qp;
mp_size_t rn;
- TMP_DECL (mark);
+ TMP_DECL;
if (nn == 1) /* tdiv_qr requirements; tested above for 0 */
{
@@ -58,12 +58,12 @@ mpz_cdiv_ui (mpz_srcptr dividend, unsigned long int divisor)
}
else
{
- TMP_MARK (mark);
+ TMP_MARK;
dp[0] = divisor & GMP_NUMB_MASK;
dp[1] = divisor >> GMP_NUMB_BITS;
qp = TMP_ALLOC_LIMBS (nn - 2 + 1);
mpn_tdiv_qr (qp, rp, (mp_size_t) 0, np, nn, dp, (mp_size_t) 2);
- TMP_FREE (mark);
+ TMP_FREE;
rl = rp[0] + (rp[1] << GMP_NUMB_BITS);
}
diff --git a/mpz/cong.c b/mpz/cong.c
index f01595adc..d32148e21 100644
--- a/mpz/cong.c
+++ b/mpz/cong.c
@@ -57,7 +57,7 @@ mpz_congruent_p (mpz_srcptr a, mpz_srcptr c, mpz_srcptr d)
mp_ptr xp;
mp_limb_t alow, clow, dlow, dmask, r;
int result;
- TMP_DECL (marker);
+ TMP_DECL;
dsize = SIZ(d);
if (UNLIKELY (dsize == 0))
@@ -145,7 +145,7 @@ mpz_congruent_p (mpz_srcptr a, mpz_srcptr c, mpz_srcptr d)
}
}
- TMP_MARK (marker);
+ TMP_MARK;
xp = TMP_ALLOC_LIMBS (asize+1);
/* calculate abs(a-c) */
@@ -169,6 +169,6 @@ mpz_congruent_p (mpz_srcptr a, mpz_srcptr c, mpz_srcptr d)
result = mpn_divisible_p (xp, asize, dp, dsize);
- TMP_FREE (marker);
+ TMP_FREE;
return result;
}
diff --git a/mpz/divexact.c b/mpz/divexact.c
index 6c6cacbdb..e801fa42c 100644
--- a/mpz/divexact.c
+++ b/mpz/divexact.c
@@ -42,7 +42,7 @@ mpz_divexact (mpz_ptr quot, mpz_srcptr num, mpz_srcptr den)
mp_size_t qsize, tsize;
mp_srcptr np, dp;
mp_size_t nsize, dsize;
- TMP_DECL (marker);
+ TMP_DECL;
#if WANT_ASSERT
{
@@ -87,7 +87,7 @@ mpz_divexact (mpz_ptr quot, mpz_srcptr num, mpz_srcptr den)
DIVIDE_BY_ZERO;
}
- TMP_MARK (marker);
+ TMP_MARK;
/* QUOT <-- NUM/2^r, T <-- DEN/2^r where = r number of twos in DEN. */
while (dp[0] == 0)
@@ -124,5 +124,5 @@ mpz_divexact (mpz_ptr quot, mpz_srcptr num, mpz_srcptr den)
quot->_mp_size = (num->_mp_size ^ den->_mp_size) >= 0 ? qsize : -qsize;
- TMP_FREE (marker);
+ TMP_FREE;
}
diff --git a/mpz/fdiv_q.c b/mpz/fdiv_q.c
index 73d2cee56..cb5887513 100644
--- a/mpz/fdiv_q.c
+++ b/mpz/fdiv_q.c
@@ -29,9 +29,9 @@ mpz_fdiv_q (mpz_ptr quot, mpz_srcptr dividend, mpz_srcptr divisor)
mp_size_t dividend_size = dividend->_mp_size;
mp_size_t divisor_size = divisor->_mp_size;
mpz_t rem;
- TMP_DECL (marker);
+ TMP_DECL;
- TMP_MARK (marker);
+ TMP_MARK;
MPZ_TMP_INIT (rem, ABS (divisor_size));
@@ -40,5 +40,5 @@ mpz_fdiv_q (mpz_ptr quot, mpz_srcptr dividend, mpz_srcptr divisor)
if ((divisor_size ^ dividend_size) < 0 && rem->_mp_size != 0)
mpz_sub_ui (quot, quot, 1L);
- TMP_FREE (marker);
+ TMP_FREE;
}
diff --git a/mpz/fdiv_qr.c b/mpz/fdiv_qr.c
index 6cbd65ee8..51e7803f5 100644
--- a/mpz/fdiv_qr.c
+++ b/mpz/fdiv_qr.c
@@ -29,9 +29,9 @@ mpz_fdiv_qr (mpz_ptr quot, mpz_ptr rem, mpz_srcptr dividend, mpz_srcptr divisor)
mp_size_t divisor_size = divisor->_mp_size;
mp_size_t xsize;
mpz_t temp_divisor; /* N.B.: lives until function returns! */
- TMP_DECL (marker);
+ TMP_DECL;
- TMP_MARK (marker);
+ TMP_MARK;
/* We need the original value of the divisor after the quotient and
remainder have been preliminary calculated. We have to copy it to
@@ -52,5 +52,5 @@ mpz_fdiv_qr (mpz_ptr quot, mpz_ptr rem, mpz_srcptr dividend, mpz_srcptr divisor)
mpz_add (rem, rem, divisor);
}
- TMP_FREE (marker);
+ TMP_FREE;
}
diff --git a/mpz/fdiv_r.c b/mpz/fdiv_r.c
index a1ecc786f..9056cb65a 100644
--- a/mpz/fdiv_r.c
+++ b/mpz/fdiv_r.c
@@ -28,9 +28,9 @@ mpz_fdiv_r (mpz_ptr rem, mpz_srcptr dividend, mpz_srcptr divisor)
{
mp_size_t divisor_size = divisor->_mp_size;
mpz_t temp_divisor; /* N.B.: lives until function returns! */
- TMP_DECL (marker);
+ TMP_DECL;
- TMP_MARK (marker);
+ TMP_MARK;
/* We need the original value of the divisor after the remainder has been
preliminary calculated. We have to copy it to temporary space if it's
@@ -47,5 +47,5 @@ mpz_fdiv_r (mpz_ptr rem, mpz_srcptr dividend, mpz_srcptr divisor)
if ((divisor_size ^ dividend->_mp_size) < 0 && rem->_mp_size != 0)
mpz_add (rem, rem, divisor);
- TMP_FREE (marker);
+ TMP_FREE;
}
diff --git a/mpz/fdiv_r_ui.c b/mpz/fdiv_r_ui.c
index 5b93437e2..1aebb26c3 100644
--- a/mpz/fdiv_r_ui.c
+++ b/mpz/fdiv_r_ui.c
@@ -48,7 +48,7 @@ mpz_fdiv_r_ui (mpz_ptr rem, mpz_srcptr dividend, unsigned long int divisor)
mp_limb_t dp[2];
mp_ptr rp, qp;
mp_size_t rn;
- TMP_DECL (mark);
+ TMP_DECL;
MPZ_REALLOC (rem, 2);
rp = PTR(rem);
@@ -60,12 +60,12 @@ mpz_fdiv_r_ui (mpz_ptr rem, mpz_srcptr dividend, unsigned long int divisor)
}
else
{
- TMP_MARK (mark);
+ TMP_MARK;
dp[0] = divisor & GMP_NUMB_MASK;
dp[1] = divisor >> GMP_NUMB_BITS;
qp = TMP_ALLOC_LIMBS (nn - 2 + 1);
mpn_tdiv_qr (qp, rp, (mp_size_t) 0, np, nn, dp, (mp_size_t) 2);
- TMP_FREE (mark);
+ TMP_FREE;
rl = rp[0] + (rp[1] << GMP_NUMB_BITS);
}
diff --git a/mpz/fdiv_ui.c b/mpz/fdiv_ui.c
index dee16a7b3..2bb707e12 100644
--- a/mpz/fdiv_ui.c
+++ b/mpz/fdiv_ui.c
@@ -47,7 +47,7 @@ mpz_fdiv_ui (mpz_srcptr dividend, unsigned long int divisor)
mp_limb_t dp[2], rp[2];
mp_ptr qp;
mp_size_t rn;
- TMP_DECL (mark);
+ TMP_DECL;
if (nn == 1) /* tdiv_qr requirements; tested above for 0 */
{
@@ -56,12 +56,12 @@ mpz_fdiv_ui (mpz_srcptr dividend, unsigned long int divisor)
}
else
{
- TMP_MARK (mark);
+ TMP_MARK;
dp[0] = divisor & GMP_NUMB_MASK;
dp[1] = divisor >> GMP_NUMB_BITS;
qp = TMP_ALLOC_LIMBS (nn - 2 + 1);
mpn_tdiv_qr (qp, rp, (mp_size_t) 0, np, nn, dp, (mp_size_t) 2);
- TMP_FREE (mark);
+ TMP_FREE;
rl = rp[0] + (rp[1] << GMP_NUMB_BITS);
}
diff --git a/mpz/fib_ui.c b/mpz/fib_ui.c
index c249a3989..2f18e1cc3 100644
--- a/mpz/fib_ui.c
+++ b/mpz/fib_ui.c
@@ -52,7 +52,7 @@ mpz_fib_ui (mpz_ptr fn, unsigned long n)
mp_size_t size, xalloc;
unsigned long n2;
mp_limb_t c, c2;
- TMP_DECL (marker);
+ TMP_DECL;
if (n <= FIB_TABLE_LIMIT)
{
@@ -66,7 +66,7 @@ mpz_fib_ui (mpz_ptr fn, unsigned long n)
MPZ_REALLOC (fn, 2*xalloc+1);
fp = PTR (fn);
- TMP_MARK (marker);
+ TMP_MARK;
TMP_ALLOC_LIMBS_2 (xp,xalloc, yp,xalloc);
size = mpn_fib2_ui (xp, yp, n2);
@@ -140,5 +140,5 @@ mpz_fib_ui (mpz_ptr fn, unsigned long n)
TRACE (printf ("done special, size=%ld\n", size);
mpn_trace ("fp ", fp, size));
- TMP_FREE (marker);
+ TMP_FREE;
}
diff --git a/mpz/gcd.c b/mpz/gcd.c
index 0578c5174..e47b8d423 100644
--- a/mpz/gcd.c
+++ b/mpz/gcd.c
@@ -43,7 +43,7 @@ gcd (mpz_srcptr u, mpz_srcptr v, mpz_ptr g)
mp_ptr vp = v->_mp_d;
mp_size_t vsize = ABS (v->_mp_size);
mp_size_t gsize;
- TMP_DECL (marker);
+ TMP_DECL;
/* GCD(0, V) == V. */
if (usize == 0)
@@ -83,7 +83,7 @@ gcd (mpz_srcptr u, mpz_srcptr v, mpz_ptr g)
return;
}
- TMP_MARK (marker);
+ TMP_MARK;
/* Eliminate low zero bits from U and V and move to temporary storage. */
while (*up == 0)
@@ -161,5 +161,5 @@ gcd (mpz_srcptr u, mpz_srcptr v, mpz_ptr g)
}
g->_mp_size = gsize;
- TMP_FREE (marker);
+ TMP_FREE;
}
diff --git a/mpz/gcdext.c b/mpz/gcdext.c
index 71f6bfc4e..a6443fe1a 100644
--- a/mpz/gcdext.c
+++ b/mpz/gcdext.c
@@ -36,9 +36,9 @@ mpz_gcdext (mpz_ptr g, mpz_ptr s, mpz_ptr t, mpz_srcptr a, mpz_srcptr b)
mpz_srcptr u, v;
mpz_ptr ss, tt;
__mpz_struct stmp, gtmp;
- TMP_DECL (marker);
+ TMP_DECL;
- TMP_MARK (marker);
+ TMP_MARK;
/* mpn_gcdext requires that U >= V. Therefore, we often have to swap U and
V. This in turn leads to a lot of complications. The computed cofactor
@@ -124,5 +124,5 @@ mpz_gcdext (mpz_ptr g, mpz_ptr s, mpz_ptr t, mpz_srcptr a, mpz_srcptr b)
MPN_COPY (gp, tmp_gp, gsize);
SIZ (g) = gsize;
- TMP_FREE (marker);
+ TMP_FREE;
}
diff --git a/mpz/get_str.c b/mpz/get_str.c
index f700c0740..8e1b1acae 100644
--- a/mpz/get_str.c
+++ b/mpz/get_str.c
@@ -40,7 +40,7 @@ mpz_get_str (char *res_str, int base, mpz_srcptr x)
size_t alloc_size = 0;
char *num_to_text;
int i;
- TMP_DECL (marker);
+ TMP_DECL;
if (base >= 0)
{
@@ -77,7 +77,7 @@ mpz_get_str (char *res_str, int base, mpz_srcptr x)
}
/* mpn_get_str clobbers its input on non power-of-2 bases */
- TMP_MARK (marker);
+ TMP_MARK;
xp = x->_mp_d;
if (! POW2_P (base))
{
@@ -103,7 +103,7 @@ mpz_get_str (char *res_str, int base, mpz_srcptr x)
res_str[i] = num_to_text[str[i]];
res_str[str_size] = 0;
- TMP_FREE (marker);
+ TMP_FREE;
/* if allocated then resize down to the actual space required */
if (alloc_size != 0)
diff --git a/mpz/inp_raw.c b/mpz/inp_raw.c
index 4bb89b18b..2e795133c 100644
--- a/mpz/inp_raw.c
+++ b/mpz/inp_raw.c
@@ -122,9 +122,9 @@ mpz_inp_raw (mpz_ptr x, FILE *fp)
int bits;
mp_size_t tpos;
mp_ptr tp;
- TMP_DECL (marker);
+ TMP_DECL;
- TMP_MARK (marker);
+ TMP_MARK;
tp = TMP_ALLOC_LIMBS (abs_xsize);
limb = 0;
bits = 0;
@@ -151,7 +151,7 @@ mpz_inp_raw (mpz_ptr x, FILE *fp)
ASSERT (tpos == abs_xsize);
MPN_COPY (xp, tp, abs_xsize);
- TMP_FREE (marker);
+ TMP_FREE;
}
/* GMP 1.x mpz_out_raw wrote high zero bytes, strip any high zero
diff --git a/mpz/invert.c b/mpz/invert.c
index ee3e5a44e..2d0dcfa62 100644
--- a/mpz/invert.c
+++ b/mpz/invert.c
@@ -29,7 +29,7 @@ mpz_invert (mpz_ptr inverse, mpz_srcptr x, mpz_srcptr n)
{
mpz_t gcd, tmp;
mp_size_t xsize, nsize, size;
- TMP_DECL (marker);
+ TMP_DECL;
xsize = SIZ (x);
nsize = SIZ (n);
@@ -42,7 +42,7 @@ mpz_invert (mpz_ptr inverse, mpz_srcptr x, mpz_srcptr n)
if (xsize == 0 || (nsize == 1 && (PTR (n))[0] == 1))
return 0;
- TMP_MARK (marker);
+ TMP_MARK;
MPZ_TMP_INIT (gcd, size);
MPZ_TMP_INIT (tmp, size);
@@ -51,7 +51,7 @@ mpz_invert (mpz_ptr inverse, mpz_srcptr x, mpz_srcptr n)
/* If no inverse existed, return with an indication of that. */
if (SIZ (gcd) != 1 || PTR(gcd)[0] != 1)
{
- TMP_FREE (marker);
+ TMP_FREE;
return 0;
}
@@ -66,6 +66,6 @@ mpz_invert (mpz_ptr inverse, mpz_srcptr x, mpz_srcptr n)
else
mpz_set (inverse, tmp);
- TMP_FREE (marker);
+ TMP_FREE;
return 1;
}
diff --git a/mpz/ior.c b/mpz/ior.c
index 11e2194c5..a694166a3 100644
--- a/mpz/ior.c
+++ b/mpz/ior.c
@@ -31,9 +31,9 @@ mpz_ior (mpz_ptr res, mpz_srcptr op1, mpz_srcptr op2)
mp_ptr res_ptr;
mp_size_t res_size;
mp_size_t i;
- TMP_DECL (marker);
+ TMP_DECL;
- TMP_MARK (marker);
+ TMP_MARK;
op1_size = op1->_mp_size;
op2_size = op2->_mp_size;
@@ -150,7 +150,7 @@ mpz_ior (mpz_ptr res, mpz_srcptr op1, mpz_srcptr op2)
}
res->_mp_size = -res_size;
- TMP_FREE (marker);
+ TMP_FREE;
return;
}
else
@@ -233,5 +233,5 @@ mpz_ior (mpz_ptr res, mpz_srcptr op1, mpz_srcptr op2)
res->_mp_size = -res_size;
}
- TMP_FREE (marker);
+ TMP_FREE;
}
diff --git a/mpz/jacobi.c b/mpz/jacobi.c
index e52b0d258..24741e681 100644
--- a/mpz/jacobi.c
+++ b/mpz/jacobi.c
@@ -89,7 +89,7 @@ mpz_jacobi (mpz_srcptr a, mpz_srcptr b)
mp_limb_t alow, blow, ahigh, bhigh, asecond, bsecond;
unsigned atwos, btwos;
int result_bit1;
- TMP_DECL (marker);
+ TMP_DECL;
TRACE (printf ("start asize=%d bsize=%d\n", SIZ(a), SIZ(b));
mpz_trace (" a", a);
@@ -190,7 +190,7 @@ mpz_jacobi (mpz_srcptr a, mpz_srcptr b)
}
- TMP_MARK (marker);
+ TMP_MARK;
TMP_ALLOC_LIMBS_2 (ap, asize, bp, bsize);
MPN_RSHIFT_OR_COPY (ap, asrcp, asize, atwos);
@@ -296,7 +296,7 @@ mpz_jacobi (mpz_srcptr a, mpz_srcptr b)
}
ASSERT (asize == 1 && bsize == 1); /* just alow and blow left */
- TMP_FREE (marker);
+ TMP_FREE;
/* (1/b)=1 always (in this case have b==1 because a>=b) */
if (alow == 1)
@@ -309,6 +309,6 @@ mpz_jacobi (mpz_srcptr a, mpz_srcptr b)
return mpn_jacobi_base (blow, alow, result_bit1);
zero:
- TMP_FREE (marker);
+ TMP_FREE;
return 0;
}
diff --git a/mpz/lcm.c b/mpz/lcm.c
index 1aea24534..623ab2dac 100644
--- a/mpz/lcm.c
+++ b/mpz/lcm.c
@@ -29,7 +29,7 @@ mpz_lcm (mpz_ptr r, mpz_srcptr u, mpz_srcptr v)
{
mpz_t g;
mp_size_t usize, vsize, size;
- TMP_DECL (marker);
+ TMP_DECL;
usize = SIZ (u);
vsize = SIZ (v);
@@ -70,7 +70,7 @@ mpz_lcm (mpz_ptr r, mpz_srcptr u, mpz_srcptr v)
goto one;
}
- TMP_MARK (marker);
+ TMP_MARK;
size = MAX (usize, vsize);
MPZ_TMP_INIT (g, size);
@@ -80,5 +80,5 @@ mpz_lcm (mpz_ptr r, mpz_srcptr u, mpz_srcptr v)
SIZ (r) = ABS (SIZ (r)); /* result always positive */
- TMP_FREE (marker);
+ TMP_FREE;
}
diff --git a/mpz/lucnum2_ui.c b/mpz/lucnum2_ui.c
index aeeceea69..756265e60 100644
--- a/mpz/lucnum2_ui.c
+++ b/mpz/lucnum2_ui.c
@@ -30,7 +30,7 @@ mpz_lucnum2_ui (mpz_ptr ln, mpz_ptr lnsub1, unsigned long n)
mp_ptr lp, l1p, f1p;
mp_size_t size;
mp_limb_t c;
- TMP_DECL (marker);
+ TMP_DECL;
ASSERT (ln != lnsub1);
@@ -51,7 +51,7 @@ mpz_lucnum2_ui (mpz_ptr ln, mpz_ptr lnsub1, unsigned long n)
return;
}
- TMP_MARK (marker);
+ TMP_MARK;
size = MPN_FIB2_SIZE (n);
f1p = TMP_ALLOC_LIMBS (size);
@@ -79,5 +79,5 @@ mpz_lucnum2_ui (mpz_ptr ln, mpz_ptr lnsub1, unsigned long n)
l1p[size] = c;
SIZ(lnsub1) = size + (c != 0);
- TMP_FREE (marker);
+ TMP_FREE;
}
diff --git a/mpz/lucnum_ui.c b/mpz/lucnum_ui.c
index 01e942f4a..59e5f4afd 100644
--- a/mpz/lucnum_ui.c
+++ b/mpz/lucnum_ui.c
@@ -52,7 +52,7 @@ mpz_lucnum_ui (mpz_ptr ln, unsigned long n)
mp_ptr lp, xp;
mp_limb_t c;
int zeros;
- TMP_DECL (marker);
+ TMP_DECL;
TRACE (printf ("mpn_lucnum_ui n=%lu\n", n));
@@ -71,7 +71,7 @@ mpz_lucnum_ui (mpz_ptr ln, unsigned long n)
MPZ_REALLOC (ln, lalloc);
lp = PTR (ln);
- TMP_MARK (marker);
+ TMP_MARK;
xalloc = lalloc;
xp = TMP_ALLOC_LIMBS (xalloc);
@@ -196,5 +196,5 @@ mpz_lucnum_ui (mpz_ptr ln, unsigned long n)
ASSERT (lp == PTR(ln));
SIZ(ln) = lsize;
- TMP_FREE (marker);
+ TMP_FREE;
}
diff --git a/mpz/millerrabin.c b/mpz/millerrabin.c
index 291c01ed4..3035043fb 100644
--- a/mpz/millerrabin.c
+++ b/mpz/millerrabin.c
@@ -44,8 +44,8 @@ mpz_millerrabin (mpz_srcptr n, int reps)
unsigned long int k;
gmp_randstate_t rstate;
int is_prime;
- TMP_DECL (marker);
- TMP_MARK (marker);
+ TMP_DECL;
+ TMP_MARK;
MPZ_TMP_INIT (nm1, SIZ (n) + 1);
mpz_sub_ui (nm1, n, 1L);
@@ -58,7 +58,7 @@ mpz_millerrabin (mpz_srcptr n, int reps)
mpz_powm (y, x, nm1, n);
if (mpz_cmp_ui (y, 1L) != 0)
{
- TMP_FREE (marker);
+ TMP_FREE;
return 0;
}
@@ -87,7 +87,7 @@ mpz_millerrabin (mpz_srcptr n, int reps)
gmp_randclear (rstate);
- TMP_FREE (marker);
+ TMP_FREE;
return is_prime;
}
diff --git a/mpz/mod.c b/mpz/mod.c
index aa6e21604..c87885853 100644
--- a/mpz/mod.c
+++ b/mpz/mod.c
@@ -28,9 +28,9 @@ mpz_mod (mpz_ptr rem, mpz_srcptr dividend, mpz_srcptr divisor)
{
mp_size_t divisor_size = divisor->_mp_size;
mpz_t temp_divisor; /* N.B.: lives until function returns! */
- TMP_DECL (marker);
+ TMP_DECL;
- TMP_MARK (marker);
+ TMP_MARK;
/* We need the original value of the divisor after the remainder has been
preliminary calculated. We have to copy it to temporary space if it's
@@ -55,5 +55,5 @@ mpz_mod (mpz_ptr rem, mpz_srcptr dividend, mpz_srcptr divisor)
}
}
- TMP_FREE (marker);
+ TMP_FREE;
}
diff --git a/mpz/mul.c b/mpz/mul.c
index 329babe8b..5e70143bf 100644
--- a/mpz/mul.c
+++ b/mpz/mul.c
@@ -43,7 +43,7 @@ mult (mpz_srcptr u, mpz_srcptr v, mpz_ptr w)
mp_ptr free_me;
size_t free_me_size;
mp_limb_t cy_limb;
- TMP_DECL (marker);
+ TMP_DECL;
sign_product = usize ^ vsize;
usize = ABS (usize);
@@ -91,7 +91,7 @@ mult (mpz_srcptr u, mpz_srcptr v, mpz_ptr w)
}
#endif
- TMP_MARK (marker);
+ TMP_MARK;
free_me = NULL;
up = u->_mp_d;
vp = v->_mp_d;
@@ -142,5 +142,5 @@ mult (mpz_srcptr u, mpz_srcptr v, mpz_ptr w)
w->_mp_size = sign_product < 0 ? -wsize : wsize;
if (free_me != NULL)
(*__gmp_free_func) (free_me, free_me_size * BYTES_PER_MP_LIMB);
- TMP_FREE (marker);
+ TMP_FREE;
}
diff --git a/mpz/n_pow_ui.c b/mpz/n_pow_ui.c
index fc0d9c6fa..3b6b5b131 100644
--- a/mpz/n_pow_ui.c
+++ b/mpz/n_pow_ui.c
@@ -162,7 +162,7 @@ mpz_n_pow_ui (mpz_ptr r, mp_srcptr bp, mp_size_t bsize, unsigned long int e)
#else
mp_limb_t b_twolimbs[2];
#endif
- TMP_DECL (marker);
+ TMP_DECL;
TRACE (printf ("mpz_n_pow_ui rp=0x%lX bp=0x%lX bsize=%ld e=%lu (0x%lX)\n",
PTR(r), bp, bsize, e, e);
@@ -211,7 +211,7 @@ mpz_n_pow_ui (mpz_ptr r, mp_srcptr bp, mp_size_t bsize, unsigned long int e)
TRACE (printf ("trailing zero btwos=%d rtwos_limbs=%ld rtwos_bits=%lu\n",
btwos, rtwos_limbs, rtwos_bits));
- TMP_MARK (marker);
+ TMP_MARK;
rl = 1;
#if HAVE_NATIVE_mpn_mul_2
@@ -511,7 +511,7 @@ mpz_n_pow_ui (mpz_ptr r, mp_srcptr bp, mp_size_t bsize, unsigned long int e)
ASSERT (rp == PTR(r) + rtwos_limbs);
TRACE (mpn_trace ("end loop r", rp, rsize));
- TMP_FREE (marker);
+ TMP_FREE;
/* Apply any partial limb factors of 2. */
if (rtwos_bits != 0)
diff --git a/mpz/out_str.c b/mpz/out_str.c
index 61dc0004b..3897edc6b 100644
--- a/mpz/out_str.c
+++ b/mpz/out_str.c
@@ -34,7 +34,7 @@ mpz_out_str (FILE *stream, int base, mpz_srcptr x)
size_t i;
size_t written;
char *num_to_text;
- TMP_DECL (marker);
+ TMP_DECL;
if (stream == 0)
stream = stdout;
@@ -72,7 +72,7 @@ mpz_out_str (FILE *stream, int base, mpz_srcptr x)
written = 1;
}
- TMP_MARK (marker);
+ TMP_MARK;
str_size = ((size_t) (x_size * BITS_PER_MP_LIMB
* __mp_bases[base].chars_per_bit_exactly)) + 3;
str = (unsigned char *) TMP_ALLOC (str_size);
@@ -102,6 +102,6 @@ mpz_out_str (FILE *stream, int base, mpz_srcptr x)
written += fwret;
}
- TMP_FREE (marker);
+ TMP_FREE;
return ferror (stream) ? 0 : written;
}
diff --git a/mpz/perfpow.c b/mpz/perfpow.c
index 0c940b5df..0f4a35b11 100644
--- a/mpz/perfpow.c
+++ b/mpz/perfpow.c
@@ -72,7 +72,7 @@ mpz_perfect_power_p (mpz_srcptr u)
int exact;
mp_size_t uns;
mp_size_t usize = SIZ (u);
- TMP_DECL (marker);
+ TMP_DECL;
if (usize == 0)
return 1; /* consider 0 a perfect power */
@@ -84,7 +84,7 @@ mpz_perfect_power_p (mpz_srcptr u)
if (n2 != 0 && (n2 & 1) == 0 && usize < 0)
return 0; /* 2 has even multiplicity with negative U */
- TMP_MARK (marker);
+ TMP_MARK;
uns = ABS (usize) - n2 / BITS_PER_MP_LIMB;
MPZ_TMP_INIT (q, uns);
@@ -104,7 +104,7 @@ mpz_perfect_power_p (mpz_srcptr u)
rem = mpz_tdiv_q_ui (q, u2, prime * prime);
if (rem != 0)
{
- TMP_FREE (marker);
+ TMP_FREE;
return 0; /* prime divides exactly once, reject */
}
mpz_swap (q, u2);
@@ -119,20 +119,20 @@ mpz_perfect_power_p (mpz_srcptr u)
if ((n & 1) == 0 && usize < 0)
{
- TMP_FREE (marker);
+ TMP_FREE;
return 0; /* even multiplicity with negative U, reject */
}
n2 = gcd (n2, n);
if (n2 == 1)
{
- TMP_FREE (marker);
+ TMP_FREE;
return 0; /* we have multiplicity 1 of some factor */
}
if (mpz_cmpabs_ui (u2, 1) == 0)
{
- TMP_FREE (marker);
+ TMP_FREE;
return 1; /* factoring completed; consistent power */
}
@@ -158,12 +158,12 @@ mpz_perfect_power_p (mpz_srcptr u)
exact = mpz_root (q, u2, nth);
if (exact)
{
- TMP_FREE (marker);
+ TMP_FREE;
return 1;
}
if (mpz_cmp_ui (q, SMALLEST_OMITTED_PRIME) < 0)
{
- TMP_FREE (marker);
+ TMP_FREE;
return 0;
}
}
@@ -186,23 +186,23 @@ mpz_perfect_power_p (mpz_srcptr u)
exact = mpz_root (q, u2, nth);
if (exact)
{
- TMP_FREE (marker);
+ TMP_FREE;
return 1;
}
if (mpz_cmp_ui (q, SMALLEST_OMITTED_PRIME) < 0)
{
- TMP_FREE (marker);
+ TMP_FREE;
return 0;
}
}
- TMP_FREE (marker);
+ TMP_FREE;
return 0;
}
n2prime:
exact = mpz_root (NULL, u2, n2);
- TMP_FREE (marker);
+ TMP_FREE;
return exact;
}
diff --git a/mpz/powm.c b/mpz/powm.c
index 36cbeda5c..1e27f7aac 100644
--- a/mpz/powm.c
+++ b/mpz/powm.c
@@ -60,14 +60,14 @@ static void
reduce (mp_ptr tp, mp_srcptr ap, mp_size_t an, mp_srcptr mp, mp_size_t mn)
{
mp_ptr qp;
- TMP_DECL (marker);
+ TMP_DECL;
- TMP_MARK (marker);
+ TMP_MARK;
qp = TMP_ALLOC_LIMBS (an - mn + 1);
mpn_tdiv_qr (qp, tp, 0L, ap, an, mp, mn);
- TMP_FREE (marker);
+ TMP_FREE;
}
#if REDUCE_EXPONENT
@@ -166,14 +166,14 @@ pow (mpz_srcptr b, mpz_srcptr e, mpz_srcptr m, mpz_ptr r)
#if REDUCE_EXPONENT
mpz_t new_e;
#endif
- TMP_DECL (marker);
+ TMP_DECL;
mp = PTR(m);
mn = ABSIZ (m);
if (mn == 0)
DIVIDE_BY_ZERO;
- TMP_MARK (marker);
+ TMP_MARK;
es = SIZ (e);
if (es <= 0)
@@ -184,7 +184,7 @@ pow (mpz_srcptr b, mpz_srcptr e, mpz_srcptr m, mpz_ptr r)
m equals 1. */
SIZ(r) = (mn == 1 && mp[0] == 1) ? 0 : 1;
PTR(r)[0] = 1;
- TMP_FREE (marker); /* we haven't really allocated anything here */
+ TMP_FREE; /* we haven't really allocated anything here */
return;
}
#if HANDLE_NEGATIVE_EXPONENT
@@ -457,5 +457,5 @@ pow (mpz_srcptr b, mpz_srcptr e, mpz_srcptr m, mpz_ptr r)
MPN_COPY (PTR(r), xp, xn);
__GMP_FREE_FUNC_LIMBS (gp, K / 2 * mn);
- TMP_FREE (marker);
+ TMP_FREE;
}
diff --git a/mpz/powm_ui.c b/mpz/powm_ui.c
index 535fe1e55..97ab3955b 100644
--- a/mpz/powm_ui.c
+++ b/mpz/powm_ui.c
@@ -31,14 +31,14 @@ static void
reduce (mp_ptr tp, mp_srcptr ap, mp_size_t an, mp_srcptr mp, mp_size_t mn)
{
mp_ptr qp;
- TMP_DECL (marker);
+ TMP_DECL;
- TMP_MARK (marker);
+ TMP_MARK;
qp = TMP_ALLOC_LIMBS (an - mn + 1);
mpn_tdiv_qr (qp, tp, 0L, ap, an, mp, mn);
- TMP_FREE (marker);
+ TMP_FREE;
}
void
@@ -49,7 +49,7 @@ mpz_powm_ui (mpz_ptr r, mpz_srcptr b, unsigned long int el, mpz_srcptr m)
int m_zero_cnt;
int c;
mp_limb_t e;
- TMP_DECL (marker);
+ TMP_DECL;
mp = PTR(m);
mn = ABSIZ(m);
@@ -65,7 +65,7 @@ mpz_powm_ui (mpz_ptr r, mpz_srcptr b, unsigned long int el, mpz_srcptr m)
return;
}
- TMP_MARK (marker);
+ TMP_MARK;
/* Normalize m (i.e. make its most significant bit set) as required by
division functions below. */
@@ -96,7 +96,7 @@ mpz_powm_ui (mpz_ptr r, mpz_srcptr b, unsigned long int el, mpz_srcptr m)
if (bn == 0)
{
SIZ(r) = 0;
- TMP_FREE (marker);
+ TMP_FREE;
return;
}
@@ -193,5 +193,5 @@ mpz_powm_ui (mpz_ptr r, mpz_srcptr b, unsigned long int el, mpz_srcptr m)
SIZ (r) = xn;
MPN_COPY (PTR(r), xp, xn);
- TMP_FREE (marker);
+ TMP_FREE;
}
diff --git a/mpz/set_str.c b/mpz/set_str.c
index b38469487..d9b756b93 100644
--- a/mpz/set_str.c
+++ b/mpz/set_str.c
@@ -42,7 +42,7 @@ mpz_set_str (mpz_ptr x, const char *str, int base)
int c;
int negative;
const unsigned char *digit_value;
- TMP_DECL (marker);
+ TMP_DECL;
digit_value = digit_value_tab;
if (base > 36)
@@ -101,7 +101,7 @@ mpz_set_str (mpz_ptr x, const char *str, int base)
return 0;
}
- TMP_MARK (marker);
+ TMP_MARK;
str_size = strlen (str - 1);
s = begs = (char *) TMP_ALLOC (str_size + 1);
@@ -114,7 +114,7 @@ mpz_set_str (mpz_ptr x, const char *str, int base)
int dig = digit_value[c];
if (dig >= base)
{
- TMP_FREE (marker);
+ TMP_FREE;
return -1;
}
*s++ = dig;
@@ -132,6 +132,6 @@ mpz_set_str (mpz_ptr x, const char *str, int base)
xsize = mpn_set_str (x->_mp_d, (unsigned char *) begs, str_size, base);
x->_mp_size = negative ? -xsize : xsize;
- TMP_FREE (marker);
+ TMP_FREE;
return 0;
}
diff --git a/mpz/sqrt.c b/mpz/sqrt.c
index dfe0392ed..6e5253855 100644
--- a/mpz/sqrt.c
+++ b/mpz/sqrt.c
@@ -30,9 +30,9 @@ mpz_sqrt (mpz_ptr root, mpz_srcptr op)
mp_ptr root_ptr, op_ptr;
mp_ptr free_me = NULL;
mp_size_t free_me_size;
- TMP_DECL (marker);
+ TMP_DECL;
- TMP_MARK (marker);
+ TMP_MARK;
op_size = op->_mp_size;
if (op_size <= 0)
{
@@ -81,5 +81,5 @@ mpz_sqrt (mpz_ptr root, mpz_srcptr op)
if (free_me != NULL)
(*__gmp_free_func) (free_me, free_me_size * BYTES_PER_MP_LIMB);
- TMP_FREE (marker);
+ TMP_FREE;
}
diff --git a/mpz/sqrtrem.c b/mpz/sqrtrem.c
index c933db570..dad1bc378 100644
--- a/mpz/sqrtrem.c
+++ b/mpz/sqrtrem.c
@@ -38,9 +38,9 @@ msqrt (mpz_srcptr op, mpz_ptr root, mpz_ptr rem)
mp_ptr root_ptr, op_ptr;
mp_ptr free_me = NULL;
mp_size_t free_me_size;
- TMP_DECL (marker);
+ TMP_DECL;
- TMP_MARK (marker);
+ TMP_MARK;
op_size = op->_mp_size;
if (op_size <= 0)
{
@@ -98,5 +98,5 @@ msqrt (mpz_srcptr op, mpz_ptr root, mpz_ptr rem)
if (free_me != NULL)
(*__gmp_free_func) (free_me, free_me_size * BYTES_PER_MP_LIMB);
- TMP_FREE (marker);
+ TMP_FREE;
}
diff --git a/mpz/tdiv_q.c b/mpz/tdiv_q.c
index 1d97e0cd4..2bf5b940a 100644
--- a/mpz/tdiv_q.c
+++ b/mpz/tdiv_q.c
@@ -29,7 +29,7 @@ mpz_tdiv_q (mpz_ptr quot, mpz_srcptr num, mpz_srcptr den)
mp_size_t ql;
mp_size_t ns, ds, nl, dl;
mp_ptr np, dp, qp, rp;
- TMP_DECL (marker);
+ TMP_DECL;
ns = SIZ (num);
ds = SIZ (den);
@@ -48,7 +48,7 @@ mpz_tdiv_q (mpz_ptr quot, mpz_srcptr num, mpz_srcptr den)
MPZ_REALLOC (quot, ql);
- TMP_MARK (marker);
+ TMP_MARK;
qp = PTR (quot);
rp = (mp_ptr) TMP_ALLOC (dl * BYTES_PER_MP_LIMB);
np = PTR (num);
@@ -80,5 +80,5 @@ mpz_tdiv_q (mpz_ptr quot, mpz_srcptr num, mpz_srcptr den)
ql -= qp[ql - 1] == 0;
SIZ (quot) = (ns ^ ds) >= 0 ? ql : -ql;
- TMP_FREE (marker);
+ TMP_FREE;
}
diff --git a/mpz/tdiv_qr.c b/mpz/tdiv_qr.c
index 5b1ea8127..f770fb6a7 100644
--- a/mpz/tdiv_qr.c
+++ b/mpz/tdiv_qr.c
@@ -37,7 +37,7 @@ mdiv (mpz_srcptr num, mpz_srcptr den, mpz_ptr quot, mpz_ptr rem)
mp_size_t ql;
mp_size_t ns, ds, nl, dl;
mp_ptr np, dp, qp, rp;
- TMP_DECL (marker);
+ TMP_DECL;
ns = SIZ (num);
ds = SIZ (den);
@@ -68,7 +68,7 @@ mdiv (mpz_srcptr num, mpz_srcptr den, mpz_ptr quot, mpz_ptr rem)
MPZ_REALLOC (quot, ql);
- TMP_MARK (marker);
+ TMP_MARK;
qp = PTR (quot);
rp = PTR (rem);
np = PTR (num);
@@ -104,5 +104,5 @@ mdiv (mpz_srcptr num, mpz_srcptr den, mpz_ptr quot, mpz_ptr rem)
SIZ (quot) = (ns ^ ds) >= 0 ? ql : -ql;
SIZ (rem) = ns >= 0 ? dl : -dl;
- TMP_FREE (marker);
+ TMP_FREE;
}
diff --git a/mpz/tdiv_r.c b/mpz/tdiv_r.c
index 6426c3457..35d9f0e82 100644
--- a/mpz/tdiv_r.c
+++ b/mpz/tdiv_r.c
@@ -29,7 +29,7 @@ mpz_tdiv_r (mpz_ptr rem, mpz_srcptr num, mpz_srcptr den)
mp_size_t ql;
mp_size_t ns, ds, nl, dl;
mp_ptr np, dp, qp, rp;
- TMP_DECL (marker);
+ TMP_DECL;
ns = SIZ (num);
ds = SIZ (den);
@@ -55,7 +55,7 @@ mpz_tdiv_r (mpz_ptr rem, mpz_srcptr num, mpz_srcptr den)
return;
}
- TMP_MARK (marker);
+ TMP_MARK;
qp = (mp_ptr) TMP_ALLOC (ql * BYTES_PER_MP_LIMB);
rp = PTR (rem);
np = PTR (num);
@@ -87,5 +87,5 @@ mpz_tdiv_r (mpz_ptr rem, mpz_srcptr num, mpz_srcptr den)
MPN_NORMALIZE (rp, dl);
SIZ (rem) = ns >= 0 ? dl : -dl;
- TMP_FREE (marker);
+ TMP_FREE;
}
diff --git a/mpz/tdiv_r_ui.c b/mpz/tdiv_r_ui.c
index 3b196ba4f..75b0436a8 100644
--- a/mpz/tdiv_r_ui.c
+++ b/mpz/tdiv_r_ui.c
@@ -49,7 +49,7 @@ mpz_tdiv_r_ui (mpz_ptr rem, mpz_srcptr dividend, unsigned long int divisor)
mp_limb_t dp[2];
mp_ptr rp, qp;
mp_size_t rn;
- TMP_DECL (mark);
+ TMP_DECL;
if (nn == 1) /* tdiv_qr requirements; tested above for 0 */
{
@@ -62,12 +62,12 @@ mpz_tdiv_r_ui (mpz_ptr rem, mpz_srcptr dividend, unsigned long int divisor)
MPZ_REALLOC (rem, 2);
rp = PTR(rem);
- TMP_MARK (mark);
+ TMP_MARK;
dp[0] = divisor & GMP_NUMB_MASK;
dp[1] = divisor >> GMP_NUMB_BITS;
qp = TMP_ALLOC_LIMBS (nn - 2 + 1);
mpn_tdiv_qr (qp, rp, (mp_size_t) 0, np, nn, dp, (mp_size_t) 2);
- TMP_FREE (mark);
+ TMP_FREE;
rl = rp[0] + (rp[1] << GMP_NUMB_BITS);
rn = 2 - (rp[1] == 0); rn -= (rp[rn - 1] == 0);
SIZ(rem) = ns >= 0 ? rn : -rn;
diff --git a/mpz/tdiv_ui.c b/mpz/tdiv_ui.c
index 7a3c9f8fd..825eb941e 100644
--- a/mpz/tdiv_ui.c
+++ b/mpz/tdiv_ui.c
@@ -49,7 +49,7 @@ mpz_tdiv_ui (mpz_srcptr dividend, unsigned long int divisor)
mp_limb_t dp[2], rp[2];
mp_ptr qp;
mp_size_t rn;
- TMP_DECL (mark);
+ TMP_DECL;
if (nn == 1) /* tdiv_qr requirements; tested above for 0 */
{
@@ -57,12 +57,12 @@ mpz_tdiv_ui (mpz_srcptr dividend, unsigned long int divisor)
return rl;
}
- TMP_MARK (mark);
+ TMP_MARK;
dp[0] = divisor & GMP_NUMB_MASK;
dp[1] = divisor >> GMP_NUMB_BITS;
qp = TMP_ALLOC_LIMBS (nn - 2 + 1);
mpn_tdiv_qr (qp, rp, (mp_size_t) 0, np, nn, dp, (mp_size_t) 2);
- TMP_FREE (mark);
+ TMP_FREE;
rl = rp[0] + (rp[1] << GMP_NUMB_BITS);
rn = 2 - (rp[1] == 0); rn -= (rp[rn - 1] == 0);
}
diff --git a/mpz/xor.c b/mpz/xor.c
index 394075cb3..bcb3d4fef 100644
--- a/mpz/xor.c
+++ b/mpz/xor.c
@@ -31,9 +31,9 @@ mpz_xor (mpz_ptr res, mpz_srcptr op1, mpz_srcptr op2)
mp_ptr res_ptr;
mp_size_t res_size, res_alloc;
mp_size_t i;
- TMP_DECL (marker);
+ TMP_DECL;
- TMP_MARK (marker);
+ TMP_MARK;
op1_size = op1->_mp_size;
op2_size = op2->_mp_size;
@@ -142,7 +142,7 @@ mpz_xor (mpz_ptr res, mpz_srcptr op1, mpz_srcptr op2)
MPN_NORMALIZE (res_ptr, res_size);
res->_mp_size = res_size;
- TMP_FREE (marker);
+ TMP_FREE;
return;
}
else
@@ -203,6 +203,6 @@ mpz_xor (mpz_ptr res, mpz_srcptr op1, mpz_srcptr op2)
MPN_NORMALIZE (res_ptr, res_size);
res->_mp_size = -res_size;
- TMP_FREE (marker);
+ TMP_FREE;
}
}