Commit aa4e645e by David Malcolm Committed by David Malcolm

config/c6x: Use rtx_insn

gcc/
	* config/c6x/c6x-protos.h (c6x_get_unit_specifier): Strengthen
	param from rtx to rtx_insn *.
	(c6x_final_prescan_insn): Likewise for first param.

	* config/c6x/c6x.c (c6x_current_insn): Likewise for this variable.
	(c6x_output_mi_thunk): Replace use of NULL_RTX with NULL.
	(c6x_expand_compare): Strengthen local "insns" from rtx to
	rtx_insn *.
	(c6x_get_unit_specifier): Likewise for param "insn".
	(c6x_print_unit_specifier_field): Likewise.
	(c6x_final_prescan_insn): Likewise.
	(emit_add_sp_const): Likewise for local "insn".
	(c6x_expand_prologue): Likewise.

From-SVN: r214440
parent bd96e53c
2014-08-25 David Malcolm <dmalcolm@redhat.com> 2014-08-25 David Malcolm <dmalcolm@redhat.com>
* config/c6x/c6x-protos.h (c6x_get_unit_specifier): Strengthen
param from rtx to rtx_insn *.
(c6x_final_prescan_insn): Likewise for first param.
* config/c6x/c6x.c (c6x_current_insn): Likewise for this variable.
(c6x_output_mi_thunk): Replace use of NULL_RTX with NULL.
(c6x_expand_compare): Strengthen local "insns" from rtx to
rtx_insn *.
(c6x_get_unit_specifier): Likewise for param "insn".
(c6x_print_unit_specifier_field): Likewise.
(c6x_final_prescan_insn): Likewise.
(emit_add_sp_const): Likewise for local "insn".
(c6x_expand_prologue): Likewise.
2014-08-25 David Malcolm <dmalcolm@redhat.com>
* config/bfin/bfin-protos.h (asm_conditional_branch): Strengthen * config/bfin/bfin-protos.h (asm_conditional_branch): Strengthen
param 1 from rtx to rtx_insn *. param 1 from rtx to rtx_insn *.
* config/bfin/bfin.c (expand_prologue_reg_save): Likewise for * config/bfin/bfin.c (expand_prologue_reg_save): Likewise for
......
...@@ -41,9 +41,9 @@ extern rtx c6x_subword (rtx, bool); ...@@ -41,9 +41,9 @@ extern rtx c6x_subword (rtx, bool);
extern void split_di (rtx *, int, rtx *, rtx *); extern void split_di (rtx *, int, rtx *, rtx *);
extern bool c6x_valid_mask_p (HOST_WIDE_INT); extern bool c6x_valid_mask_p (HOST_WIDE_INT);
extern char c6x_get_unit_specifier (rtx); extern char c6x_get_unit_specifier (rtx_insn *);
extern void c6x_final_prescan_insn(rtx insn, rtx *opvec, int noperands); extern void c6x_final_prescan_insn(rtx_insn *insn, rtx *opvec, int noperands);
extern int c6x_nsaved_regs (void); extern int c6x_nsaved_regs (void);
extern HOST_WIDE_INT c6x_initial_elimination_offset (int, int); extern HOST_WIDE_INT c6x_initial_elimination_offset (int, int);
......
...@@ -87,7 +87,7 @@ unsigned long c6x_insn_mask = C6X_DEFAULT_INSN_MASK; ...@@ -87,7 +87,7 @@ unsigned long c6x_insn_mask = C6X_DEFAULT_INSN_MASK;
/* The instruction that is being output (as obtained from FINAL_PRESCAN_INSN). /* The instruction that is being output (as obtained from FINAL_PRESCAN_INSN).
*/ */
static rtx c6x_current_insn = NULL_RTX; static rtx_insn *c6x_current_insn = NULL;
/* A decl we build to access __c6xabi_DSBT_base. */ /* A decl we build to access __c6xabi_DSBT_base. */
static GTY(()) tree dsbt_decl; static GTY(()) tree dsbt_decl;
...@@ -770,7 +770,7 @@ c6x_output_mi_thunk (FILE *file ATTRIBUTE_UNUSED, ...@@ -770,7 +770,7 @@ c6x_output_mi_thunk (FILE *file ATTRIBUTE_UNUSED,
/* The this parameter is passed as the first argument. */ /* The this parameter is passed as the first argument. */
rtx this_rtx = gen_rtx_REG (Pmode, REG_A4); rtx this_rtx = gen_rtx_REG (Pmode, REG_A4);
c6x_current_insn = NULL_RTX; c6x_current_insn = NULL;
xops[4] = XEXP (DECL_RTL (function), 0); xops[4] = XEXP (DECL_RTL (function), 0);
if (!vcall_offset) if (!vcall_offset)
...@@ -1566,7 +1566,7 @@ c6x_expand_compare (rtx comparison, enum machine_mode mode) ...@@ -1566,7 +1566,7 @@ c6x_expand_compare (rtx comparison, enum machine_mode mode)
if (is_fp_libfunc) if (is_fp_libfunc)
{ {
rtx insns; rtx_insn *insns;
rtx libfunc; rtx libfunc;
switch (code) switch (code)
{ {
...@@ -1971,7 +1971,7 @@ c6x_print_address_operand (FILE *file, rtx x, enum machine_mode mem_mode) ...@@ -1971,7 +1971,7 @@ c6x_print_address_operand (FILE *file, rtx x, enum machine_mode mem_mode)
specifies the functional unit used by INSN. */ specifies the functional unit used by INSN. */
char char
c6x_get_unit_specifier (rtx insn) c6x_get_unit_specifier (rtx_insn *insn)
{ {
enum attr_units units; enum attr_units units;
...@@ -2008,7 +2008,7 @@ c6x_get_unit_specifier (rtx insn) ...@@ -2008,7 +2008,7 @@ c6x_get_unit_specifier (rtx insn)
/* Prints the unit specifier field. */ /* Prints the unit specifier field. */
static void static void
c6x_print_unit_specifier_field (FILE *file, rtx insn) c6x_print_unit_specifier_field (FILE *file, rtx_insn *insn)
{ {
enum attr_units units = get_attr_units (insn); enum attr_units units = get_attr_units (insn);
enum attr_cross cross = get_attr_cross (insn); enum attr_cross cross = get_attr_cross (insn);
...@@ -2488,7 +2488,7 @@ c6x_preferred_rename_class (reg_class_t cl) ...@@ -2488,7 +2488,7 @@ c6x_preferred_rename_class (reg_class_t cl)
/* Implements FINAL_PRESCAN_INSN. */ /* Implements FINAL_PRESCAN_INSN. */
void void
c6x_final_prescan_insn (rtx insn, rtx *opvec ATTRIBUTE_UNUSED, c6x_final_prescan_insn (rtx_insn *insn, rtx *opvec ATTRIBUTE_UNUSED,
int noperands ATTRIBUTE_UNUSED) int noperands ATTRIBUTE_UNUSED)
{ {
c6x_current_insn = insn; c6x_current_insn = insn;
...@@ -2716,7 +2716,7 @@ emit_add_sp_const (HOST_WIDE_INT offset, bool frame_related_p) ...@@ -2716,7 +2716,7 @@ emit_add_sp_const (HOST_WIDE_INT offset, bool frame_related_p)
{ {
rtx to_add = GEN_INT (offset); rtx to_add = GEN_INT (offset);
rtx orig_to_add = to_add; rtx orig_to_add = to_add;
rtx insn; rtx_insn *insn;
if (offset == 0) if (offset == 0)
return; return;
...@@ -2753,7 +2753,8 @@ void ...@@ -2753,7 +2753,8 @@ void
c6x_expand_prologue (void) c6x_expand_prologue (void)
{ {
struct c6x_frame frame; struct c6x_frame frame;
rtx insn, mem; rtx_insn *insn;
rtx mem;
int nsaved = 0; int nsaved = 0;
HOST_WIDE_INT initial_offset, off, added_already; HOST_WIDE_INT initial_offset, off, added_already;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment