Rename MP_IS* to MP_*P, for consistency's sake. Use these macros more often.

[u/mdw/catacomb] / mp-gcd.c

diff --git a/mp-gcd.c b/mp-gcd.c
index 5e663a1..d997072 100644 (file)
--- a/mp-gcd.c
+++ b/mp-gcd.c
@@ -1,6 +1,6 @@
 /* -*-c-*-
  *
- * $Id: mp-gcd.c,v 1.7 2004/04/08 01:36:15 mdw Exp $
+ * $Id$
  *
  * Extended GCD calculation
  *
@@ -63,9 +63,9 @@ void mp_gcd(mp **gcd, mp **xx, mp **yy, mp *a, mp *b)
   if (xx || yy)
     f |= f_ext;
 
-  if (a->f & MP_NEG)
+  if (MP_NEGP(a))
     f |= f_aneg;
-  if (b->f & MP_NEG)
+  if (MP_NEGP(b))
     f |= f_bneg;
 
   /* --- Ensure that @a@ is larger than @b@ --- *
@@ -87,7 +87,7 @@ void mp_gcd(mp **gcd, mp **xx, mp **yy, mp *a, mp *b)
     if (gcd) {
       if (*gcd) MP_DROP(*gcd);
       a = MP_COPY(a);
-      if (a->f & MP_NEG) {
+      if (MP_NEGP(a)) {
        MP_SPLIT(a);
        a->f &= ~MP_NEG;
        f |= f_aneg;
@@ -131,7 +131,7 @@ void mp_gcd(mp **gcd, mp **xx, mp **yy, mp *a, mp *b)
   u = MP_COPY(a);
   v = MP_COPY(b);
 
-  while (MP_LEN(v)) {
+  while (!MP_ZEROP(v)) {
     mp *t;
     mp_div(&q, &u, u, v);
     if (f & f_ext) {
@@ -178,11 +178,11 @@ void mp_gcd(mp **gcd, mp **xx, mp **yy, mp *a, mp *b)
      */
 
     if (yy) {
-      if (y->f & MP_NEG) {
+      if (MP_NEGP(y)) {
        do {
          y = mp_add(y, y, a);
          x = mp_sub(x, x, b);
-       } while (y->f & MP_NEG);
+       } while (MP_NEGP(y));
       } else {
        while (MP_CMP(y, >=, a)) {
          y = mp_sub(y, y, a);
@@ -190,10 +190,10 @@ void mp_gcd(mp **gcd, mp **xx, mp **yy, mp *a, mp *b)
        }
       }
     } else {
-      if (x->f & MP_NEG) {
+      if (MP_NEGP(x)) {
        do
          x = mp_add(x, x, b);
-       while (x->f & MP_NEG);
+       while (MP_NEGP(x));
       } else {
        while (MP_CMP(x, >=, b))
          x = mp_sub(x, x, b);