projects
/
u
/
mdw
/
catacomb
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rename MP_IS* to MP_*P, for consistency's sake. Use these macros more often.
[u/mdw/catacomb]
/
mp-arith.c
diff --git
a/mp-arith.c
b/mp-arith.c
index
736be2f
..
4bd0976
100644
(file)
--- a/
mp-arith.c
+++ b/
mp-arith.c
@@
-1,6
+1,6
@@
/* -*-c-*-
*
/* -*-c-*-
*
- * $Id
: mp-arith.c,v 1.18 2004/04/08 01:36:15 mdw Exp
$
+ * $Id$
*
* Basic arithmetic on multiprecision integers
*
*
* Basic arithmetic on multiprecision integers
*
@@
-90,7
+90,7
@@
mp *mp_lsr(mp *d, mp *a, size_t n)
mp *mp_lsl2c(mp *d, mp *a, size_t n)
{
mp *mp_lsl2c(mp *d, mp *a, size_t n)
{
- if (!
(a->f & MP_NEG
))
+ if (!
MP_NEGP(a
))
return (mp_lsl(d, a, n));
d = mp_not2c(d, a);
d = mp_lslc(d, d, n);
return (mp_lsl(d, a, n));
d = mp_not2c(d, a);
d = mp_lslc(d, d, n);
@@
-100,7
+100,7
@@
mp *mp_lsl2c(mp *d, mp *a, size_t n)
mp *mp_lsr2c(mp *d, mp *a, size_t n)
{
mp *mp_lsr2c(mp *d, mp *a, size_t n)
{
- if (!
(a->f & MP_NEG
))
+ if (!
MP_NEGP(a
))
return (mp_lsr(d, a, n));
d = mp_not2c(d, a);
d = mp_lsr(d, d, n);
return (mp_lsr(d, a, n));
d = mp_not2c(d, a);
d = mp_lsr(d, d, n);
@@
-135,7
+135,7
@@
int mp_testbit(mp *x, unsigned long n)
int mp_testbit2c(mp *x, unsigned long n)
{
int r;
int mp_testbit2c(mp *x, unsigned long n)
{
int r;
- if (!
(x->f & MP_NEG
))
+ if (!
MP_NEGP(x
))
return (mp_testbit(x, n));
x = mp_not2c(MP_NEW, x);
r = !mp_testbit(x, n);
return (mp_testbit(x, n));
x = mp_not2c(MP_NEW, x);
r = !mp_testbit(x, n);
@@
-192,7
+192,7
@@
mp *mp_clearbit(mp *d, mp *x, unsigned long n)
mp *mp_setbit2c(mp *d, mp *x, unsigned long n)
{
mp *mp_setbit2c(mp *d, mp *x, unsigned long n)
{
- if (!
(x->f & MP_NEG
))
+ if (!
MP_NEGP(x
))
return mp_setbit(d, x, n);
d = mp_not2c(d, x);
d = mp_clearbit(d, d, n);
return mp_setbit(d, x, n);
d = mp_not2c(d, x);
d = mp_clearbit(d, d, n);
@@
-202,7
+202,7
@@
mp *mp_setbit2c(mp *d, mp *x, unsigned long n)
mp *mp_clearbit2c(mp *d, mp *x, unsigned long n)
{
mp *mp_clearbit2c(mp *d, mp *x, unsigned long n)
{
- if (!
(x->f & MP_NEG
))
+ if (!
MP_NEGP(x
))
return mp_clearbit(d, x, n);
d = mp_not2c(d, x);
d = mp_setbit(d, d, n);
return mp_clearbit(d, x, n);
d = mp_not2c(d, x);
d = mp_setbit(d, d, n);
@@
-400,12
+400,12
@@
mp *mp_not2c(mp *d, mp *a)
MP_DEST(d, MP_LEN(a) + 1, a->f);
if (d == a) {
MP_DEST(d, MP_LEN(a) + 1, a->f);
if (d == a) {
- if (
a->f & MP_NEG
)
+ if (
MP_NEGP(a)
)
MPX_USUBN(d->v, d->vl, 1);
else
MPX_UADDN(d->v, d->vl, 1);
} else {
MPX_USUBN(d->v, d->vl, 1);
else
MPX_UADDN(d->v, d->vl, 1);
} else {
- if (
a->f & MP_NEG
)
+ if (
MP_NEGP(a)
)
mpx_usub(d->v, d->vl, a->v, a->vl, &one, &one + 1);
else
mpx_uadd(d->v, d->vl, a->v, a->vl, &one, &one + 1);
mpx_usub(d->v, d->vl, a->v, a->vl, &one, &one + 1);
else
mpx_uadd(d->v, d->vl, a->v, a->vl, &one, &one + 1);
@@
-590,7
+590,7
@@
void mp_div(mp **qq, mp **rr, mp *a, mp *b)
*/
q->f = ((r->f | b->f) & MP_BURN) | ((r->f ^ b->f) & MP_NEG);
*/
q->f = ((r->f | b->f) & MP_BURN) | ((r->f ^ b->f) & MP_NEG);
- if (
q->f & MP_NEG
) {
+ if (
MP_NEGP(q)
) {
mpw *v;
for (v = r->v; v < r->vl; v++) {
if (*v) {
mpw *v;
for (v = r->v; v < r->vl; v++) {
if (*v) {