X-Git-Url: https://git.distorted.org.uk/u/mdw/catacomb/blobdiff_plain/581c854ebf69254c5ae527a789994a0fc70368e7..578a86d91941a0f722b87973d88e84ec2cf9a608:/pgen.h

diff --git a/pgen.h b/pgen.h
index 9ce4e86..421819a 100644
--- a/pgen.h
+++ b/pgen.h
@@ -1,6 +1,6 @@
 /* -*-c-*-
  *
- * $Id: pgen.h,v 1.4 1999/12/22 16:01:11 mdw Exp $
+ * $Id: pgen.h,v 1.9 2004/04/08 01:36:15 mdw Exp $
  *
  * Prime generation glue
  *
@@ -27,15 +27,6 @@
  * MA 02111-1307, USA.
  */
 
-/*----- Revision history --------------------------------------------------* 
- *
- * $Log: pgen.h,v $
- * Revision 1.4  1999/12/22 16:01:11  mdw
- * Same file, completely different code.  Main interface for new prime-
- * search system.
- *
- */
-
 #ifndef CATACOMB_PGEN_H
 #define CATACOMB_PGEN_H
 
@@ -191,6 +182,19 @@ typedef struct pgen_safestepctx {
 
 extern int pgen_safestep(int /*rq*/, pgen_event */*ev*/, void */*p*/);
 
+/* --- @pgen_safejump@ --- *
+ *
+ * Jumps two numbers, %$q$% and %$p = 2q + 1$% such that neither has any
+ * small factors.
+ */
+
+typedef struct pgen_safejumpctx {
+  pfilt q, jq;
+  pfilt p, jp;
+} pgen_safejumpctx;
+
+extern int pgen_safejump(int /*rq*/, pgen_event */*ev*/, void */*p*/);
+
 /* --- @pgen_safetest@ --- *
  *
  * Applies Rabin-Miller tests to %$p$% and %$(p - 1)/2$%.
@@ -203,6 +207,24 @@ typedef struct pgen_safetestctx {
 
 extern int pgen_safetest(int /*rq*/, pgen_event */*ev*/, void */*p*/);
 
+/*----- Miscellaneous steppers and testers --------------------------------*/
+
+typedef struct pgen_gcdstepctx {
+  pfilt p, jp;				/* Prime filter and step filter */
+  mp *q, *jq;				/* %$p - 1$%, and a step value*/
+  mp *r;				/* Other argument for GCD */
+  mp *g;				/* GCD output (must be inited) */
+  mp *max;				/* Maximum permissible GCD */
+} pgen_gcdstepctx;
+
+/* --- @pgen_gcdstep@ --- *
+ *
+ * Steps @p@ and @q@, until @p@ has no small factors, and
+ * %$\gcd(p, r) \le max$%.
+ */
+
+extern int pgen_gcdstep(int /*rq*/, pgen_event */*ev*/, void */*p*/);
+
 /*----- Standard event handlers -------------------------------------------*/
 
 /* --- @pgen_evspin@ --- *
@@ -219,6 +241,13 @@ extern int pgen_evspin(int /*rq*/, pgen_event */*ev*/, void */*p*/);
 
 extern int pgen_ev(int /*rq*/, pgen_event */*ev*/, void */*p*/);
 
+/* --- @pgen_subev@ --- *
+ *
+ * Subsidiary event handler, mainly for Lim-Lee searches and so on.
+ */
+
+extern int pgen_subev(int /*rq*/, pgen_event */*ev*/, void */*p*/);
+
 /*----- The main driver ---------------------------------------------------*/
 
 /* --- @pgen@ --- *
@@ -246,6 +275,16 @@ extern mp *pgen(const char */*name*/, mp */*d*/, mp */*m*/,
 		unsigned /*steps*/, pgen_proc */*step*/, void */*sctx*/,
 		unsigned /*tests*/, pgen_proc */*test*/, void */*tctx*/);
 
+/* --- @pgen_primep@ --- *
+ *
+ * Arguments:	@mp *p@ = a number to check
+ *		@grand *gr@ = a random number source
+ *
+ * Returns:	Nonzero if @p@ is really prime.
+ */
+
+extern int pgen_primep(mp */*p*/, grand */*gr*/);
+
 /*----- That's all, folks -------------------------------------------------*/
 
 #ifdef __cplusplus