X-Git-Url: https://git.distorted.org.uk/~mdw/catacomb/blobdiff_plain/eb867836b08bab8a2a8e4bca3733994cbc83eb1c..HEAD:/math/g-prime.c

diff --git a/math/g-prime.c b/math/g-prime.c
index 9072b4ac..3cc540d5 100644
--- a/math/g-prime.c
+++ b/math/g-prime.c
@@ -32,7 +32,7 @@
 #include "mpmont.h"
 #include "pgen.h"
 
-#define ge mp *
+#define ge ge_prime
 #include "group-guts.h"
 
 /*----- Main code ---------------------------------------------------------*/
@@ -41,27 +41,30 @@
 
 static void gdestroygroup(group *gg) {
   gctx_prime *g = (gctx_prime *)gg;
-  mp_drop(g->gen); mp_drop(g->g.r); mp_drop(g->g.h);
+  mp_drop(g->gen.x); mp_drop(g->g.r); mp_drop(g->g.h);
   mpmont_destroy(&g->mm);
   DESTROY(g);
 }
 
-static mp **gcreate(group *gg)
-  { mp **x = CREATE(mp *); *x = MP_COPY(*gg->i); return (x); }
+static ge_prime *gcreate(group *gg) {
+  gctx_prime *g = (gctx_prime *)gg; ge_prime *x = CREATE(ge_prime);
+  x->x = MP_COPY(g->i.x); return (x);
+}
 
-static void gcopy(group *gg, mp **d, mp **x)
-  { mp *t = MP_COPY(*x); MP_DROP(*d); *d = t; }
+static void gcopy(group *gg, ge_prime *d, ge_prime *x)
+  { mp *t = MP_COPY(x->x); MP_DROP(d->x); d->x = t; }
 
-static void gburn(group *gg, mp **x) { (*x)->f |= MP_BURN; }
+static void gburn(group *gg, ge_prime *x) { x->x->f |= MP_BURN; }
 
-static void gdestroy(group *gg, mp **x) { MP_DROP(*x); DESTROY(x); }
+static void gdestroy(group *gg, ge_prime *x) { MP_DROP(x->x); DESTROY(x); }
 
 static int gsamep(group *gg, group *hh) {
   gctx_prime *g = (gctx_prime *)gg, *h = (gctx_prime *)hh;
   return (MP_EQ(g->mm.m, h->mm.m));
 }
 
-static int geq(group *gg, mp **x, mp **y) { return (MP_EQ(*x, *y)); }
+static int geq(group *gg, ge_prime *x, ge_prime *y)
+  { return (MP_EQ(x->x, y->x)); }
 
 static const char *gcheck(group *gg, grand *gr) {
   gctx_prime *g = (gctx_prime *)gg; int rc; mp *t;
@@ -71,77 +74,85 @@ static const char *gcheck(group *gg, grand *gr) {
   return (group_stdcheck(gg, gr));
 }
 
-static void gmul(group *gg, mp **d, mp **x, mp **y)
-  { gctx_prime *g = (gctx_prime *)gg; *d = mpmont_mul(&g->mm, *d, *x, *y); }
+static void gmul(group *gg, ge_prime *d, ge_prime *x, ge_prime *y) {
+  gctx_prime *g = (gctx_prime *)gg;
+  d->x = mpmont_mul(&g->mm, d->x, x->x, y->x);
+}
 
-static void gsqr(group *gg, mp **d, mp **x) {
-  gctx_prime *g = (gctx_prime *)gg; mp *r = mp_sqr(*d, *x);
-  *d = mpmont_reduce(&g->mm, r, r);
+static void gsqr(group *gg, ge_prime *d, ge_prime *x) {
+  gctx_prime *g = (gctx_prime *)gg; mp *r = mp_sqr(d->x, x->x);
+  d->x = mpmont_reduce(&g->mm, r, r);
 }
 
-static void ginv(group *gg, mp **d, mp **x) {
-  gctx_prime *g = (gctx_prime *)gg; mp *r = mpmont_reduce(&g->mm, *d, *x);
-  r = mp_modinv(r, r, g->mm.m); *d = mpmont_mul(&g->mm, r, r, g->mm.r2);
+static void ginv(group *gg, ge_prime *d, ge_prime *x) {
+  gctx_prime *g = (gctx_prime *)gg;
+  mp *r = mpmont_reduce(&g->mm, d->x, x->x);
+  r = mp_modinv(r, r, g->mm.m); d->x = mpmont_mul(&g->mm, r, r, g->mm.r2);
 }
 
-static void gexp(group *gg, mp **d, mp **x, mp *n)
-  { gctx_prime *g = (gctx_prime *)gg; *d = mpmont_expr(&g->mm, *d, *x, n); }
+static void gexp(group *gg, ge_prime *d, ge_prime *x, mp *n)
+{
+  gctx_prime *g = (gctx_prime *)gg;
+  d->x = mpmont_expr(&g->mm, d->x, x->x, n);
+}
 
-static void gmexp(group *gg, mp **d, const group_expfactor *f, size_t n) {
+static void gmexp(group *gg, ge_prime *d, const group_expfactor *f, size_t n)
+{
   gctx_prime *g = (gctx_prime *)gg; size_t i;
   mp_expfactor *ff = xmalloc(n * sizeof(mp_expfactor));
-  for (i = 0; i < n; i++) { ff[i].base = *f[i].base; ff[i].exp = f[i].exp; }
-  *d = mpmont_mexpr(&g->mm, *d, ff, n); xfree(ff);
+  for (i = 0; i < n; i++)
+    { ff[i].base = f[i].base->x; ff[i].exp = f[i].exp; }
+  d->x = mpmont_mexpr(&g->mm, d->x, ff, n); xfree(ff);
 }
 
-static int gread(group *gg, mp **d, const mptext_ops *ops, void *p) {
+static int gread(group *gg, ge_prime *d, const mptext_ops *ops, void *p) {
   gctx_prime *g = (gctx_prime *)gg; mp *t;
   if ((t = mp_read(MP_NEW, 0, ops, p)) == 0) return (-1);
-  mp_drop(*d); *d = mpmont_mul(&g->mm, t, t, g->mm.r2); return (0);
+  mp_drop(d->x); d->x = mpmont_mul(&g->mm, t, t, g->mm.r2); return (0);
 }
 
-static int gwrite(group *gg, mp **x, const mptext_ops *ops, void *p) {
+static int gwrite(group *gg, ge_prime *x, const mptext_ops *ops, void *p) {
   gctx_prime *g = (gctx_prime *)gg;
-  mp *t = mpmont_reduce(&g->mm, MP_NEW, *x);
+  mp *t = mpmont_reduce(&g->mm, MP_NEW, x->x);
   int rc = mp_write(t, 10, ops, p); MP_DROP(t); return (rc);
 }
 
-static mp *gtoint(group *gg, mp *d, mp **x) {
+static mp *gtoint(group *gg, mp *d, ge_prime *x) {
   gctx_prime *g = (gctx_prime *)gg;
-  return (mpmont_reduce(&g->mm, d, *x));
+  return (mpmont_reduce(&g->mm, d, x->x));
 }
 
-static int gfromint(group *gg, mp **d, mp *x) {
-  gctx_prime *g = (gctx_prime *)gg; mp_div(0, d, x, g->mm.m);
-  *d = mpmont_mul(&g->mm, *d, *d, g->mm.r2); return (0);
+static int gfromint(group *gg, ge_prime *d, mp *x) {
+  gctx_prime *g = (gctx_prime *)gg; mp_div(0, &d->x, x, g->mm.m);
+  d->x = mpmont_mul(&g->mm, d->x, d->x, g->mm.r2); return (0);
 }
 
-static int gtobuf(group *gg, buf *b, mp **x) {
+static int gtobuf(group *gg, buf *b, ge_prime *x) {
   gctx_prime *g = (gctx_prime *)gg;
-  mp *t = mpmont_reduce(&g->mm, MP_NEW, *x);
+  mp *t = mpmont_reduce(&g->mm, MP_NEW, x->x);
   int rc = buf_putmp(b, t); MP_DROP(t); return (rc);
 }
 
-static int gfrombuf(group *gg, buf *b, mp **d) {
+static int gfrombuf(group *gg, buf *b, ge_prime *d) {
   gctx_prime * g = (gctx_prime *)gg; mp *x;
   if ((x = buf_getmp(b)) == 0) return (-1);
-  mp_div(0, &x, x, g->mm.m); mp_drop(*d);
-  *d = mpmont_mul(&g->mm, x, x, g->mm.r2); return(0);
+  mp_div(0, &x, x, g->mm.m); mp_drop(d->x);
+  d->x = mpmont_mul(&g->mm, x, x, g->mm.r2); return(0);
 }
 
-static int gtoraw(group *gg, buf *b, mp **x) {
+static int gtoraw(group *gg, buf *b, ge_prime *x) {
   gctx_prime *g = (gctx_prime *)gg; octet *q;
-  mp *t = mpmont_reduce(&g->mm, MP_NEW, *x);
+  mp *t = mpmont_reduce(&g->mm, MP_NEW, x->x);
   if ((q = buf_get(b, g->g.noctets)) == 0) { MP_DROP(t); return (-1); }
   mp_storeb(t, q, g->g.noctets); MP_DROP(t); return (0);
 }
 
-static int gfromraw(group *gg, buf *b, mp **d) {
+static int gfromraw(group *gg, buf *b, ge_prime *d) {
   gctx_prime * g = (gctx_prime *)gg; mp *x; octet *q;
   if ((q = buf_get(b, g->g.noctets)) == 0) return (-1);
   x = mp_loadb(MP_NEW, q, g->g.noctets);
-  mp_div(0, &x, x, g->mm.m); mp_drop(*d);
-  *d = mpmont_mul(&g->mm, x, x, g->mm.r2); return(0);
+  mp_div(0, &x, x, g->mm.m); mp_drop(d->x);
+  d->x = mpmont_mul(&g->mm, x, x, g->mm.r2); return(0);
 }
 
 /* --- @group_prime@ --- *
@@ -176,8 +187,8 @@ group *group_prime(const gprime_param *gp)
   g->g.nbits = mp_bits(gp->p);
   g->g.noctets = (g->g.nbits + 7) >> 3;
   mpmont_create(&g->mm, gp->p);
-  g->g.i = &g->mm.r;
-  g->gen = mpmont_mul(&g->mm, MP_NEW, gp->g, g->mm.r2);
+  g->i.x = g->mm.r; g->g.i = &g->i;
+  g->gen.x = mpmont_mul(&g->mm, MP_NEW, gp->g, g->mm.r2);
   g->g.g = &g->gen;
   g->g.r = MP_COPY(gp->q);
   g->g.h = MP_NEW; mp_div(&g->g.h, 0, gp->p, gp->q);