Change gmp_ui/gmp_si types to mpir_ui/mpir_si

Author: BrianGladman

build.vc10/mpir-tests.sln

@@ -178,33 +178,33 @@ void fft_mulmod_2expp1(mp_ptr r1, mp_srcptr i1, mp_srcptr i2,
    TMP_FREE;
 }
 
-gmp_si fft_adjust_limbs(mp_size_t limbs)
+mpir_si fft_adjust_limbs(mp_size_t limbs)
 {
    mp_size_t bits1 = limbs*GMP_LIMB_BITS, bits2;
    mp_size_t depth = 1, limbs2, depth1 = 1, depth2 = 1, adj;
    mp_size_t off1, off2;
 
    if (limbs <= FFT_MULMOD_2EXPP1_CUTOFF) return limbs;
 
-   while ((((gmp_ui)1)<<depth)<limbs) depth++;
-   limbs2 = (((gmp_si)1)<<depth); /* within a factor of 2 of limbs */
+   while ((((mpir_ui)1)<<depth)<limbs) depth++;
+   limbs2 = (((mpir_si)1)<<depth); /* within a factor of 2 of limbs */
    bits2 = limbs2*GMP_LIMB_BITS;
 
-   while ((((gmp_ui)1)<<depth1) < bits1) depth1++;
+   while ((((mpir_ui)1)<<depth1) < bits1) depth1++;
    if (depth1 < 12) off1 = mulmod_2expp1_table_n[0];
    else off1 = mulmod_2expp1_table_n[MIN(depth1, FFT_N_NUM + 11) - 12];
    depth1 = depth1/2 - off1;
 
-   while ((((gmp_ui)1)<<depth2) < bits2) depth2++;
+   while ((((mpir_ui)1)<<depth2) < bits2) depth2++;
    if (depth2 < 12) off2 = mulmod_2expp1_table_n[0];
    else off2 = mulmod_2expp1_table_n[MIN(depth2, FFT_N_NUM + 11) - 12];
    depth2 = depth2/2 - off2;
 
    depth1 = MAX(depth1, depth2);
-   adj = (((gmp_si)1)<<(depth1 + 1));
+   adj = (((mpir_si)1)<<(depth1 + 1));
    limbs2 = adj*((limbs + adj - 1)/adj); /* round up number of limbs */
    bits1 = limbs2*GMP_LIMB_BITS;
-   bits2 = (((gmp_si)1)<<(depth1*2));
+   bits2 = (((mpir_si)1)<<(depth1*2));
    bits1 = bits2*((bits1 + bits2 - 1)/bits2); /* round up bits */
    limbs = bits1/GMP_LIMB_BITS;
 

build.vc10/mpir.sln

@@ -842,7 +842,7 @@ void __gmpz_aorsmul_1 _PROTO ((REGPARM_3_1 (mpz_ptr w, mpz_srcptr u, mp_limb_t v
 #define mpz_aorsmul_1(w,u,v,sub)  __gmpz_aorsmul_1 (REGPARM_3_1 (w, u, v, sub))
 
 #define mpz_n_pow_ui __gmpz_n_pow_ui
-void    mpz_n_pow_ui _PROTO ((mpz_ptr, mp_srcptr, mp_size_t, gmp_ui));
+void    mpz_n_pow_ui _PROTO ((mpz_ptr, mp_srcptr, mp_size_t, mpir_ui));
 
 
 #define mpn_add_nc __MPN(add_nc)
@@ -955,7 +955,7 @@ __GMP_DECLSPEC mp_limb_t mpn_divrem_1c __GMP_PROTO ((mp_ptr, mp_size_t, mp_srcpt
 __GMP_DECLSPEC void mpn_dump __GMP_PROTO ((mp_srcptr, mp_size_t));
 
 #define mpn_fib2_ui __MPN(fib2_ui)
-mp_size_t mpn_fib2_ui _PROTO ((mp_ptr, mp_ptr, gmp_ui));
+mp_size_t mpn_fib2_ui _PROTO ((mp_ptr, mp_ptr, mpir_ui));
 
 /* Remap names of internal mpn functions.  */
 #define __clz_tab               __MPN(clz_tab)
@@ -1193,15 +1193,15 @@ __GMP_DECLSPEC void fft_naive_convolution_1 __GMP_PROTO ((mp_ptr r, mp_srcptr ii
                                                      mp_srcptr jj, mp_size_t m));
 
 #define mpn_mulmod_2expp1_basecase __MPN(mulmod_2expp1_basecase)
-__GMP_DECLSPEC int mpn_mulmod_2expp1_basecase __GMP_PROTO ((mp_ptr, mp_srcptr, mp_srcptr, int, gmp_ui, mp_ptr));
+__GMP_DECLSPEC int mpn_mulmod_2expp1_basecase __GMP_PROTO ((mp_ptr, mp_srcptr, mp_srcptr, int, mpir_ui, mp_ptr));
 
 typedef __gmp_randstate_struct *gmp_randstate_ptr;
 typedef const __gmp_randstate_struct *gmp_randstate_srcptr;
 
 /* Pseudo-random number generator function pointers structure.  */
 typedef struct {
   void (*randseed_fn) __GMP_PROTO ((gmp_randstate_t rstate, mpz_srcptr seed));
-  void (*randget_fn) __GMP_PROTO ((gmp_randstate_t rstate, mp_ptr dest, gmp_ui nbits));
+  void (*randget_fn) __GMP_PROTO ((gmp_randstate_t rstate, mp_ptr dest, mpir_ui nbits));
   void (*randclear_fn) __GMP_PROTO ((gmp_randstate_t rstate));
   void (*randiset_fn) __GMP_PROTO ((gmp_randstate_ptr, gmp_randstate_srcptr));
 } gmp_randfnptr_t;

fft/mulmod_2expp1.c

@@ -23,7 +23,7 @@ MA 02110-1301, USA. */
 #include "gmp-impl.h"
 
 void
-mpf_add_ui (mpf_ptr sum, mpf_srcptr u, gmp_ui v)
+mpf_add_ui (mpf_ptr sum, mpf_srcptr u, mpir_ui v)
 {
   mp_srcptr up = u->_mp_d;
   mp_ptr sump = sum->_mp_d;

gmp-h.in

@@ -24,7 +24,7 @@ MA 02110-1301, USA. */
 #include "gmp-impl.h"
 
 int
-mpf_cmp_si (mpf_srcptr u, gmp_si vval)
+mpf_cmp_si (mpf_srcptr u, mpir_si vval)
 {
   mp_srcptr up;
   mp_size_t usize;
@@ -61,9 +61,9 @@ mpf_cmp_si (mpf_srcptr u, gmp_si vval)
 
   /* 2. Are the exponents different (V's exponent == 1)?  */
 #if GMP_NAIL_BITS != 0
-  if (uexp > 1 + ((gmp_ui) vval > GMP_NUMB_MAX))
+  if (uexp > 1 + ((mpir_ui) vval > GMP_NUMB_MAX))
     return usign;
-  if (uexp < 1 + ((gmp_ui) vval > GMP_NUMB_MAX))
+  if (uexp < 1 + ((mpir_ui) vval > GMP_NUMB_MAX))
     return -usign;
 #else
   if (uexp > 1)
@@ -87,9 +87,9 @@ mpf_cmp_si (mpf_srcptr u, gmp_si vval)
   usize--;
 
   /* 3. Compare the most significant mantissa limb with V.  */
-  if (ulimb > (gmp_ui) vval)
+  if (ulimb > (mpir_ui) vval)
     return usign;
-  else if (ulimb < (gmp_ui) vval)
+  else if (ulimb < (mpir_ui) vval)
     return -usign;
 
   /* Ignore zeroes at the low end of U.  */

gmp-impl.h

@@ -23,7 +23,7 @@ MA 02110-1301, USA. */
 #include "gmp-impl.h"
 
 int
-mpf_cmp_ui (mpf_srcptr u, gmp_ui vval)
+mpf_cmp_ui (mpf_srcptr u, mpir_ui vval)
 {
   mp_srcptr up;
   mp_size_t usize;

mpf/add_ui.c

@@ -25,7 +25,7 @@ MA 02110-1301, USA. */
 #include "longlong.h"
 
 void
-mpf_div_ui (mpf_ptr r, mpf_srcptr u, gmp_ui v)
+mpf_div_ui (mpf_ptr r, mpf_srcptr u, mpir_ui v)
 {
   mp_srcptr up;
   mp_ptr rp, tp, rtp;

mpf/cmp_si.c

@@ -25,12 +25,12 @@ MA 02110-1301, USA. */
 
 
 double
-mpf_get_d_2exp (gmp_si *exp2, mpf_srcptr src)
+mpf_get_d_2exp (mpir_si *exp2, mpf_srcptr src)
 {
   mp_size_t size, abs_size;
   mp_srcptr ptr;
   int cnt;
-  gmp_si exp;
+  mpir_si exp;
 
   size = SIZ(src);
   if (UNLIKELY (size == 0))