7 files changed, 25 insertions, 23 deletions

diff --git a/src/exhaustive/ansi.c b/src/exhaustive/ansi.c
index 51d20e5..d18ea02 100644
--- a/src/exhaustive/ansi.c
+++ b/src/exhaustive/ansi.c
@@ -183,9 +183,9 @@ static GENERATOR(ansi_gen_equation_f2m) {
 GENERATOR(ansi_gen_equation) {
 	switch (cfg->field) {
 		case FIELD_PRIME:
-			return ansi_gen_equation_fp(curve, cfg, args);
+			return ansi_gen_equation_fp(curve, cfg, args, state);
 		case FIELD_BINARY:
-			return ansi_gen_equation_f2m(curve, cfg, args);
+			return ansi_gen_equation_f2m(curve, cfg, args, state);
 		default:
 			pari_err_BUG("Field not prime or binary?");
 			return INT_MIN; /* NOT REACHABLE */
diff --git a/src/exhaustive/exhaustive.c b/src/exhaustive/exhaustive.c
index 623396e..8103f3b 100644
--- a/src/exhaustive/exhaustive.c
+++ b/src/exhaustive/exhaustive.c
@@ -230,14 +230,15 @@ int exhaustive_gen_retry(curve_t *curve, const config_t *cfg,
 
 		arg_t *arg = argss ? argss[state] : NULL;
 
-		int diff = generators[state](curve, cfg, arg);
+		int diff = generators[state](curve, cfg, arg, (offset_e)state);
 		int new_state = state + diff;
 		if (new_state < start_offset) new_state = start_offset;
 
 		if (diff > 0 && validators && validators[state]) {
 			check_t *validator = validators[state];
 			for (size_t i = 0; i < validator->nchecks; ++i) {
-				int new_diff = validator->checks[i](curve, cfg, arg);
+				int new_diff = validator->checks[i](curve, cfg, arg,
+													(offset_e)state);
 				if (new_diff <= 0) {
 					diff = new_diff;
 					break;
diff --git a/src/gen/equation.c b/src/gen/equation.c
index 76d0498..9d85c13 100644
--- a/src/gen/equation.c
+++ b/src/gen/equation.c
@@ -36,7 +36,7 @@ GENERATOR(a_gen_once) {
 		return 1;
 	}
 
-	int inp = a_gen_input(curve, cfg, args);
+	int inp = a_gen_input(curve, cfg, args, state);
 	if (inp > 0) {
 		a = gclone(curve->a);
 		curve_a = curve;
@@ -86,7 +86,7 @@ GENERATOR(b_gen_once) {
 		return 1;
 	}
 
-	int inp = b_gen_input(curve, cfg, args);
+	int inp = b_gen_input(curve, cfg, args, state);
 	if (inp > 0) {
 		b = gclone(curve->b);
 		curve_b = curve;
diff --git a/src/gen/field.c b/src/gen/field.c
index 9a908cc..898af9e 100644
--- a/src/gen/field.c
+++ b/src/gen/field.c
@@ -104,7 +104,7 @@ GENERATOR(field_gen_once) {
 		return 1;
 	}
 
-	int inp = field_gen_input(curve, cfg, args);
+	int inp = field_gen_input(curve, cfg, args, state);
 	if (inp > 0) {
 		field = gclone(curve->field);
 		curve_field = curve;
diff --git a/src/misc/types.h b/src/misc/types.h
index 103cf8a..74a0aa2 100644
--- a/src/misc/types.h
+++ b/src/misc/types.h
@@ -116,10 +116,11 @@ typedef struct {
  * @param curve A curve_t being generated
  * @param cfg An application config
  * @param args Current optional generator argument
+ * @param state The current generation state
  * @return state diff
  */
 #define GENERATOR(gen_name) \
-	int gen_name(curve_t *curve, const config_t *cfg, arg_t *args)
+	int gen_name(curve_t *curve, const config_t *cfg, arg_t *args, offset_e state)
 
 typedef GENERATOR((*gen_f));
 
diff --git a/test/src/exhaustive/test_ansi.c b/test/src/exhaustive/test_ansi.c
index 09e9e5c..3e3e4e1 100644
--- a/test/src/exhaustive/test_ansi.c
+++ b/test/src/exhaustive/test_ansi.c
@@ -33,7 +33,7 @@ TestSuite(ansi, .init = ansi_suite_setup, .fini = ansi_suite_teardown);
 Test(ansi, test_seed_random) {
 	curve_t curve = {};
 	config_t cfg = {.bits = 256};
-	int ret = ansi_gen_seed_random(&curve, &cfg, NULL);
+	int ret = ansi_gen_seed_random(&curve, &cfg, NULL, OFFSET_SEED);
 
 	cr_assert_eq(ret, 1, );
 	cr_assert_not_null(curve.seed, );
@@ -45,7 +45,7 @@ Test(ansi, test_seed_argument) {
 	curve_t curve = {};
 	char *seed = "abcdefabcdefabcdefabcdefabcdefabcdefabcd";
 	config_t cfg = {.seed = seed, .bits = 256};
-	int ret = ansi_gen_seed_argument(&curve, &cfg, NULL);
+	int ret = ansi_gen_seed_argument(&curve, &cfg, NULL, OFFSET_SEED);
 
 	cr_assert_eq(ret, 1, );
 	cr_assert_not_null(curve.seed, );
@@ -60,7 +60,7 @@ Test(ansi, test_seed_argument_hex) {
 	curve_t curve = {};
 	char *seed = "0xabcdefabcdefabcdefabcdefabcdefabcdefabcd";
 	config_t cfg = {.seed = seed, .bits = 256};
-	int ret = ansi_gen_seed_argument(&curve, &cfg, NULL);
+	int ret = ansi_gen_seed_argument(&curve, &cfg, NULL, OFFSET_SEED);
 
 	cr_assert_eq(ret, 1, );
 	cr_assert_not_null(curve.seed, );
@@ -76,7 +76,7 @@ Test(ansi, test_seed_input) {
 	char *seed = "abcdefabcdefabcdefabcdefabcdefabcdefabcd";
 	config_t cfg = {.bits = 256};
 	fprintf(write_in, "%s\n", seed);
-	int ret = ansi_gen_seed_input(&curve, &cfg, NULL);
+	int ret = ansi_gen_seed_input(&curve, &cfg, NULL, OFFSET_SEED);
 
 	cr_assert_eq(ret, 1, );
 	cr_assert_not_null(curve.seed, );
@@ -92,7 +92,7 @@ Test(ansi, test_seed_input_short) {
 	char *seed = "abcdef";
 	config_t cfg = {};
 	fprintf(write_in, "%s\n", seed);
-	int ret = ansi_gen_seed_input(&curve, &cfg, NULL);
+	int ret = ansi_gen_seed_input(&curve, &cfg, NULL, OFFSET_SEED);
 
 	cr_assert_eq(ret, 0, );
 }
@@ -175,10 +175,10 @@ ParameterizedTest(struct prime_params *param, ansi, test_seed_prime_examples) {
 	bits_t *p = bits_from_hex(param->p);
 	curve.field = bits_to_i(p);
 
-	int ret = ansi_gen_seed_argument(&curve, &cfg, NULL);
+	int ret = ansi_gen_seed_argument(&curve, &cfg, NULL, OFFSET_SEED);
 	cr_assert_eq(ret, 1, );
 
-	ret = ansi_gen_equation(&curve, &cfg, NULL);
+	ret = ansi_gen_equation(&curve, &cfg, NULL, OFFSET_SEED);
 	cr_assert_eq(ret, 1, );
 	GEN expected_r = bits_to_i(bits_from_hex(param->r));
 	cr_assert(gequal(curve.seed->ansi.r, expected_r), );
@@ -278,10 +278,10 @@ ParameterizedTest(struct binary_params *param, ansi,
 	GEN expected_b = bits_to_i(bits_from_hex(param->b));
 	bits_t *b = bits_from_i(expected_b);
 
-	int ret = ansi_gen_seed_argument(&curve, &cfg, NULL);
+	int ret = ansi_gen_seed_argument(&curve, &cfg, NULL, OFFSET_SEED);
 	cr_assert_eq(ret, 1, );
 
-	ret = ansi_gen_equation(&curve, &cfg, NULL);
+	ret = ansi_gen_equation(&curve, &cfg, NULL, OFFSET_SEED);
 	cr_assert_eq(ret, 1, );
 	GEN curve_b = field_elementi(curve.b);
 	cr_assert(gequal(curve_b, expected_b), );
diff --git a/test/src/gen/test_point.c b/test/src/gen/test_point.c
index d77f83d..d185e9a 100644
--- a/test/src/gen/test_point.c
+++ b/test/src/gen/test_point.c
@@ -14,7 +14,7 @@ Test(point, test_point_random) {
 	GEN e = ellinit(mkvec2s(1, 3), stoi(23), -1);
 	curve_t curve = {.order = stoi(27), .curve = e};
 	config_t cfg = {};
-	int ret = point_gen_random(&curve, &cfg, NULL);
+	int ret = point_gen_random(&curve, &cfg, NULL, OFFSET_POINTS);
 
 	cr_assert_eq(ret, 1, "Point wasn't generated.");
 	cr_assert_eq(curve.npoints, 1, "Incorrect number of points.");
@@ -34,7 +34,7 @@ Test(point, test_points_random) {
 	config_t cfg = {};
 	size_t npoints = 3;
 	arg_t arg = {.args = &npoints, .nargs = 1};
-	int ret = points_gen_random(&curve, &cfg, &arg);
+	int ret = points_gen_random(&curve, &cfg, &arg, OFFSET_POINTS);
 
 	cr_assert_eq(ret, 1, "Points weren't generated.");
 	cr_assert_eq(curve.npoints, npoints, "Incorrect number of points.");
@@ -62,7 +62,7 @@ Test(point, test_points_trial) {
 	config_t cfg = {};
 	pari_ulong prime = 3;
 	arg_t arg = {.args = &prime, .nargs = 1};
-	int ret = points_gen_trial(&curve, &cfg, &arg);
+	int ret = points_gen_trial(&curve, &cfg, &arg, OFFSET_POINTS);
 
 	cr_assert_eq(ret, 1, "Points weren't generated.");
 	cr_assert_eq(curve.npoints, 1, "Incorrect number of points.");
@@ -90,7 +90,7 @@ Test(point, test_points_prime) {
 	    .order = stoi(27), .curve = e, .ngens = 1, .generators = gens};
 	config_t cfg = {};
 	pari_ulong prime = 3;
-	int ret = points_gen_prime(&curve, &cfg, NULL);
+	int ret = points_gen_prime(&curve, &cfg, NULL, OFFSET_POINTS);
 
 	cr_assert_eq(ret, 1, "Points weren't generated.");
 	cr_assert_eq(curve.npoints, 1, "Incorrect number of points.");
@@ -119,7 +119,7 @@ Test(point, test_points_all) {
 	config_t cfg = {};
 	GEN orders = mkvec3s(3, 9, 27);
 	size_t npoints = 3;
-	int ret = points_gen_allgroups(&curve, &cfg, NULL);
+	int ret = points_gen_allgroups(&curve, &cfg, NULL, OFFSET_POINTS);
 
 	cr_assert_eq(ret, 1, "Points weren't generated.");
 	cr_assert_eq(curve.npoints, npoints, "Incorrect number of points.");
@@ -150,7 +150,7 @@ Test(point, test_points_nonprime) {
 	config_t cfg = {};
 	GEN orders = mkvec2s(9, 27);
 	size_t npoints = 2;
-	int ret = points_gen_nonprime(&curve, &cfg, NULL);
+	int ret = points_gen_nonprime(&curve, &cfg, NULL, OFFSET_POINTS);
 
 	cr_assert_eq(ret, 1, "Points weren't generated.");
 	cr_assert_eq(curve.npoints, npoints, "Incorrect number of points.");