diff options
Diffstat (limited to 'gcc/emit-rtl.c')
| -rw-r--r-- | gcc/emit-rtl.c | 84 |
1 files changed, 37 insertions, 47 deletions
diff --git a/gcc/emit-rtl.c b/gcc/emit-rtl.c index 613030f..a327ff2 100644 --- a/gcc/emit-rtl.c +++ b/gcc/emit-rtl.c @@ -3602,10 +3602,8 @@ prev_nonnote_nondebug_insn_bb (rtx_insn *insn) SEQUENCEs. */ rtx_insn * -next_real_insn (rtx uncast_insn) +next_real_insn (rtx_insn *insn) { - rtx_insn *insn = safe_as_a <rtx_insn *> (uncast_insn); - while (insn) { insn = NEXT_INSN (insn); @@ -4230,10 +4228,8 @@ add_insn_before_nobb (rtx_insn *insn, rtx_insn *before) they know how to update a SEQUENCE. */ void -add_insn_after (rtx uncast_insn, rtx uncast_after, basic_block bb) +add_insn_after (rtx_insn *insn, rtx_insn *after, basic_block bb) { - rtx_insn *insn = as_a <rtx_insn *> (uncast_insn); - rtx_insn *after = as_a <rtx_insn *> (uncast_after); add_insn_after_nobb (insn, after); if (!BARRIER_P (after) && !BARRIER_P (insn) @@ -4260,10 +4256,8 @@ add_insn_after (rtx uncast_insn, rtx uncast_after, basic_block bb) they know how to update a SEQUENCE. */ void -add_insn_before (rtx uncast_insn, rtx uncast_before, basic_block bb) +add_insn_before (rtx_insn *insn, rtx_insn *before, basic_block bb) { - rtx_insn *insn = as_a <rtx_insn *> (uncast_insn); - rtx_insn *before = as_a <rtx_insn *> (uncast_before); add_insn_before_nobb (insn, before); if (!bb @@ -4313,9 +4307,8 @@ set_insn_deleted (rtx insn) To really delete an insn and related DF information, use delete_insn. */ void -remove_insn (rtx uncast_insn) +remove_insn (rtx_insn *insn) { - rtx_insn *insn = as_a <rtx_insn *> (uncast_insn); rtx_insn *next = NEXT_INSN (insn); rtx_insn *prev = PREV_INSN (insn); basic_block bb; @@ -4518,7 +4511,8 @@ reorder_insns (rtx_insn *from, rtx_insn *to, rtx_insn *after) generated would almost certainly die right after it was created. */ static rtx_insn * -emit_pattern_before_noloc (rtx x, rtx before, rtx last, basic_block bb, +emit_pattern_before_noloc (rtx x, rtx_insn *before, rtx_insn *last, + basic_block bb, rtx_insn *(*make_raw) (rtx)) { rtx_insn *insn; @@ -4526,7 +4520,7 @@ emit_pattern_before_noloc (rtx x, rtx before, rtx last, basic_block bb, gcc_assert (before); if (x == NULL_RTX) - return safe_as_a <rtx_insn *> (last); + return last; switch (GET_CODE (x)) { @@ -4559,7 +4553,7 @@ emit_pattern_before_noloc (rtx x, rtx before, rtx last, basic_block bb, break; } - return safe_as_a <rtx_insn *> (last); + return last; } /* Make X be output before the instruction BEFORE. */ @@ -4577,7 +4571,7 @@ rtx_jump_insn * emit_jump_insn_before_noloc (rtx x, rtx_insn *before) { return as_a <rtx_jump_insn *> ( - emit_pattern_before_noloc (x, before, NULL_RTX, NULL, + emit_pattern_before_noloc (x, before, NULL, NULL, make_jump_insn_raw)); } @@ -4587,7 +4581,7 @@ emit_jump_insn_before_noloc (rtx x, rtx_insn *before) rtx_insn * emit_call_insn_before_noloc (rtx x, rtx_insn *before) { - return emit_pattern_before_noloc (x, before, NULL_RTX, NULL, + return emit_pattern_before_noloc (x, before, NULL, NULL, make_call_insn_raw); } @@ -4595,9 +4589,9 @@ emit_call_insn_before_noloc (rtx x, rtx_insn *before) and output it before the instruction BEFORE. */ rtx_insn * -emit_debug_insn_before_noloc (rtx x, rtx before) +emit_debug_insn_before_noloc (rtx x, rtx_insn *before) { - return emit_pattern_before_noloc (x, before, NULL_RTX, NULL, + return emit_pattern_before_noloc (x, before, NULL, NULL, make_debug_insn_raw); } @@ -4605,7 +4599,7 @@ emit_debug_insn_before_noloc (rtx x, rtx before) and output it before the insn BEFORE. */ rtx_barrier * -emit_barrier_before (rtx before) +emit_barrier_before (rtx_insn *before) { rtx_barrier *insn = as_a <rtx_barrier *> (rtx_alloc (BARRIER)); @@ -4618,21 +4612,20 @@ emit_barrier_before (rtx before) /* Emit the label LABEL before the insn BEFORE. */ rtx_code_label * -emit_label_before (rtx label, rtx_insn *before) +emit_label_before (rtx_code_label *label, rtx_insn *before) { gcc_checking_assert (INSN_UID (label) == 0); INSN_UID (label) = cur_insn_uid++; add_insn_before (label, before, NULL); - return as_a <rtx_code_label *> (label); + return label; } /* Helper for emit_insn_after, handles lists of instructions efficiently. */ static rtx_insn * -emit_insn_after_1 (rtx_insn *first, rtx uncast_after, basic_block bb) +emit_insn_after_1 (rtx_insn *first, rtx_insn *after, basic_block bb) { - rtx_insn *after = safe_as_a <rtx_insn *> (uncast_after); rtx_insn *last; rtx_insn *after_after; if (!bb && !BARRIER_P (after)) @@ -4674,10 +4667,9 @@ emit_insn_after_1 (rtx_insn *first, rtx uncast_after, basic_block bb) } static rtx_insn * -emit_pattern_after_noloc (rtx x, rtx uncast_after, basic_block bb, +emit_pattern_after_noloc (rtx x, rtx_insn *after, basic_block bb, rtx_insn *(*make_raw)(rtx)) { - rtx_insn *after = safe_as_a <rtx_insn *> (uncast_after); rtx_insn *last = after; gcc_assert (after); @@ -4716,7 +4708,7 @@ emit_pattern_after_noloc (rtx x, rtx uncast_after, basic_block bb, BB is NULL, an attempt is made to infer the BB from AFTER. */ rtx_insn * -emit_insn_after_noloc (rtx x, rtx after, basic_block bb) +emit_insn_after_noloc (rtx x, rtx_insn *after, basic_block bb) { return emit_pattern_after_noloc (x, after, bb, make_insn_raw); } @@ -4726,7 +4718,7 @@ emit_insn_after_noloc (rtx x, rtx after, basic_block bb) and output it after the insn AFTER. */ rtx_jump_insn * -emit_jump_insn_after_noloc (rtx x, rtx after) +emit_jump_insn_after_noloc (rtx x, rtx_insn *after) { return as_a <rtx_jump_insn *> ( emit_pattern_after_noloc (x, after, NULL, make_jump_insn_raw)); @@ -4736,7 +4728,7 @@ emit_jump_insn_after_noloc (rtx x, rtx after) and output it after the instruction AFTER. */ rtx_insn * -emit_call_insn_after_noloc (rtx x, rtx after) +emit_call_insn_after_noloc (rtx x, rtx_insn *after) { return emit_pattern_after_noloc (x, after, NULL, make_call_insn_raw); } @@ -4745,7 +4737,7 @@ emit_call_insn_after_noloc (rtx x, rtx after) and output it after the instruction AFTER. */ rtx_insn * -emit_debug_insn_after_noloc (rtx x, rtx after) +emit_debug_insn_after_noloc (rtx x, rtx_insn *after) { return emit_pattern_after_noloc (x, after, NULL, make_debug_insn_raw); } @@ -4754,7 +4746,7 @@ emit_debug_insn_after_noloc (rtx x, rtx after) and output it after the insn AFTER. */ rtx_barrier * -emit_barrier_after (rtx after) +emit_barrier_after (rtx_insn *after) { rtx_barrier *insn = as_a <rtx_barrier *> (rtx_alloc (BARRIER)); @@ -4767,12 +4759,12 @@ emit_barrier_after (rtx after) /* Emit the label LABEL after the insn AFTER. */ rtx_insn * -emit_label_after (rtx label, rtx_insn *after) +emit_label_after (rtx_insn *label, rtx_insn *after) { gcc_checking_assert (INSN_UID (label) == 0); INSN_UID (label) = cur_insn_uid++; add_insn_after (label, after, NULL); - return as_a <rtx_insn *> (label); + return label; } /* Notes require a bit of special handling: Some notes need to have their @@ -4842,10 +4834,9 @@ emit_note_before (enum insn_note subtype, rtx_insn *before) MAKE_RAW indicates how to turn PATTERN into a real insn. */ static rtx_insn * -emit_pattern_after_setloc (rtx pattern, rtx uncast_after, int loc, +emit_pattern_after_setloc (rtx pattern, rtx_insn *after, location_t loc, rtx_insn *(*make_raw) (rtx)) { - rtx_insn *after = safe_as_a <rtx_insn *> (uncast_after); rtx_insn *last = emit_pattern_after_noloc (pattern, after, NULL, make_raw); if (pattern == NULL_RTX || !loc) @@ -4889,7 +4880,7 @@ emit_pattern_after (rtx pattern, rtx uncast_after, bool skip_debug_insns, /* Like emit_insn_after_noloc, but set INSN_LOCATION according to LOC. */ rtx_insn * -emit_insn_after_setloc (rtx pattern, rtx after, int loc) +emit_insn_after_setloc (rtx pattern, rtx_insn *after, location_t loc) { return emit_pattern_after_setloc (pattern, after, loc, make_insn_raw); } @@ -4903,7 +4894,7 @@ emit_insn_after (rtx pattern, rtx after) /* Like emit_jump_insn_after_noloc, but set INSN_LOCATION according to LOC. */ rtx_jump_insn * -emit_jump_insn_after_setloc (rtx pattern, rtx after, int loc) +emit_jump_insn_after_setloc (rtx pattern, rtx_insn *after, location_t loc) { return as_a <rtx_jump_insn *> ( emit_pattern_after_setloc (pattern, after, loc, make_jump_insn_raw)); @@ -4919,7 +4910,7 @@ emit_jump_insn_after (rtx pattern, rtx after) /* Like emit_call_insn_after_noloc, but set INSN_LOCATION according to LOC. */ rtx_insn * -emit_call_insn_after_setloc (rtx pattern, rtx after, int loc) +emit_call_insn_after_setloc (rtx pattern, rtx_insn *after, location_t loc) { return emit_pattern_after_setloc (pattern, after, loc, make_call_insn_raw); } @@ -4933,7 +4924,7 @@ emit_call_insn_after (rtx pattern, rtx after) /* Like emit_debug_insn_after_noloc, but set INSN_LOCATION according to LOC. */ rtx_insn * -emit_debug_insn_after_setloc (rtx pattern, rtx after, int loc) +emit_debug_insn_after_setloc (rtx pattern, rtx_insn *after, location_t loc) { return emit_pattern_after_setloc (pattern, after, loc, make_debug_insn_raw); } @@ -4951,13 +4942,12 @@ emit_debug_insn_after (rtx pattern, rtx after) CALL_INSN, etc. */ static rtx_insn * -emit_pattern_before_setloc (rtx pattern, rtx uncast_before, int loc, bool insnp, - rtx_insn *(*make_raw) (rtx)) +emit_pattern_before_setloc (rtx pattern, rtx_insn *before, location_t loc, + bool insnp, rtx_insn *(*make_raw) (rtx)) { - rtx_insn *before = as_a <rtx_insn *> (uncast_before); rtx_insn *first = PREV_INSN (before); rtx_insn *last = emit_pattern_before_noloc (pattern, before, - insnp ? before : NULL_RTX, + insnp ? before : NULL, NULL, make_raw); if (pattern == NULL_RTX || !loc) @@ -5001,13 +4991,13 @@ emit_pattern_before (rtx pattern, rtx uncast_before, bool skip_debug_insns, insnp, make_raw); else return emit_pattern_before_noloc (pattern, before, - insnp ? before : NULL_RTX, + insnp ? before : NULL, NULL, make_raw); } /* Like emit_insn_before_noloc, but set INSN_LOCATION according to LOC. */ rtx_insn * -emit_insn_before_setloc (rtx pattern, rtx_insn *before, int loc) +emit_insn_before_setloc (rtx pattern, rtx_insn *before, location_t loc) { return emit_pattern_before_setloc (pattern, before, loc, true, make_insn_raw); @@ -5022,7 +5012,7 @@ emit_insn_before (rtx pattern, rtx before) /* like emit_insn_before_noloc, but set INSN_LOCATION according to LOC. */ rtx_jump_insn * -emit_jump_insn_before_setloc (rtx pattern, rtx_insn *before, int loc) +emit_jump_insn_before_setloc (rtx pattern, rtx_insn *before, location_t loc) { return as_a <rtx_jump_insn *> ( emit_pattern_before_setloc (pattern, before, loc, false, @@ -5040,7 +5030,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_insn *before, int loc) +emit_call_insn_before_setloc (rtx pattern, rtx_insn *before, location_t loc) { return emit_pattern_before_setloc (pattern, before, loc, false, make_call_insn_raw); @@ -5057,7 +5047,7 @@ emit_call_insn_before (rtx pattern, rtx_insn *before) /* Like emit_insn_before_noloc, but set INSN_LOCATION according to LOC. */ rtx_insn * -emit_debug_insn_before_setloc (rtx pattern, rtx before, int loc) +emit_debug_insn_before_setloc (rtx pattern, rtx_insn *before, location_t loc) { return emit_pattern_before_setloc (pattern, before, loc, false, make_debug_insn_raw); |