From ec573d17b874fe0528f47b7522905fffe9803d48 Mon Sep 17 00:00:00 2001 From: Kyrylo Tkachov Date: Thu, 14 Jul 2016 13:57:05 +0000 Subject: [PATCH] [1/2] Move choose_mult_variant declaration and dependent declarations to expmed.h * expmed.c (mult_variant, choose_mult_variant): Move declaration to... * expmed.h: ... Here. From-SVN: r238337 --- gcc/ChangeLog | 5 +++++ gcc/expmed.c | 10 +--------- gcc/expmed.h | 9 +++++++++ 3 files changed, 15 insertions(+), 9 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 5830663300f..e04e48af523 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,8 @@ +2016-07-14 Kyrylo Tkachov + + * expmed.c (mult_variant, choose_mult_variant): Move declaration to... + * expmed.h: ... Here. + 2016-07-14 Jan Hubicka * gimple.h (stmt_can_terminate_bb_p): New function. diff --git a/gcc/expmed.c b/gcc/expmed.c index 6645a535b3e..bd29e42aae0 100644 --- a/gcc/expmed.c +++ b/gcc/expmed.c @@ -2482,16 +2482,8 @@ expand_variable_shift (enum tree_code code, machine_mode mode, rtx shifted, } -/* Indicates the type of fixup needed after a constant multiplication. - BASIC_VARIANT means no fixup is needed, NEGATE_VARIANT means that - the result should be negated, and ADD_VARIANT means that the - multiplicand should be added to the result. */ -enum mult_variant {basic_variant, negate_variant, add_variant}; - static void synth_mult (struct algorithm *, unsigned HOST_WIDE_INT, const struct mult_cost *, machine_mode mode); -static bool choose_mult_variant (machine_mode, HOST_WIDE_INT, - struct algorithm *, enum mult_variant *, int); static rtx expand_mult_const (machine_mode, rtx, HOST_WIDE_INT, rtx, const struct algorithm *, enum mult_variant); static unsigned HOST_WIDE_INT invert_mod2n (unsigned HOST_WIDE_INT, int); @@ -2981,7 +2973,7 @@ synth_mult (struct algorithm *alg_out, unsigned HOST_WIDE_INT t, Return true if the cheapest of these cost less than MULT_COST, describing the algorithm in *ALG and final fixup in *VARIANT. */ -static bool +bool choose_mult_variant (machine_mode mode, HOST_WIDE_INT val, struct algorithm *alg, enum mult_variant *variant, int mult_cost) diff --git a/gcc/expmed.h b/gcc/expmed.h index 1279199f057..cbceaf16dff 100644 --- a/gcc/expmed.h +++ b/gcc/expmed.h @@ -35,6 +35,15 @@ enum alg_code { alg_impossible }; +/* Indicates the type of fixup needed after a constant multiplication. + BASIC_VARIANT means no fixup is needed, NEGATE_VARIANT means that + the result should be negated, and ADD_VARIANT means that the + multiplicand should be added to the result. */ +enum mult_variant {basic_variant, negate_variant, add_variant}; + +bool choose_mult_variant (machine_mode, HOST_WIDE_INT, + struct algorithm *, enum mult_variant *, int); + /* This structure holds the "cost" of a multiply sequence. The "cost" field holds the total rtx_cost of every operator in the synthetic multiplication sequence, hence cost(a op b) is defined -- 2.30.2