prime generation: Deploy the new Baillie--PSW testers.

[catacomb] / math / group-guts.h

diff --git a/math/group-guts.h b/math/group-guts.h
index c34d89c24bc892aff0f42cc3580f05daa7905b60..c9f28c499c51ed30b4a1e0d612560e4de219ef7a 100644 (file)
--- a/math/group-guts.h
+++ b/math/group-guts.h
@@ -50,6 +50,10 @@
 #  include "gfreduce.h"
 #endif
 
 #  include "gfreduce.h"
 #endif
 

+#define GROUP_GUTS_MPSTRUCT
+typedef struct { mp *x; } ge_prime;
+typedef struct { mp *x; } ge_bin;
+

 #ifndef CATACOMB_GROUP_H
 #  include "group.h"
 #endif
 #ifndef CATACOMB_GROUP_H
 #  include "group.h"
 #endif


@@ -57,21 +61,22 @@
 /*----- Data structures ---------------------------------------------------*/
 
 typedef struct gctx_prime {
 /*----- Data structures ---------------------------------------------------*/
 
 typedef struct gctx_prime {

-  group g;
-  mp *gen;
+  struct group_ g;
+  ge_prime gen;

   mpmont mm;
   mpmont mm;

+  ge_prime i;

 } gctx_prime;
 
 typedef struct gctx_ec {
 } gctx_prime;
 
 typedef struct gctx_ec {

-  group g;
+  struct group_ g;

   ec id, gen;
   ec_info ei;
 } gctx_ec;
 
 typedef struct gctx_bin {
   ec id, gen;
   ec_info ei;
 } gctx_ec;
 
 typedef struct gctx_bin {

-  group g;
-  mp *gen;
-  mp *one;
+  struct group_ g;
+  ge_bin gen;
+  ge_bin one;

   gfreduce r;
 } gctx_bin;
 
   gfreduce r;
 } gctx_bin;