Renamed mp_sieve.c to mp_is_small_prime.c for organisational purposes.

Author: czurnieden

demo/test.c

@@ -1601,18 +1601,21 @@ static int test_mp_next_small_prime(void)
    };
 
 #if ( (defined MP_64BIT) && (defined MP_SIEVE_USE_LARGE_SIEVE) )
-   /* primesum up to 2^33. Would fit into a 64-bit type */
-   /*const char *primesum_64 = "1649816561794735645";*/
    /* primesum up to 2^64 
       $ time /home/czurnieden/GITHUB/primesum/primesum 2^64
        3879578600671960388666457126750869198
 
        real	37m6,448s
        user	107m17,056s
        sys	0m12,152s
+      I think we should use something smaller.
    */
-   const char *primesum_64 = "3879578600671960388666457126750869198";
+   /* const char *primesum_64 = "3879578600671960388666457126750869198"; */
+
+   /* primesum up to 2^33. */
+   const char *primesum_64 = "1649816561794735645";
 #else
+   /* TODO: Needs a minute here. Might cause a time-out in Github CI tests: check */
    const char *primesum_32 = "425649736193687430";
 #endif 
 
@@ -1636,13 +1639,15 @@ static int test_mp_next_small_prime(void)
 
    DOR(mp_init_multi(&primesum, &t, NULL));
    start = clock();
-   for (p = 0;ret < (mp_sieve_prime)MP_SIEVE_BIGGEST_PRIME;p++) {
+   for (p = 0;ret < (mp_sieve_prime)MP_SIEVE_BIGGEST_PRIME;) {
       DO(mp_next_small_prime(p, &ret, &sieve));
+      p = ret + 1;
 #if ( (defined MP_64BIT) && (defined MP_SIEVE_USE_LARGE_SIEVE) )
       mp_set_u64(&t, ret);
 #else
       mp_set_u32(&t, ret);  
 #endif
+printf(" %"MP_SIEVE_PR_UINT"\n", ret);
       DO(mp_add(&primesum, &t, &primesum));
    }
    stop = clock();
@@ -2427,9 +2432,10 @@ static int unit_tests(int argc, char **argv)
       T1(mp_prime_next_prime, MP_PRIME_NEXT_PRIME),
       T1(mp_prime_rand, MP_PRIME_RAND),
       T1(mp_rand, MP_RAND),
-      T1(mp_is_small_prime, ),
-      T1(mp_next_small_prime, MP_NEXT_SMALL_PRIME_C),
-      T1(mp_prec_small_prime, MP_PREC_SMALL_PRIME_C),
+
+      T1(mp_is_small_prime, MP_IS_SMALL_PRIME),
+      T1(mp_next_small_prime, MP_NEXT_SMALL_PRIME),
+      T1(mp_prec_small_prime, MP_PREC_SMALL_PRIME),
 
       T1(mp_read_radix, MP_READ_RADIX),
       T1(mp_read_write_ubin, MP_TO_UBIN),

libtommath_VS2008.vcproj

@@ -532,6 +532,10 @@
 			RelativePath="mp_invmod.c"
 			>
 		</File>
+		<File
+			RelativePath="mp_is_small_prime.c"
+			>
+		</File>
 		<File
 			RelativePath="mp_is_square.c"
 			>
@@ -748,10 +752,6 @@
 			RelativePath="mp_shrink.c"
 			>
 		</File>
-		<File
-			RelativePath="mp_sieve.c"
-			>
-		</File>
 		<File
 			RelativePath="mp_sieve_clear.c"
 			>

makefile

@@ -33,16 +33,16 @@ mp_error_to_string.o mp_exch.o mp_expt_n.o mp_exptmod.o mp_exteuclid.o mp_fread.
 mp_from_ubin.o mp_fwrite.o mp_gcd.o mp_get_double.o mp_get_i32.o mp_get_i64.o mp_get_l.o mp_get_mag_u32.o \
 mp_get_mag_u64.o mp_get_mag_ul.o mp_grow.o mp_hash.o mp_init.o mp_init_copy.o mp_init_i32.o mp_init_i64.o \
 mp_init_l.o mp_init_multi.o mp_init_set.o mp_init_size.o mp_init_u32.o mp_init_u64.o mp_init_ul.o \
-mp_invmod.o mp_is_square.o mp_kronecker.o mp_lcm.o mp_log_n.o mp_lshd.o mp_mod.o mp_mod_2d.o \
-mp_montgomery_calc_normalization.o mp_montgomery_reduce.o mp_montgomery_setup.o mp_mul.o mp_mul_2.o \
-mp_mul_2d.o mp_mul_d.o mp_mulmod.o mp_neg.o mp_next_small_prime.o mp_or.o mp_pack.o mp_pack_count.o \
-mp_prec_small_prime.o mp_prime_fermat.o mp_prime_frobenius_underwood.o mp_prime_is_prime.o \
-mp_prime_miller_rabin.o mp_prime_next_prime.o mp_prime_rabin_miller_trials.o mp_prime_rand.o \
-mp_prime_strong_lucas_selfridge.o mp_radix_size.o mp_radix_size_overestimate.o mp_rand.o \
+mp_invmod.o mp_is_small_prime.o mp_is_square.o mp_kronecker.o mp_lcm.o mp_log_n.o mp_lshd.o mp_mod.o \
+mp_mod_2d.o mp_montgomery_calc_normalization.o mp_montgomery_reduce.o mp_montgomery_setup.o mp_mul.o \
+mp_mul_2.o mp_mul_2d.o mp_mul_d.o mp_mulmod.o mp_neg.o mp_next_small_prime.o mp_or.o mp_pack.o \
+mp_pack_count.o mp_prec_small_prime.o mp_prime_fermat.o mp_prime_frobenius_underwood.o \
+mp_prime_is_prime.o mp_prime_miller_rabin.o mp_prime_next_prime.o mp_prime_rabin_miller_trials.o \
+mp_prime_rand.o mp_prime_strong_lucas_selfridge.o mp_radix_size.o mp_radix_size_overestimate.o mp_rand.o \
 mp_rand_source.o mp_read_radix.o mp_reduce.o mp_reduce_2k.o mp_reduce_2k_l.o mp_reduce_2k_setup.o \
 mp_reduce_2k_setup_l.o mp_reduce_is_2k.o mp_reduce_is_2k_l.o mp_reduce_setup.o mp_root_n.o mp_rshd.o \
 mp_sbin_size.o mp_set.o mp_set_double.o mp_set_i32.o mp_set_i64.o mp_set_l.o mp_set_u32.o mp_set_u64.o \
-mp_set_ul.o mp_shrink.o mp_sieve.o mp_sieve_clear.o mp_sieve_init.o mp_signed_rsh.o mp_sqrmod.o mp_sqrt.o \
+mp_set_ul.o mp_shrink.o mp_sieve_clear.o mp_sieve_init.o mp_signed_rsh.o mp_sqrmod.o mp_sqrt.o \
 mp_sqrtmod_prime.o mp_sub.o mp_sub_d.o mp_submod.o mp_to_radix.o mp_to_sbin.o mp_to_ubin.o mp_ubin_size.o \
 mp_unpack.o mp_xor.o mp_zero.o s_mp_add.o s_mp_copy_digs.o s_mp_div_3.o s_mp_div_recursive.o \
 s_mp_div_school.o s_mp_div_small.o s_mp_exptmod.o s_mp_exptmod_fast.o s_mp_get_bit.o s_mp_invmod.o \

makefile.mingw

@@ -35,16 +35,16 @@ mp_error_to_string.o mp_exch.o mp_expt_n.o mp_exptmod.o mp_exteuclid.o mp_fread.
 mp_from_ubin.o mp_fwrite.o mp_gcd.o mp_get_double.o mp_get_i32.o mp_get_i64.o mp_get_l.o mp_get_mag_u32.o \
 mp_get_mag_u64.o mp_get_mag_ul.o mp_grow.o mp_hash.o mp_init.o mp_init_copy.o mp_init_i32.o mp_init_i64.o \
 mp_init_l.o mp_init_multi.o mp_init_set.o mp_init_size.o mp_init_u32.o mp_init_u64.o mp_init_ul.o \
-mp_invmod.o mp_is_square.o mp_kronecker.o mp_lcm.o mp_log_n.o mp_lshd.o mp_mod.o mp_mod_2d.o \
-mp_montgomery_calc_normalization.o mp_montgomery_reduce.o mp_montgomery_setup.o mp_mul.o mp_mul_2.o \
-mp_mul_2d.o mp_mul_d.o mp_mulmod.o mp_neg.o mp_next_small_prime.o mp_or.o mp_pack.o mp_pack_count.o \
-mp_prec_small_prime.o mp_prime_fermat.o mp_prime_frobenius_underwood.o mp_prime_is_prime.o \
-mp_prime_miller_rabin.o mp_prime_next_prime.o mp_prime_rabin_miller_trials.o mp_prime_rand.o \
-mp_prime_strong_lucas_selfridge.o mp_radix_size.o mp_radix_size_overestimate.o mp_rand.o \
+mp_invmod.o mp_is_small_prime.o mp_is_square.o mp_kronecker.o mp_lcm.o mp_log_n.o mp_lshd.o mp_mod.o \
+mp_mod_2d.o mp_montgomery_calc_normalization.o mp_montgomery_reduce.o mp_montgomery_setup.o mp_mul.o \
+mp_mul_2.o mp_mul_2d.o mp_mul_d.o mp_mulmod.o mp_neg.o mp_next_small_prime.o mp_or.o mp_pack.o \
+mp_pack_count.o mp_prec_small_prime.o mp_prime_fermat.o mp_prime_frobenius_underwood.o \
+mp_prime_is_prime.o mp_prime_miller_rabin.o mp_prime_next_prime.o mp_prime_rabin_miller_trials.o \
+mp_prime_rand.o mp_prime_strong_lucas_selfridge.o mp_radix_size.o mp_radix_size_overestimate.o mp_rand.o \
 mp_rand_source.o mp_read_radix.o mp_reduce.o mp_reduce_2k.o mp_reduce_2k_l.o mp_reduce_2k_setup.o \
 mp_reduce_2k_setup_l.o mp_reduce_is_2k.o mp_reduce_is_2k_l.o mp_reduce_setup.o mp_root_n.o mp_rshd.o \
 mp_sbin_size.o mp_set.o mp_set_double.o mp_set_i32.o mp_set_i64.o mp_set_l.o mp_set_u32.o mp_set_u64.o \
-mp_set_ul.o mp_shrink.o mp_sieve.o mp_sieve_clear.o mp_sieve_init.o mp_signed_rsh.o mp_sqrmod.o mp_sqrt.o \
+mp_set_ul.o mp_shrink.o mp_sieve_clear.o mp_sieve_init.o mp_signed_rsh.o mp_sqrmod.o mp_sqrt.o \
 mp_sqrtmod_prime.o mp_sub.o mp_sub_d.o mp_submod.o mp_to_radix.o mp_to_sbin.o mp_to_ubin.o mp_ubin_size.o \
 mp_unpack.o mp_xor.o mp_zero.o s_mp_add.o s_mp_copy_digs.o s_mp_div_3.o s_mp_div_recursive.o \
 s_mp_div_school.o s_mp_div_small.o s_mp_exptmod.o s_mp_exptmod_fast.o s_mp_get_bit.o s_mp_invmod.o \

makefile.msvc

@@ -31,16 +31,16 @@ mp_error_to_string.obj mp_exch.obj mp_expt_n.obj mp_exptmod.obj mp_exteuclid.obj
 mp_from_ubin.obj mp_fwrite.obj mp_gcd.obj mp_get_double.obj mp_get_i32.obj mp_get_i64.obj mp_get_l.obj mp_get_mag_u32.obj \
 mp_get_mag_u64.obj mp_get_mag_ul.obj mp_grow.obj mp_hash.obj mp_init.obj mp_init_copy.obj mp_init_i32.obj mp_init_i64.obj \
 mp_init_l.obj mp_init_multi.obj mp_init_set.obj mp_init_size.obj mp_init_u32.obj mp_init_u64.obj mp_init_ul.obj \
-mp_invmod.obj mp_is_square.obj mp_kronecker.obj mp_lcm.obj mp_log_n.obj mp_lshd.obj mp_mod.obj mp_mod_2d.obj \
-mp_montgomery_calc_normalization.obj mp_montgomery_reduce.obj mp_montgomery_setup.obj mp_mul.obj mp_mul_2.obj \
-mp_mul_2d.obj mp_mul_d.obj mp_mulmod.obj mp_neg.obj mp_next_small_prime.obj mp_or.obj mp_pack.obj mp_pack_count.obj \
-mp_prec_small_prime.obj mp_prime_fermat.obj mp_prime_frobenius_underwood.obj mp_prime_is_prime.obj \
-mp_prime_miller_rabin.obj mp_prime_next_prime.obj mp_prime_rabin_miller_trials.obj mp_prime_rand.obj \
-mp_prime_strong_lucas_selfridge.obj mp_radix_size.obj mp_radix_size_overestimate.obj mp_rand.obj \
+mp_invmod.obj mp_is_small_prime.obj mp_is_square.obj mp_kronecker.obj mp_lcm.obj mp_log_n.obj mp_lshd.obj mp_mod.obj \
+mp_mod_2d.obj mp_montgomery_calc_normalization.obj mp_montgomery_reduce.obj mp_montgomery_setup.obj mp_mul.obj \
+mp_mul_2.obj mp_mul_2d.obj mp_mul_d.obj mp_mulmod.obj mp_neg.obj mp_next_small_prime.obj mp_or.obj mp_pack.obj \
+mp_pack_count.obj mp_prec_small_prime.obj mp_prime_fermat.obj mp_prime_frobenius_underwood.obj \
+mp_prime_is_prime.obj mp_prime_miller_rabin.obj mp_prime_next_prime.obj mp_prime_rabin_miller_trials.obj \
+mp_prime_rand.obj mp_prime_strong_lucas_selfridge.obj mp_radix_size.obj mp_radix_size_overestimate.obj mp_rand.obj \
 mp_rand_source.obj mp_read_radix.obj mp_reduce.obj mp_reduce_2k.obj mp_reduce_2k_l.obj mp_reduce_2k_setup.obj \
 mp_reduce_2k_setup_l.obj mp_reduce_is_2k.obj mp_reduce_is_2k_l.obj mp_reduce_setup.obj mp_root_n.obj mp_rshd.obj \
 mp_sbin_size.obj mp_set.obj mp_set_double.obj mp_set_i32.obj mp_set_i64.obj mp_set_l.obj mp_set_u32.obj mp_set_u64.obj \
-mp_set_ul.obj mp_shrink.obj mp_sieve.obj mp_sieve_clear.obj mp_sieve_init.obj mp_signed_rsh.obj mp_sqrmod.obj mp_sqrt.obj \
+mp_set_ul.obj mp_shrink.obj mp_sieve_clear.obj mp_sieve_init.obj mp_signed_rsh.obj mp_sqrmod.obj mp_sqrt.obj \
 mp_sqrtmod_prime.obj mp_sub.obj mp_sub_d.obj mp_submod.obj mp_to_radix.obj mp_to_sbin.obj mp_to_ubin.obj mp_ubin_size.obj \
 mp_unpack.obj mp_xor.obj mp_zero.obj s_mp_add.obj s_mp_copy_digs.obj s_mp_div_3.obj s_mp_div_recursive.obj \
 s_mp_div_school.obj s_mp_div_small.obj s_mp_exptmod.obj s_mp_exptmod_fast.obj s_mp_get_bit.obj s_mp_invmod.obj \

makefile.shared

@@ -30,16 +30,16 @@ mp_error_to_string.o mp_exch.o mp_expt_n.o mp_exptmod.o mp_exteuclid.o mp_fread.
 mp_from_ubin.o mp_fwrite.o mp_gcd.o mp_get_double.o mp_get_i32.o mp_get_i64.o mp_get_l.o mp_get_mag_u32.o \
 mp_get_mag_u64.o mp_get_mag_ul.o mp_grow.o mp_hash.o mp_init.o mp_init_copy.o mp_init_i32.o mp_init_i64.o \
 mp_init_l.o mp_init_multi.o mp_init_set.o mp_init_size.o mp_init_u32.o mp_init_u64.o mp_init_ul.o \
-mp_invmod.o mp_is_square.o mp_kronecker.o mp_lcm.o mp_log_n.o mp_lshd.o mp_mod.o mp_mod_2d.o \
-mp_montgomery_calc_normalization.o mp_montgomery_reduce.o mp_montgomery_setup.o mp_mul.o mp_mul_2.o \
-mp_mul_2d.o mp_mul_d.o mp_mulmod.o mp_neg.o mp_next_small_prime.o mp_or.o mp_pack.o mp_pack_count.o \
-mp_prec_small_prime.o mp_prime_fermat.o mp_prime_frobenius_underwood.o mp_prime_is_prime.o \
-mp_prime_miller_rabin.o mp_prime_next_prime.o mp_prime_rabin_miller_trials.o mp_prime_rand.o \
-mp_prime_strong_lucas_selfridge.o mp_radix_size.o mp_radix_size_overestimate.o mp_rand.o \
+mp_invmod.o mp_is_small_prime.o mp_is_square.o mp_kronecker.o mp_lcm.o mp_log_n.o mp_lshd.o mp_mod.o \
+mp_mod_2d.o mp_montgomery_calc_normalization.o mp_montgomery_reduce.o mp_montgomery_setup.o mp_mul.o \
+mp_mul_2.o mp_mul_2d.o mp_mul_d.o mp_mulmod.o mp_neg.o mp_next_small_prime.o mp_or.o mp_pack.o \
+mp_pack_count.o mp_prec_small_prime.o mp_prime_fermat.o mp_prime_frobenius_underwood.o \
+mp_prime_is_prime.o mp_prime_miller_rabin.o mp_prime_next_prime.o mp_prime_rabin_miller_trials.o \
+mp_prime_rand.o mp_prime_strong_lucas_selfridge.o mp_radix_size.o mp_radix_size_overestimate.o mp_rand.o \
 mp_rand_source.o mp_read_radix.o mp_reduce.o mp_reduce_2k.o mp_reduce_2k_l.o mp_reduce_2k_setup.o \
 mp_reduce_2k_setup_l.o mp_reduce_is_2k.o mp_reduce_is_2k_l.o mp_reduce_setup.o mp_root_n.o mp_rshd.o \
 mp_sbin_size.o mp_set.o mp_set_double.o mp_set_i32.o mp_set_i64.o mp_set_l.o mp_set_u32.o mp_set_u64.o \
-mp_set_ul.o mp_shrink.o mp_sieve.o mp_sieve_clear.o mp_sieve_init.o mp_signed_rsh.o mp_sqrmod.o mp_sqrt.o \
+mp_set_ul.o mp_shrink.o mp_sieve_clear.o mp_sieve_init.o mp_signed_rsh.o mp_sqrmod.o mp_sqrt.o \
 mp_sqrtmod_prime.o mp_sub.o mp_sub_d.o mp_submod.o mp_to_radix.o mp_to_sbin.o mp_to_ubin.o mp_ubin_size.o \
 mp_unpack.o mp_xor.o mp_zero.o s_mp_add.o s_mp_copy_digs.o s_mp_div_3.o s_mp_div_recursive.o \
 s_mp_div_school.o s_mp_div_small.o s_mp_exptmod.o s_mp_exptmod_fast.o s_mp_get_bit.o s_mp_invmod.o \

makefile.unix

@@ -36,16 +36,16 @@ mp_error_to_string.o mp_exch.o mp_expt_n.o mp_exptmod.o mp_exteuclid.o mp_fread.
 mp_from_ubin.o mp_fwrite.o mp_gcd.o mp_get_double.o mp_get_i32.o mp_get_i64.o mp_get_l.o mp_get_mag_u32.o \
 mp_get_mag_u64.o mp_get_mag_ul.o mp_grow.o mp_hash.o mp_init.o mp_init_copy.o mp_init_i32.o mp_init_i64.o \
 mp_init_l.o mp_init_multi.o mp_init_set.o mp_init_size.o mp_init_u32.o mp_init_u64.o mp_init_ul.o \
-mp_invmod.o mp_is_square.o mp_kronecker.o mp_lcm.o mp_log_n.o mp_lshd.o mp_mod.o mp_mod_2d.o \
-mp_montgomery_calc_normalization.o mp_montgomery_reduce.o mp_montgomery_setup.o mp_mul.o mp_mul_2.o \
-mp_mul_2d.o mp_mul_d.o mp_mulmod.o mp_neg.o mp_next_small_prime.o mp_or.o mp_pack.o mp_pack_count.o \
-mp_prec_small_prime.o mp_prime_fermat.o mp_prime_frobenius_underwood.o mp_prime_is_prime.o \
-mp_prime_miller_rabin.o mp_prime_next_prime.o mp_prime_rabin_miller_trials.o mp_prime_rand.o \
-mp_prime_strong_lucas_selfridge.o mp_radix_size.o mp_radix_size_overestimate.o mp_rand.o \
+mp_invmod.o mp_is_small_prime.o mp_is_square.o mp_kronecker.o mp_lcm.o mp_log_n.o mp_lshd.o mp_mod.o \
+mp_mod_2d.o mp_montgomery_calc_normalization.o mp_montgomery_reduce.o mp_montgomery_setup.o mp_mul.o \
+mp_mul_2.o mp_mul_2d.o mp_mul_d.o mp_mulmod.o mp_neg.o mp_next_small_prime.o mp_or.o mp_pack.o \
+mp_pack_count.o mp_prec_small_prime.o mp_prime_fermat.o mp_prime_frobenius_underwood.o \
+mp_prime_is_prime.o mp_prime_miller_rabin.o mp_prime_next_prime.o mp_prime_rabin_miller_trials.o \
+mp_prime_rand.o mp_prime_strong_lucas_selfridge.o mp_radix_size.o mp_radix_size_overestimate.o mp_rand.o \
 mp_rand_source.o mp_read_radix.o mp_reduce.o mp_reduce_2k.o mp_reduce_2k_l.o mp_reduce_2k_setup.o \
 mp_reduce_2k_setup_l.o mp_reduce_is_2k.o mp_reduce_is_2k_l.o mp_reduce_setup.o mp_root_n.o mp_rshd.o \
 mp_sbin_size.o mp_set.o mp_set_double.o mp_set_i32.o mp_set_i64.o mp_set_l.o mp_set_u32.o mp_set_u64.o \
-mp_set_ul.o mp_shrink.o mp_sieve.o mp_sieve_clear.o mp_sieve_init.o mp_signed_rsh.o mp_sqrmod.o mp_sqrt.o \
+mp_set_ul.o mp_shrink.o mp_sieve_clear.o mp_sieve_init.o mp_signed_rsh.o mp_sqrmod.o mp_sqrt.o \
 mp_sqrtmod_prime.o mp_sub.o mp_sub_d.o mp_submod.o mp_to_radix.o mp_to_sbin.o mp_to_ubin.o mp_ubin_size.o \
 mp_unpack.o mp_xor.o mp_zero.o s_mp_add.o s_mp_copy_digs.o s_mp_div_3.o s_mp_div_recursive.o \
 s_mp_div_school.o s_mp_div_small.o s_mp_exptmod.o s_mp_exptmod_fast.o s_mp_get_bit.o s_mp_invmod.o \

mp_sieve.c renamed to mp_is_small_prime.c

@@ -1,13 +1,9 @@
 #include "tommath_private.h"
-#ifdef MP_SIEVE_C
+#ifdef MP_IS_SMALL_PRIME_C
 /* LibTomMath, multiple-precision integer library -- Tom St Denis */
 /* SPDX-License-Identifier: Unlicense */
 
 
-
-/* LibTomMath, multiple-precision integer library -- Tom St Denis */
-/* SPDX-License-Identifier: Unlicense */
-
 /* Segmented version of an Eratosthenes sieve */
 #define MP_SIEVE_PRIME_NUM_BITS (sizeof(mp_sieve_prime)*CHAR_BIT)
 
@@ -100,24 +96,6 @@ static mp_sieve_prime s_isqrt(mp_sieve_prime n)
    return root;
 }
 
-/*
- * Set range_a_b to sqrt(MP_SIEVE_PRIME_MAX)
- * TODO: Make it const or put it in bncore.c because it is said to be faster
- * if the size of range_a_b fits into the L2-cache.
- * Not much difference on the author's machine for 32 bit but quite
- * a large one for 64 bit and large limits. YMMV, as always.
- * Please be aware that range_a_b is in bits, not bytes and memory
- * allocation rounds up and adds CHAR_BIT*sizeof(mp_sieve_prime) bits.
- */
-#ifndef MP_SIEVE_RANGE_A_B
-#if ( (defined MP_64BIT) && (defined MP_SIEVE_USE_LARGE_SIEVE) )
-#define MP_SIEVE_RANGE_A_B  0x400000uL
-#else
-#define MP_SIEVE_RANGE_A_B ((mp_sieve_prime) MP_SIEVE_PRIME_MAX_SQRT)
-#endif
-#endif
-#define MP_SIEVE_BASE_SIEVE_SIZE  ((mp_sieve_prime)MP_SIEVE_PRIME_MAX_SQRT)
-
 /* TODO: Some redundant code below, needs a clean-up */
 
 
@@ -398,5 +376,4 @@ mp_err mp_is_small_prime(mp_sieve_prime n, mp_sieve_prime *result, mp_sieve *sie
 }
 
 
-
 #endif

sources.cmake

@@ -57,6 +57,7 @@ mp_init_u32.c
 mp_init_u64.c
 mp_init_ul.c
 mp_invmod.c
+mp_is_small_prime.c
 mp_is_square.c
 mp_kronecker.c
 mp_lcm.c
@@ -111,7 +112,6 @@ mp_set_u32.c
 mp_set_u64.c
 mp_set_ul.c
 mp_shrink.c
-mp_sieve.c
 mp_sieve_clear.c
 mp_sieve_init.c
 mp_signed_rsh.c

tommath.def

@@ -60,6 +60,7 @@ EXPORTS
     mp_init_u64
     mp_init_ul
     mp_invmod
+    mp_is_small_prime
     mp_is_square
     mp_kronecker
     mp_lcm
@@ -114,7 +115,6 @@ EXPORTS
     mp_set_u64
     mp_set_ul
     mp_shrink
-    mp_sieve
     mp_sieve_clear
     mp_sieve_init
     mp_signed_rsh