diff options
| author | Torbjorn Granlund <tg@gmplib.org> | 2019-12-02 22:52:52 +0100 |
|---|---|---|
| committer | Torbjorn Granlund <tg@gmplib.org> | 2019-12-02 22:52:52 +0100 |
| commit | e62f80aa6e8b05afec172da5da331daf84bb3f4d (patch) | |
| tree | a59f56c9124eb3402e013bb5fadb510f97fdffe4 | |
| parent | 5ccaf969bad8a1c88f6dc8b38850558cc5584ed9 (diff) | |
| download | gmp-e62f80aa6e8b05afec172da5da331daf84bb3f4d.tar.gz | |
Finish change vs fat and gcd_11. Remove gcd_22 from fat functions for now, its calls to gcd_11 are problematic.
| -rw-r--r-- | configure.ac | 3 | ||||
| -rw-r--r-- | gmp-impl.h | 6 | ||||
| -rw-r--r-- | mpn/x86/fat/fat.c | 1 | ||||
| -rw-r--r-- | mpn/x86/x86-defs.m4 | 2 | ||||
| -rw-r--r-- | mpn/x86_64/fat/fat.c | 1 | ||||
| -rw-r--r-- | mpn/x86_64/x86_64-defs.m4 | 2 |
6 files changed, 7 insertions, 8 deletions
diff --git a/configure.ac b/configure.ac index 045693c40..07c0bbe28 100644 --- a/configure.ac +++ b/configure.ac @@ -2280,7 +2280,7 @@ case $host in fat_functions="add_n addmul_1 bdiv_dbm1c com cnd_add_n cnd_sub_n copyd copyi dive_1 divrem_1 - gcd_1 lshift lshiftc mod_1 mod_1_1 mod_1_1_cps mod_1_2 + gcd_11 lshift lshiftc mod_1 mod_1_1 mod_1_1_cps mod_1_2 mod_1_2_cps mod_1_4 mod_1_4_cps mod_34lsub1 mode1o mul_1 mul_basecase mullo_basecase pre_divrem_1 pre_mod_1 redc_1 redc_2 rshift sqr_basecase sub_n submul_1" @@ -3593,6 +3593,7 @@ AH_VERBATIM([HAVE_NATIVE], #undef HAVE_NATIVE_mpn_divrem_2 #undef HAVE_NATIVE_mpn_gcd_1 #undef HAVE_NATIVE_mpn_gcd_11 +#undef HAVE_NATIVE_mpn_gcd_22 #undef HAVE_NATIVE_mpn_hamdist #undef HAVE_NATIVE_mpn_invert_limb #undef HAVE_NATIVE_mpn_ior_n diff --git a/gmp-impl.h b/gmp-impl.h index f73618aee..777d24809 100644 --- a/gmp-impl.h +++ b/gmp-impl.h @@ -91,8 +91,8 @@ see https://www.gnu.org/licenses/. */ __GMP_DECLSPEC mp_limb_t name (mp_ptr, mp_srcptr, mp_size_t, mp_limb_t) #define DECL_divrem_1(name) \ __GMP_DECLSPEC mp_limb_t name (mp_ptr, mp_size_t, mp_srcptr, mp_size_t, mp_limb_t) -#define DECL_gcd_1(name) \ - __GMP_DECLSPEC mp_limb_t name (mp_srcptr, mp_size_t, mp_limb_t) +#define DECL_gcd_11(name) \ + __GMP_DECLSPEC mp_limb_t name (mp_limb_t, mp_limb_t) #define DECL_lshift(name) \ __GMP_DECLSPEC mp_limb_t name (mp_ptr, mp_srcptr, mp_size_t, unsigned) #define DECL_lshiftc(name) \ @@ -4667,7 +4667,7 @@ struct cpuvec_t { DECL_copyi ((*copyi)); DECL_divexact_1 ((*divexact_1)); DECL_divrem_1 ((*divrem_1)); - DECL_gcd_1 ((*gcd_1)); + DECL_gcd_11 ((*gcd_11)); DECL_lshift ((*lshift)); DECL_lshiftc ((*lshiftc)); DECL_mod_1 ((*mod_1)); diff --git a/mpn/x86/fat/fat.c b/mpn/x86/fat/fat.c index 69fe81ff1..18be05a39 100644 --- a/mpn/x86/fat/fat.c +++ b/mpn/x86/fat/fat.c @@ -175,7 +175,6 @@ struct cpuvec_t __gmpn_cpuvec = { __MPN(divexact_1_init), __MPN(divrem_1_init), __MPN(gcd_11_init), - __MPN(gcd_22_init), __MPN(lshift_init), __MPN(lshiftc_init), __MPN(mod_1_init), diff --git a/mpn/x86/x86-defs.m4 b/mpn/x86/x86-defs.m4 index 56dfa03e6..81309b224 100644 --- a/mpn/x86/x86-defs.m4 +++ b/mpn/x86/x86-defs.m4 @@ -78,7 +78,7 @@ define(CPUVEC_FUNCS_LIST, `copyi', `divexact_1', `divrem_1', -`gcd_1', +`gcd_11', `lshift', `lshiftc', `mod_1', diff --git a/mpn/x86_64/fat/fat.c b/mpn/x86_64/fat/fat.c index 97938fe99..b7446a395 100644 --- a/mpn/x86_64/fat/fat.c +++ b/mpn/x86_64/fat/fat.c @@ -161,7 +161,6 @@ struct cpuvec_t __gmpn_cpuvec = { __MPN(divexact_1_init), __MPN(divrem_1_init), __MPN(gcd_11_init), - __MPN(gcd_22_init), __MPN(lshift_init), __MPN(lshiftc_init), __MPN(mod_1_init), diff --git a/mpn/x86_64/x86_64-defs.m4 b/mpn/x86_64/x86_64-defs.m4 index 563226ffd..64e372980 100644 --- a/mpn/x86_64/x86_64-defs.m4 +++ b/mpn/x86_64/x86_64-defs.m4 @@ -51,7 +51,7 @@ define(CPUVEC_FUNCS_LIST, `copyi', `divexact_1', `divrem_1', -`gcd_1', +`gcd_11', `lshift', `lshiftc', `mod_1', |