From 596f2b172abcab2882c9ed03b9a91703de051844 Mon Sep 17 00:00:00 2001 From: Trevor Saunders Date: Fri, 5 Sep 2014 02:31:40 +0000 Subject: [PATCH] make several emit functions take an rtx_insn * gcc/ChangeLog: 2014-09-04 Trevor Saunders * emit-rtl.c (emit_insn_before_noloc): Take an rtx_insn * instead of an rtx. (emit_jump_insn_before_noloc): Likewise. (emit_call_insn_before_noloc): Likewise. (emit_label_before): Likewise. (emit_label_after): Likewise. (emit_insn_before_setloc): Likewise. (emit_jump_insn_before_setloc): Likewise. (emit_call_insn_before_setloc): Likewise. (emit_call_insn_before): Likewise. * rtl.h: Adjust. From-SVN: r214933 --- gcc/ChangeLog | 14 ++++++++++++++ gcc/emit-rtl.c | 18 +++++++++--------- gcc/rtl.h | 18 +++++++++--------- 3 files changed, 32 insertions(+), 18 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 7b32da10d89..0a5252a92d7 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,17 @@ +2014-09-04 Trevor Saunders + + * emit-rtl.c (emit_insn_before_noloc): Take an rtx_insn * instead of + an rtx. + (emit_jump_insn_before_noloc): Likewise. + (emit_call_insn_before_noloc): Likewise. + (emit_label_before): Likewise. + (emit_label_after): Likewise. + (emit_insn_before_setloc): Likewise. + (emit_jump_insn_before_setloc): Likewise. + (emit_call_insn_before_setloc): Likewise. + (emit_call_insn_before): Likewise. + * rtl.h: Adjust. + 2014-09-05 David Malcolm * cse.c (cse_insn): Strengthen local "new_rtx" from rtx to diff --git a/gcc/emit-rtl.c b/gcc/emit-rtl.c index a6b12a4cc06..e3df826fda2 100644 --- a/gcc/emit-rtl.c +++ b/gcc/emit-rtl.c @@ -4377,7 +4377,7 @@ emit_pattern_before_noloc (rtx x, rtx before, rtx last, basic_block bb, /* Make X be output before the instruction BEFORE. */ rtx_insn * -emit_insn_before_noloc (rtx x, rtx before, basic_block bb) +emit_insn_before_noloc (rtx x, rtx_insn *before, basic_block bb) { return emit_pattern_before_noloc (x, before, before, bb, make_insn_raw); } @@ -4386,7 +4386,7 @@ emit_insn_before_noloc (rtx x, rtx before, basic_block bb) and output it before the instruction BEFORE. */ rtx_insn * -emit_jump_insn_before_noloc (rtx x, rtx before) +emit_jump_insn_before_noloc (rtx x, rtx_insn *before) { return emit_pattern_before_noloc (x, before, NULL_RTX, NULL, make_jump_insn_raw); @@ -4396,7 +4396,7 @@ emit_jump_insn_before_noloc (rtx x, rtx before) and output it before the instruction BEFORE. */ rtx_insn * -emit_call_insn_before_noloc (rtx x, rtx before) +emit_call_insn_before_noloc (rtx x, rtx_insn *before) { return emit_pattern_before_noloc (x, before, NULL_RTX, NULL, make_call_insn_raw); @@ -4429,7 +4429,7 @@ emit_barrier_before (rtx before) /* Emit the label LABEL before the insn BEFORE. */ rtx_insn * -emit_label_before (rtx label, rtx before) +emit_label_before (rtx label, rtx_insn *before) { gcc_checking_assert (INSN_UID (label) == 0); INSN_UID (label) = cur_insn_uid++; @@ -4577,7 +4577,7 @@ emit_barrier_after (rtx after) /* Emit the label LABEL after the insn AFTER. */ rtx_insn * -emit_label_after (rtx label, rtx after) +emit_label_after (rtx label, rtx_insn *after) { gcc_checking_assert (INSN_UID (label) == 0); INSN_UID (label) = cur_insn_uid++; @@ -4814,7 +4814,7 @@ emit_pattern_before (rtx pattern, rtx uncast_before, bool skip_debug_insns, /* Like emit_insn_before_noloc, but set INSN_LOCATION according to LOC. */ rtx_insn * -emit_insn_before_setloc (rtx pattern, rtx before, int loc) +emit_insn_before_setloc (rtx pattern, rtx_insn *before, int loc) { return emit_pattern_before_setloc (pattern, before, loc, true, make_insn_raw); @@ -4829,7 +4829,7 @@ emit_insn_before (rtx pattern, rtx before) /* like emit_insn_before_noloc, but set INSN_LOCATION according to LOC. */ rtx_insn * -emit_jump_insn_before_setloc (rtx pattern, rtx before, int loc) +emit_jump_insn_before_setloc (rtx pattern, rtx_insn *before, int loc) { return emit_pattern_before_setloc (pattern, before, loc, false, make_jump_insn_raw); @@ -4845,7 +4845,7 @@ emit_jump_insn_before (rtx pattern, rtx before) /* Like emit_insn_before_noloc, but set INSN_LOCATION according to LOC. */ rtx_insn * -emit_call_insn_before_setloc (rtx pattern, rtx before, int loc) +emit_call_insn_before_setloc (rtx pattern, rtx_insn *before, int loc) { return emit_pattern_before_setloc (pattern, before, loc, false, make_call_insn_raw); @@ -4854,7 +4854,7 @@ emit_call_insn_before_setloc (rtx pattern, rtx before, int loc) /* Like emit_call_insn_before_noloc, but set insn_location according to BEFORE. */ rtx_insn * -emit_call_insn_before (rtx pattern, rtx before) +emit_call_insn_before (rtx pattern, rtx_insn *before) { return emit_pattern_before (pattern, before, true, false, make_call_insn_raw); diff --git a/gcc/rtl.h b/gcc/rtl.h index deb206ba2d4..cd2f2e7ae15 100644 --- a/gcc/rtl.h +++ b/gcc/rtl.h @@ -2575,19 +2575,19 @@ extern rtx assign_temp (tree, int, int); /* In emit-rtl.c */ extern rtx_insn *emit_insn_before (rtx, rtx); -extern rtx_insn *emit_insn_before_noloc (rtx, rtx, basic_block); -extern rtx_insn *emit_insn_before_setloc (rtx, rtx, int); +extern rtx_insn *emit_insn_before_noloc (rtx, rtx_insn *, basic_block); +extern rtx_insn *emit_insn_before_setloc (rtx, rtx_insn *, int); extern rtx_insn *emit_jump_insn_before (rtx, rtx); -extern rtx_insn *emit_jump_insn_before_noloc (rtx, rtx); -extern rtx_insn *emit_jump_insn_before_setloc (rtx, rtx, int); -extern rtx_insn *emit_call_insn_before (rtx, rtx); -extern rtx_insn *emit_call_insn_before_noloc (rtx, rtx); -extern rtx_insn *emit_call_insn_before_setloc (rtx, rtx, int); +extern rtx_insn *emit_jump_insn_before_noloc (rtx, rtx_insn *); +extern rtx_insn *emit_jump_insn_before_setloc (rtx, rtx_insn *, int); +extern rtx_insn *emit_call_insn_before (rtx, rtx_insn *); +extern rtx_insn *emit_call_insn_before_noloc (rtx, rtx_insn *); +extern rtx_insn *emit_call_insn_before_setloc (rtx, rtx_insn *, int); extern rtx_insn *emit_debug_insn_before (rtx, rtx); extern rtx_insn *emit_debug_insn_before_noloc (rtx, rtx); extern rtx_insn *emit_debug_insn_before_setloc (rtx, rtx, int); extern rtx_barrier *emit_barrier_before (rtx); -extern rtx_insn *emit_label_before (rtx, rtx); +extern rtx_insn *emit_label_before (rtx, rtx_insn *); extern rtx_note *emit_note_before (enum insn_note, rtx); extern rtx_insn *emit_insn_after (rtx, rtx); extern rtx_insn *emit_insn_after_noloc (rtx, rtx, basic_block); @@ -2602,7 +2602,7 @@ extern rtx_insn *emit_debug_insn_after (rtx, rtx); extern rtx_insn *emit_debug_insn_after_noloc (rtx, rtx); extern rtx_insn *emit_debug_insn_after_setloc (rtx, rtx, int); extern rtx_barrier *emit_barrier_after (rtx); -extern rtx_insn *emit_label_after (rtx, rtx); +extern rtx_insn *emit_label_after (rtx, rtx_insn *); extern rtx_note *emit_note_after (enum insn_note, rtx); extern rtx_insn *emit_insn (rtx); extern rtx_insn *emit_debug_insn (rtx); -- 2.30.2