From 80f6015f3c8f2c38a0a6fec58c5d101a5a3e7f1d Mon Sep 17 00:00:00 2001 From: "(no author)" <(no author)> Date: Wed, 3 Mar 2010 00:15:20 +0000 Subject: [PATCH] Partly fixed tuning code for dc_bdiv fns. --- gmp-impl.h | 2 ++ mpn/generic/dc_bdiv_qr.c | 2 +- tune/Makefile.am | 2 +- tune/Makefile.in | 5 +++-- 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/gmp-impl.h b/gmp-impl.h index 4a6e3f8a..71fc77fa 100644 --- a/gmp-impl.h +++ b/gmp-impl.h @@ -3734,6 +3734,8 @@ __GMP_DECLSPEC mp_size_t mpn_dc_set_str __GMP_PROTO ((mp_ptr, const unsigned cha __GMP_DECLSPEC mp_size_t mpn_bc_set_str __GMP_PROTO ((mp_ptr, const unsigned char *, size_t, int)); #define mpn_set_str_compute_powtab __MPN(set_str_compute_powtab) __GMP_DECLSPEC void mpn_set_str_compute_powtab __GMP_PROTO ((powers_t *, mp_ptr, mp_size_t, int)); +#define mpn_pre_set_str __MPN(pre_set_str) +__GMP_DECLSPEC void mpn_pre_set_str __GMP_PROTO ((mp_ptr wp, unsigned char *str, size_t str_len, powers_t *powtab, mp_ptr tp)); void _tc4_add(mp_ptr rp, mp_size_t * rn, mp_srcptr r1, mp_size_t r1n, mp_srcptr r2, mp_size_t r2n); diff --git a/mpn/generic/dc_bdiv_qr.c b/mpn/generic/dc_bdiv_qr.c index f4349320..3205ec9d 100644 --- a/mpn/generic/dc_bdiv_qr.c +++ b/mpn/generic/dc_bdiv_qr.c @@ -24,7 +24,7 @@ License for more details. You should have received a copy of the GNU Lesser General Public License along with the GNU MP Library. If not, see http://www.gnu.org/licenses/. */ -#include "gmp.h" +#include "mpir.h" #include "gmp-impl.h" /* Computes Hensel binary division of {np, 2*n} by {dp, n}. diff --git a/tune/Makefile.am b/tune/Makefile.am index f86a259b..3ce18cbb 100644 --- a/tune/Makefile.am +++ b/tune/Makefile.am @@ -131,7 +131,7 @@ TUNE_MPN_SRCS_BASIC = dc_divrem_n.c divrem_2.c gcd.c gcdext.c get_str.c \ toom4_mul_n.c toom4_mul.c toom3_mul.c toom3_mul_n.c \ toom8h_mul.c toom8_sqr_n.c mulmod_2expm1.c rootrem.c divrem_euclidean_r_1.c \ divrem_hensel_qr_1.c rsh_divrem_hensel_qr_1.c dc_divappr_q.c dc_div_qr.c \ - inv_divappr_q.c inv_div_qr.c tdiv_q.c + inv_divappr_q.c inv_div_qr.c tdiv_q.c dc_bdiv_qr.c dc_bdiv_q.c $(TUNE_MPN_SRCS_BASIC): for i in $(TUNE_MPN_SRCS_BASIC); do \ diff --git a/tune/Makefile.in b/tune/Makefile.in index d68df528..b56add09 100644 --- a/tune/Makefile.in +++ b/tune/Makefile.in @@ -129,7 +129,8 @@ am__objects_1 = dc_divrem_n.$(OBJEXT) divrem_2.$(OBJEXT) gcd.$(OBJEXT) \ rootrem.$(OBJEXT) divrem_euclidean_r_1.$(OBJEXT) \ divrem_hensel_qr_1.$(OBJEXT) rsh_divrem_hensel_qr_1.$(OBJEXT) \ dc_divappr_q.$(OBJEXT) dc_div_qr.$(OBJEXT) \ - inv_divappr_q.$(OBJEXT) inv_div_qr.$(OBJEXT) tdiv_q.$(OBJEXT) + inv_divappr_q.$(OBJEXT) inv_div_qr.$(OBJEXT) tdiv_q.$(OBJEXT) \ + dc_bdiv_qr.$(OBJEXT) dc_bdiv_q.$(OBJEXT) am__objects_2 = $(am__objects_1) divrem_1.$(OBJEXT) mod_1.$(OBJEXT) nodist_tuneup_OBJECTS = sqr_basecase.$(OBJEXT) $(am__objects_2) tuneup_OBJECTS = $(am_tuneup_OBJECTS) $(nodist_tuneup_OBJECTS) @@ -387,7 +388,7 @@ TUNE_MPN_SRCS_BASIC = dc_divrem_n.c divrem_2.c gcd.c gcdext.c get_str.c \ toom4_mul_n.c toom4_mul.c toom3_mul.c toom3_mul_n.c \ toom8h_mul.c toom8_sqr_n.c mulmod_2expm1.c rootrem.c divrem_euclidean_r_1.c \ divrem_hensel_qr_1.c rsh_divrem_hensel_qr_1.c dc_divappr_q.c dc_div_qr.c \ - inv_divappr_q.c inv_div_qr.c tdiv_q.c + inv_divappr_q.c inv_div_qr.c tdiv_q.c dc_bdiv_qr.c dc_bdiv_q.c # COMPILE minus CC.