From 0e1305f3ecc2fe8280041b5ad66c4a49eda41669 Mon Sep 17 00:00:00 2001 From: David Malcolm Date: Fri, 10 Jan 2014 10:38:00 -0500 Subject: [PATCH 146/159] FIXME: auto-inc-dec.c --- gcc/auto-inc-dec.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/gcc/auto-inc-dec.c b/gcc/auto-inc-dec.c index 5b5813f..0401daa 100644 --- a/gcc/auto-inc-dec.c +++ b/gcc/auto-inc-dec.c @@ -408,7 +408,7 @@ static rtx_base_insn *reg_next_def = NULL; does not appear that there are any other kinds of relevant notes. */ static void -move_dead_notes (rtx to_insn, rtx from_insn, rtx pattern) +move_dead_notes (rtx_base_insn to_insn, rtx_base_insn from_insn, rtx pattern) { rtx note; rtx next_note; @@ -437,7 +437,7 @@ move_dead_notes (rtx to_insn, rtx from_insn, rtx pattern) NEXT_INSN. */ static rtx_base_insn -insert_move_insn_before (rtx next_insn, rtx dest_reg, rtx src_reg) +insert_move_insn_before (rtx_base_insn next_insn, rtx dest_reg, rtx src_reg) { rtx_base_insn insns; @@ -611,7 +611,7 @@ try_merge (void) /* The width of the mem being accessed. */ int size = GET_MODE_SIZE (GET_MODE (mem)); - rtx last_insn = NULL; + rtx_base_insn last_insn = NULL; enum machine_mode reg_mode = GET_MODE (inc_reg); switch (inc_insn.form) @@ -968,7 +968,7 @@ find_inc (bool first_try) { rtx_base_insn insn; basic_block bb = BLOCK_FOR_INSN (mem_insn.insn); - rtx other_insn; + rtx_base_insn other_insn; df_ref *def_rec; /* Make sure this reg appears only once in this insn. */ @@ -1039,9 +1039,9 @@ find_inc (bool first_try) { /* Make sure that there is no insn that assigns to inc_insn.res between the mem_insn and the inc_insn. */ - rtx other_insn = get_next_ref (REGNO (inc_insn.reg_res), - BLOCK_FOR_INSN (mem_insn.insn), - reg_next_def); + rtx_base_insn other_insn = get_next_ref (REGNO (inc_insn.reg_res), + BLOCK_FOR_INSN (mem_insn.insn), + reg_next_def); if (other_insn != inc_insn.insn) { if (dump_file) @@ -1130,7 +1130,7 @@ find_inc (bool first_try) then we just abandon this. */ int luid = DF_INSN_LUID (inc_insn.insn); - rtx other_insn; + rtx_base_insn other_insn; /* Make sure this reg appears only once in this insn. */ if (count_occurrences (PATTERN (mem_insn.insn), mem_insn.reg1, 1) != 1) @@ -1379,7 +1379,7 @@ merge_in_block (int max_reg, basic_block bb) clear of c because the inc insn is going to move into the mem_insn.insn. */ int luid = DF_INSN_LUID (mem_insn.insn); - rtx other_insn + rtx_base_insn other_insn = get_next_ref (REGNO (inc_insn.reg1), bb, reg_next_use); if (other_insn && luid > DF_INSN_LUID (other_insn)) -- 1.7.11.7