From e3329a3bebb11d28a440aeb4582fad849c23d3ff Mon Sep 17 00:00:00 2001 From: gladman Date: Fri, 9 Jul 2010 12:48:04 +0000 Subject: [PATCH] Minor correction to function renaming changes --- tests/devel/try.c | 8 ++++---- tune/common.c | 2 +- tune/speed.h | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/tests/devel/try.c b/tests/devel/try.c index 875410f9..aa97aa25 100644 --- a/tests/devel/try.c +++ b/tests/devel/try.c @@ -663,7 +663,7 @@ validate_sqrtrem (void) #define TYPE_REDC_BASECASE 111 #define TYPE_DIVREM_EUCLIDEAN_QR_1 112 #define TYPE_DIVREM_EUCLIDEAN_R_1 113 -#define TYPE_DIVEXACT_BYBM1OF 114 +#define TYPE_DIVEXACT_FOBM1 114 #define TYPE_LSHIFT2 115 #define TYPE_RSHIFT2 116 @@ -1138,7 +1138,7 @@ param_init (void) p->carry=CARRY_LIMB; REFERENCE (refmpn_rsh_divrem_hensel_qr_1); - p = ¶m[TYPE_DIVEXACT_BYBM1OF]; + p = ¶m[TYPE_DIVEXACT_FOBM1]; p->retval = 1; p->src[0] = 1; p->divisor = DIVISOR_DIVBM1; @@ -1856,7 +1856,7 @@ const struct choice_t choice_array[] = { { TRY(mpn_divexact_1), TYPE_DIVEXACT_1 }, { TRY_FUNFUN(mpn_divexact_by3), TYPE_DIVEXACT_BY3 }, { TRY(mpn_divexact_byff), TYPE_DIVEXACT_BYFF }, - { TRY(mpn_divexact_fobm1), TYPE_DIVEXACT_BYBM1OF }, + { TRY(mpn_divexact_fobm1), TYPE_DIVEXACT_FOBM1 }, { TRY_FUNFUN(mpn_lshift1), TYPE_LSHIFT1 }, { TRY_FUNFUN(mpn_rshift1), TYPE_RSHIFT1 }, @@ -2583,7 +2583,7 @@ call (struct each_t *e, tryfun_t function) e->retval = CALLING_CONVENTIONS (function) (e->d[0].p, e->s[0].p, size, divisor,shift); break; - case TYPE_DIVEXACT_BYBM1OF: + case TYPE_DIVEXACT_FOBM1: e->retval = CALLING_CONVENTIONS (function) (e->d[0].p, e->s[0].p, size, altdiv,GMP_NUMB_MAX/altdiv); break; case TYPE_DIVMOD_1C: diff --git a/tune/common.c b/tune/common.c index f348d71b..67280359 100644 --- a/tune/common.c +++ b/tune/common.c @@ -815,7 +815,7 @@ speed_mpn_divexact_byff (struct speed_params *s) double speed_mpn_divexact_fobm1 (struct speed_params *s) { - SPEED_ROUTINE_mpn_divexact_fobm1 (mpn_divexact_fobm1); + SPEED_ROUTINE_MPN_DIVEXACT_BYBM1OF (mpn_divexact_fobm1); } #if HAVE_NATIVE_mpn_modexact_1_odd diff --git a/tune/speed.h b/tune/speed.h index 399d96f0..34885799 100644 --- a/tune/speed.h +++ b/tune/speed.h @@ -875,7 +875,7 @@ int speed_routine_count_zeros_setup _PROTO ((struct speed_params *s, #define SPEED_ROUTINE_MPN_DIVEXACT_1(function) \ SPEED_ROUTINE_MPN_UNARY_1_CALL ((*function) (wp, s->xp, s->size, s->r)) -#define SPEED_ROUTINE_mpn_divexact_fobm1(function) \ +#define SPEED_ROUTINE_MPN_DIVEXACT_BYBM1OF(function) \ { \ mp_ptr wp; \ unsigned i; \