Rename mpn_sec_minvert => mpn_sec_invert, many files affected.

10 files changed, 26 insertions, 24 deletions

diff --git a/AUTHORS b/AUTHORS
index 424ac9d7b..fbe298d61 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -40,7 +40,7 @@ Niels Möller		gen-jacobitab.c,
 			matrix22_mul1_inverse_vector.c,
 			toom_interpolate_7pts, mulmod_bnm1.c, dcpi1_bdiv_qr.c,
 			dcpi1_bdiv_q.c, sbpi1_bdiv_qr.c, sbpi1_bdiv_q.c,
-			sec_minvert.c,
+			sec_invert.c,
 			toom_eval_dgr3_pm1.c, toom_eval_dgr3_pm2.c,
 			toom_eval_pm1.c, toom_eval_pm2.c, toom_eval_pm2exp.c,
 			divexact.c, mod_1_1.c, div_qr_2.c,
diff --git a/ChangeLog b/ChangeLog
index d01dd4bba..a86e19282 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2014-01-19  Torbjorn Granlund  <tege@gmplib.org>
 
+	* Rename mpn_sec_minvert => mpn_sec_invert, many files affected.
+	* mpn/generic/sec_invert.c: New name for sec_minvert.c.
+
 	* doc/gmp.texi: Undocument mpz_array_init.
 
 	* acinclude.m4 (GMP_C_STDARG): Comment out.
diff --git a/configure.ac b/configure.ac
index 3f34e52df..d55cb08e7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2835,7 +2835,7 @@ gmp_mpn_functions="$extra_functions					   \
   bdiv_q bdiv_qr broot brootinv bsqrt bsqrtinv				   \
   divexact bdiv_dbm1c redc_1 redc_2 redc_n powm powlo sec_powm		   \
   sec_mul sec_sqr sec_div_qr sec_div_r sec_pi1_div_qr sec_pi1_div_r	   \
-  sec_add_1 sec_sub_1 sec_minvert					   \
+  sec_add_1 sec_sub_1 sec_invert					   \
   trialdiv remove							   \
   and_n andn_n nand_n ior_n iorn_n nior_n xor_n xnor_n			   \
   copyi copyd zero sec_tabselect					   \
diff --git a/doc/gmp.texi b/doc/gmp.texi
index f3c2add44..32eae0996 100644
--- a/doc/gmp.texi
+++ b/doc/gmp.texi
@@ -5783,8 +5783,8 @@ This function requires scratch space of @code{mpn_sec_div_r_itch(@var{nn},
 @var{dn})} limbs to be passed in the @var{tp} parameter.
 @end deftypefun
 
-@deftypefun int mpn_sec_minvert (mp_limb_t *@var{rp}, mp_limb_t *@var{ap}, const mp_limb_t *@var{mp}, mp_size_t @var{n}, mp_bitcnt_t @var{nbcnt}, mp_limb_t *@var{tp})
-@deftypefunx mp_size_t mpn_sec_minvert_itch (mp_size_t @var{n})
+@deftypefun int mpn_sec_invert (mp_limb_t *@var{rp}, mp_limb_t *@var{ap}, const mp_limb_t *@var{mp}, mp_size_t @var{n}, mp_bitcnt_t @var{nbcnt}, mp_limb_t *@var{tp})
+@deftypefunx mp_size_t mpn_sec_invert_itch (mp_size_t @var{n})
 Set @var{R} to @m{@var{A}^{-1} \bmod @var{M}, the inverse of @var{A} modulo
 @var{M}}, where @var{R} = @{@var{rp},@var{n}@}, @var{A} = @{@var{ap},@var{n}@},
 and @var{M} = @{@var{mp},@var{n}@}.  @strong{This function's interface is
@@ -5799,7 +5799,7 @@ It is required that @var{M} is odd, and that @math{@var{nbcnt} @ge
 @times{} @var{n} @times{} GMP_NUMB_BITS}, but a smaller value might improve
 performance if @var{M} or @var{A} are known to have leading zero bits.
 
-This function requires scratch space of @code{mpn_sec_minvert_itch(@var{n})}
+This function requires scratch space of @code{mpn_sec_invert_itch(@var{n})}
 limbs to be passed in the @var{tp} parameter.
 @end deftypefun
 
diff --git a/gmp-h.in b/gmp-h.in
index 94dccb07a..a48dfc1d1 100644
--- a/gmp-h.in
+++ b/gmp-h.in
@@ -1664,10 +1664,10 @@ __GMP_DECLSPEC void mpn_sec_div_r (mp_ptr, mp_size_t, mp_srcptr, mp_size_t, mp_p
 #define mpn_sec_div_r_itch __MPN(sec_div_r_itch)
 __GMP_DECLSPEC mp_size_t mpn_sec_div_r_itch (mp_size_t, mp_size_t) __GMP_ATTRIBUTE_PURE;
 
-#define mpn_sec_minvert __MPN(sec_minvert)
-__GMP_DECLSPEC int mpn_sec_minvert (mp_ptr, mp_ptr, mp_srcptr, mp_size_t, mp_bitcnt_t, mp_ptr);
-#define mpn_sec_minvert_itch __MPN(sec_minvert_itch)
-__GMP_DECLSPEC mp_size_t mpn_sec_minvert_itch (mp_size_t) __GMP_ATTRIBUTE_PURE;
+#define mpn_sec_invert __MPN(sec_invert)
+__GMP_DECLSPEC int mpn_sec_invert (mp_ptr, mp_ptr, mp_srcptr, mp_size_t, mp_bitcnt_t, mp_ptr);
+#define mpn_sec_invert_itch __MPN(sec_invert_itch)
+__GMP_DECLSPEC mp_size_t mpn_sec_invert_itch (mp_size_t) __GMP_ATTRIBUTE_PURE;
 
 
 /**************** mpz inlines ****************/
diff --git a/mpn/generic/sec_minvert.c b/mpn/generic/sec_invert.c
index acc61ac44..3df4cb424 100644
--- a/mpn/generic/sec_minvert.c
+++ b/mpn/generic/sec_invert.c
@@ -1,4 +1,4 @@
-/* mpn_sec_minvert
+/* mpn_sec_invert
 
    Contributed to the GNU project by Niels Möller
 
@@ -69,7 +69,7 @@ mpn_sec_eq_ui (mp_srcptr ap, mp_size_t n, mp_limb_t b)
 }
 
 mp_size_t
-mpn_sec_minvert_itch (mp_size_t n)
+mpn_sec_invert_itch (mp_size_t n)
 {
   return 4*n;
 }
@@ -82,9 +82,9 @@ mpn_sec_minvert_itch (mp_size_t n)
    M = 2^521 - 1 and A < M, bit_size can be any bound on the sum of
    the bit sizes of A and M. */
 int
-mpn_sec_minvert (mp_ptr vp, mp_ptr ap, mp_srcptr mp,
-		 mp_size_t n, mp_bitcnt_t bit_size,
-		 mp_ptr scratch)
+mpn_sec_invert (mp_ptr vp, mp_ptr ap, mp_srcptr mp,
+		mp_size_t n, mp_bitcnt_t bit_size,
+		mp_ptr scratch)
 {
   ASSERT (n > 0);
   ASSERT (bit_size > 0);
diff --git a/tests/mpn/t-minvert.c b/tests/mpn/t-minvert.c
index 3a4611e9a..ade61a152 100644
--- a/tests/mpn/t-minvert.c
+++ b/tests/mpn/t-minvert.c
@@ -94,7 +94,7 @@ main (int argc, char **argv)
   ap = TMP_ALLOC_LIMBS (MAX_SIZE);
   vp = TMP_ALLOC_LIMBS (MAX_SIZE);
   tp = TMP_ALLOC_LIMBS (MAX_SIZE);
-  scratch = TMP_ALLOC_LIMBS (mpn_sec_minvert_itch (MAX_SIZE) + 1);
+  scratch = TMP_ALLOC_LIMBS (mpn_sec_invert_itch (MAX_SIZE) + 1);
 
   for (test = 0; test < count; test++)
     {
@@ -141,15 +141,14 @@ main (int argc, char **argv)
 
       n = (bits + GMP_NUMB_BITS - 1) / GMP_NUMB_BITS;
       ASSERT_ALWAYS (n <= MAX_SIZE);
-      itch = mpn_sec_minvert_itch (n);
+      itch = mpn_sec_invert_itch (n);
       scratch[itch] = ran = urandom ();
 
       mpz_to_mpn (ap, n, a);
       mpz_to_mpn (mp, n, m);
-      tres = mpn_sec_minvert (tp,
-			      ap, mp, n,
-			      bit_size (ap, n) + bit_size (mp, n),
-			      scratch);
+      tres = mpn_sec_invert (tp, ap, mp, n,
+			     bit_size (ap, n) + bit_size (mp, n),
+			     scratch);
 
       if (rres != tres || (rres == 1 && !mpz_eq_mpn (tp, n, r)) || ran != scratch[itch])
 	{
diff --git a/tune/common.c b/tune/common.c
index 0bac5902a..0d569e160 100644
--- a/tune/common.c
+++ b/tune/common.c
@@ -931,9 +931,9 @@ speed_mpn_ni_invertappr (struct speed_params *s)
 }
 
 double
-speed_mpn_sec_minvert (struct speed_params *s)
+speed_mpn_sec_invert (struct speed_params *s)
 {
-  SPEED_ROUTINE_MPN_SEC_MINVERT (mpn_sec_minvert, mpn_sec_minvert_itch);
+  SPEED_ROUTINE_MPN_SEC_MINVERT (mpn_sec_invert, mpn_sec_invert_itch);
 }
 
 double
diff --git a/tune/speed.c b/tune/speed.c
index 1f6ead190..8def1cff7 100644
--- a/tune/speed.c
+++ b/tune/speed.c
@@ -361,7 +361,7 @@ const struct routine_t {
   { "mpn_invertappr",          speed_mpn_invertappr          },
   { "mpn_ni_invertappr",       speed_mpn_ni_invertappr       },
   { "mpn_binvert",             speed_mpn_binvert             },
-  { "mpn_sec_minvert",         speed_mpn_sec_minvert         },
+  { "mpn_sec_invert",          speed_mpn_sec_invert          },
 
   { "mpn_sbpi1_div_qr",        speed_mpn_sbpi1_div_qr,    FLAG_R_OPTIONAL},
   { "mpn_dcpi1_div_qr",        speed_mpn_dcpi1_div_qr,    FLAG_R_OPTIONAL},
diff --git a/tune/speed.h b/tune/speed.h
index 851c2547a..249190d5d 100644
--- a/tune/speed.h
+++ b/tune/speed.h
@@ -291,7 +291,7 @@ double speed_mpn_brootinv (struct speed_params *);
 double speed_mpn_invert (struct speed_params *);
 double speed_mpn_invertappr (struct speed_params *);
 double speed_mpn_ni_invertappr (struct speed_params *);
-double speed_mpn_sec_minvert (struct speed_params *s);
+double speed_mpn_sec_invert (struct speed_params *s);
 double speed_mpn_binvert (struct speed_params *);
 double speed_mpn_redc_1 (struct speed_params *);
 double speed_mpn_redc_2 (struct speed_params *);