diff options
Diffstat (limited to 'gcc/sched.c')
| -rw-r--r-- | gcc/sched.c | 44 |
1 files changed, 23 insertions, 21 deletions
diff --git a/gcc/sched.c b/gcc/sched.c index 64b785f9533..d52a55bef4b 100644 --- a/gcc/sched.c +++ b/gcc/sched.c @@ -1333,8 +1333,8 @@ sched_analyze_2 (x, insn) while (--i >= 0) { reg_last_uses[regno + i] - = gen_rtx (INSN_LIST, VOIDmode, - insn, reg_last_uses[regno + i]); + = gen_rtx_INSN_LIST (VOIDmode, + insn, reg_last_uses[regno + i]); if (reg_last_sets[regno + i]) add_dependence (insn, reg_last_sets[regno + i], 0); if ((call_used_regs[regno + i] || global_regs[regno + i]) @@ -1346,7 +1346,7 @@ sched_analyze_2 (x, insn) else { reg_last_uses[regno] - = gen_rtx (INSN_LIST, VOIDmode, insn, reg_last_uses[regno]); + = gen_rtx_INSN_LIST (VOIDmode, insn, reg_last_uses[regno]); if (reg_last_sets[regno]) add_dependence (insn, reg_last_sets[regno], 0); @@ -1685,12 +1685,12 @@ sched_analyze (head, tail) convert back into a NOTE_INSN_SETJMP note. See reemit_notes for why we use a pair of of NOTEs. */ - REG_NOTES (insn) = gen_rtx (EXPR_LIST, REG_DEAD, - GEN_INT (0), - REG_NOTES (insn)); - REG_NOTES (insn) = gen_rtx (EXPR_LIST, REG_DEAD, - GEN_INT (NOTE_INSN_SETJMP), - REG_NOTES (insn)); + REG_NOTES (insn) = gen_rtx_EXPR_LIST (REG_DEAD, + GEN_INT (0), + REG_NOTES (insn)); + REG_NOTES (insn) = gen_rtx_EXPR_LIST (REG_DEAD, + GEN_INT (NOTE_INSN_SETJMP), + REG_NOTES (insn)); } else { @@ -1740,10 +1740,12 @@ sched_analyze (head, tail) || (NOTE_LINE_NUMBER (insn) == NOTE_INSN_SETJMP && GET_CODE (PREV_INSN (insn)) != CALL_INSN))) { - loop_notes = gen_rtx (EXPR_LIST, REG_DEAD, - GEN_INT (NOTE_BLOCK_NUMBER (insn)), loop_notes); - loop_notes = gen_rtx (EXPR_LIST, REG_DEAD, - GEN_INT (NOTE_LINE_NUMBER (insn)), loop_notes); + loop_notes = gen_rtx_EXPR_LIST (REG_DEAD, + GEN_INT (NOTE_BLOCK_NUMBER (insn)), + loop_notes); + loop_notes = gen_rtx_EXPR_LIST (REG_DEAD, + GEN_INT (NOTE_LINE_NUMBER (insn)), + loop_notes); CONST_CALL_P (loop_notes) = CONST_CALL_P (insn); } @@ -2236,7 +2238,7 @@ create_reg_dead_note (reg, insn) { rtx temp_reg, temp_link; - temp_reg = gen_rtx (REG, word_mode, 0); + temp_reg = gen_rtx_REG (word_mode, 0); temp_link = rtx_alloc (EXPR_LIST); PUT_REG_NOTE_KIND (temp_link, REG_DEAD); XEXP (temp_link, 0) = temp_reg; @@ -2372,9 +2374,8 @@ attach_deaths (x, insn, set_p) i >= 0; i--) if (! REGNO_REG_SET_P (old_live_regs, regno + i) && ! dead_or_set_regno_p (insn, regno + i)) - create_reg_dead_note (gen_rtx (REG, - reg_raw_mode[regno + i], - regno + i), + create_reg_dead_note (gen_rtx_REG (reg_raw_mode[regno + i], + regno + i), insn); } } @@ -3995,8 +3996,9 @@ update_flow_info (notes, first, last, orig_insn) for (insn = first; insn != NEXT_INSN (last); insn = NEXT_INSN (insn)) if (GET_RTX_CLASS (GET_CODE (insn)) == 'i' && reg_mentioned_p (XEXP (note, 0), PATTERN (insn))) - REG_NOTES (insn) = gen_rtx (EXPR_LIST, REG_LABEL, - XEXP (note, 0), REG_NOTES (insn)); + REG_NOTES (insn) = gen_rtx_EXPR_LIST (REG_LABEL, + XEXP (note, 0), + REG_NOTES (insn)); break; case REG_CC_SETTER: @@ -4246,8 +4248,8 @@ schedule_insns (dump_file) /* Create an insn here so that we can hang dependencies off of it later. */ sched_before_next_call - = gen_rtx (INSN, VOIDmode, 0, NULL_RTX, NULL_RTX, - NULL_RTX, 0, NULL_RTX, NULL_RTX); + = gen_rtx_INSN (VOIDmode, 0, NULL_RTX, NULL_RTX, + NULL_RTX, 0, NULL_RTX, NULL_RTX); /* Initialize the unused_*_lists. We can't use the ones left over from the previous function, because gcc has freed that memory. We can use |