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

[u/mdw/catacomb] / f-niceprime.c

diff --git a/f-niceprime.c b/f-niceprime.c
index 2a51352..d9ec1ac 100644 (file)
--- a/f-niceprime.c
+++ b/f-niceprime.c
@@ -1,6 +1,6 @@
 /* -*-c-*-
  *
- * $Id: f-niceprime.c,v 1.4 2004/04/01 21:28:41 mdw Exp $
+ * $Id$
  *
  * Prime fields with efficient reduction for special-form primes
  *
@@ -27,29 +27,6 @@
  * MA 02111-1307, USA.
  */
 
-/*----- Revision history --------------------------------------------------* 
- *
- * $Log: f-niceprime.c,v $
- * Revision 1.4  2004/04/01 21:28:41  mdw
- * Normal basis support (translates to poly basis internally).  Rewrite
- * EC and prime group table generators in awk, so that they can reuse data
- * for repeated constants.
- *
- * Revision 1.3  2004/04/01 12:50:09  mdw
- * Add cyclic group abstraction, with test code.  Separate off exponentation
- * functions for better static linking.  Fix a buttload of bugs on the way.
- * Generally ensure that negative exponents do inversion correctly.  Add
- * table of standard prime-field subgroups.  (Binary field subgroups are
- * currently unimplemented but easy to add if anyone ever finds a good one.)
- *
- * Revision 1.2  2004/03/27 17:54:11  mdw
- * Standard curves and curve checking.
- *
- * Revision 1.1  2004/03/27 00:04:46  mdw
- * Implement efficient reduction for pleasant-looking primes.
- *
- */
-
 /*----- Header files ------------------------------------------------------*/
 
 #include <mLib/sub.h>
@@ -73,21 +50,21 @@ static void fdestroy(field *ff)
 static mp *frand(field *ff, mp *d, grand *r)
   { fctx *f = (fctx *)ff; return (mprand_range(d, f->r.p, r, 0)); }
 
-static int fzerop(field *ff, mp *x) { return (!MP_LEN(x)); }
+static int fzerop(field *ff, mp *x) { return (MP_ZEROP(x)); }
 
 static mp *fneg(field *ff, mp *d, mp *x)
   { fctx *f = (fctx *)ff; return (mp_sub(d, f->r.p, x)); }
 
 static mp *fadd(field *ff, mp *d, mp *x, mp *y) {
   fctx *f = (fctx *)ff; d = mp_add(d, x, y);
-  if (d->f & MP_NEG) d = mp_add(d, d, f->r.p);
+  if (MP_NEGP(d)) d = mp_add(d, d, f->r.p);
   else if (MP_CMP(d, >, f->r.p)) d = mp_sub(d, d, f->r.p);
   return (d);
 }
 
 static mp *fsub(field *ff, mp *d, mp *x, mp *y) {
   fctx *f = (fctx *)ff; d = mp_sub(d, x, y);
-  if (d->f & MP_NEG) d = mp_add(d, d, f->r.p);
+  if (MP_NEGP(d)) d = mp_add(d, d, f->r.p);
   else if (MP_CMP(d, >, f->r.p)) d = mp_sub(d, d, f->r.p);
   return (d);
 }
@@ -103,7 +80,7 @@ static mp *fsqr(field *ff, mp *d, mp *x) {
 }
 
 static mp *finv(field *ff, mp *d, mp *x)
-  { fctx *f = (fctx *)ff; mp_gcd(0, 0, &d, f->r.p, x); return (d); }
+  { fctx *f = (fctx *)ff; d = mp_modinv(d, x, f->r.p); return (d); }
 
 static mp *freduce(field *ff, mp *d, mp *x)
   { fctx *f = (fctx *)ff; return (mpreduce_do(&f->r, d, x)); }
@@ -132,14 +109,14 @@ static mp *fqdl(field *ff, mp *d, mp *x) {
 
 static mp *fhlv(field *ff, mp *d, mp *x) {
   fctx *f = (fctx *)ff;
-  if (!MP_LEN(x)) { MP_COPY(x); MP_DROP(d); return (x); }
+  if (MP_ZEROP(x)) { MP_COPY(x); MP_DROP(d); return (x); }
   if (x->v[0] & 1) { d = mp_add(d, x, f->r.p); x = d; }
   return (mp_lsr(d, x, 1));
 }
 
 /* --- Field operations table --- */
 
-static field_ops fops = {
+static const field_ops fops = {
   FTY_PRIME, "niceprime",
   fdestroy, frand, field_stdsamep,
   freduce, field_id,