From: David Malcolm Date: Mon, 25 Aug 2014 17:16:51 +0000 (+0000) Subject: config/epiphany: Use rtx_insn X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=bcfba653d9710ae743487bda72123d4881e2a5a3;p=gcc.git config/epiphany: Use rtx_insn gcc/ * config/epiphany/epiphany-protos.h (epiphany_final_prescan_insn): Strengthen first param "insn" from rtx to rtx_insn *. * config/epiphany/epiphany.c (epiphany_final_prescan_insn): Likewise. (frame_insn): Likewise for return type. Introduce local "insn" for use in place of local "x" for use as an rtx_insn *. (frame_move_insn): Strengthen return type from rtx to rtx_insn *. (epiphany_expand_prologue): Likewise for local "insn". * config/epiphany/mode-switch-use.c (insert_uses): Likewise. * config/epiphany/resolve-sw-modes.c (pass_resolve_sw_modes::execute): Likewise for locals "insn" and "seq". From-SVN: r214441 --- diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 984b99b7646..bd34252b449 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,19 @@ +2014-08-25 David Malcolm + + * config/epiphany/epiphany-protos.h (epiphany_final_prescan_insn): + Strengthen first param "insn" from rtx to rtx_insn *. + + * config/epiphany/epiphany.c (epiphany_final_prescan_insn): + Likewise. + (frame_insn): Likewise for return type. Introduce local "insn" + for use in place of local "x" for use as an rtx_insn *. + (frame_move_insn): Strengthen return type from rtx to rtx_insn *. + (epiphany_expand_prologue): Likewise for local "insn". + * config/epiphany/mode-switch-use.c (insert_uses): Likewise. + * config/epiphany/resolve-sw-modes.c + (pass_resolve_sw_modes::execute): Likewise for locals "insn" and + "seq". + 2014-08-25 David Malcolm * config/c6x/c6x-protos.h (c6x_get_unit_specifier): Strengthen diff --git a/gcc/config/epiphany/epiphany-protos.h b/gcc/config/epiphany/epiphany-protos.h index 98342a8d499..a40cb58c2e4 100644 --- a/gcc/config/epiphany/epiphany-protos.h +++ b/gcc/config/epiphany/epiphany-protos.h @@ -27,7 +27,7 @@ extern struct rtx_def *gen_compare_reg (enum machine_mode, enum rtx_code, #endif /* Declarations for various fns used in the .md file. */ -extern void epiphany_final_prescan_insn (rtx, rtx *, int); +extern void epiphany_final_prescan_insn (rtx_insn *, rtx *, int); extern bool epiphany_is_long_call_p (rtx); extern bool epiphany_small16 (rtx); bool epiphany_uninterruptible_p (tree decl); diff --git a/gcc/config/epiphany/epiphany.c b/gcc/config/epiphany/epiphany.c index a9a37115096..792475ff86b 100644 --- a/gcc/config/epiphany/epiphany.c +++ b/gcc/config/epiphany/epiphany.c @@ -76,7 +76,7 @@ static tree epiphany_handle_forwarder_attribute (tree *, tree, tree, int, bool *); static bool epiphany_pass_by_reference (cumulative_args_t, enum machine_mode, const_tree, bool); -static rtx frame_insn (rtx); +static rtx_insn *frame_insn (rtx); /* defines for the initialization of the GCC target structure. */ #define TARGET_ATTRIBUTE_TABLE epiphany_attribute_table @@ -1440,7 +1440,7 @@ epiphany_print_operand_address (FILE *file, rtx addr) } void -epiphany_final_prescan_insn (rtx insn ATTRIBUTE_UNUSED, +epiphany_final_prescan_insn (rtx_insn *insn ATTRIBUTE_UNUSED, rtx *opvec ATTRIBUTE_UNUSED, int noperands ATTRIBUTE_UNUSED) { @@ -1545,11 +1545,12 @@ frame_subreg_note (rtx set, int offset) return set; } -static rtx +static rtx_insn * frame_insn (rtx x) { int i; rtx note = NULL_RTX; + rtx_insn *insn; if (GET_CODE (x) == PARALLEL) { @@ -1584,14 +1585,14 @@ frame_insn (rtx x) note = gen_rtx_PARALLEL (VOIDmode, gen_rtvec (2, frame_subreg_note (x, 0), frame_subreg_note (x, UNITS_PER_WORD))); - x = emit_insn (x); - RTX_FRAME_RELATED_P (x) = 1; + insn = emit_insn (x); + RTX_FRAME_RELATED_P (insn) = 1; if (note) - add_reg_note (x, REG_FRAME_RELATED_EXPR, note); - return x; + add_reg_note (insn, REG_FRAME_RELATED_EXPR, note); + return insn; } -static rtx +static rtx_insn * frame_move_insn (rtx to, rtx from) { return frame_insn (gen_rtx_SET (VOIDmode, to, from)); @@ -1819,7 +1820,8 @@ epiphany_expand_prologue (void) register save. */ if (current_frame_info.last_slot >= 0) { - rtx ip, mem2, insn, note; + rtx ip, mem2, note; + rtx_insn *insn; gcc_assert (current_frame_info.last_slot != GPR_FP || (!current_frame_info.need_fp diff --git a/gcc/config/epiphany/mode-switch-use.c b/gcc/config/epiphany/mode-switch-use.c index b05f13db514..b57b854034a 100644 --- a/gcc/config/epiphany/mode-switch-use.c +++ b/gcc/config/epiphany/mode-switch-use.c @@ -49,7 +49,7 @@ insert_uses (void) for (e = N_ENTITIES - 1; e >= 0; e--) { int no_mode = num_modes[e]; - rtx insn; + rtx_insn *insn; int mode; if (!OPTIMIZE_MODE_SWITCHING (e)) diff --git a/gcc/config/epiphany/resolve-sw-modes.c b/gcc/config/epiphany/resolve-sw-modes.c index f40cc8dbad5..47c11ff711c 100644 --- a/gcc/config/epiphany/resolve-sw-modes.c +++ b/gcc/config/epiphany/resolve-sw-modes.c @@ -77,7 +77,8 @@ unsigned pass_resolve_sw_modes::execute (function *fun) { basic_block bb; - rtx insn, src; + rtx_insn *insn; + rtx src; vec todo; sbitmap pushed; bool need_commit = false; @@ -155,7 +156,7 @@ pass_resolve_sw_modes::execute (function *fun) FOR_EACH_EDGE (e, ei, bb->succs) { basic_block succ = e->dest; - rtx seq; + rtx_insn *seq; if (!REGNO_REG_SET_P (DF_LIVE_IN (succ), jilted_reg)) continue;