mpi: fix some careless use of integer types.

MPI has a mp_size type for sizing of the digit arrays and some
other uses. It is not consistently used.  Moreover, it is
typedef'd as a signed type.  The type int is used for
iterating over digits, instead of the matching mpi_size type.
The int type is used as a size argument in some functions,
and in functions that return the number of bits.

This patch makes mp_size unsigned and replaces most uses of
int with a more appropriate type.

Because mp_size is now used for indexing, and is unsigned,
some downward loop termination tests have to be changed;
the always true condition ix >= 0 cannot be used.

* arith.c (width): Use mp_size for local variable which
iterates over digits inside mpi_int object, and for bit
count. Use unum to convert bit count to Lisp integer:
mp_size could be out of range of cnum.

* mpi/mpi-types.h (mp_size): Typedef to unsigned.
(MP_SIZE_MAX): New macro.
(MP_DIGIT_BIT, MP_WORD_BIT): Cast the value to mp_size rather
than to int.

* mpi/mpi.c (s_mp_defprec): Declare variable as mp_size.
(s_mp_setz, s_mp_copy, mp_size, s_highest_bit_mp,
s_mp_set_bit, s_mp_ispow2, s_mp_outlen, mp_set_int,
mp_set_uintptr, mp_set_double_intptr, mp_expt, mp_sqrt,
mp_exptmod, mp_hash, mp_gcd, mp_shift, mp_bit, mp_to_double,
mp_print, mp_read_signed_bin, mp_signed_bin_size,
mp_read_unsigned_bin, mp_unsigned_bin_size,
mp_to_unsigned_bin, mp_to_unsigned_buf, mp_count_bits,
mp_is_pow_two, mp_read_radix, mp_radix_size,
mp_value_radix_size, mp_toradix_case, s_mp_setz, s_mp_copy,
mp_size, s_highest_bit_mp, s_mp_set_bit, s_mp_mul_2,
s_mp_mod_2d, s_mp_div_2d, s_mp_div_d, s_mp_sqr, s_mp_sqr,
s_mp_div, s_mp_cmp, s_mp_cmp_d, s_mp_ispow2, s_mp_outlen): In
all these functions, use size_t for external size, mp_size for
number of digits and bits, in return values, arguments and
local variables. Tests in descending loops are adjusted for
unsigned logic.

* mpi/mpi.h (mp_get_prec, mp_set_prec, mp_read_signed_bin,
mp_signed_bin_size, mp_read_unsigned_bin,
mp_unsigned_bin_size, mp_to_unsigned_buf, mp_count_bits,
mp_is_pow_two, mp_radix_size, mp_value_radix_size):
Declarations updated.

* mpi/mplogic.c (mpl_not, mpl_and, mpl_or, mpl_xor, mpl_rsh,
mpl_lsh, mpl_num_set, mpl_num_clear, mpl_parity): Just like
in mpi.c

* rand.c (make_random_state): Use mp_size and ucnum for local
variables holding digit and bit counts.

* sysif.c (off_t_num): Use mp_size for digit count.

1 files changed, 23 insertions, 20 deletions

diff --git a/mpi/mplogic.c b/mpi/mplogic.c
index 629ff312..eae1ea47 100644
--- a/mpi/mplogic.c
+++ b/mpi/mplogic.c
@@ -9,12 +9,12 @@
  * $Id: mplogic.c,v 1.1 2004/02/08 04:29:29 sting Exp $
  */
 
+#include <stdlib.h>
 #include "config.h"
 #include "mplogic.h"
 #if MP_ARGCHK == 2
 #include <assert.h>
 #endif
-#include <stdlib.h>
 
 #ifdef __cplusplus
 #define convert(TYPE, EXPR) (static_cast<TYPE>(EXPR))
@@ -67,7 +67,7 @@ static unsigned char bitc[] = {
 mp_err mpl_not(mp_int *a, mp_int *b)
 {
   mp_err res;
-  int ix;
+  mp_size ix;
 
   ARGCHK(a != NULL && b != NULL, MP_BADARG);
 
@@ -87,7 +87,7 @@ mp_err mpl_and(mp_int *a, mp_int *b, mp_int *c)
 {
   mp_int *which, *other;
   mp_err res;
-  int ix;
+  mp_size ix;
 
   ARGCHK(a != NULL && b != NULL && c != NULL, MP_BADARG);
 
@@ -114,7 +114,7 @@ mp_err mpl_or(mp_int *a, mp_int *b, mp_int *c)
 {
   mp_int *which, *other;
   mp_err res;
-  int ix;
+  mp_size ix;
 
   ARGCHK(a != NULL && b != NULL && c != NULL, MP_BADARG);
 
@@ -139,7 +139,7 @@ mp_err mpl_xor(mp_int *a, mp_int *b, mp_int *c)
 {
   mp_int *which, *other;
   mp_err res;
-  int ix;
+  mp_size ix;
 
   ARGCHK(a != NULL && b != NULL && c != NULL, MP_BADARG);
 
@@ -168,7 +168,7 @@ mp_err mpl_xor(mp_int *a, mp_int *b, mp_int *c)
 mp_err mpl_rsh(mp_int *a, mp_int *b, mp_digit d)
 {
   mp_err res;
-  mp_digit dshift, bshift;
+  mp_size dshift, bshift;
 
   ARGCHK(a != NULL && b != NULL, MP_BADARG);
 
@@ -186,14 +186,14 @@ mp_err mpl_rsh(mp_int *a, mp_int *b, mp_digit d)
   if (bshift)
   {
     mp_digit prev = 0, next, mask = (1 << bshift) - 1;
-    int ix;
+    mp_size ix;
 
     /* 'mask' is a digit with the lower bshift bits set, the rest
      * clear.  It is used to mask off the bottom bshift bits of each
      * digit, which are then shifted on to the top of the next lower
      * digit.
      */
-    for (ix = USED(b) - 1; ix >= 0; ix--) {
+    for (ix = USED(b) - 1; ix < MP_SIZE_MAX; ix--) {
       /* Take off the lower bits and shift them up... */
       next = (DIGIT(b, ix) & mask) << (DIGIT_BIT - bshift);
 
@@ -213,7 +213,7 @@ mp_err mpl_rsh(mp_int *a, mp_int *b, mp_digit d)
 mp_err mpl_lsh(mp_int *a, mp_int *b, mp_digit d)
 {
   mp_err res;
-  mp_digit dshift, bshift;
+  mp_size dshift, bshift;
 
   ARGCHK(a != NULL && b != NULL, MP_BADARG);
 
@@ -228,7 +228,7 @@ mp_err mpl_lsh(mp_int *a, mp_int *b, mp_digit d)
       return res;
 
   if (bshift) {
-    int ix;
+    mp_size ix;
     mp_digit prev = 0, next, mask = (1 << bshift) - 1;
 
     for (ix = 0; ix < USED(b); ix++) {
@@ -251,19 +251,20 @@ mp_err mpl_lsh(mp_int *a, mp_int *b, mp_digit d)
  *
  * mpl_num_clear() does basically the same thing for clear bits.
  */
-mp_err mpl_num_set(mp_int *a, int *num)
+mp_err mpl_num_set(mp_int *a, mp_size *num)
 {
-  int ix, db, nset = 0;
+  mp_size ix, nset = 0;
   mp_digit cur;
   unsigned char reg;
 
   ARGCHK(a != NULL, MP_BADARG);
 
   for (ix = 0; ix < USED(a); ix++) {
+    size_t i;
     cur = DIGIT(a, ix);
 
-    for (db = 0; db < convert(int, sizeof (mp_digit)); db++) {
-      reg = (cur >> (CHAR_BIT * db)) & UCHAR_MAX;
+    for (i = 0; i < sizeof (mp_digit); i++) {
+      reg = (cur >> (CHAR_BIT * i)) & UCHAR_MAX;
 
       nset += bitc[reg];
     }
@@ -275,19 +276,20 @@ mp_err mpl_num_set(mp_int *a, int *num)
   return MP_OKAY;
 }
 
-mp_err mpl_num_clear(mp_int *a, int *num)
+mp_err mpl_num_clear(mp_int *a, mp_size *num)
 {
-  int ix, db, nset = 0;
+  mp_size ix, nset = 0;
   mp_digit cur;
   unsigned char reg;
 
   ARGCHK(a != NULL, MP_BADARG);
 
   for (ix = 0; ix < USED(a); ix++) {
+    size_t i;
     cur = DIGIT(a, ix);
 
-    for (db = 0; db < convert(int, sizeof (mp_digit)); db++) {
-      reg = (cur >> (CHAR_BIT * db)) & UCHAR_MAX;
+    for (i = 0; i < sizeof (mp_digit); i++) {
+      reg = (cur >> (CHAR_BIT * i)) & UCHAR_MAX;
 
       nset += bitc[UCHAR_MAX - reg];
     }
@@ -305,13 +307,14 @@ mp_err mpl_num_clear(mp_int *a, int *num)
  */
 mp_err mpl_parity(mp_int *a)
 {
-  int ix, par = 0;
+  mp_size ix;
+  unsigned par = 0;
   mp_digit cur;
 
   ARGCHK(a != NULL, MP_BADARG);
 
   for (ix = 0; ix < USED(a); ix++) {
-    int shft = (sizeof (mp_digit) * CHAR_BIT) / 2;
+    unsigned shft = (sizeof (mp_digit) * CHAR_BIT) / 2;
 
     cur = DIGIT(a, ix);