Experiment: On platforms which support it (gcc), compiled libtommath with DIGIT_BIT=60

7 files changed, 20 insertions, 43 deletions

diff --git a/generic/tcl.h b/generic/tcl.h
index c287a84..65fdab9 100644
--- a/generic/tcl.h
+++ b/generic/tcl.h
@@ -2202,10 +2202,6 @@ typedef void (Tcl_LimitHandlerDeleteProc) (ClientData clientData);
 
 typedef struct mp_int mp_int;
 #define MP_INT_DECLARED
-typedef unsigned int mp_digit;
-#define MP_DIGIT_DECLARED
-typedef unsigned TCL_WIDE_INT_TYPE mp_word;
-#define MP_WORD_DECLARED
 
 /*
  *----------------------------------------------------------------------------
diff --git a/generic/tclInt.h b/generic/tclInt.h
index 9fc778b..e6b211c 100644
--- a/generic/tclInt.h
+++ b/generic/tclInt.h
@@ -5050,7 +5050,6 @@ typedef struct NRE_callback {
 
 #include "tclIntDecls.h"
 #include "tclIntPlatDecls.h"
-#include "tclTomMathDecls.h"
 
 #if !defined(USE_TCL_STUBS) && !defined(TCL_MEM_DEBUG)
 #define Tcl_AttemptAlloc(size)        TclpAlloc(size)
diff --git a/generic/tclTest.c b/generic/tclTest.c
index 172b56e..dde4496 100644
--- a/generic/tclTest.c
+++ b/generic/tclTest.c
@@ -20,6 +20,7 @@
 #   define USE_TCL_STUBS
 #endif
 #include "tclInt.h"
+#include "tclTomMath.h"
 #include "tclOO.h"
 #include <math.h>
 
diff --git a/generic/tclTomMath.h b/generic/tclTomMath.h
index 3f23fd6..180de77 100644
--- a/generic/tclTomMath.h
+++ b/generic/tclTomMath.h
@@ -7,13 +7,11 @@
  * Michael Fromberger but has been written from scratch with
  * additional optimizations in place.
  *
- * The library is free for all purposes without any express
- * guarantee it works.
+ * SPDX-License-Identifier: Unlicense
  */
 #ifndef BN_H_
 #define BN_H_
 
-#include "tclTomMathDecls.h"
 #ifndef MODULE_SCOPE
 #define MODULE_SCOPE extern
 #endif
@@ -30,7 +28,12 @@ extern "C" {
 #endif
 
 /* detect 64-bit mode if possible */
-#if defined(NEVER)
+#if defined(__x86_64__) || defined(_M_X64) || defined(_M_AMD64) || \
+    defined(__powerpc64__) || defined(__ppc64__) || defined(__PPC64__) || \
+    defined(__s390x__) || defined(__arch64__) || defined(__aarch64__) || \
+    defined(__sparcv9) || defined(__sparc_v9__) || defined(__sparc64__) || \
+    defined(__ia64) || defined(__ia64__) || defined(__itanium__) || defined(_M_IA64) || \
+    defined(__LP64__) || defined(_LP64) || defined(__64BIT__)
 #   if !(defined(MP_32BIT) || defined(MP_16BIT) || defined(MP_8BIT))
 #      if defined(__GNUC__)
 /* we support 128bit integers only via: __attribute__((mode(TI))) */
@@ -45,57 +48,31 @@ extern "C" {
 /* some default configurations.
  *
  * A "mp_digit" must be able to hold DIGIT_BIT + 1 bits
- * A "mp_word" must be able to hold 2*DIGIT_BIT + 1 bits
  *
  * At the very least a mp_digit must be able to hold 7 bits
  * [any size beyond that is ok provided it doesn't overflow the data type]
  */
 #ifdef MP_8BIT
-#ifndef MP_DIGIT_DECLARED
 typedef unsigned char        mp_digit;
-#define MP_DIGIT_DECLARED
-#endif
-#ifndef MP_WORD_DECLARED
-typedef unsigned short       mp_word;
-#define MP_WORD_DECLARED
-#endif
 #   define MP_SIZEOF_MP_DIGIT 1
 #   ifdef DIGIT_BIT
 #      error You must not define DIGIT_BIT when using MP_8BIT
 #   endif
 #elif defined(MP_16BIT)
-#ifndef MP_DIGIT_DECLARED
 typedef unsigned short       mp_digit;
-#define MP_DIGIT_DECLARED
-#endif
-#ifndef MP_WORD_DECLARED
-typedef unsigned int         mp_word;
-#define MP_WORD_DECLARED
-#endif
 #   define MP_SIZEOF_MP_DIGIT 2
 #   ifdef DIGIT_BIT
 #      error You must not define DIGIT_BIT when using MP_16BIT
 #   endif
 #elif defined(MP_64BIT)
 /* for GCC only on supported platforms */
-#ifndef MP_DIGIT_DECLARED
 typedef unsigned long long   mp_digit;
-#define MP_DIGIT_DECLARED
-#endif
-typedef unsigned long        mp_word __attribute__((mode(TI)));
 #   define DIGIT_BIT 60
 #else
 /* this is the default case, 28-bit digits */
 
 /* this is to make porting into LibTomCrypt easier :-) */
-#ifndef MP_DIGIT_DECLARED
 typedef unsigned int         mp_digit;
-#define MP_DIGIT_DECLARED
-#endif
-#ifndef MP_WORD_DECLARED
-typedef unsigned long long   mp_word;
-#define MP_WORD_DECLARED
-#endif
 
 #   ifdef MP_31BIT
 /* this is an extension that uses 31-bit digits */
@@ -151,9 +128,6 @@ typedef int           mp_err;
 #   endif
 #endif
 
-/* size of comba arrays, should be at least 2 * 2**(BITS_PER_WORD - BITS_PER_DIGIT*2) */
-#define MP_WARRAY               (1u << (((sizeof(mp_word) * CHAR_BIT) - (2 * DIGIT_BIT)) + 1))
-
 /* the infamous mp_int structure */
 #ifndef MP_INT_DECLARED
 #define MP_INT_DECLARED
@@ -804,6 +778,8 @@ int mp_fwrite(const mp_int *a, int radix, FILE *stream);
 #define mp_todecimal(M, S) mp_toradix((M), (S), 10)
 #define mp_tohex(M, S)     mp_toradix((M), (S), 16)
 
+#include "tclTomMathDecls.h"
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/generic/tclTomMathStubLib.c b/generic/tclTomMathStubLib.c
index 324f2a3..1cff1ca 100644
--- a/generic/tclTomMathStubLib.c
+++ b/generic/tclTomMathStubLib.c
@@ -12,6 +12,7 @@
  */
 
 #include "tclInt.h"
+#include "tclTomMath.h"
 
 MODULE_SCOPE const TclTomMathStubs *tclTomMathStubsPtr;
 
diff --git a/libtommath/tommath.h b/libtommath/tommath.h
index b5faf8c..66e2d8c 100644
--- a/libtommath/tommath.h
+++ b/libtommath/tommath.h
@@ -50,21 +50,18 @@ typedef unsigned long long Tcl_WideUInt;
 /* some default configurations.
  *
  * A "mp_digit" must be able to hold DIGIT_BIT + 1 bits
- * A "mp_word" must be able to hold 2*DIGIT_BIT + 1 bits
  *
  * At the very least a mp_digit must be able to hold 7 bits
  * [any size beyond that is ok provided it doesn't overflow the data type]
  */
 #ifdef MP_8BIT
 typedef unsigned char        mp_digit;
-typedef unsigned short       mp_word;
 #   define MP_SIZEOF_MP_DIGIT 1
 #   ifdef DIGIT_BIT
 #      error You must not define DIGIT_BIT when using MP_8BIT
 #   endif
 #elif defined(MP_16BIT)
 typedef unsigned short       mp_digit;
-typedef unsigned int         mp_word;
 #   define MP_SIZEOF_MP_DIGIT 2
 #   ifdef DIGIT_BIT
 #      error You must not define DIGIT_BIT when using MP_16BIT
@@ -72,14 +69,12 @@ typedef unsigned int         mp_word;
 #elif defined(MP_64BIT)
 /* for GCC only on supported platforms */
 typedef unsigned long long   mp_digit;
-typedef unsigned long        mp_word __attribute__((mode(TI)));
 #   define DIGIT_BIT 60
 #else
 /* this is the default case, 28-bit digits */
 
 /* this is to make porting into LibTomCrypt easier :-) */
 typedef unsigned int         mp_digit;
-typedef unsigned long long   mp_word;
 
 #   ifdef MP_31BIT
 /* this is an extension that uses 31-bit digits */
diff --git a/libtommath/tommath_private.h b/libtommath/tommath_private.h
index 2096f77..e1ad45d 100644
--- a/libtommath/tommath_private.h
+++ b/libtommath/tommath_private.h
@@ -49,6 +49,15 @@ extern void *XREALLOC(void *p, size_t n);
 extern void XFREE(void *p);
 #endif
 
+#if defined(MP_64BIT)
+/* for GCC only on supported platforms */
+typedef unsigned long        mp_word __attribute__((mode(TI)));
+#elif _WIN32
+typedef __int64              mp_word;
+#else
+typedef unsigned long long   mp_word;
+#endif
+
 /* you'll have to tune these... */
 #define KARATSUBA_MUL_CUTOFF 80      /* Min. number of digits before Karatsuba multiplication is used. */
 #define KARATSUBA_SQR_CUTOFF 120     /* Min. number of digits before Karatsuba squaring is used. */