From 8ce68b7f6335e2f75e470b90bdcb443eb74c823a Mon Sep 17 00:00:00 2001 From: David Malcolm Date: Tue, 31 Dec 2013 13:02:14 -0500 Subject: [PATCH 047/159] FIXME: loop-unroll.c --- gcc/loop-unroll.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/gcc/loop-unroll.c b/gcc/loop-unroll.c index e28913fc..14b2121 100644 --- a/gcc/loop-unroll.c +++ b/gcc/loop-unroll.c @@ -73,7 +73,7 @@ along with GCC; see the file COPYING3. If not see struct iv_to_split { - rtx insn; /* The insn in that the induction variable occurs. */ + rtx_base_insn insn; /* The insn in that the induction variable occurs. */ rtx orig_var; /* The variable (register) for the IV before split. */ rtx base_var; /* The variable on that the values in the further iterations are based. */ @@ -90,7 +90,7 @@ struct iv_to_split struct var_to_expand { - rtx insn; /* The insn in that the variable expansion occurs. */ + rtx_base_insn insn; /* The insn in that the variable expansion occurs. */ rtx reg; /* The accumulator which is expanded. */ vec var_expansions; /* The copies of the accumulator which is expanded. */ struct var_to_expand *next; /* Next entry in walking order. */ @@ -192,10 +192,12 @@ static struct opt_info *analyze_insns_in_loop (struct loop *); static void opt_info_start_duplication (struct opt_info *); static void apply_opt_in_copies (struct opt_info *, unsigned, bool, bool); static void free_opt_info (struct opt_info *); -static struct var_to_expand *analyze_insn_to_expand_var (struct loop*, rtx); +static struct var_to_expand *analyze_insn_to_expand_var (struct loop*, + rtx_base_insn); static bool referenced_in_one_insn_in_loop_p (struct loop *, rtx, int *); -static struct iv_to_split *analyze_iv_to_split_insn (rtx); -static void expand_var_during_unrolling (struct var_to_expand *, rtx); +static struct iv_to_split *analyze_iv_to_split_insn (rtx_base_insn); +static void expand_var_during_unrolling (struct var_to_expand *, + rtx_base_insn); static void insert_var_expansion_initialization (struct var_to_expand *, basic_block); static void combine_var_copies_in_loop_exit (struct var_to_expand *, @@ -1717,7 +1719,7 @@ reset_debug_uses_in_loop (struct loop *loop, rtx reg, int debug_uses) */ static struct var_to_expand * -analyze_insn_to_expand_var (struct loop *loop, rtx insn) +analyze_insn_to_expand_var (struct loop *loop, rtx_base_insn insn) { rtx set, dest, src; struct var_to_expand *ves; @@ -1855,7 +1857,7 @@ analyze_insn_to_expand_var (struct loop *loop, rtx insn) pointer to it. */ static struct iv_to_split * -analyze_iv_to_split_insn (rtx insn) +analyze_iv_to_split_insn (rtx_base_insn insn) { rtx set, dest; struct rtx_iv iv; @@ -2165,7 +2167,7 @@ get_expansion (struct var_to_expand *ve) with a new register. */ static void -expand_var_during_unrolling (struct var_to_expand *ve, rtx insn) +expand_var_during_unrolling (struct var_to_expand *ve, rtx_base_insn insn) { rtx new_reg, set; bool really_new_expansion = false; -- 1.7.11.7