Merge 8.6

7 files changed, 36 insertions, 38 deletions

diff --git a/generic/tclExecute.c b/generic/tclExecute.c
index c3d02a6..a2eed3f 100644
--- a/generic/tclExecute.c
+++ b/generic/tclExecute.c
@@ -8191,7 +8191,7 @@ ExecuteExtendedBinaryMathOp(
 	if (opcode == INST_LSHIFT) {
 	    mp_mul_2d(&big1, shift, &bigResult);
 	} else {
-	    mp_tc_div_2d(&big1, shift, &bigResult);
+	    mp_signed_rsh(&big1, shift, &bigResult);
 	}
 	mp_clear(&big1);
 	BIG_RESULT(&bigResult);
diff --git a/generic/tclStrToD.c b/generic/tclStrToD.c
index c9abb1a..b160d9e 100644
--- a/generic/tclStrToD.c
+++ b/generic/tclStrToD.c
@@ -4577,7 +4577,7 @@ TclBignumToDouble(
 	     */
 
 	    mp_div_2d(a, -shift, &b, NULL);
-	    if (mp_get_bit(&b, 0)) {
+	    if (mp_isodd(&b)) {
 		if (b.sign == MP_ZPOS) {
 		    mp_add_d(&b, 1, &b);
 		} else {
diff --git a/generic/tclStubInit.c b/generic/tclStubInit.c
index c9a195f..74d02f1 100644
--- a/generic/tclStubInit.c
+++ b/generic/tclStubInit.c
@@ -61,6 +61,13 @@
 #undef Tcl_BackgroundError
 #define TclStaticPackage Tcl_StaticPackage
 
+#undef TclBN_mp_tc_and
+#undef TclBN_mp_tc_or
+#undef TclBN_mp_tc_xor
+#define TclBN_mp_tc_and TclBN_mp_and
+#define TclBN_mp_tc_or TclBN_mp_or
+#define TclBN_mp_tc_xor TclBN_mp_xor
+
 /* See bug 510001: TclSockMinimumBuffers needs plat imp */
 #if defined(_WIN64) || defined(TCL_NO_DEPRECATED) || TCL_MAJOR_VERSION > 8
 #   define TclSockMinimumBuffersOld 0
@@ -950,7 +957,7 @@ const TclTomMathStubs tclTomMathStubs = {
     TclBN_mp_tc_and, /* 73 */
     TclBN_mp_tc_or, /* 74 */
     TclBN_mp_tc_xor, /* 75 */
-    TclBN_mp_tc_div_2d, /* 76 */
+    TclBN_mp_signed_rsh, /* 76 */
     TclBN_mp_get_bit, /* 77 */
 };
 
diff --git a/generic/tclTestObj.c b/generic/tclTestObj.c
index a289e32..c9e4a6f 100644
--- a/generic/tclTestObj.c
+++ b/generic/tclTestObj.c
@@ -290,9 +290,9 @@ TestbignumobjCmd(
 	    return TCL_ERROR;
 	}
 	if (!Tcl_IsShared(varPtr[varIndex])) {
-	    Tcl_SetIntObj(varPtr[varIndex], !mp_get_bit(&bignumValue, 0));
+	    Tcl_SetIntObj(varPtr[varIndex], !mp_isodd(&bignumValue));
 	} else {
-	    SetVarToObj(varPtr, varIndex, Tcl_NewIntObj(!mp_get_bit(&bignumValue, 0)));
+	    SetVarToObj(varPtr, varIndex, Tcl_NewIntObj(!mp_isodd(&bignumValue)));
 	}
 	mp_clear(&bignumValue);
 	break;
diff --git a/generic/tclTomMath.decls b/generic/tclTomMath.decls
index 7221dcf..01b6342 100644
--- a/generic/tclTomMath.decls
+++ b/generic/tclTomMath.decls
@@ -265,7 +265,7 @@ declare 75 {
     int TclBN_mp_tc_xor(const mp_int *a, const mp_int *b, mp_int *c)
 }
 declare 76 {
-    int TclBN_mp_tc_div_2d(const mp_int *a, int b, mp_int *c)
+    int TclBN_mp_signed_rsh(const mp_int *a, int b, mp_int *c)
 }
 declare 77 {
     int TclBN_mp_get_bit(const mp_int *a, int b)
diff --git a/generic/tclTomMath.h b/generic/tclTomMath.h
index cc9f286..bbcb4bc 100644
--- a/generic/tclTomMath.h
+++ b/generic/tclTomMath.h
@@ -203,12 +203,14 @@ typedef int ltm_prime_callback(unsigned char *dst, int len, void *dat);
 
 
 /* error code to char* string */
-const char *mp_error_to_string(int code);
+/*
+const char *mp_error_to_string(mp_err code);
+*/
 
 /* ---> init and deinit bignum functions <--- */
 /* init a bignum */
 /*
-int mp_init(mp_int *a);
+mp_err mp_init(mp_int *a);
 */
 
 /* free a bignum */
@@ -218,7 +220,7 @@ void mp_clear(mp_int *a);
 
 /* init a null terminated series of arguments */
 /*
-int mp_init_multi(mp_int *mp, ...);
+mp_err mp_init_multi(mp_int *mp, ...);
 */
 
 /* clear a null terminated series of arguments */
@@ -233,23 +235,23 @@ void mp_exch(mp_int *a, mp_int *b);
 
 /* shrink ram required for a bignum */
 /*
-int mp_shrink(mp_int *a);
+mp_err mp_shrink(mp_int *a);
 */
 
 /* grow an int to a given size */
 /*
-int mp_grow(mp_int *a, int size);
+mp_err mp_grow(mp_int *a, int size);
 */
 
 /* init to a given number of digits */
 /*
-int mp_init_size(mp_int *a, int size);
+mp_err mp_init_size(mp_int *a, int size);
 */
 
 /* ---> Basic Manipulations <--- */
 #define mp_iszero(a) (((a)->used == 0) ? MP_YES : MP_NO)
-#define mp_iseven(a) (!mp_get_bit((a),0))
-#define mp_isodd(a)  mp_get_bit((a),0)
+#define mp_iseven(a) (((a)->used == 0 || (((a)->dp[0] & 1) == 0)) ? MP_YES : MP_NO)
+#define mp_isodd(a)  (((a)->used > 0 && (((a)->dp[0] & 1) == 1)) ? MP_YES : MP_NO)
 #define mp_isneg(a)  (((a)->sign != MP_ZPOS) ? MP_YES : MP_NO)
 
 /* set to zero */
@@ -410,24 +412,9 @@ int mp_or(const mp_int *a, const mp_int *b, mp_int *c);
 int mp_and(const mp_int *a, const mp_int *b, mp_int *c);
 */
 
-/* c = a XOR b (two complement) */
-/*
-int mp_tc_xor(const mp_int *a, const mp_int *b, mp_int *c);
-*/
-
-/* c = a OR b (two complement) */
-/*
-int mp_tc_or(const mp_int *a, const mp_int *b, mp_int *c);
-*/
-
-/* c = a AND b (two complement) */
-/*
-int mp_tc_and(const mp_int *a, const mp_int *b, mp_int *c);
-*/
-
 /* right shift (two complement) */
 /*
-int mp_tc_div_2d(const mp_int *a, int b, mp_int *c);
+int mp_signed_rsh(const mp_int *a, int b, mp_int *c);
 */
 
 /* ---> Basic arithmetic <--- */
diff --git a/generic/tclTomMathDecls.h b/generic/tclTomMathDecls.h
index c5ed4d5..52b84ee 100644
--- a/generic/tclTomMathDecls.h
+++ b/generic/tclTomMathDecls.h
@@ -75,6 +75,8 @@
 #define mp_get_long TclBN_mp_get_long
 #define mp_get_long_long TclBN_mp_get_long_long
 #define mp_grow TclBN_mp_grow
+#define s_mp_get_bit TclBN_mp_get_bit
+#define mp_grow TclBN_mp_grow
 #define mp_init TclBN_mp_init
 #define mp_init_copy TclBN_mp_init_copy
 #define mp_init_multi TclBN_mp_init_multi
@@ -106,10 +108,11 @@
 #define mp_sqrt TclBN_mp_sqrt
 #define mp_sub TclBN_mp_sub
 #define mp_sub_d TclBN_mp_sub_d
-#define mp_tc_and TclBN_mp_tc_and
-#define mp_tc_div_2d TclBN_mp_tc_div_2d
-#define mp_tc_or TclBN_mp_tc_or
-#define mp_tc_xor TclBN_mp_tc_xor
+#define mp_signed_rsh TclBN_mp_signed_rsh
+#define mp_tc_and TclBN_mp_and
+#define mp_tc_div_2d TclBN_mp_signed_rsh
+#define mp_tc_or TclBN_mp_or
+#define mp_tc_xor TclBN_mp_xor
 #define mp_to_unsigned_bin TclBN_mp_to_unsigned_bin
 #define mp_to_unsigned_bin_n TclBN_mp_to_unsigned_bin_n
 #define mp_toom_mul TclBN_mp_toom_mul
@@ -351,7 +354,8 @@ EXTERN int		TclBN_mp_tc_or(const mp_int *a, const mp_int *b,
 EXTERN int		TclBN_mp_tc_xor(const mp_int *a, const mp_int *b,
 				mp_int *c);
 /* 76 */
-EXTERN int		TclBN_mp_tc_div_2d(const mp_int *a, int b, mp_int *c);
+EXTERN int		TclBN_mp_signed_rsh(const mp_int *a, int b,
+				mp_int *c);
 /* 77 */
 EXTERN int		TclBN_mp_get_bit(const mp_int *a, int b);
 
@@ -435,7 +439,7 @@ typedef struct TclTomMathStubs {
     int (*tclBN_mp_tc_and) (const mp_int *a, const mp_int *b, mp_int *c); /* 73 */
     int (*tclBN_mp_tc_or) (const mp_int *a, const mp_int *b, mp_int *c); /* 74 */
     int (*tclBN_mp_tc_xor) (const mp_int *a, const mp_int *b, mp_int *c); /* 75 */
-    int (*tclBN_mp_tc_div_2d) (const mp_int *a, int b, mp_int *c); /* 76 */
+    int (*tclBN_mp_signed_rsh) (const mp_int *a, int b, mp_int *c); /* 76 */
     int (*tclBN_mp_get_bit) (const mp_int *a, int b); /* 77 */
 } TclTomMathStubs;
 
@@ -603,8 +607,8 @@ extern const TclTomMathStubs *tclTomMathStubsPtr;
 	(tclTomMathStubsPtr->tclBN_mp_tc_or) /* 74 */
 #define TclBN_mp_tc_xor \
 	(tclTomMathStubsPtr->tclBN_mp_tc_xor) /* 75 */
-#define TclBN_mp_tc_div_2d \
-	(tclTomMathStubsPtr->tclBN_mp_tc_div_2d) /* 76 */
+#define TclBN_mp_signed_rsh \
+	(tclTomMathStubsPtr->tclBN_mp_signed_rsh) /* 76 */
 #define TclBN_mp_get_bit \
 	(tclTomMathStubsPtr->tclBN_mp_get_bit) /* 77 */