Merge branch 'master' of git+ssh://metalzone.distorted.org.uk/~mdw/public-git/catacomb/

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

diff --git a/mp-sqrt.c b/mp-sqrt.c
index 01fe000..2e35158 100644 (file)
--- a/mp-sqrt.c
+++ b/mp-sqrt.c
@@ -1,6 +1,6 @@
 /* -*-c-*-
  *
- * $Id: mp-sqrt.c,v 1.5 2004/04/08 01:36:15 mdw Exp $
+ * $Id$
  *
  * Compute integer square roots
  *
@@ -54,12 +54,12 @@ mp *mp_sqrt(mp *d, mp *a)
 
   /* --- Sanity preservation --- */
 
-  assert(((void)"imaginary root in mp_sqrt", !(a->f & MP_NEG)));
+  assert(!MP_NEGP(a));
 
   /* --- Deal with trivial cases --- */
 
   MP_SHRINK(a);
-  if (a->v == a->vl) {
+  if (MP_ZEROP(a)) {
     mp_drop(d);
     return (MP_ZERO);
   }
@@ -84,12 +84,12 @@ mp *mp_sqrt(mp *d, mp *a)
   for (;;) {
     q = mp_sqr(q, d);
     q = mp_sub(q, q, a);
-    if (q->v == q->vl)
+    if (MP_ZEROP(q))
       break;
-    if (q->f & MP_NEG) {
+    if (MP_NEGP(q)) {
       r = mp_lsl(r, d, 1);
       r->f |= MP_NEG;
-      if (MP_CMP(q, <=, r))
+      if (MP_CMP(q, >=, r))
        break;
     }
     mp_div(&r, &q, q, d);