From 16cb56686dba6e45ab5e19b86fbed7712e1e6501 Mon Sep 17 00:00:00 2001 From: Trevor Saunders Date: Thu, 9 Jul 2015 02:50:21 +0000 Subject: always define AUTO_INC_DEC gcc/ChangeLog: 2015-07-08 Trevor Saunders * rtl.h: Always define AUTO_INC_DEC. * auto-inc-dec.c (pass_inc_dec::execute): Adjust. * combine.c (combine_instructions): Likewise. (can_combine_p): Likewise. (try_combine): Likewise. * emit-rtl.c (try_split): Likewise. * loop-invariant.c (calculate_loop_reg_pressure): Likewise. * lower-subreg.c (resolve_simple_move): Likewise. * lra.c (update_inc_notes): Likewise. * recog.c (asm_operand_ok): Likewise. (constrain_operands): Likewise. * regrename.c (scan_rtx_address): Likewise. * reload.c (update_auto_inc_notes): Likewise. (find_equiv_reg): Likewise. * reload1.c (reload): Likewise. (reload_as_needed): Likewise. (choose_reload_regs): Likewise. (emit_input_reload_insns): Likewise. (delete_output_reload): Likewise. * sched-deps.c (init_insn_reg_pressure_info): Likewise. * valtrack.c (cleanup_auto_inc_dec): Likewise. From-SVN: r225595 --- gcc/reload1.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'gcc/reload1.c') diff --git a/gcc/reload1.c b/gcc/reload1.c index cd607a0..8c3e6e8 100644 --- a/gcc/reload1.c +++ b/gcc/reload1.c @@ -417,7 +417,7 @@ static void delete_output_reload (rtx_insn *, int, int, rtx); static void delete_address_reloads (rtx_insn *, rtx_insn *); static void delete_address_reloads_1 (rtx_insn *, rtx, rtx_insn *); static void inc_for_reload (rtx, rtx, rtx, int); -#ifdef AUTO_INC_DEC +#if AUTO_INC_DEC static void add_auto_inc_notes (rtx_insn *, rtx); #endif static void substitute (rtx *, const_rtx, rtx); @@ -1250,7 +1250,7 @@ reload (rtx_insn *first, int global) pnote = &XEXP (*pnote, 1); } -#ifdef AUTO_INC_DEC +#if AUTO_INC_DEC add_auto_inc_notes (insn, PATTERN (insn)); #endif @@ -4581,7 +4581,7 @@ static void reload_as_needed (int live_known) { struct insn_chain *chain; -#if defined (AUTO_INC_DEC) +#if AUTO_INC_DEC int i; #endif rtx_note *marker; @@ -4604,7 +4604,7 @@ reload_as_needed (int live_known) rtx_insn *prev = 0; rtx_insn *insn = chain->insn; rtx_insn *old_next = NEXT_INSN (insn); -#ifdef AUTO_INC_DEC +#if AUTO_INC_DEC rtx_insn *old_prev = PREV_INSN (insn); #endif @@ -4749,7 +4749,7 @@ reload_as_needed (int live_known) if (NONJUMP_INSN_P (x) && GET_CODE (PATTERN (x)) == CLOBBER) note_stores (PATTERN (x), forget_old_reloads_1, NULL); -#ifdef AUTO_INC_DEC +#if AUTO_INC_DEC /* Likewise for regs altered by auto-increment in this insn. REG_INC notes have been changed by reloading: find_reloads_address_1 records substitutions for them, @@ -6606,7 +6606,7 @@ choose_reload_regs (struct insn_chain *chain) } mode = GET_MODE (rld[r].in_reg); } -#ifdef AUTO_INC_DEC +#if AUTO_INC_DEC else if (GET_RTX_CLASS (GET_CODE (rld[r].in_reg)) == RTX_AUTOINC && REG_P (XEXP (rld[r].in_reg, 0))) { @@ -7397,7 +7397,7 @@ emit_input_reload_insns (struct insn_chain *chain, struct reload *rl, is ill-formed and we must reject this optimization. */ extract_insn (temp); if (constrain_operands (1, get_enabled_alternatives (temp)) -#ifdef AUTO_INC_DEC +#if AUTO_INC_DEC && ! find_reg_note (temp, REG_INC, reloadreg) #endif ) @@ -8870,7 +8870,7 @@ delete_output_reload (rtx_insn *insn, int j, int last_reload_reg, continue; if (MEM_P (reg2) || reload_override_in[k]) reg2 = rld[k].in_reg; -#ifdef AUTO_INC_DEC +#if AUTO_INC_DEC if (rld[k].out && ! rld[k].out_reg) reg2 = XEXP (rld[k].in_reg, 0); #endif @@ -9266,7 +9266,7 @@ inc_for_reload (rtx reloadreg, rtx in, rtx value, int inc_amount) } } -#ifdef AUTO_INC_DEC +#if AUTO_INC_DEC static void add_auto_inc_notes (rtx_insn *insn, rtx x) { -- cgit v1.1