config/sh: Use rtx_insn and rtx_code_label

gcc/
	* config/sh/sh-protos.h (output_ieee_ccmpeq): Strengthen param 1
	from rtx to rtx_insn *.
	(output_branchy_insn): Likewise for param 3.
	(output_far_jump): Likewise for param 1.
	(final_prescan_insn): Likewise.
	(sh_insn_length_adjustment): Likewise for sole param.

	* config/sh/sh.c (expand_cbranchsi4): Likewise for local "jump".
	(expand_cbranchdi4): Strengthen local "skip_label" from rtx to
	rtx_code_label *.
	(sh_emit_compare_and_set): Likewise for local "lab".
	(output_far_jump): Strengthen param "insn" and local "prev" from
	rtx to rtx_insn *.
	(output_branchy_insn): Likewise for param "insn" and local
	"next_insn".
	(output_ieee_ccmpeq): Likewise for param "insn".
	(struct label_ref_list_d): Strengthen field "label" from rtx to
	rtx_code_label *.
	(pool_node): Likewise.
	(pool_window_label): Likewise for this global.
	(add_constant): Likewise for return type and locals "lab", "new_rtx".
	(dump_table): Strengthen params "start", "barrier" and local
	"scan" from rtx to rtx_insn *.
	(broken_move): Likewise for param "insn".
	(untangle_mova): Likewise for params "first_mova" and "new_mova".
	Strengthen param "first_mova" from rtx * to rtx_insn **.
	(mova_p): Likewise for param "insn".
	(fixup_mova): Likewise for param "mova".
	(find_barrier): Likewise for return type, params "mova" and
	"from", and locals "barrier_before_mova", "found_barrier",
	"good_barrier", "orig", "last_symoff", "next".  Strengthen local
	"label" from rtx to rtx_code_label *.
	(sh_loop_align): Strengthen locals "first", "insn", "mova" from
	rtx to rtx_insn *.
	(sh_reorg): Likewise for locals "link", "scan", "barrier".
	(split_branches): Likewise for param "first" and local "insn".
	(final_prescan_insn): Likewise for param "insn".
	(sequence_insn_p): Likewise for locals "prev", "next".
	(sh_insn_length_adjustment): Likewise for param "insn".
	(sh_can_redirect_branch): Likewise for local "insn".
	(find_r0_life_regions): Likewise for locals "end", "insn".
	(sh_output_mi_thunk): Likewise for local "insns".

From-SVN: r214459

gcc/ChangeLog

 2014-08-25  David Malcolm  <dmalcolm@redhat.com>
 
+	* config/sh/sh-protos.h (output_ieee_ccmpeq): Strengthen param 1
+	from rtx to rtx_insn *.
+	(output_branchy_insn): Likewise for param 3.
+	(output_far_jump): Likewise for param 1.
+	(final_prescan_insn): Likewise.
+	(sh_insn_length_adjustment): Likewise for sole param.
+
+	* config/sh/sh.c (expand_cbranchsi4): Likewise for local "jump".
+	(expand_cbranchdi4): Strengthen local "skip_label" from rtx to
+	rtx_code_label *.
+	(sh_emit_compare_and_set): Likewise for local "lab".
+	(output_far_jump): Strengthen param "insn" and local "prev" from
+	rtx to rtx_insn *.
+	(output_branchy_insn): Likewise for param "insn" and local
+	"next_insn".
+	(output_ieee_ccmpeq): Likewise for param "insn".
+	(struct label_ref_list_d): Strengthen field "label" from rtx to
+	rtx_code_label *.
+	(pool_node): Likewise.
+	(pool_window_label): Likewise for this global.
+	(add_constant): Likewise for return type and locals "lab", "new_rtx".
+	(dump_table): Strengthen params "start", "barrier" and local
+	"scan" from rtx to rtx_insn *.
+	(broken_move): Likewise for param "insn".
+	(untangle_mova): Likewise for params "first_mova" and "new_mova".
+	Strengthen param "first_mova" from rtx * to rtx_insn **.
+	(mova_p): Likewise for param "insn".
+	(fixup_mova): Likewise for param "mova".
+	(find_barrier): Likewise for return type, params "mova" and
+	"from", and locals "barrier_before_mova", "found_barrier",
+	"good_barrier", "orig", "last_symoff", "next".  Strengthen local
+	"label" from rtx to rtx_code_label *.
+	(sh_loop_align): Strengthen locals "first", "insn", "mova" from
+	rtx to rtx_insn *.
+	(sh_reorg): Likewise for locals "link", "scan", "barrier".
+	(split_branches): Likewise for param "first" and local "insn".
+	(final_prescan_insn): Likewise for param "insn".
+	(sequence_insn_p): Likewise for locals "prev", "next".
+	(sh_insn_length_adjustment): Likewise for param "insn".
+	(sh_can_redirect_branch): Likewise for local "insn".
+	(find_r0_life_regions): Likewise for locals "end", "insn".
+	(sh_output_mi_thunk): Likewise for local "insns".
+
+2014-08-25  David Malcolm  <dmalcolm@redhat.com>
+
 	* config/score/score.c (score_output_mi_thunk): Strengthen local
 	"insn" from rtx to rtx_insn *.
 	(score_prologue): Likewise.

gcc/config/sh/sh-protos.h

@@ -95,11 +95,12 @@ extern rtx sh_fsca_int2sf (void);
 /* Declare functions defined in sh.c and used in templates.  */
 
 extern const char *output_branch (int, rtx, rtx *);
-extern const char *output_ieee_ccmpeq (rtx, rtx *);
-extern const char *output_branchy_insn (enum rtx_code, const char *, rtx, rtx *);
+extern const char *output_ieee_ccmpeq (rtx_insn *, rtx *);
+extern const char *output_branchy_insn (enum rtx_code, const char *,
+					rtx_insn *, rtx *);
 extern const char *output_movedouble (rtx, rtx[], enum machine_mode);
 extern const char *output_movepcrel (rtx, rtx[], enum machine_mode);
-extern const char *output_far_jump (rtx, rtx);
+extern const char *output_far_jump (rtx_insn *, rtx);
 
 extern rtx sfunc_uses_reg (rtx);
 extern int barrier_align (rtx);
@@ -145,7 +146,7 @@ extern rtx gen_datalabel_ref (rtx);
 extern int regs_used (rtx, int);
 extern void fixup_addr_diff_vecs (rtx);
 extern int get_dest_uid (rtx, int);
-extern void final_prescan_insn (rtx, rtx *, int);
+extern void final_prescan_insn (rtx_insn *, rtx *, int);
 extern enum tls_model tls_symbolic_operand (rtx, enum machine_mode);
 extern bool system_reg_operand (rtx, enum machine_mode);
 extern bool reg_unused_after (rtx, rtx);
@@ -153,7 +154,7 @@ extern void expand_sf_unop (rtx (*)(rtx, rtx, rtx), rtx *);
 extern void expand_sf_binop (rtx (*)(rtx, rtx, rtx, rtx), rtx *);
 extern void expand_df_unop (rtx (*)(rtx, rtx, rtx), rtx *);
 extern void expand_df_binop (rtx (*)(rtx, rtx, rtx, rtx), rtx *);
-extern int sh_insn_length_adjustment (rtx);
+extern int sh_insn_length_adjustment (rtx_insn *);
 extern bool sh_can_redirect_branch (rtx, rtx);
 extern void sh_expand_unop_v2sf (enum rtx_code, rtx, rtx);
 extern void sh_expand_binop_v2sf (enum rtx_code, rtx, rtx, rtx);