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, 8 insertions, 8 deletions

diff --git a/rand.c b/rand.c
index bf57ca3c..6797dcdc 100644
--- a/rand.c
+++ b/rand.c
@@ -121,7 +121,7 @@ val make_random_state(val seed, val warmup)
   warmup = default_null_arg(warmup);
 
   if (bignump(seed)) {
-    int dig, bit;
+    mp_size dig, bit;
     mp_int *m = mp(seed);
 
     for (i = 0, dig = 0, bit = 0; i < 16 && dig < m->used; i++) {
@@ -222,15 +222,15 @@ val random(val state, val modulus)
 
   if (bignump(modulus)) {
     mp_int *m = mp(modulus);
-    int bits = mp_count_bits(m) - mp_is_pow_two(m);
-    int rands_needed = (bits + 32 - 1) / 32;
-    int msb_rand_bits = bits % 32;
+    ucnum bits = mp_count_bits(m) - mp_is_pow_two(m);
+    ucnum rands_needed = (bits + 32 - 1) / 32;
+    ucnum msb_rand_bits = bits % 32;
     rand32_t msb_rand_mask = convert(rand32_t, -1) >> (32 - msb_rand_bits);
     val out = make_bignum();
     mp_int *om = mp(out);
 
     for (;;) {
-      int i;
+      ucnum i;
       for (i = 0; i < rands_needed; i++) {
         rand32_t rnd = rand32(r);
 #if MP_DIGIT_SIZE >= 4
@@ -264,14 +264,14 @@ val random(val state, val modulus)
     } else if (m > 1) {
       int bits = highest_bit(m - 1);
 #if SIZEOF_PTR >= 8
-      int rands_needed = (bits + 32 - 1) / 32;
+      ucnum rands_needed = (bits + 32 - 1) / 32;
 #endif
-      int msb_rand_bits = bits % 32;
+      ucnum msb_rand_bits = bits % 32;
       rand32_t msb_rand_mask = convert(rand32_t, -1) >> (32 - msb_rand_bits);
       for (;;) {
         cnum out = 0;
 #if SIZEOF_PTR >= 8
-        int i;
+        ucnum i;
 
         for (i = 0; i < rands_needed; i++) {
           rand32_t rnd = rand32(r);