summaryrefslogtreecommitdiff
path: root/mpq
diff options
context:
space:
mode:
authorMarco Bodrato <bodrato@mail.dm.unipi.it>2015-05-24 09:47:58 +0200
committerMarco Bodrato <bodrato@mail.dm.unipi.it>2015-05-24 09:47:58 +0200
commit241519f21c809dc980a437a52cb2eb141eb0b6dd (patch)
tree8431647e071f6738de87d670c576a7c6f0c73d9c /mpq
parent06a19bc5dabfde6da5b56b3793cd3f9f13f99f32 (diff)
downloadgmp-241519f21c809dc980a437a52cb2eb141eb0b6dd.tar.gz
mpq/div.c: Remove two vars.
Diffstat (limited to 'mpq')
-rw-r--r--mpq/div.c39
1 files changed, 19 insertions, 20 deletions
diff --git a/mpq/div.c b/mpq/div.c
index 6c058a250..91f2c9f13 100644
--- a/mpq/div.c
+++ b/mpq/div.c
@@ -37,16 +37,14 @@ mpq_div (mpq_ptr quot, mpq_srcptr op1, mpq_srcptr op2)
{
mpz_t gcd1, gcd2;
mpz_t tmp1, tmp2;
- mp_size_t op1_num_size;
- mp_size_t op1_den_size;
- mp_size_t op2_num_size;
- mp_size_t op2_den_size;
+ mp_size_t op1_size;
+ mp_size_t op2_size;
mp_size_t alloc;
TMP_DECL;
- op2_num_size = SIZ(NUM(op2));
+ op2_size = SIZ(NUM(op2));
- if (UNLIKELY (op2_num_size == 0))
+ if (UNLIKELY (op2_size == 0))
DIVIDE_BY_ZERO;
if (op1 == op2)
@@ -64,23 +62,23 @@ mpq_div (mpq_ptr quot, mpq_srcptr op1, mpq_srcptr op2)
We compute x=y/x by computing x=inv(x)*y */
MPN_PTR_SWAP (PTR(NUM(quot)), ALLOC(NUM(quot)),
PTR(DEN(quot)), ALLOC(DEN(quot)));
- if (op2_num_size > 0)
+ if (op2_size > 0)
{
SIZ(NUM(quot)) = SIZ(DEN(quot));
- SIZ(DEN(quot)) = op2_num_size;
+ SIZ(DEN(quot)) = op2_size;
}
else
{
SIZ(NUM(quot)) = - SIZ(DEN(quot));
- SIZ(DEN(quot)) = - op2_num_size;
+ SIZ(DEN(quot)) = - op2_size;
}
mpq_mul (quot, quot, op1);
return;
}
- op1_num_size = ABSIZ(NUM(op1));
+ op1_size = ABSIZ(NUM(op1));
- if (op1_num_size == 0)
+ if (op1_size == 0)
{
/* We special case this to simplify allocation logic; gcd(0,x) = x
is a singular case for the allocations. */
@@ -90,22 +88,23 @@ mpq_div (mpq_ptr quot, mpq_srcptr op1, mpq_srcptr op2)
return;
}
- op2_num_size = ABS(op2_num_size);
- op2_den_size = SIZ(DEN(op2));
- op1_den_size = SIZ(DEN(op1));
+ op2_size = ABS(op2_size);
TMP_MARK;
- alloc = MIN (op1_num_size, op2_num_size);
+ alloc = MIN (op1_size, op2_size);
MPZ_TMP_INIT (gcd1, alloc);
- alloc = MIN (op1_den_size, op2_den_size);
- MPZ_TMP_INIT (gcd2, alloc);
-
- alloc = MAX (op1_num_size, op2_num_size);
+ alloc = MAX (op1_size, op2_size);
MPZ_TMP_INIT (tmp1, alloc);
- alloc = MAX (op1_den_size, op2_den_size);
+ op2_size = SIZ(DEN(op2));
+ op1_size = SIZ(DEN(op1));
+
+ alloc = MIN (op1_size, op2_size);
+ MPZ_TMP_INIT (gcd2, alloc);
+
+ alloc = MAX (op1_size, op2_size);
MPZ_TMP_INIT (tmp2, alloc);
/* QUOT might be identical to OP1, so don't store the result there