diff options
Diffstat (limited to 'gcc/config/frv/frv.c')
| -rw-r--r-- | gcc/config/frv/frv.c | 33 |
1 files changed, 17 insertions, 16 deletions
diff --git a/gcc/config/frv/frv.c b/gcc/config/frv/frv.c index ac317945557..a9e574c69de 100644 --- a/gcc/config/frv/frv.c +++ b/gcc/config/frv/frv.c @@ -337,8 +337,8 @@ static void frv_start_packet (void); static void frv_start_packet_block (void); static void frv_finish_packet (void (*) (void)); static bool frv_pack_insn_p (rtx); -static void frv_add_insn_to_packet (rtx); -static void frv_insert_nop_in_packet (rtx); +static void frv_add_insn_to_packet (rtx_insn *); +static void frv_insert_nop_in_packet (rtx_insn *); static bool frv_for_each_packet (void (*) (void)); static bool frv_sort_insn_group_1 (enum frv_insn_group, unsigned int, unsigned int, @@ -1391,7 +1391,7 @@ static int frv_insn_packing_flag; static int frv_function_contains_far_jump (void) { - rtx insn = get_insns (); + rtx_insn *insn = get_insns (); while (insn != NULL && !(JUMP_P (insn) && get_attr_far_jump (insn) == FAR_JUMP_YES)) @@ -5368,8 +5368,8 @@ frv_ifcvt_modify_tests (ce_if_block *ce_info, rtx *p_true, rtx *p_false) /* Scan all of the blocks for registers that must not be allocated. */ for (j = 0; j < num_bb; j++) { - rtx last_insn = BB_END (bb[j]); - rtx insn = BB_HEAD (bb[j]); + rtx_insn *last_insn = BB_END (bb[j]); + rtx_insn *insn = BB_HEAD (bb[j]); unsigned int regno; if (dump_file) @@ -7101,15 +7101,15 @@ struct frv_packet_group { /* A list of the instructions that belong to this group, in the order they appear in the rtl stream. */ - rtx insns[ARRAY_SIZE (frv_unit_codes)]; + rtx_insn *insns[ARRAY_SIZE (frv_unit_codes)]; /* The contents of INSNS after they have been sorted into the correct assembly-language order. Element X issues to unit X. The list may contain extra nops. */ - rtx sorted[ARRAY_SIZE (frv_unit_codes)]; + rtx_insn *sorted[ARRAY_SIZE (frv_unit_codes)]; /* The member of frv_nops[] to use in sorted[]. */ - rtx nop; + rtx_insn *nop; }; /* The current state of the packing pass, implemented by frv_pack_insns. */ @@ -7140,7 +7140,7 @@ static struct { struct frv_packet_group groups[NUM_GROUPS]; /* The instructions that make up the current packet. */ - rtx insns[ARRAY_SIZE (frv_unit_codes)]; + rtx_insn *insns[ARRAY_SIZE (frv_unit_codes)]; unsigned int num_insns; } frv_packet; @@ -7388,7 +7388,7 @@ frv_pack_insn_p (rtx insn) /* Add instruction INSN to the current packet. */ static void -frv_add_insn_to_packet (rtx insn) +frv_add_insn_to_packet (rtx_insn *insn) { struct frv_packet_group *packet_group; @@ -7405,10 +7405,10 @@ frv_add_insn_to_packet (rtx insn) add to the end. */ static void -frv_insert_nop_in_packet (rtx insn) +frv_insert_nop_in_packet (rtx_insn *insn) { struct frv_packet_group *packet_group; - rtx last; + rtx_insn *last; packet_group = &frv_packet.groups[frv_unit_groups[frv_insn_unit (insn)]]; last = frv_packet.insns[frv_packet.num_insns - 1]; @@ -7433,7 +7433,7 @@ frv_insert_nop_in_packet (rtx insn) static bool frv_for_each_packet (void (*handle_packet) (void)) { - rtx insn, next_insn; + rtx_insn *insn, *next_insn; frv_packet.issue_rate = frv_issue_rate (); @@ -7531,7 +7531,7 @@ frv_sort_insn_group_1 (enum frv_insn_group group, unsigned int i; state_t test_state; size_t dfa_size; - rtx insn; + rtx_insn *insn; /* Early success if we've filled all the slots. */ if (lower_slot == upper_slot) @@ -7870,7 +7870,8 @@ frv_optimize_membar_local (basic_block bb, struct frv_io *next_io, rtx *last_membar) { HARD_REG_SET used_regs; - rtx next_membar, set, insn; + rtx next_membar, set; + rtx_insn *insn; bool next_is_end_p; /* NEXT_IO is the next I/O operation to be performed after the current @@ -8074,7 +8075,7 @@ static void frv_align_label (void) { unsigned int alignment, target, nop; - rtx x, last, barrier, label; + rtx_insn *x, *last, *barrier, *label; /* Walk forward to the start of the next packet. Set ALIGNMENT to the maximum alignment of that packet, LABEL to the last label between |