Change gmp_ui/gmp_si types to mpir_ui/mpir_si

wbhart · Jan 24, 2012 · fb616ee · fb616ee
1 parent f8048b4
commit fb616ee
Show file tree

Hide file tree

Showing 122 changed files with 890 additions and 890 deletions.
diff --git a/build.vc10/mpir-tests.sln b/build.vc10/mpir-tests.sln
diff --git a/build.vc10/mpir.sln b/build.vc10/mpir.sln
diff --git a/fft/mulmod_2expp1.c b/fft/mulmod_2expp1.c
@@ -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;
 

diff --git a/gmp-h.in b/gmp-h.in
diff --git a/gmp-impl.h b/gmp-impl.h
@@ -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;

diff --git a/mpf/add_ui.c b/mpf/add_ui.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;

diff --git a/mpf/cmp_si.c b/mpf/cmp_si.c
@@ -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.  */

diff --git a/mpf/cmp_ui.c b/mpf/cmp_ui.c
@@ -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;

diff --git a/mpf/div_ui.c b/mpf/div_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;

diff --git a/mpf/get_d_2exp.c b/mpf/get_d_2exp.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))

diff --git a/mpf/get_si.c b/mpf/get_si.c
@@ -42,7 +42,7 @@ MA 02110-1301, USA.
    through to the zany final "~ ((fl - 1) & LONG_MAX)", that would give
    -0x80000000 instead of the desired 0.  */
 
-gmp_si
+mpir_si
 mpf_get_si (mpf_srcptr f)
 {
   mp_exp_t exp;
@@ -72,8 +72,8 @@ mpf_get_si (mpf_srcptr f)
 #endif
 
   if (size > 0)
-    return (gmp_si)(fl & GMP_SI_MAX);
+    return (mpir_si)(fl & GMP_SI_MAX);
   else
     /* this form necessary to correctly handle -0x80..00 */
-    return (gmp_si)(~((fl - 1) & GMP_SI_MAX));
+    return (mpir_si)(~((fl - 1) & GMP_SI_MAX));
 }
diff --git a/mpf/get_str.c b/mpf/get_str.c
@@ -47,7 +47,7 @@ MA 02110-1301, USA. */
    Allocation of rp[] and the temporary tp[] should be 2*prec+2 limbs.  */
 static mp_size_t
 mpn_pow_1_highpart (mp_ptr rp, mp_size_t *ignp,
-		    mp_limb_t base, gmp_ui exp,
+		    mp_limb_t base, mpir_ui exp,
 		    mp_size_t prec, mp_ptr tp)
 {
   mp_size_t ign;		/* counts number of ignored low limbs in r */
@@ -180,10 +180,10 @@ mpf_get_str (char *dbuf, mp_exp_t *exp, int base, size_t n_digits, mpf_srcptr u)
     {
       /* We need to multiply number by base^n to get an n_digits integer part.  */
       mp_size_t n_more_limbs_needed, ign, off;
-      gmp_ui e;
+      mpir_ui e;
 
       n_more_limbs_needed = n_limbs_needed - ue;
-      e = (gmp_ui) n_more_limbs_needed * (GMP_NUMB_BITS * mp_bases[base].chars_per_bit_exactly);
+      e = (mpir_ui) n_more_limbs_needed * (GMP_NUMB_BITS * mp_bases[base].chars_per_bit_exactly);
 
       if (un > n_limbs_needed)
 	{
@@ -216,11 +216,11 @@ mpf_get_str (char *dbuf, mp_exp_t *exp, int base, size_t n_digits, mpf_srcptr u)
     {
       /* We need to divide number by base^n to get an n_digits integer part.  */
       mp_size_t n_less_limbs_needed, ign, off, xn;
-      gmp_ui e;
+      mpir_ui e;
       mp_ptr dummyp, xp;
 
       n_less_limbs_needed = ue - n_limbs_needed;
-      e = (gmp_ui) n_less_limbs_needed * (GMP_NUMB_BITS * mp_bases[base].chars_per_bit_exactly);
+      e = (mpir_ui) n_less_limbs_needed * (GMP_NUMB_BITS * mp_bases[base].chars_per_bit_exactly);
 
       if (un > n_limbs_needed)
 	{

diff --git a/mpf/get_ui.c b/mpf/get_ui.c
@@ -63,7 +63,7 @@ MA 02110-1301, USA.
    exp-1>0, which is incorrect when exp==MP_EXP_T_MIN.  By having exp>0
    tested first we ensure MP_EXP_T_MIN doesn't reach exp>1.  */
 
-gmp_ui
+mpir_ui
 mpf_get_ui (mpf_srcptr f)
 {
   mp_size_t size;
@@ -90,5 +90,5 @@ mpf_get_ui (mpf_srcptr f)
 #endif
     }
 
-  return (gmp_ui) fl;
+  return (mpir_ui) fl;
 }
diff --git a/mpf/iset_si.c b/mpf/iset_si.c
@@ -24,7 +24,7 @@ MA 02110-1301, USA. */
 #include "gmp-impl.h"
 
 void
-mpf_init_set_si (mpf_ptr r, gmp_si val)
+mpf_init_set_si (mpf_ptr r, mpir_si val)
 {
   mp_size_t prec = __gmp_default_fp_limb_precision;
   mp_size_t size;
@@ -33,7 +33,7 @@ mpf_init_set_si (mpf_ptr r, gmp_si val)
   r->_mp_prec = prec;
   r->_mp_d = (mp_ptr) (*__gmp_allocate_func) ((prec + 1) * BYTES_PER_MP_LIMB);
 
-  vl = (mp_limb_t) (gmp_ui) (val >= 0 ? val : -val);
+  vl = (mp_limb_t) (mpir_ui) (val >= 0 ? val : -val);
 
   r->_mp_d[0] = vl & GMP_NUMB_MASK;
   size = vl != 0;

diff --git a/mpf/iset_ui.c b/mpf/iset_ui.c
@@ -24,7 +24,7 @@ MA 02110-1301, USA. */
 #include "gmp-impl.h"
 
 void
-mpf_init_set_ui (mpf_ptr r, gmp_ui val)
+mpf_init_set_ui (mpf_ptr r, mpir_ui val)
 {
   mp_size_t prec = __gmp_default_fp_limb_precision;
   mp_size_t size;

diff --git a/mpf/mul_ui.c b/mpf/mul_ui.c
@@ -79,7 +79,7 @@ MA 02110-1301, USA. */
    later.  */
 
 void
-mpf_mul_ui (mpf_ptr r, mpf_srcptr u, gmp_ui v)
+mpf_mul_ui (mpf_ptr r, mpf_srcptr u, mpir_ui v)
 {
   mp_srcptr up;
   mp_size_t usize;

diff --git a/mpf/pow_ui.c b/mpf/pow_ui.c
@@ -23,10 +23,10 @@ MA 02110-1301, USA. */
 #include "gmp-impl.h"
 
 void
-mpf_pow_ui (mpf_ptr r, mpf_srcptr b, gmp_ui e)
+mpf_pow_ui (mpf_ptr r, mpf_srcptr b, mpir_ui e)
 {
   mpf_t b2;
-  gmp_ui e2;
+  mpir_ui e2;
 
   mpf_init2 (b2, mpf_get_prec (r));
   mpf_set (b2, b);

diff --git a/mpf/reldiff.c b/mpf/reldiff.c
@@ -32,7 +32,7 @@ mpf_reldiff (mpf_t rdiff, mpf_srcptr x, mpf_srcptr y)
 {
   if (UNLIKELY (SIZ(x) == 0))
     {
-      mpf_set_ui (rdiff, (gmp_ui) (mpf_sgn (y) != 0));
+      mpf_set_ui (rdiff, (mpir_ui) (mpf_sgn (y) != 0));
     }
   else
     {

diff --git a/mpf/set_si.c b/mpf/set_si.c
@@ -24,12 +24,12 @@ MA 02110-1301, USA. */
 #include "gmp-impl.h"
 
 void
-mpf_set_si (mpf_ptr dest, gmp_si val)
+mpf_set_si (mpf_ptr dest, mpir_si val)
 {
   mp_size_t size;
   mp_limb_t vl;
 
-  vl = (mp_limb_t) (gmp_ui) (val >= 0 ? val : -val);
+  vl = (mp_limb_t) (mpir_ui) (val >= 0 ? val : -val);
 
   dest->_mp_d[0] = vl & GMP_NUMB_MASK;
   size = vl != 0;

diff --git a/mpf/set_ui.c b/mpf/set_ui.c
@@ -23,7 +23,7 @@ MA 02110-1301, USA. */
 #include "gmp-impl.h"
 
 void
-mpf_set_ui (mpf_ptr f, gmp_ui val)
+mpf_set_ui (mpf_ptr f, mpir_ui val)
 {
   mp_size_t size;
 

diff --git a/mpf/sqrt_ui.c b/mpf/sqrt_ui.c
@@ -59,7 +59,7 @@ MA 02110-1301, USA. */
 #define U2   (GMP_NUMB_BITS < BITS_PER_UI)
 
 void
-mpf_sqrt_ui (mpf_ptr r, gmp_ui u)
+mpf_sqrt_ui (mpf_ptr r, mpir_ui u)
 {
   mp_size_t rsize, zeros;
   mp_ptr tp;

diff --git a/mpf/sub_ui.c b/mpf/sub_ui.c
@@ -23,7 +23,7 @@ MA 02110-1301, USA. */
 #include "gmp-impl.h"
 
 void
-mpf_sub_ui (mpf_ptr sum, mpf_srcptr u, gmp_ui v)
+mpf_sub_ui (mpf_ptr sum, mpf_srcptr u, mpir_ui v)
 {
   __mpf_struct vv;
   mp_limb_t vl;

diff --git a/mpf/ui_div.c b/mpf/ui_div.c
@@ -27,7 +27,7 @@ MA 02110-1301, USA. */
 
 
 void
-mpf_ui_div (mpf_ptr r, gmp_ui u, mpf_srcptr v)
+mpf_ui_div (mpf_ptr r, mpir_ui u, mpf_srcptr v)
 {
   mp_srcptr vp;
   mp_ptr rp, tp, remp, new_vp;

diff --git a/mpf/ui_sub.c b/mpf/ui_sub.c
@@ -24,7 +24,7 @@ MA 02110-1301, USA. */
 #include "gmp-impl.h"
 
 void
-mpf_ui_sub (mpf_ptr r, gmp_ui u, mpf_srcptr v)
+mpf_ui_sub (mpf_ptr r, mpir_ui u, mpf_srcptr v)
 {
   mp_srcptr up, vp;
   mp_ptr rp, tp;
-Original file line number
+Diff line change
@@ Expand Up / @@ -32,7 +32,7 @@ mpf_reldiff (mpf_t rdiff, mpf_srcptr x, mpf_srcptr y) @@
     {
       if (UNLIKELY (SIZ(x) == 0))
         {
-          mpf_set_ui (rdiff, (gmp_ui) (mpf_sgn (y) != 0));
+          mpf_set_ui (rdiff, (mpir_ui) (mpf_sgn (y) != 0));
         }
       else
         {
@@ Expand Down @@