Rename MP_LIMB_T_HIGHBIT => GMP_LIMB_HIGHBIT

15 files changed, 30 insertions, 30 deletions

diff --git a/mpfr/add1.c b/mpfr/add1.c
index 31c77fe1d..1118d663f 100644
--- a/mpfr/add1.c
+++ b/mpfr/add1.c
@@ -180,7 +180,7 @@ mpfr_add1 (mpfr_ptr a, mpfr_srcptr b, mpfr_srcptr c,
                 fb = 1;
             }
           mpn_rshift(ap, ap, an, 1);
-          ap[an-1] += MP_LIMB_T_HIGHBIT;
+          ap[an-1] += GMP_LIMB_HIGHBIT;
           if (sh && fb < 0)
             goto rounding;
         } /* cc */
@@ -247,7 +247,7 @@ mpfr_add1 (mpfr_ptr a, mpfr_srcptr b, mpfr_srcptr c,
               if (rb < 0) /* rb not initialized yet */
                 {
                   rb = bb >> (BITS_PER_MP_LIMB - 1);
-                  bb |= MP_LIMB_T_HIGHBIT;
+                  bb |= GMP_LIMB_HIGHBIT;
                 }
               fb = 1;
               if (bb != MP_LIMB_T_MAX)
@@ -308,7 +308,7 @@ mpfr_add1 (mpfr_ptr a, mpfr_srcptr b, mpfr_srcptr c,
                       goto end_of_add;
                     }
                   MPFR_EXP(a)++;
-                  ap[an-1] = MP_LIMB_T_HIGHBIT;
+                  ap[an-1] = GMP_LIMB_HIGHBIT;
                   rb = 0;
                 }
 
@@ -362,7 +362,7 @@ mpfr_add1 (mpfr_ptr a, mpfr_srcptr b, mpfr_srcptr c,
                           goto end_of_add;
                         }
                       MPFR_EXP(a)++;
-                      ap[an-1] = MP_LIMB_T_HIGHBIT;
+                      ap[an-1] = GMP_LIMB_HIGHBIT;
                     }
                 } /* bb < cc */
 
@@ -405,7 +405,7 @@ mpfr_add1 (mpfr_ptr a, mpfr_srcptr b, mpfr_srcptr c,
               if (rb < 0) /* rb not initialized yet */
                 {
                   rb = bb >> (BITS_PER_MP_LIMB - 1);
-                  bb &= ~MP_LIMB_T_HIGHBIT;
+                  bb &= ~GMP_LIMB_HIGHBIT;
                 }
               fb = bb != 0;
             } /* fb < 0 */
@@ -459,7 +459,7 @@ mpfr_add1 (mpfr_ptr a, mpfr_srcptr b, mpfr_srcptr c,
               if (rb < 0)
                 {
                   rb = cc >> (BITS_PER_MP_LIMB - 1);
-                  cc &= ~MP_LIMB_T_HIGHBIT;
+                  cc &= ~GMP_LIMB_HIGHBIT;
                 }
               while (cc == 0)
                 {
@@ -538,7 +538,7 @@ mpfr_add1 (mpfr_ptr a, mpfr_srcptr b, mpfr_srcptr c,
       else
         {
           MPFR_EXP(a)++;
-          ap[an-1] = MP_LIMB_T_HIGHBIT;
+          ap[an-1] = GMP_LIMB_HIGHBIT;
         }
     }
 
diff --git a/mpfr/add_one_ulp.c b/mpfr/add_one_ulp.c
index 8baadaf8f..c4c5c2754 100644
--- a/mpfr/add_one_ulp.c
+++ b/mpfr/add_one_ulp.c
@@ -49,7 +49,7 @@ mpfr_add_one_ulp (mpfr_ptr x, mp_rnd_t rnd_mode)
       else
         {
           MPFR_EXP(x)++;
-          xp[xn-1] = MP_LIMB_T_HIGHBIT;
+          xp[xn-1] = GMP_LIMB_HIGHBIT;
         }
     }
   return 0;
diff --git a/mpfr/div.c b/mpfr/div.c
index bf9826f2e..9ece931a6 100644
--- a/mpfr/div.c
+++ b/mpfr/div.c
@@ -337,7 +337,7 @@ mpfr_div (mpfr_ptr q, mpfr_srcptr u, mpfr_srcptr v, mp_rnd_t rnd_mode)
     /* Hack : qp[qsize] is 0, 1 or 2, hence if not 0, = 2^(qp[qsize] - 1). */
     {
       near = mpn_rshift(qp, qp, qsize, qp[qsize]);
-      qp[qsize - 1] |= MP_LIMB_T_HIGHBIT; qexp += qp[qsize]; 
+      qp[qsize - 1] |= GMP_LIMB_HIGHBIT; qexp += qp[qsize]; 
     }
   else
     {
@@ -430,7 +430,7 @@ mpfr_div (mpfr_ptr q, mpfr_srcptr u, mpfr_srcptr v, mp_rnd_t rnd_mode)
       if (cc)
         {
           mpn_rshift (qp, qp, qsize, 1);
-          qp[qsize-1] |= MP_LIMB_T_HIGHBIT;
+          qp[qsize-1] |= GMP_LIMB_HIGHBIT;
           qexp++;
         }
     }
diff --git a/mpfr/exceptions.c b/mpfr/exceptions.c
index a8519992f..63adb5a7c 100644
--- a/mpfr/exceptions.c
+++ b/mpfr/exceptions.c
@@ -182,7 +182,7 @@ mpfr_set_underflow (mpfr_ptr x, mp_rnd_t rnd_mode, int sign)
       MPFR_EXP(x) = __mpfr_emin;
       xn = (MPFR_PREC(x)-1)/BITS_PER_MP_LIMB;
       xp = MPFR_MANT(x);
-      xp[xn] = MP_LIMB_T_HIGHBIT;
+      xp[xn] = GMP_LIMB_HIGHBIT;
       MPN_ZERO(xp, xn);
       inex = 1;
     }
diff --git a/mpfr/mul.c b/mpfr/mul.c
index 0a81e36ca..6b9ceb04a 100644
--- a/mpfr/mul.c
+++ b/mpfr/mul.c
@@ -160,7 +160,7 @@ mpfr_mul (mpfr_ptr a, mpfr_srcptr b, mpfr_srcptr c, mp_rnd_t rnd_mode)
   cc = mpfr_round_raw (ap, tmp, bq + cq, sign_product < 0, aq,
 		       rnd_mode, &inexact);
   if (cc) /* cc = 1 ==> result is a power of two */
-    ap[an-1] = MP_LIMB_T_HIGHBIT;
+    ap[an-1] = GMP_LIMB_HIGHBIT;
 
   TMP_FREE(marker);
 
diff --git a/mpfr/mul_ui.c b/mpfr/mul_ui.c
index 2527ae215..f655071a5 100644
--- a/mpfr/mul_ui.c
+++ b/mpfr/mul_ui.c
@@ -85,7 +85,7 @@ mpfr_mul_ui (mpfr_ptr y, mpfr_srcptr x, unsigned long int u, mp_rnd_t rnd_mode)
   /* since the case u=1 was treated above, we have u >= 2, thus
      yp[xn] >= 1 since x was msb-normalized */
   MPFR_ASSERTN(yp[xn] != 0);
-  if ((yp[xn] & MP_LIMB_T_HIGHBIT) == 0)
+  if ((yp[xn] & GMP_LIMB_HIGHBIT) == 0)
     {
       count_leading_zeros(cnt, yp[xn]);
       mpn_lshift (yp, yp, xn + 1, cnt);
@@ -105,7 +105,7 @@ mpfr_mul_ui (mpfr_ptr y, mpfr_srcptr x, unsigned long int u, mp_rnd_t rnd_mode)
 
   if (c) /* rounded result is 1.0000000000000000... */
     {
-      old_yp[yn-1] = MP_LIMB_T_HIGHBIT;
+      old_yp[yn-1] = GMP_LIMB_HIGHBIT;
       cnt++;
     }
 
diff --git a/mpfr/print_raw.c b/mpfr/print_raw.c
index d5af87013..0fece2f70 100644
--- a/mpfr/print_raw.c
+++ b/mpfr/print_raw.c
@@ -44,7 +44,7 @@ mpfr_get_str_raw (char *digit_ptr, mpfr_srcptr x)
   for (k = sx - 1; k >= 0 ; k--)
     { 
       wd = mx[k]; 
-      t = MP_LIMB_T_HIGHBIT;
+      t = GMP_LIMB_HIGHBIT;
       for (l = BITS_PER_MP_LIMB - 1; l>=0; l--)
 	{
 	  if (wd & t) 
diff --git a/mpfr/rint.c b/mpfr/rint.c
index 9475b67b0..f549ea40b 100644
--- a/mpfr/rint.c
+++ b/mpfr/rint.c
@@ -68,7 +68,7 @@ mpfr_rint (mpfr_ptr r, mpfr_srcptr u, mp_rnd_t rnd_mode)
 
           rp = MPFR_MANT(r);
           rm = (MPFR_PREC(r) - 1) / BITS_PER_MP_LIMB;
-          rp[rm] = MP_LIMB_T_HIGHBIT;
+          rp[rm] = GMP_LIMB_HIGHBIT;
           MPN_ZERO(rp, rm);
           MPFR_EXP(r) = 1;  /* |r| = 1 */
           MPFR_RET(sign > 0 ? 2 : -2);
@@ -134,7 +134,7 @@ mpfr_rint (mpfr_ptr r, mpfr_srcptr u, mp_rnd_t rnd_mode)
              is 0, change the rounding mode to GMP_RNDZ. */
           if (rnd_mode == GMP_RNDN &&
               ((sh != 0 && (rp[0] & (MP_LIMB_T_ONE << (sh - 1))) == 0) ||
-               (sh == 0 && (up[un - rn - 1] & MP_LIMB_T_HIGHBIT) == 0)))
+               (sh == 0 && (up[un - rn - 1] & GMP_LIMB_HIGHBIT) == 0)))
             rnd_mode = GMP_RNDZ;
           if (uflags == 0)
             { /* u is an integer; determine if it is representable */
@@ -193,7 +193,7 @@ mpfr_rint (mpfr_ptr r, mpfr_srcptr u, mp_rnd_t rnd_mode)
                   ((ush != 0 &&
                     (up[uj] & (MP_LIMB_T_ONE << (ush - 1))) == 0) ||
                    (ush == 0 &&
-                    (uj == 0 || (up[uj - 1] & MP_LIMB_T_HIGHBIT) == 0))))
+                    (uj == 0 || (up[uj - 1] & GMP_LIMB_HIGHBIT) == 0))))
                 rnd_mode = GMP_RNDZ;  /* rounding bit is 0 */
             }
           if (sh != 0)
@@ -218,7 +218,7 @@ mpfr_rint (mpfr_ptr r, mpfr_srcptr u, mp_rnd_t rnd_mode)
           else
             {
               MPFR_EXP(r)++;
-              rp[rn-1] = MP_LIMB_T_HIGHBIT;
+              rp[rn-1] = GMP_LIMB_HIGHBIT;
             }
         }
 
diff --git a/mpfr/round_prec.c b/mpfr/round_prec.c
index 95c4889a2..2ecf972d5 100644
--- a/mpfr/round_prec.c
+++ b/mpfr/round_prec.c
@@ -198,7 +198,7 @@ mpfr_round_prec (mpfr_ptr x, mp_rnd_t rnd_mode, mp_prec_t prec)
       else
         {
           MPFR_EXP(x)++;
-          xp[nw - 1] = MP_LIMB_T_HIGHBIT;
+          xp[nw - 1] = GMP_LIMB_HIGHBIT;
           if (nw - 1 > 0)
             MPN_ZERO(xp, nw - 1);
         }
diff --git a/mpfr/set.c b/mpfr/set.c
index 4c23da284..ca5822367 100644
--- a/mpfr/set.c
+++ b/mpfr/set.c
@@ -66,7 +66,7 @@ mpfr_set4 (mpfr_ptr a, mpfr_srcptr b, mp_rnd_t rnd_mode, int signb)
             return mpfr_set_overflow(a, rnd_mode, signb);
 
           MPFR_EXP(a)++;
-          ap[(MPFR_PREC(a)-1)/BITS_PER_MP_LIMB] = MP_LIMB_T_HIGHBIT;
+          ap[(MPFR_PREC(a)-1)/BITS_PER_MP_LIMB] = GMP_LIMB_HIGHBIT;
         }
     }
 
diff --git a/mpfr/set_si.c b/mpfr/set_si.c
index e0786d549..965830c56 100644
--- a/mpfr/set_si.c
+++ b/mpfr/set_si.c
@@ -73,7 +73,7 @@ mpfr_set_si (mpfr_ptr x, long i, mp_rnd_t rnd_mode)
             return mpfr_set_overflow(x, rnd_mode, (i < 0 ? -1 : 1));
 
           MPFR_EXP(x)++;
-          xp[xn] = MP_LIMB_T_HIGHBIT;
+          xp[xn] = GMP_LIMB_HIGHBIT;
         }
     }
 
diff --git a/mpfr/set_ui.c b/mpfr/set_ui.c
index 1f225425c..9aead7e65 100644
--- a/mpfr/set_ui.c
+++ b/mpfr/set_ui.c
@@ -66,7 +66,7 @@ mpfr_set_ui (mpfr_ptr x, unsigned long i, mp_rnd_t rnd_mode)
                 return mpfr_set_overflow(x, rnd_mode, 1);
 
               MPFR_EXP(x)++;
-              xp[xn] = MP_LIMB_T_HIGHBIT;
+              xp[xn] = GMP_LIMB_HIGHBIT;
             }
         }
     }
diff --git a/mpfr/set_z.c b/mpfr/set_z.c
index b23275db0..fff0c6818 100644
--- a/mpfr/set_z.c
+++ b/mpfr/set_z.c
@@ -107,7 +107,7 @@ mpfr_set_z (mpfr_ptr f, mpz_srcptr z, mp_rnd_t rnd_mode)
               MPFR_ASSERTN(cc == 0);
               if (dif > 0)
                 cc = zp[--dif] << k;
-              if ((cc & MP_LIMB_T_HIGHBIT) == 0)
+              if ((cc & GMP_LIMB_HIGHBIT) == 0)
                 rnd_mode = GMP_RNDZ; /* rounding bit is 0 */
               else
                 cc <<= 1;
@@ -143,7 +143,7 @@ mpfr_set_z (mpfr_ptr f, mpz_srcptr z, mp_rnd_t rnd_mode)
               else
                 {
                   exp++;
-                  fp[fn-1] = MP_LIMB_T_HIGHBIT;
+                  fp[fn-1] = GMP_LIMB_HIGHBIT;
                 }
             }
           inex = sign_z;
diff --git a/mpfr/sqrt.c b/mpfr/sqrt.c
index b1b4c44da..1f6baf0f7 100644
--- a/mpfr/sqrt.c
+++ b/mpfr/sqrt.c
@@ -117,7 +117,7 @@ mpfr_sqrt (mpfr_ptr r, mpfr_srcptr u, mp_rnd_t rnd_mode)
           {
             up = TMP_ALLOC((usize + 1) * BYTES_PER_MP_LIMB);
             if (mpn_rshift(up + 1, MPFR_MANT(u), usize, 1))
-              up[0] = MP_LIMB_T_HIGHBIT;
+              up[0] = GMP_LIMB_HIGHBIT;
             else
               up[0] = 0;
             usize++;
@@ -263,7 +263,7 @@ mpfr_sqrt (mpfr_ptr r, mpfr_srcptr u, mp_rnd_t rnd_mode)
       {
         /* Is a shift necessary here? Isn't the result 1.0000...? */
         mpn_rshift (rp, rp, rrsize, 1);
-        rp[rrsize-1] |= MP_LIMB_T_HIGHBIT;
+        rp[rrsize-1] |= GMP_LIMB_HIGHBIT;
         MPFR_EXP(r)++;
       }
 
diff --git a/mpfr/sub1.c b/mpfr/sub1.c
index eb3ae9e21..0385a4f78 100644
--- a/mpfr/sub1.c
+++ b/mpfr/sub1.c
@@ -268,7 +268,7 @@ mpfr_sub1 (mpfr_ptr a, mpfr_srcptr b, mpfr_srcptr c, mp_rnd_t rnd_mode,
 
       if ((rnd_mode == GMP_RNDN) && !k && sh == 0)
 	{
-	  mp_limb_t half = MP_LIMB_T_HIGHBIT;
+	  mp_limb_t half = GMP_LIMB_HIGHBIT;
 
 	  is_exact = (bb == cc);
 
@@ -371,7 +371,7 @@ mpfr_sub1 (mpfr_ptr a, mpfr_srcptr b, mpfr_srcptr c, mp_rnd_t rnd_mode,
  add_one_ulp: /* add one unit in last place to a */
   if (mpn_add_1 (ap, ap, an, MP_LIMB_T_ONE << sh)) /* result is a power of 2 */
     {
-      ap[an-1] = MP_LIMB_T_HIGHBIT;
+      ap[an-1] = GMP_LIMB_HIGHBIT;
       add_exp = 1;
     }
   inexact = 1; /* result larger than exact value */
@@ -379,7 +379,7 @@ mpfr_sub1 (mpfr_ptr a, mpfr_srcptr b, mpfr_srcptr c, mp_rnd_t rnd_mode,
  truncate:
   if ((ap[an-1] >> (BITS_PER_MP_LIMB - 1)) == 0) /* case 1 - epsilon */
     {
-      ap[an-1] = MP_LIMB_T_HIGHBIT;
+      ap[an-1] = GMP_LIMB_HIGHBIT;
       add_exp = 1;
     }