diff options
Diffstat (limited to 'gcc/modulo-sched.c')
| -rw-r--r-- | gcc/modulo-sched.c | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/gcc/modulo-sched.c b/gcc/modulo-sched.c index 3d8ee8d57b8..5a270339492 100644 --- a/gcc/modulo-sched.c +++ b/gcc/modulo-sched.c @@ -237,12 +237,6 @@ sms_print_insn (rtx insn, int aligned ATTRIBUTE_UNUSED) return tmp; } -static int -contributes_to_priority (rtx next, rtx insn) -{ - return BLOCK_NUM (next) == BLOCK_NUM (insn); -} - static void compute_jump_reg_dependencies (rtx insn ATTRIBUTE_UNUSED, regset cond_exec ATTRIBUTE_UNUSED, @@ -259,12 +253,16 @@ static struct sched_info sms_sched_info = NULL, NULL, sms_print_insn, - contributes_to_priority, + NULL, compute_jump_reg_dependencies, NULL, NULL, NULL, NULL, 0, 0, 0, + NULL, NULL, NULL, NULL, NULL, +#ifdef ENABLE_CHECKING + NULL, +#endif 0 }; @@ -314,7 +312,7 @@ const_iteration_count (rtx count_reg, basic_block pre_header, if (! pre_header) return NULL_RTX; - get_block_head_tail (pre_header->index, &head, &tail); + get_ebb_head_tail (pre_header, pre_header, &head, &tail); for (insn = tail; insn != PREV_INSN (head); insn = PREV_INSN (insn)) if (INSN_P (insn) && single_set (insn) && @@ -794,7 +792,7 @@ loop_single_full_bb_p (struct loop *loop) /* Make sure that basic blocks other than the header have only notes labels or jumps. */ - get_block_head_tail (bbs[i]->index, &head, &tail); + get_ebb_head_tail (bbs[i], bbs[i], &head, &tail); for (; head != NEXT_INSN (tail); head = NEXT_INSN (head)) { if (NOTE_P (head) || LABEL_P (head) @@ -972,7 +970,7 @@ sms_schedule (void) bb = loop->header; - get_block_head_tail (bb->index, &head, &tail); + get_ebb_head_tail (bb, bb, &head, &tail); latch_edge = loop_latch_edge (loop); gcc_assert (loop->single_exit); if (loop->single_exit->count) @@ -1074,7 +1072,7 @@ sms_schedule (void) if (dump_file) print_ddg (dump_file, g); - get_block_head_tail (loop->header->index, &head, &tail); + get_ebb_head_tail (loop->header, loop->header, &head, &tail); latch_edge = loop_latch_edge (loop); gcc_assert (loop->single_exit); |