diff options
Diffstat (limited to 'gcc/sched-rgn.c')
| -rw-r--r-- | gcc/sched-rgn.c | 44 |
1 files changed, 22 insertions, 22 deletions
diff --git a/gcc/sched-rgn.c b/gcc/sched-rgn.c index fc8378b97f6..f346816ef92 100644 --- a/gcc/sched-rgn.c +++ b/gcc/sched-rgn.c @@ -236,7 +236,7 @@ static int is_exception_free (rtx, int, int); static bool sets_likely_spilled (rtx); static void sets_likely_spilled_1 (rtx, const_rtx, void *); -static void add_branch_dependences (rtx, rtx); +static void add_branch_dependences (rtx_insn *, rtx_insn *); static void compute_block_dependences (int); static void schedule_region (int); @@ -540,7 +540,7 @@ rgn_estimate_number_of_insns (basic_block bb) if (MAY_HAVE_DEBUG_INSNS) { - rtx insn; + rtx_insn *insn; FOR_BB_INSNS (bb, insn) if (DEBUG_INSN_P (insn)) @@ -1804,7 +1804,7 @@ update_live_1 (int src, rtx x) ready-list or before the scheduling. */ static int -check_live (rtx insn, int src) +check_live (rtx_insn *insn, int src) { /* Find the registers set by instruction. */ if (GET_CODE (PATTERN (insn)) == SET @@ -2078,19 +2078,19 @@ static int sched_n_insns; /* Implementations of the sched_info functions for region scheduling. */ static void init_ready_list (void); -static int can_schedule_ready_p (rtx); -static void begin_schedule_ready (rtx); -static ds_t new_ready (rtx, ds_t); +static int can_schedule_ready_p (rtx_insn *); +static void begin_schedule_ready (rtx_insn *); +static ds_t new_ready (rtx_insn *, ds_t); static int schedule_more_p (void); -static const char *rgn_print_insn (const_rtx, int); -static int rgn_rank (rtx, rtx); +static const char *rgn_print_insn (const rtx_insn *, int); +static int rgn_rank (rtx_insn *, rtx_insn *); static void compute_jump_reg_dependencies (rtx, regset); /* Functions for speculative scheduling. */ -static void rgn_add_remove_insn (rtx, int); +static void rgn_add_remove_insn (rtx_insn *, int); static void rgn_add_block (basic_block, basic_block); static void rgn_fix_recovery_cfg (int, int, int); -static basic_block advance_target_bb (basic_block, rtx); +static basic_block advance_target_bb (basic_block, rtx_insn *); /* Return nonzero if there are more insns that should be scheduled. */ @@ -2109,7 +2109,7 @@ init_ready_list (void) rtx prev_head = current_sched_info->prev_head; rtx next_tail = current_sched_info->next_tail; int bb_src; - rtx insn; + rtx_insn *insn; target_n_insns = 0; sched_target_n_insns = 0; @@ -2164,7 +2164,7 @@ init_ready_list (void) insn can be scheduled, nonzero if we should silently discard it. */ static int -can_schedule_ready_p (rtx insn) +can_schedule_ready_p (rtx_insn *insn) { /* An interblock motion? */ if (INSN_BB (insn) != target_bb @@ -2180,7 +2180,7 @@ can_schedule_ready_p (rtx insn) can_schedule_ready_p () differs from the one passed to begin_schedule_ready (). */ static void -begin_schedule_ready (rtx insn) +begin_schedule_ready (rtx_insn *insn) { /* An interblock motion? */ if (INSN_BB (insn) != target_bb) @@ -2212,7 +2212,7 @@ begin_schedule_ready (rtx insn) Return nonzero if it should be moved to the ready list or the queue, or zero if we should silently discard it. */ static ds_t -new_ready (rtx next, ds_t ts) +new_ready (rtx_insn *next, ds_t ts) { if (INSN_BB (next) != target_bb) { @@ -2265,7 +2265,7 @@ new_ready (rtx next, ds_t ts) to be formatted so that multiple output lines will line up nicely. */ static const char * -rgn_print_insn (const_rtx insn, int aligned) +rgn_print_insn (const rtx_insn *insn, int aligned) { static char tmp[80]; @@ -2286,7 +2286,7 @@ rgn_print_insn (const_rtx insn, int aligned) is to be preferred. Zero if they are equally good. */ static int -rgn_rank (rtx insn1, rtx insn2) +rgn_rank (rtx_insn *insn1, rtx_insn *insn2) { /* Some comparison make sense in interblock scheduling only. */ if (INSN_BB (insn1) != INSN_BB (insn2)) @@ -2317,7 +2317,7 @@ rgn_rank (rtx insn1, rtx insn2) calculations. */ int -contributes_to_priority (rtx next, rtx insn) +contributes_to_priority (rtx_insn *next, rtx_insn *insn) { /* NEXT and INSN reside in one ebb. */ return BLOCK_TO_BB (BLOCK_NUM (next)) == BLOCK_TO_BB (BLOCK_NUM (insn)); @@ -2363,7 +2363,7 @@ static const struct sched_deps_info_def rgn_const_sel_sched_deps_info = /* Return true if scheduling INSN will trigger finish of scheduling current block. */ static bool -rgn_insn_finishes_block_p (rtx insn) +rgn_insn_finishes_block_p (rtx_insn *insn) { if (INSN_BB (insn) == target_bb && sched_target_n_insns + 1 == target_n_insns) @@ -2440,9 +2440,9 @@ static sbitmap insn_referenced; /* Add dependences so that branches are scheduled to run last in their block. */ static void -add_branch_dependences (rtx head, rtx tail) +add_branch_dependences (rtx_insn *head, rtx_insn *tail) { - rtx insn, last; + rtx_insn *insn, *last; /* For all branches, calls, uses, clobbers, cc0 setters, and instructions that can throw exceptions, force them to remain in order at the end of @@ -3425,7 +3425,7 @@ schedule_insns (void) /* INSN has been added to/removed from current region. */ static void -rgn_add_remove_insn (rtx insn, int remove_p) +rgn_add_remove_insn (rtx_insn *insn, int remove_p) { if (!remove_p) rgn_n_insns++; @@ -3580,7 +3580,7 @@ rgn_fix_recovery_cfg (int bbi, int check_bbi, int check_bb_nexti) /* Return next block in ebb chain. For parameter meaning please refer to sched-int.h: struct sched_info: advance_target_bb. */ static basic_block -advance_target_bb (basic_block bb, rtx insn) +advance_target_bb (basic_block bb, rtx_insn *insn) { if (insn) return 0; |