summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarco Bodrato <bodrato@mail.dm.unipi.it>2018-05-13 09:47:33 +0200
committerMarco Bodrato <bodrato@mail.dm.unipi.it>2018-05-13 09:47:33 +0200
commit3a6ab30c08a0ee6883d6e6bb32c231626d48219a (patch)
treeb79f91cc5fa01a5e7c4c7189dcb5bbe7c4b14900
parent3b890ede1b2cb78aa4e0ce3b420789ccc5dcacee (diff)
downloadgmp-3a6ab30c08a0ee6883d6e6bb32c231626d48219a.tar.gz
igi static
-rw-r--r--gmp-impl.h16
-rw-r--r--mpn/generic/dcpi1_bdiv_q.c6
-rw-r--r--mpn/generic/dcpi1_divappr_q.c2
-rw-r--r--mpn/generic/matrix22_mul.c2
-rw-r--r--mpn/generic/mu_div_qr.c3
-rw-r--r--mpn/generic/mu_divappr_q.c7
6 files changed, 12 insertions, 24 deletions
diff --git a/gmp-impl.h b/gmp-impl.h
index 7bcdd89d0..6424478f2 100644
--- a/gmp-impl.h
+++ b/gmp-impl.h
@@ -1534,15 +1534,11 @@ __GMP_DECLSPEC mp_limb_t mpn_dcpi1_div_q (mp_ptr, mp_ptr, mp_size_t, mp_srcptr,
#define mpn_dcpi1_divappr_q __MPN(dcpi1_divappr_q)
__GMP_DECLSPEC mp_limb_t mpn_dcpi1_divappr_q (mp_ptr, mp_ptr, mp_size_t, mp_srcptr, mp_size_t, gmp_pi1_t *);
-#define mpn_dcpi1_divappr_q_n __MPN(dcpi1_divappr_q_n)
-__GMP_DECLSPEC mp_limb_t mpn_dcpi1_divappr_q_n (mp_ptr, mp_ptr, mp_srcptr, mp_size_t, gmp_pi1_t *, mp_ptr);
#define mpn_mu_div_qr __MPN(mu_div_qr)
__GMP_DECLSPEC mp_limb_t mpn_mu_div_qr (mp_ptr, mp_ptr, mp_srcptr, mp_size_t, mp_srcptr, mp_size_t, mp_ptr);
#define mpn_mu_div_qr_itch __MPN(mu_div_qr_itch)
__GMP_DECLSPEC mp_size_t mpn_mu_div_qr_itch (mp_size_t, mp_size_t, int) ATTRIBUTE_CONST;
-#define mpn_mu_div_qr_choose_in __MPN(mu_div_qr_choose_in)
-__GMP_DECLSPEC mp_size_t mpn_mu_div_qr_choose_in (mp_size_t, mp_size_t, int);
#define mpn_preinv_mu_div_qr __MPN(preinv_mu_div_qr)
__GMP_DECLSPEC mp_limb_t mpn_preinv_mu_div_qr (mp_ptr, mp_ptr, mp_srcptr, mp_size_t, mp_srcptr, mp_size_t, mp_srcptr, mp_size_t, mp_ptr);
@@ -1553,11 +1549,6 @@ __GMP_DECLSPEC mp_size_t mpn_preinv_mu_div_qr_itch (mp_size_t, mp_size_t, mp_siz
__GMP_DECLSPEC mp_limb_t mpn_mu_divappr_q (mp_ptr, mp_srcptr, mp_size_t, mp_srcptr, mp_size_t, mp_ptr);
#define mpn_mu_divappr_q_itch __MPN(mu_divappr_q_itch)
__GMP_DECLSPEC mp_size_t mpn_mu_divappr_q_itch (mp_size_t, mp_size_t, int) ATTRIBUTE_CONST;
-#define mpn_mu_divappr_q_choose_in __MPN(mu_divappr_q_choose_in)
-__GMP_DECLSPEC mp_size_t mpn_mu_divappr_q_choose_in (mp_size_t, mp_size_t, int);
-
-#define mpn_preinv_mu_divappr_q __MPN(preinv_mu_divappr_q)
-__GMP_DECLSPEC mp_limb_t mpn_preinv_mu_divappr_q (mp_ptr, mp_srcptr, mp_size_t, mp_srcptr, mp_size_t, mp_srcptr, mp_size_t, mp_ptr);
#define mpn_mu_div_q __MPN(mu_div_q)
__GMP_DECLSPEC mp_limb_t mpn_mu_div_q (mp_ptr, mp_srcptr, mp_size_t, mp_srcptr, mp_size_t, mp_ptr);
@@ -1607,11 +1598,6 @@ __GMP_DECLSPEC mp_limb_t mpn_dcpi1_bdiv_qr_n (mp_ptr, mp_ptr, mp_srcptr, mp_size
#define mpn_dcpi1_bdiv_q __MPN(dcpi1_bdiv_q)
__GMP_DECLSPEC void mpn_dcpi1_bdiv_q (mp_ptr, mp_ptr, mp_size_t, mp_srcptr, mp_size_t, mp_limb_t);
-#define mpn_dcpi1_bdiv_q_n __MPN(dcpi1_bdiv_q_n)
-__GMP_DECLSPEC void mpn_dcpi1_bdiv_q_n (mp_ptr, mp_ptr, mp_srcptr, mp_size_t, mp_limb_t, mp_ptr);
-#define mpn_dcpi1_bdiv_q_n_itch __MPN(dcpi1_bdiv_q_n_itch)
-__GMP_DECLSPEC mp_size_t mpn_dcpi1_bdiv_q_n_itch (mp_size_t) ATTRIBUTE_CONST;
-
#define mpn_mu_bdiv_qr __MPN(mu_bdiv_qr)
__GMP_DECLSPEC mp_limb_t mpn_mu_bdiv_qr (mp_ptr, mp_ptr, mp_srcptr, mp_size_t, mp_srcptr, mp_size_t, mp_ptr);
#define mpn_mu_bdiv_qr_itch __MPN(mu_bdiv_qr_itch)
@@ -4184,8 +4170,6 @@ mpn_jacobi_update (unsigned bits, unsigned denominator, unsigned q)
/* Matrix multiplication */
#define mpn_matrix22_mul __MPN(matrix22_mul)
__GMP_DECLSPEC void mpn_matrix22_mul (mp_ptr, mp_ptr, mp_ptr, mp_ptr, mp_size_t, mp_srcptr, mp_srcptr, mp_srcptr, mp_srcptr, mp_size_t, mp_ptr);
-#define mpn_matrix22_mul_strassen __MPN(matrix22_mul_strassen)
-__GMP_DECLSPEC void mpn_matrix22_mul_strassen (mp_ptr, mp_ptr, mp_ptr, mp_ptr, mp_size_t, mp_srcptr, mp_srcptr, mp_srcptr, mp_srcptr, mp_size_t, mp_ptr);
#define mpn_matrix22_mul_itch __MPN(matrix22_mul_itch)
__GMP_DECLSPEC mp_size_t mpn_matrix22_mul_itch (mp_size_t, mp_size_t) ATTRIBUTE_CONST;
diff --git a/mpn/generic/dcpi1_bdiv_q.c b/mpn/generic/dcpi1_bdiv_q.c
index 0ad2f82d4..1a4bd2a9e 100644
--- a/mpn/generic/dcpi1_bdiv_q.c
+++ b/mpn/generic/dcpi1_bdiv_q.c
@@ -38,10 +38,10 @@ see https://www.gnu.org/licenses/. */
#include "gmp-impl.h"
-mp_size_t
+static mp_size_t
mpn_dcpi1_bdiv_q_n_itch (mp_size_t n)
{
- /* NOTE: Depends on mullo_n interface */
+ /* NOTE: Depends on mullo_n and mpn_dcpi1_bdiv_qr_n interface */
return n;
}
@@ -51,7 +51,7 @@ mpn_dcpi1_bdiv_q_n_itch (mp_size_t n)
D = {dp,n}
*/
-void
+static void
mpn_dcpi1_bdiv_q_n (mp_ptr qp,
mp_ptr np, mp_srcptr dp, mp_size_t n,
mp_limb_t dinv, mp_ptr tp)
diff --git a/mpn/generic/dcpi1_divappr_q.c b/mpn/generic/dcpi1_divappr_q.c
index 6488c759e..0abe04eff 100644
--- a/mpn/generic/dcpi1_divappr_q.c
+++ b/mpn/generic/dcpi1_divappr_q.c
@@ -39,7 +39,7 @@ see https://www.gnu.org/licenses/. */
#include "longlong.h"
-mp_limb_t
+static mp_limb_t
mpn_dcpi1_divappr_q_n (mp_ptr qp, mp_ptr np, mp_srcptr dp, mp_size_t n,
gmp_pi1_t *dinv, mp_ptr tp)
{
diff --git a/mpn/generic/matrix22_mul.c b/mpn/generic/matrix22_mul.c
index 8a6689f63..6a1299ad0 100644
--- a/mpn/generic/matrix22_mul.c
+++ b/mpn/generic/matrix22_mul.c
@@ -126,7 +126,7 @@ mpn_matrix22_mul_itch (mp_size_t rn, mp_size_t mn)
* Resulting elements are of size up to rn + mn + 1.
*
* Temporary storage: 3 rn + 3 mn + 5. */
-void
+static void
mpn_matrix22_mul_strassen (mp_ptr r0, mp_ptr r1, mp_ptr r2, mp_ptr r3, mp_size_t rn,
mp_srcptr m0, mp_srcptr m1, mp_srcptr m2, mp_srcptr m3, mp_size_t mn,
mp_ptr tp)
diff --git a/mpn/generic/mu_div_qr.c b/mpn/generic/mu_div_qr.c
index 009a312e2..8b9c702b9 100644
--- a/mpn/generic/mu_div_qr.c
+++ b/mpn/generic/mu_div_qr.c
@@ -90,6 +90,7 @@ see https://www.gnu.org/licenses/. */
static mp_limb_t mpn_mu_div_qr2 (mp_ptr, mp_ptr, mp_srcptr, mp_size_t, mp_srcptr, mp_size_t, mp_ptr);
+static mp_size_t mpn_mu_div_qr_choose_in (mp_size_t, mp_size_t, int);
mp_limb_t
@@ -362,7 +363,7 @@ mpn_preinv_mu_div_qr (mp_ptr qp,
(c) qn < dn/3: in = qn
In all cases we have in <= dn.
*/
-mp_size_t
+static mp_size_t
mpn_mu_div_qr_choose_in (mp_size_t qn, mp_size_t dn, int k)
{
mp_size_t in;
diff --git a/mpn/generic/mu_divappr_q.c b/mpn/generic/mu_divappr_q.c
index 451e1cb0b..c022b4f10 100644
--- a/mpn/generic/mu_divappr_q.c
+++ b/mpn/generic/mu_divappr_q.c
@@ -70,6 +70,9 @@ see https://www.gnu.org/licenses/. */
#include <stdlib.h> /* for NULL */
#include "gmp-impl.h"
+static mp_limb_t mpn_preinv_mu_divappr_q (mp_ptr, mp_srcptr, mp_size_t,
+ mp_srcptr, mp_size_t, mp_srcptr, mp_size_t, mp_ptr);
+static mp_size_t mpn_mu_divappr_q_choose_in (mp_size_t, mp_size_t, int);
mp_limb_t
mpn_mu_divappr_q (mp_ptr qp,
@@ -155,7 +158,7 @@ mpn_mu_divappr_q (mp_ptr qp,
return qh;
}
-mp_limb_t
+static mp_limb_t
mpn_preinv_mu_divappr_q (mp_ptr qp,
mp_srcptr np,
mp_size_t nn,
@@ -311,7 +314,7 @@ mpn_preinv_mu_divappr_q (mp_ptr qp,
(c) qn < dn/3: in = qn
In all cases we have in <= dn.
*/
-mp_size_t
+static mp_size_t
mpn_mu_divappr_q_choose_in (mp_size_t qn, mp_size_t dn, int k)
{
mp_size_t in;