X-Git-Url: https://git.distorted.org.uk/u/mdw/catacomb/blobdiff_plain/953ec7bd1d3ce50efd70f23b4c83ad24693571c2..f94b972d1c0389e4e9203cc9919ceaadbe655b61:/f-prime.c

diff --git a/f-prime.c b/f-prime.c
index 1dcfded..9b1ceb6 100644
--- a/f-prime.c
+++ b/f-prime.c
@@ -32,95 +32,104 @@
 #include <mLib/sub.h>
 
 #include "field.h"
-#include "mpmont.h"
 #include "mprand.h"
+#include "field-guts.h"
 
 /*----- Main code ---------------------------------------------------------*/
 
-typedef struct fctx {
-  field f;
-  mpmont mm;
-} fctx;
-
 /* --- Field operations --- */
 
-static void fdestroy(field *ff)
-  { fctx *f = (fctx *)ff; mpmont_destroy(&f->mm); DESTROY(f); }
+static void fdestroy(field *ff) {
+  fctx_prime *f = (fctx_prime *)ff;
+  mpmont_destroy(&f->mm);
+  DESTROY(f);
+}
 
-static mp *frand(field *ff, mp *d, grand *r)
-  { fctx *f = (fctx *)ff; return (mprand_range(d, f->mm.m, r, 0)); }
+static mp *frand(field *ff, mp *d, grand *r) {
+  fctx_prime *f = (fctx_prime *)ff;
+  return (mprand_range(d, f->mm.m, r, 0));
+}
 
 static mp *fin(field *ff, mp *d, mp *x) {
-  fctx *f = (fctx *)ff;
+  fctx_prime *f = (fctx_prime *)ff;
   mp_div(0, &d, x, f->mm.m);
   return (mpmont_mul(&f->mm, d, d, f->mm.r2));
 }
 
-static mp *fout(field *ff, mp *d, mp *x)
-  { fctx *f = (fctx *)ff; return (mpmont_reduce(&f->mm, d, x)); }
+static mp *fout(field *ff, mp *d, mp *x) {
+  fctx_prime *f = (fctx_prime *)ff;
+  return (mpmont_reduce(&f->mm, d, 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->mm.m, x)); }
+static mp *fneg(field *ff, mp *d, mp *x) {
+  fctx_prime *f = (fctx_prime *)ff;
+  return (mp_sub(d, f->mm.m, x));
+}
 
 static mp *fadd(field *ff, mp *d, mp *x, mp *y) {
-  fctx *f = (fctx *)ff; d = mp_add(d, x, y);
+  fctx_prime *f = (fctx_prime *)ff; d = mp_add(d, x, y);
   if (MP_NEGP(d)) d = mp_add(d, d, f->mm.m);
   else if (MP_CMP(d, >, f->mm.m)) d = mp_sub(d, d, f->mm.m);
   return (d);
 }
 
 static mp *fsub(field *ff, mp *d, mp *x, mp *y) {
-  fctx *f = (fctx *)ff; d = mp_sub(d, x, y);
+  fctx_prime *f = (fctx_prime *)ff; d = mp_sub(d, x, y);
   if (MP_NEGP(d)) d = mp_add(d, d, f->mm.m);
   else if (MP_CMP(d, >, f->mm.m)) d = mp_sub(d, d, f->mm.m);
   return (d);
 }
 
-static mp *fmul(field *ff, mp *d, mp *x, mp *y)
-  { fctx *f = (fctx *)ff; return (mpmont_mul(&f->mm, d, x, y)); }
+static mp *fmul(field *ff, mp *d, mp *x, mp *y) {
+  fctx_prime *f = (fctx_prime *)ff;
+  return (mpmont_mul(&f->mm, d, x, y));
+}
 
 static mp *fsqr(field *ff, mp *d, mp *x) {
-  fctx *f = (fctx *)ff; d = mp_sqr(d, x);
+  fctx_prime *f = (fctx_prime *)ff; d = mp_sqr(d, x);
   return (mpmont_reduce(&f->mm, d, d));
 }
 
 static mp *finv(field *ff, mp *d, mp *x) {
-  fctx *f = (fctx *)ff; d = mpmont_reduce(&f->mm, d, x);
+  fctx_prime *f = (fctx_prime *)ff; d = mpmont_reduce(&f->mm, d, x);
   d = mp_modinv(d, d, f->mm.m); return (mpmont_mul(&f->mm, d, d, f->mm.r2));
 }
 
-static mp *freduce(field *ff, mp *d, mp *x)
-  { fctx *f = (fctx *)ff; mp_div(0, &d, x, f->mm.m); return (d); }
+static mp *freduce(field *ff, mp *d, mp *x) {
+  fctx_prime *f = (fctx_prime *)ff;
+  mp_div(0, &d, x, f->mm.m);
+  return (d);
+}
 
 static mp *fsqrt(field *ff, mp *d, mp *x) {
-  fctx *f = (fctx *)ff; d = mpmont_reduce(&f->mm, d, x);
+  fctx_prime *f = (fctx_prime *)ff; d = mpmont_reduce(&f->mm, d, x);
   d = mp_modsqrt(d, d, f->mm.m); if (!d) return (d);
   return (mpmont_mul(&f->mm, d, d, f->mm.r2));
 }
 
 static mp *fdbl(field *ff, mp *d, mp *x) {
-  fctx *f = (fctx *)ff; d = mp_lsl(d, x, 1);
+  fctx_prime *f = (fctx_prime *)ff; d = mp_lsl(d, x, 1);
   if (MP_CMP(d, >, f->mm.m)) d = mp_sub(d, d, f->mm.m);
   return (d);
 }
 
 static mp *ftpl(field *ff, mp *d, mp *x) {
-  fctx *f = (fctx *)ff; MP_DEST(d, MP_LEN(x) + 1, x->f);
+  fctx_prime *f = (fctx_prime *)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->mm.m)) d = mp_sub(d, d, f->mm.m);
   return (d);
 }
 
 static mp *fqdl(field *ff, mp *d, mp *x) {
-  fctx *f = (fctx *)ff; d = mp_lsl(d, x, 2);
+  fctx_prime *f = (fctx_prime *)ff; d = mp_lsl(d, x, 2);
   while (MP_CMP(d, >, f->mm.m)) d = mp_sub(d, d, f->mm.m);
   return (d);
 }
 
 static mp *fhlv(field *ff, mp *d, mp *x) {
-  fctx *f = (fctx *)ff;
+  fctx_prime *f = (fctx_prime *)ff;
   if (MP_ZEROP(x)) { MP_COPY(x); MP_DROP(d); return (x); }
   if (x->v[0] & 1) { d = mp_add(d, x, f->mm.m); x = d; }
   return (mp_lsr(d, x, 1));
@@ -149,11 +158,11 @@ static const field_ops fops = {
 
 field *field_prime(mp *p)
 {
-  fctx *f;
+  fctx_prime *f;
 
   if (!MP_POSP(p) || !MP_ODDP(p))
     return (0);
-  f = CREATE(fctx);
+  f = CREATE(fctx_prime);
   f->f.ops = &fops;
   mpmont_create(&f->mm, p);
   f->f.zero = MP_ZERO;