X-Git-Url: https://git.distorted.org.uk/u/mdw/catacomb/blobdiff_plain/34e4f738bcba58e6d8c4cabbb0b3232a65b42a9d..4e66da02f19648ee1be862e67ba1d1fc5549fb7f:/f-niceprime.c

diff --git a/f-niceprime.c b/f-niceprime.c
index 4ffc028..8f0b43d 100644
--- a/f-niceprime.c
+++ b/f-niceprime.c
@@ -1,6 +1,6 @@
 /* -*-c-*-
  *
- * $Id: f-niceprime.c,v 1.3 2004/04/01 12:50:09 mdw Exp $
+ * $Id: f-niceprime.c,v 1.5 2004/04/02 01:03:49 mdw Exp $
  *
  * Prime fields with efficient reduction for special-form primes
  *
@@ -30,6 +30,14 @@
 /*----- Revision history --------------------------------------------------* 
  *
  * $Log: f-niceprime.c,v $
+ * Revision 1.5  2004/04/02 01:03:49  mdw
+ * Miscellaneous constification.
+ *
+ * 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.
@@ -53,142 +61,88 @@
 #include "mpreduce.h"
 #include "mprand.h"
 
-/*----- Data structures ---------------------------------------------------*/
+/*----- Main code ---------------------------------------------------------*/
 
 typedef struct fctx {
   field f;
   mpreduce r;
 } fctx;
 
-/*----- Main code ---------------------------------------------------------*/
-
 /* --- Field operations --- */
 
 static void fdestroy(field *ff)
-{
-  fctx *f = (fctx *)ff;
-  mpreduce_destroy(&f->r);
-  DESTROY(f);
-}
+  { fctx *f = (fctx *)ff; mpreduce_destroy(&f->r); DESTROY(f); }
 
 static mp *frand(field *ff, mp *d, grand *r)
-{
-  fctx *f = (fctx *)ff;
-  return (mprand_range(d, f->r.p, r, 0));
-}
+  { 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_LEN(x)); }
 
 static mp *fneg(field *ff, mp *d, mp *x)
-{
-  fctx *f = (fctx *)ff;
-  return (mp_sub(d, f->r.p, 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);
-  else if (MP_CMP(d, >, f->r.p))
-    d = mp_sub(d, d, f->r.p);
+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);
+  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);
-  else if (MP_CMP(d, >, f->r.p))
-    d = mp_sub(d, d, f->r.p);
+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);
+  else if (MP_CMP(d, >, f->r.p)) d = mp_sub(d, d, f->r.p);
   return (d);
 }
 
-static mp *fmul(field *ff, mp *d, mp *x, mp *y)
-{
-  fctx *f = (fctx *)ff;
-  d = mp_mul(d, x, y);
+static mp *fmul(field *ff, mp *d, mp *x, mp *y) {
+  fctx *f = (fctx *)ff; d = mp_mul(d, x, y);
   return (mpreduce_do(&f->r, d, d));
 }
 
-static mp *fsqr(field *ff, mp *d, mp *x)
-{
-  fctx *f = (fctx *)ff;
-  d = mp_sqr(d, x);
+static mp *fsqr(field *ff, mp *d, mp *x) {
+  fctx *f = (fctx *)ff; d = mp_sqr(d, x);
   return (mpreduce_do(&f->r, d, d));
 }
 
 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; mp_gcd(0, 0, &d, f->r.p, x); return (d); }
 
 static mp *freduce(field *ff, mp *d, mp *x)
-{
-  fctx *f = (fctx *)ff;
-  return (mpreduce_do(&f->r, d, x));
-}
+  { fctx *f = (fctx *)ff; return (mpreduce_do(&f->r, d, x)); }
 
 static mp *fsqrt(field *ff, mp *d, mp *x)
-{
-  fctx *f = (fctx *)ff;
-  return (mp_modsqrt(d, x, f->r.p));
-}
+  { fctx *f = (fctx *)ff; return (mp_modsqrt(d, x, f->r.p)); }
 
-static mp *fdbl(field *ff, mp *d, mp *x)
-{
-  fctx *f = (fctx *)ff;
-  d = mp_lsl(d, x, 1);
-  if (MP_CMP(d, >, f->r.p))
-    d = mp_sub(d, d, f->r.p);
+static mp *fdbl(field *ff, mp *d, mp *x) {
+  fctx *f = (fctx *)ff; d = mp_lsl(d, x, 1);
+  if (MP_CMP(d, >, f->r.p)) d = mp_sub(d, d, f->r.p);
   return (d);
 }
 
-static mp *ftpl(field *ff, mp *d, mp *x)
-{
-  fctx *f = (fctx *)ff;
-  MP_DEST(d, MP_LEN(x) + 1, x->f);
+static mp *ftpl(field *ff, mp *d, mp *x) {
+  fctx *f = (fctx *)ff; MP_DEST(d, MP_LEN(x) + 1, x->f);
   MPX_UMULN(d->v, d->vl, x->v, x->vl, 3);
-  while (MP_CMP(d, >, f->r.p))
-    d = mp_sub(d, d, f->r.p);
+  while (MP_CMP(d, >, f->r.p)) d = mp_sub(d, d, f->r.p);
   return (d);
 }
 
-static mp *fqdl(field *ff, mp *d, mp *x)
-{
-  fctx *f = (fctx *)ff;
-  d = mp_lsl(d, x, 2);
-  while (MP_CMP(d, >, f->r.p))
-    d = mp_sub(d, d, f->r.p);
+static mp *fqdl(field *ff, mp *d, mp *x) {
+  fctx *f = (fctx *)ff; d = mp_lsl(d, x, 2);
+  while (MP_CMP(d, >, f->r.p)) d = mp_sub(d, d, f->r.p);
   return (d);
 }
 
-static mp *fhlv(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 (x->v[0] & 1) {
-    d = mp_add(d, x, f->r.p);
-    x = d;
-  }
+  if (!MP_LEN(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,