kc3-lang/libtommath

diff --git a/bn_mp_ilogb.c b/bn_mp_ilogb.c
deleted file mode 100644
index 274cf8f..0000000
--- a/bn_mp_ilogb.c
+++ /dev/null
@@ -1,190 +0,0 @@
-#include "tommath_private.h"
-#ifdef BN_MP_ILOGB_C
-/* LibTomMath, multiple-precision integer library -- Tom St Denis */
-/* SPDX-License-Identifier: Unlicense */
-
-/* Compute log_{base}(a) */
-static mp_word s_pow(mp_word base, mp_word exponent)
-{
-   mp_word result = 1uLL;
-   while (exponent != 0u) {
-      if ((exponent & 1u) == 1u) {
-         result *= base;
-      }
-      exponent >>= 1;
-      base *= base;
-   }
-
-   return result;
-}
-
-static mp_digit s_digit_ilogb(mp_digit base, mp_digit n)
-{
-   mp_word bracket_low = 1uLL, bracket_mid, bracket_high, N;
-   mp_digit ret, high = 1uL, low = 0uL, mid;
-
-   if (n < base) {
-      return 0uL;
-   }
-   if (n == base) {
-      return 1uL;
-   }
-
-   bracket_high = (mp_word) base ;
-   N = (mp_word) n;
-
-   while (bracket_high < N) {
-      low = high;
-      bracket_low = bracket_high;
-      high <<= 1;
-      bracket_high *= bracket_high;
-   }
-
-   while (((mp_digit)(high - low)) > 1uL) {
-      mid = (low + high) >> 1;
-      bracket_mid = bracket_low * s_pow(base, (mp_word)(mid - low));
-
-      if (N < bracket_mid) {
-         high = mid ;
-         bracket_high = bracket_mid ;
-      }
-      if (N > bracket_mid) {
-         low = mid ;
-         bracket_low = bracket_mid ;
-      }
-      if (N == bracket_mid) {
-         return (mp_digit) mid;
-      }
-   }
-
-   if (bracket_high == N) {
-      ret = high;
-   } else {
-      ret = low;
-   }
-
-   return ret;
-}
-
-/* TODO: output could be "int" because the output of mp_radix_size is int, too,
-         as is the output of mp_bitcount.
-         With the same problem: max size is INT_MAX * MP_DIGIT not INT_MAX only!
-*/
-mp_err mp_ilogb(const mp_int *a, uint32_t base, mp_int *c)
-{
-   mp_err err;
-   mp_ord cmp;
-   unsigned int high, low, mid;
-   mp_int bracket_low, bracket_high, bracket_mid, t, bi_base;
-
-   err = MP_OKAY;
-
-   if (a->sign == MP_NEG) {
-      return MP_VAL;
-   }
-
-   if (MP_IS_ZERO(a)) {
-      return MP_VAL;
-   }
-
-   if (base < 2u) {
-      return MP_VAL;
-   }
-
-   /* A small shortcut for bases that are powers of two. */
-   if (!(base & (base - 1u))) {
-      int x, y, bit_count;
-      for (y=0; (y < 7) && !(base & 1u); y++) {
-         base >>= 1;
-      }
-      bit_count = mp_count_bits(a) - 1;
-      x = bit_count/y;
-      mp_set_u32(c, (uint32_t)(x));
-      return MP_OKAY;
-   }
-
-   if (a->used == 1) {
-      mp_set(c, s_digit_ilogb(base, a->dp[0]));
-      return err;
-   }
-
-   cmp = mp_cmp_d(a, base);
-
-   if (cmp == MP_LT) {
-      mp_zero(c);
-      return err;
-   }
-   if (cmp == MP_EQ) {
-      mp_set(c, 1uL);
-      return err;
-   }
-
-   if ((err =
-           mp_init_multi(&bracket_low, &bracket_high,
-                         &bracket_mid, &t, &bi_base, NULL)) != MP_OKAY) {
-      return err;
-   }
-
-   low = 0u;
-   mp_set(&bracket_low, 1uL);
-   high = 1u;
-
-   mp_set(&bracket_high, base);
-
-   /*
-       A kind of Giant-step/baby-step algorithm.
-       Idea shamelessly stolen from https://programmingpraxis.com/2010/05/07/integer-logarithms/2/
-       The effect is asymptotic, hence needs benchmarks to test if the Giant-step should be skipped
-       for small n.
-    */
-   while (mp_cmp(&bracket_high, a) == MP_LT) {
-      low = high;
-      if ((err = mp_copy(&bracket_high, &bracket_low)) != MP_OKAY) {
-         goto LBL_ERR;
-      }
-      high <<= 1;
-      if ((err = mp_sqr(&bracket_high, &bracket_high)) != MP_OKAY) {
-         goto LBL_ERR;
-      }
-   }
-   mp_set(&bi_base, base);
-
-   while ((high - low) > 1u) {
-      mid = (high + low) >> 1;
-
-      if ((err = mp_expt_u32(&bi_base, (uint32_t)(mid - low), &t)) != MP_OKAY) {
-         goto LBL_ERR;
-      }
-      if ((err = mp_mul(&bracket_low, &t, &bracket_mid)) != MP_OKAY) {
-         goto LBL_ERR;
-      }
-      cmp = mp_cmp(a, &bracket_mid);
-      if (cmp == MP_LT) {
-         high = mid;
-         mp_exch(&bracket_mid, &bracket_high);
-      }
-      if (cmp == MP_GT) {
-         low = mid;
-         mp_exch(&bracket_mid, &bracket_low);
-      }
-      if (cmp == MP_EQ) {
-         mp_set_u32(c, mid);
-         goto LBL_END;
-      }
-   }
-
-   if (mp_cmp(&bracket_high, a) == MP_EQ) {
-      mp_set_u32(c, high);
-   } else {
-      mp_set_u32(c, low);
-   }
-
-LBL_END:
-LBL_ERR:
-   mp_clear_multi(&bracket_low, &bracket_high, &bracket_mid,
-                  &t, &bi_base, NULL);
-   return err;
-}
-
-
-#endif
diff --git a/bn_mp_log_u32.c b/bn_mp_log_u32.c
new file mode 100644
index 0000000..75cf59e
--- /dev/null
+++ b/bn_mp_log_u32.c
@@ -0,0 +1,190 @@
+#include "tommath_private.h"
+#ifdef BN_MP_LOG_U32_C
+/* LibTomMath, multiple-precision integer library -- Tom St Denis */
+/* SPDX-License-Identifier: Unlicense */
+
+/* Compute log_{base}(a) */
+static mp_word s_pow(mp_word base, mp_word exponent)
+{
+   mp_word result = 1uLL;
+   while (exponent != 0u) {
+      if ((exponent & 1u) == 1u) {
+         result *= base;
+      }
+      exponent >>= 1;
+      base *= base;
+   }
+
+   return result;
+}
+
+static mp_digit s_digit_ilogb(mp_digit base, mp_digit n)
+{
+   mp_word bracket_low = 1uLL, bracket_mid, bracket_high, N;
+   mp_digit ret, high = 1uL, low = 0uL, mid;
+
+   if (n < base) {
+      return 0uL;
+   }
+   if (n == base) {
+      return 1uL;
+   }
+
+   bracket_high = (mp_word) base ;
+   N = (mp_word) n;
+
+   while (bracket_high < N) {
+      low = high;
+      bracket_low = bracket_high;
+      high <<= 1;
+      bracket_high *= bracket_high;
+   }
+
+   while (((mp_digit)(high - low)) > 1uL) {
+      mid = (low + high) >> 1;
+      bracket_mid = bracket_low * s_pow(base, (mp_word)(mid - low));
+
+      if (N < bracket_mid) {
+         high = mid ;
+         bracket_high = bracket_mid ;
+      }
+      if (N > bracket_mid) {
+         low = mid ;
+         bracket_low = bracket_mid ;
+      }
+      if (N == bracket_mid) {
+         return (mp_digit) mid;
+      }
+   }
+
+   if (bracket_high == N) {
+      ret = high;
+   } else {
+      ret = low;
+   }
+
+   return ret;
+}
+
+/* TODO: output could be "int" because the output of mp_radix_size is int, too,
+         as is the output of mp_bitcount.
+         With the same problem: max size is INT_MAX * MP_DIGIT not INT_MAX only!
+*/
+mp_err mp_log_u32(const mp_int *a, uint32_t base, mp_int *c)
+{
+   mp_err err;
+   mp_ord cmp;
+   unsigned int high, low, mid;
+   mp_int bracket_low, bracket_high, bracket_mid, t, bi_base;
+
+   err = MP_OKAY;
+
+   if (a->sign == MP_NEG) {
+      return MP_VAL;
+   }
+
+   if (MP_IS_ZERO(a)) {
+      return MP_VAL;
+   }
+
+   if (base < 2u) {
+      return MP_VAL;
+   }
+
+   /* A small shortcut for bases that are powers of two. */
+   if (!(base & (base - 1u))) {
+      int x, y, bit_count;
+      for (y=0; (y < 7) && !(base & 1u); y++) {
+         base >>= 1;
+      }
+      bit_count = mp_count_bits(a) - 1;
+      x = bit_count/y;
+      mp_set_u32(c, (uint32_t)(x));
+      return MP_OKAY;
+   }
+
+   if (a->used == 1) {
+      mp_set(c, s_digit_ilogb(base, a->dp[0]));
+      return err;
+   }
+
+   cmp = mp_cmp_d(a, base);
+
+   if (cmp == MP_LT) {
+      mp_zero(c);
+      return err;
+   }
+   if (cmp == MP_EQ) {
+      mp_set(c, 1uL);
+      return err;
+   }
+
+   if ((err =
+           mp_init_multi(&bracket_low, &bracket_high,
+                         &bracket_mid, &t, &bi_base, NULL)) != MP_OKAY) {
+      return err;
+   }
+
+   low = 0u;
+   mp_set(&bracket_low, 1uL);
+   high = 1u;
+
+   mp_set(&bracket_high, base);
+
+   /*
+       A kind of Giant-step/baby-step algorithm.
+       Idea shamelessly stolen from https://programmingpraxis.com/2010/05/07/integer-logarithms/2/
+       The effect is asymptotic, hence needs benchmarks to test if the Giant-step should be skipped
+       for small n.
+    */
+   while (mp_cmp(&bracket_high, a) == MP_LT) {
+      low = high;
+      if ((err = mp_copy(&bracket_high, &bracket_low)) != MP_OKAY) {
+         goto LBL_ERR;
+      }
+      high <<= 1;
+      if ((err = mp_sqr(&bracket_high, &bracket_high)) != MP_OKAY) {
+         goto LBL_ERR;
+      }
+   }
+   mp_set(&bi_base, base);
+
+   while ((high - low) > 1u) {
+      mid = (high + low) >> 1;
+
+      if ((err = mp_expt_u32(&bi_base, (uint32_t)(mid - low), &t)) != MP_OKAY) {
+         goto LBL_ERR;
+      }
+      if ((err = mp_mul(&bracket_low, &t, &bracket_mid)) != MP_OKAY) {
+         goto LBL_ERR;
+      }
+      cmp = mp_cmp(a, &bracket_mid);
+      if (cmp == MP_LT) {
+         high = mid;
+         mp_exch(&bracket_mid, &bracket_high);
+      }
+      if (cmp == MP_GT) {
+         low = mid;
+         mp_exch(&bracket_mid, &bracket_low);
+      }
+      if (cmp == MP_EQ) {
+         mp_set_u32(c, mid);
+         goto LBL_END;
+      }
+   }
+
+   if (mp_cmp(&bracket_high, a) == MP_EQ) {
+      mp_set_u32(c, high);
+   } else {
+      mp_set_u32(c, low);
+   }
+
+LBL_END:
+LBL_ERR:
+   mp_clear_multi(&bracket_low, &bracket_high, &bracket_mid,
+                  &t, &bi_base, NULL);
+   return err;
+}
+
+
+#endif
diff --git a/demo/test.c b/demo/test.c
index 81f5afe..8282917 100644
--- a/demo/test.c
+++ b/demo/test.c
@@ -1574,7 +1574,7 @@ static mp_err s_rs(const mp_int *a, int radix, int *size)
    *size = digs + 1;
    return MP_OKAY;
 }
-static int test_mp_ilogb(void)
+static int test_mp_log_u32(void)
 {
    mp_int a, lb;
    mp_digit d;
@@ -1593,11 +1593,11 @@ static int test_mp_ilogb(void)
    */
    mp_set(&a, 42uL);
    base = 0u;
-   if (mp_ilogb(&a, base, &lb) != MP_VAL) {
+   if (mp_log_u32(&a, base, &lb) != MP_VAL) {
       goto LBL_ERR;
    }
    base = 1u;
-   if (mp_ilogb(&a, base, &lb) != MP_VAL) {
+   if (mp_log_u32(&a, base, &lb) != MP_VAL) {
       goto LBL_ERR;
    }
    /*
@@ -1609,13 +1609,13 @@ static int test_mp_ilogb(void)
    */
    base = 2u;
    mp_zero(&a);
-   if (mp_ilogb(&a, base, &lb) != MP_VAL) {
+   if (mp_log_u32(&a, base, &lb) != MP_VAL) {
       goto LBL_ERR;
    }
 
    for (d = 1; d < 4; d++) {
       mp_set(&a, d);
-      if (mp_ilogb(&a, base, &lb) != MP_OKAY) {
+      if (mp_log_u32(&a, base, &lb) != MP_OKAY) {
          goto LBL_ERR;
       }
       if (mp_cmp_d(&lb, (d == 1)?0uL:1uL) != MP_EQ) {
@@ -1631,12 +1631,12 @@ static int test_mp_ilogb(void)
    */
    base = 3u;
    mp_zero(&a);
-   if (mp_ilogb(&a, base, &lb) != MP_VAL) {
+   if (mp_log_u32(&a, base, &lb) != MP_VAL) {
       goto LBL_ERR;
    }
    for (d = 1; d < 4; d++) {
       mp_set(&a, d);
-      if (mp_ilogb(&a, base, &lb) != MP_OKAY) {
+      if (mp_log_u32(&a, base, &lb) != MP_OKAY) {
          goto LBL_ERR;
       }
       if (mp_cmp_d(&lb, (d < base)?0uL:1uL) != MP_EQ) {
@@ -1653,7 +1653,7 @@ static int test_mp_ilogb(void)
       goto LBL_ERR;
    }
    for (base = 2u; base < 65u; base++) {
-      if (mp_ilogb(&a, base, &lb) != MP_OKAY) {
+      if (mp_log_u32(&a, base, &lb) != MP_OKAY) {
          goto LBL_ERR;
       }
       if (s_rs(&a,(int)base, &size) != MP_OKAY) {
@@ -1674,7 +1674,7 @@ static int test_mp_ilogb(void)
       goto LBL_ERR;
    }
    for (base = 2u; base < 65u; base++) {
-      if (mp_ilogb(&a, base, &lb) != MP_OKAY) {
+      if (mp_log_u32(&a, base, &lb) != MP_OKAY) {
          goto LBL_ERR;
       }
       if (s_rs(&a,(int)base, &size) != MP_OKAY) {
@@ -1694,7 +1694,7 @@ static int test_mp_ilogb(void)
    if (mp_add_d(&a, max_base / 2, &a) != MP_OKAY) {
       goto LBL_ERR;
    }
-   if (mp_ilogb(&a, max_base, &lb) != MP_OKAY) {
+   if (mp_log_u32(&a, max_base, &lb) != MP_OKAY) {
       goto LBL_ERR;
    }
    if (mp_cmp_d(&lb, 10uL) != MP_EQ) {
@@ -2444,7 +2444,7 @@ static int unit_tests(int argc, char **argv)
       T1(mp_get_u32, MP_GET_I32),
       T1(mp_get_u64, MP_GET_I64),
       T1(mp_get_ul, MP_GET_L),
-      T1(mp_ilogb, MP_ILOGB),
+      T1(mp_log_u32, MP_LOG_U32),
       T1(mp_incr, MP_INCR),
       T1(mp_invmod, MP_INVMOD),
       T1(mp_is_square, MP_IS_SQUARE),
diff --git a/libtommath_VS2008.vcproj b/libtommath_VS2008.vcproj
index 960d756..67cc89b 100644
--- a/libtommath_VS2008.vcproj
+++ b/libtommath_VS2008.vcproj
@@ -501,10 +501,6 @@
 			>
 		</File>
 		<File
-			RelativePath="bn_mp_ilogb.c"
-			>
-		</File>
-		<File
 			RelativePath="bn_mp_incr.c"
 			>
 		</File>
@@ -585,6 +581,10 @@
 			>
 		</File>
 		<File
+			RelativePath="bn_mp_log_u32.c"
+			>
+		</File>
+		<File
 			RelativePath="bn_mp_lshd.c"
 			>
 		</File>
diff --git a/makefile b/makefile
index eecc852..cc7f922 100644
--- a/makefile
+++ b/makefile
@@ -33,10 +33,10 @@ bn_mp_div_2d.o bn_mp_div_3.o bn_mp_div_d.o bn_mp_dr_is_modulus.o bn_mp_dr_reduce
 bn_mp_error_to_string.o bn_mp_exch.o bn_mp_expt_u32.o bn_mp_exptmod.o bn_mp_exteuclid.o bn_mp_fread.o \
 bn_mp_from_sbin.o bn_mp_from_ubin.o bn_mp_fwrite.o bn_mp_gcd.o bn_mp_get_double.o bn_mp_get_i32.o \
 bn_mp_get_i64.o bn_mp_get_l.o bn_mp_get_ll.o bn_mp_get_mag_u32.o bn_mp_get_mag_u64.o bn_mp_get_mag_ul.o \
-bn_mp_get_mag_ull.o bn_mp_grow.o bn_mp_ilogb.o bn_mp_incr.o bn_mp_init.o bn_mp_init_copy.o \
-bn_mp_init_i32.o bn_mp_init_i64.o bn_mp_init_l.o bn_mp_init_ll.o bn_mp_init_multi.o bn_mp_init_set.o \
-bn_mp_init_size.o bn_mp_init_u32.o bn_mp_init_u64.o bn_mp_init_ul.o bn_mp_init_ull.o bn_mp_invmod.o \
-bn_mp_is_square.o bn_mp_iseven.o bn_mp_isodd.o bn_mp_kronecker.o bn_mp_lcm.o bn_mp_lshd.o bn_mp_mod.o \
+bn_mp_get_mag_ull.o bn_mp_grow.o bn_mp_incr.o bn_mp_init.o bn_mp_init_copy.o bn_mp_init_i32.o \
+bn_mp_init_i64.o bn_mp_init_l.o bn_mp_init_ll.o bn_mp_init_multi.o bn_mp_init_set.o bn_mp_init_size.o \
+bn_mp_init_u32.o bn_mp_init_u64.o bn_mp_init_ul.o bn_mp_init_ull.o bn_mp_invmod.o bn_mp_is_square.o \
+bn_mp_iseven.o bn_mp_isodd.o bn_mp_kronecker.o bn_mp_lcm.o bn_mp_log_u32.o bn_mp_lshd.o bn_mp_mod.o \
 bn_mp_mod_2d.o bn_mp_mod_d.o bn_mp_montgomery_calc_normalization.o bn_mp_montgomery_reduce.o \
 bn_mp_montgomery_setup.o bn_mp_mul.o bn_mp_mul_2.o bn_mp_mul_2d.o bn_mp_mul_d.o bn_mp_mulmod.o bn_mp_neg.o \
 bn_mp_or.o bn_mp_pack.o bn_mp_pack_count.o bn_mp_prime_fermat.o bn_mp_prime_frobenius_underwood.o \
diff --git a/makefile.mingw b/makefile.mingw
index 08db73e..7eee57d 100644
--- a/makefile.mingw
+++ b/makefile.mingw
@@ -36,10 +36,10 @@ bn_mp_div_2d.o bn_mp_div_3.o bn_mp_div_d.o bn_mp_dr_is_modulus.o bn_mp_dr_reduce
 bn_mp_error_to_string.o bn_mp_exch.o bn_mp_expt_u32.o bn_mp_exptmod.o bn_mp_exteuclid.o bn_mp_fread.o \
 bn_mp_from_sbin.o bn_mp_from_ubin.o bn_mp_fwrite.o bn_mp_gcd.o bn_mp_get_double.o bn_mp_get_i32.o \
 bn_mp_get_i64.o bn_mp_get_l.o bn_mp_get_ll.o bn_mp_get_mag_u32.o bn_mp_get_mag_u64.o bn_mp_get_mag_ul.o \
-bn_mp_get_mag_ull.o bn_mp_grow.o bn_mp_ilogb.o bn_mp_incr.o bn_mp_init.o bn_mp_init_copy.o \
-bn_mp_init_i32.o bn_mp_init_i64.o bn_mp_init_l.o bn_mp_init_ll.o bn_mp_init_multi.o bn_mp_init_set.o \
-bn_mp_init_size.o bn_mp_init_u32.o bn_mp_init_u64.o bn_mp_init_ul.o bn_mp_init_ull.o bn_mp_invmod.o \
-bn_mp_is_square.o bn_mp_iseven.o bn_mp_isodd.o bn_mp_kronecker.o bn_mp_lcm.o bn_mp_lshd.o bn_mp_mod.o \
+bn_mp_get_mag_ull.o bn_mp_grow.o bn_mp_incr.o bn_mp_init.o bn_mp_init_copy.o bn_mp_init_i32.o \
+bn_mp_init_i64.o bn_mp_init_l.o bn_mp_init_ll.o bn_mp_init_multi.o bn_mp_init_set.o bn_mp_init_size.o \
+bn_mp_init_u32.o bn_mp_init_u64.o bn_mp_init_ul.o bn_mp_init_ull.o bn_mp_invmod.o bn_mp_is_square.o \
+bn_mp_iseven.o bn_mp_isodd.o bn_mp_kronecker.o bn_mp_lcm.o bn_mp_log_u32.o bn_mp_lshd.o bn_mp_mod.o \
 bn_mp_mod_2d.o bn_mp_mod_d.o bn_mp_montgomery_calc_normalization.o bn_mp_montgomery_reduce.o \
 bn_mp_montgomery_setup.o bn_mp_mul.o bn_mp_mul_2.o bn_mp_mul_2d.o bn_mp_mul_d.o bn_mp_mulmod.o bn_mp_neg.o \
 bn_mp_or.o bn_mp_pack.o bn_mp_pack_count.o bn_mp_prime_fermat.o bn_mp_prime_frobenius_underwood.o \
diff --git a/makefile.msvc b/makefile.msvc
index 577235f..d282e93 100644
--- a/makefile.msvc
+++ b/makefile.msvc
@@ -28,10 +28,10 @@ bn_mp_div_2d.obj bn_mp_div_3.obj bn_mp_div_d.obj bn_mp_dr_is_modulus.obj bn_mp_d
 bn_mp_error_to_string.obj bn_mp_exch.obj bn_mp_expt_u32.obj bn_mp_exptmod.obj bn_mp_exteuclid.obj bn_mp_fread.obj \
 bn_mp_from_sbin.obj bn_mp_from_ubin.obj bn_mp_fwrite.obj bn_mp_gcd.obj bn_mp_get_double.obj bn_mp_get_i32.obj \
 bn_mp_get_i64.obj bn_mp_get_l.obj bn_mp_get_ll.obj bn_mp_get_mag_u32.obj bn_mp_get_mag_u64.obj bn_mp_get_mag_ul.obj \
-bn_mp_get_mag_ull.obj bn_mp_grow.obj bn_mp_ilogb.obj bn_mp_incr.obj bn_mp_init.obj bn_mp_init_copy.obj \
-bn_mp_init_i32.obj bn_mp_init_i64.obj bn_mp_init_l.obj bn_mp_init_ll.obj bn_mp_init_multi.obj bn_mp_init_set.obj \
-bn_mp_init_size.obj bn_mp_init_u32.obj bn_mp_init_u64.obj bn_mp_init_ul.obj bn_mp_init_ull.obj bn_mp_invmod.obj \
-bn_mp_is_square.obj bn_mp_iseven.obj bn_mp_isodd.obj bn_mp_kronecker.obj bn_mp_lcm.obj bn_mp_lshd.obj bn_mp_mod.obj \
+bn_mp_get_mag_ull.obj bn_mp_grow.obj bn_mp_incr.obj bn_mp_init.obj bn_mp_init_copy.obj bn_mp_init_i32.obj \
+bn_mp_init_i64.obj bn_mp_init_l.obj bn_mp_init_ll.obj bn_mp_init_multi.obj bn_mp_init_set.obj bn_mp_init_size.obj \
+bn_mp_init_u32.obj bn_mp_init_u64.obj bn_mp_init_ul.obj bn_mp_init_ull.obj bn_mp_invmod.obj bn_mp_is_square.obj \
+bn_mp_iseven.obj bn_mp_isodd.obj bn_mp_kronecker.obj bn_mp_lcm.obj bn_mp_log_u32.obj bn_mp_lshd.obj bn_mp_mod.obj \
 bn_mp_mod_2d.obj bn_mp_mod_d.obj bn_mp_montgomery_calc_normalization.obj bn_mp_montgomery_reduce.obj \
 bn_mp_montgomery_setup.obj bn_mp_mul.obj bn_mp_mul_2.obj bn_mp_mul_2d.obj bn_mp_mul_d.obj bn_mp_mulmod.obj bn_mp_neg.obj \
 bn_mp_or.obj bn_mp_pack.obj bn_mp_pack_count.obj bn_mp_prime_fermat.obj bn_mp_prime_frobenius_underwood.obj \
diff --git a/makefile.shared b/makefile.shared
index 130212d..6802107 100644
--- a/makefile.shared
+++ b/makefile.shared
@@ -30,10 +30,10 @@ bn_mp_div_2d.o bn_mp_div_3.o bn_mp_div_d.o bn_mp_dr_is_modulus.o bn_mp_dr_reduce
 bn_mp_error_to_string.o bn_mp_exch.o bn_mp_expt_u32.o bn_mp_exptmod.o bn_mp_exteuclid.o bn_mp_fread.o \
 bn_mp_from_sbin.o bn_mp_from_ubin.o bn_mp_fwrite.o bn_mp_gcd.o bn_mp_get_double.o bn_mp_get_i32.o \
 bn_mp_get_i64.o bn_mp_get_l.o bn_mp_get_ll.o bn_mp_get_mag_u32.o bn_mp_get_mag_u64.o bn_mp_get_mag_ul.o \
-bn_mp_get_mag_ull.o bn_mp_grow.o bn_mp_ilogb.o bn_mp_incr.o bn_mp_init.o bn_mp_init_copy.o \
-bn_mp_init_i32.o bn_mp_init_i64.o bn_mp_init_l.o bn_mp_init_ll.o bn_mp_init_multi.o bn_mp_init_set.o \
-bn_mp_init_size.o bn_mp_init_u32.o bn_mp_init_u64.o bn_mp_init_ul.o bn_mp_init_ull.o bn_mp_invmod.o \
-bn_mp_is_square.o bn_mp_iseven.o bn_mp_isodd.o bn_mp_kronecker.o bn_mp_lcm.o bn_mp_lshd.o bn_mp_mod.o \
+bn_mp_get_mag_ull.o bn_mp_grow.o bn_mp_incr.o bn_mp_init.o bn_mp_init_copy.o bn_mp_init_i32.o \
+bn_mp_init_i64.o bn_mp_init_l.o bn_mp_init_ll.o bn_mp_init_multi.o bn_mp_init_set.o bn_mp_init_size.o \
+bn_mp_init_u32.o bn_mp_init_u64.o bn_mp_init_ul.o bn_mp_init_ull.o bn_mp_invmod.o bn_mp_is_square.o \
+bn_mp_iseven.o bn_mp_isodd.o bn_mp_kronecker.o bn_mp_lcm.o bn_mp_log_u32.o bn_mp_lshd.o bn_mp_mod.o \
 bn_mp_mod_2d.o bn_mp_mod_d.o bn_mp_montgomery_calc_normalization.o bn_mp_montgomery_reduce.o \
 bn_mp_montgomery_setup.o bn_mp_mul.o bn_mp_mul_2.o bn_mp_mul_2d.o bn_mp_mul_d.o bn_mp_mulmod.o bn_mp_neg.o \
 bn_mp_or.o bn_mp_pack.o bn_mp_pack_count.o bn_mp_prime_fermat.o bn_mp_prime_frobenius_underwood.o \
diff --git a/makefile.unix b/makefile.unix
index aa5e920..750be56 100644
--- a/makefile.unix
+++ b/makefile.unix
@@ -37,10 +37,10 @@ bn_mp_div_2d.o bn_mp_div_3.o bn_mp_div_d.o bn_mp_dr_is_modulus.o bn_mp_dr_reduce
 bn_mp_error_to_string.o bn_mp_exch.o bn_mp_expt_u32.o bn_mp_exptmod.o bn_mp_exteuclid.o bn_mp_fread.o \
 bn_mp_from_sbin.o bn_mp_from_ubin.o bn_mp_fwrite.o bn_mp_gcd.o bn_mp_get_double.o bn_mp_get_i32.o \
 bn_mp_get_i64.o bn_mp_get_l.o bn_mp_get_ll.o bn_mp_get_mag_u32.o bn_mp_get_mag_u64.o bn_mp_get_mag_ul.o \
-bn_mp_get_mag_ull.o bn_mp_grow.o bn_mp_ilogb.o bn_mp_incr.o bn_mp_init.o bn_mp_init_copy.o \
-bn_mp_init_i32.o bn_mp_init_i64.o bn_mp_init_l.o bn_mp_init_ll.o bn_mp_init_multi.o bn_mp_init_set.o \
-bn_mp_init_size.o bn_mp_init_u32.o bn_mp_init_u64.o bn_mp_init_ul.o bn_mp_init_ull.o bn_mp_invmod.o \
-bn_mp_is_square.o bn_mp_iseven.o bn_mp_isodd.o bn_mp_kronecker.o bn_mp_lcm.o bn_mp_lshd.o bn_mp_mod.o \
+bn_mp_get_mag_ull.o bn_mp_grow.o bn_mp_incr.o bn_mp_init.o bn_mp_init_copy.o bn_mp_init_i32.o \
+bn_mp_init_i64.o bn_mp_init_l.o bn_mp_init_ll.o bn_mp_init_multi.o bn_mp_init_set.o bn_mp_init_size.o \
+bn_mp_init_u32.o bn_mp_init_u64.o bn_mp_init_ul.o bn_mp_init_ull.o bn_mp_invmod.o bn_mp_is_square.o \
+bn_mp_iseven.o bn_mp_isodd.o bn_mp_kronecker.o bn_mp_lcm.o bn_mp_log_u32.o bn_mp_lshd.o bn_mp_mod.o \
 bn_mp_mod_2d.o bn_mp_mod_d.o bn_mp_montgomery_calc_normalization.o bn_mp_montgomery_reduce.o \
 bn_mp_montgomery_setup.o bn_mp_mul.o bn_mp_mul_2.o bn_mp_mul_2d.o bn_mp_mul_d.o bn_mp_mulmod.o bn_mp_neg.o \
 bn_mp_or.o bn_mp_pack.o bn_mp_pack_count.o bn_mp_prime_fermat.o bn_mp_prime_frobenius_underwood.o \
diff --git a/tommath.def b/tommath.def
index b814186..229fae4 100644
--- a/tommath.def
+++ b/tommath.def
@@ -54,7 +54,6 @@ EXPORTS
     mp_get_mag_ul
     mp_get_mag_ull
     mp_grow
-    mp_ilogb
     mp_incr
     mp_init
     mp_init_copy
@@ -76,6 +75,7 @@ EXPORTS
     mp_isodd
     mp_kronecker
     mp_lcm
+    mp_log_u32
     mp_lshd
     mp_mod
     mp_mod_2d
diff --git a/tommath.h b/tommath.h
index a8ad230..b92b06e 100644
--- a/tommath.h
+++ b/tommath.h
@@ -717,7 +717,7 @@ MP_DEPRECATED(mp_prime_rand) mp_err mp_prime_random_ex(mp_int *a, int t, int siz
 mp_err mp_prime_rand(mp_int *a, int t, int size, int flags) MP_WUR;
 
 /* Integer logarithm to integer base */
-mp_err mp_ilogb(const mp_int *a, uint32_t base, mp_int *c) MP_WUR;
+mp_err mp_log_u32(const mp_int *a, uint32_t base, mp_int *c) MP_WUR;
 
 /* c = a**b */
 mp_err mp_expt_u32(const mp_int *a, uint32_t b, mp_int *c) MP_WUR;
diff --git a/tommath_class.h b/tommath_class.h
index d70fe9f..d7f71a4 100644
--- a/tommath_class.h
+++ b/tommath_class.h
@@ -58,7 +58,6 @@
 #   define BN_MP_GET_MAG_UL_C
 #   define BN_MP_GET_MAG_ULL_C
 #   define BN_MP_GROW_C
-#   define BN_MP_ILOGB_C
 #   define BN_MP_INCR_C
 #   define BN_MP_INIT_C
 #   define BN_MP_INIT_COPY_C
@@ -79,6 +78,7 @@
 #   define BN_MP_ISODD_C
 #   define BN_MP_KRONECKER_C
 #   define BN_MP_LCM_C
+#   define BN_MP_LOG_U32_C
 #   define BN_MP_LSHD_C
 #   define BN_MP_MOD_C
 #   define BN_MP_MOD_2D_C
@@ -505,22 +505,6 @@
 #if defined(BN_MP_GROW_C)
 #endif
 
-#if defined(BN_MP_ILOGB_C)
-#   define BN_MP_CLEAR_MULTI_C
-#   define BN_MP_CMP_C
-#   define BN_MP_CMP_D_C
-#   define BN_MP_COPY_C
-#   define BN_MP_COUNT_BITS_C
-#   define BN_MP_EXCH_C
-#   define BN_MP_EXPT_U32_C
-#   define BN_MP_INIT_MULTI_C
-#   define BN_MP_MUL_C
-#   define BN_MP_SET_C
-#   define BN_MP_SET_U32_C
-#   define BN_MP_SQR_C
-#   define BN_MP_ZERO_C
-#endif
-
 #if defined(BN_MP_INCR_C)
 #   define BN_MP_ADD_D_C
 #   define BN_MP_DECR_C
@@ -632,6 +616,22 @@
 #   define BN_MP_MUL_C
 #endif
 
+#if defined(BN_MP_LOG_U32_C)
+#   define BN_MP_CLEAR_MULTI_C
+#   define BN_MP_CMP_C
+#   define BN_MP_CMP_D_C
+#   define BN_MP_COPY_C
+#   define BN_MP_COUNT_BITS_C
+#   define BN_MP_EXCH_C
+#   define BN_MP_EXPT_U32_C
+#   define BN_MP_INIT_MULTI_C
+#   define BN_MP_MUL_C
+#   define BN_MP_SET_C
+#   define BN_MP_SET_U32_C
+#   define BN_MP_SQR_C
+#   define BN_MP_ZERO_C
+#endif
+
 #if defined(BN_MP_LSHD_C)
 #   define BN_MP_GROW_C
 #endif