From a95b23b4290ffaa95614a10eb13123251bcd7e90 Mon Sep 17 00:00:00 2001 From: Bernd Schmidt Date: Fri, 27 May 2011 10:47:48 +0000 Subject: haifa-sched.c (sched_scan_info): Remove. * haifa-sched.c (sched_scan_info): Remove. (schedule_block): Call sched_extend_luids rather than sched_init_luids with NULL args. (extend_bb, init_bb, extend_insn, init_insn, init_insns_in_bb): Remove functions. (sched_scan): Remove. (sched_extend_luids): Renamed from luids_extend_insn and no longer static. All callers changed. (sched_init_insn_luid): Renamed from luids_init_insn and no longer static. All callers changed. (sched_init_luids): Remove all arguments except the first. All callers changed. Don't use sched_scan. (haifa_init_h_i_d): Likewise. (haifa_init_insn): Call sched_extend_luids and sched_init_insn_luid manually rather than using sched_init_luids. Likewise with extend_h_i_d, init_h_i_d and haifa_init_h_i_d. * sel-sched.c (sel_region_target_finish): Call sched_extend_luids rather than sched_init_luids with NULL args. * sel-sched-ir.c (new_insns): Remove variable. (sched_scan): New static function, previously in haifa-sched.c. Remove all arguments but the first two; all callers changed. (sel_init_new_insn): Call sched_extend_luids and sched_init_insn_luid rather than sched_init_luids. (sel_init_bbs): Remove second argument. All callers changed. (sel_add_bb): Call sched_extend_luids rather than sched_init_luids with NULL arguments. (create_insn_rtx_from_pattern): Likewise. * sel-sched-ir.h (sel_init_bbs): Adjust declaration. * sched-int.h (sched_init_luids, haifa_init_h_i_d): Likewise. (sched_init_insn_luid, sched_extend_luids): Declare. (sched_scan_info_def, sched_scan_info, sched_scan): Remove declarations. From-SVN: r174327 --- gcc/sched-int.h | 34 +++++----------------------------- 1 file changed, 5 insertions(+), 29 deletions(-) (limited to 'gcc/sched-int.h') diff --git a/gcc/sched-int.h b/gcc/sched-int.h index d5c9509f61a..a18f8461e71 100644 --- a/gcc/sched-int.h +++ b/gcc/sched-int.h @@ -39,42 +39,18 @@ enum sched_pass_id_t { SCHED_PASS_UNKNOWN, SCHED_RGN_PASS, SCHED_EBB_PASS, typedef VEC (basic_block, heap) *bb_vec_t; typedef VEC (rtx, heap) *insn_vec_t; -typedef VEC(rtx, heap) *rtx_vec_t; - -struct sched_scan_info_def -{ - /* This hook notifies scheduler frontend to extend its internal per basic - block data structures. This hook should be called once before a series of - calls to bb_init (). */ - void (*extend_bb) (void); - - /* This hook makes scheduler frontend to initialize its internal data - structures for the passed basic block. */ - void (*init_bb) (basic_block); - - /* This hook notifies scheduler frontend to extend its internal per insn data - structures. This hook should be called once before a series of calls to - insn_init (). */ - void (*extend_insn) (void); - - /* This hook makes scheduler frontend to initialize its internal data - structures for the passed insn. */ - void (*init_insn) (rtx); -}; - -extern const struct sched_scan_info_def *sched_scan_info; - -extern void sched_scan (const struct sched_scan_info_def *, - bb_vec_t, basic_block, insn_vec_t, rtx); +typedef VEC (rtx, heap) *rtx_vec_t; extern void sched_init_bbs (void); -extern void sched_init_luids (bb_vec_t, basic_block, insn_vec_t, rtx); +extern void sched_extend_luids (void); +extern void sched_init_insn_luid (rtx); +extern void sched_init_luids (bb_vec_t); extern void sched_finish_luids (void); extern void sched_extend_target (void); -extern void haifa_init_h_i_d (bb_vec_t, basic_block, insn_vec_t, rtx); +extern void haifa_init_h_i_d (bb_vec_t); extern void haifa_finish_h_i_d (void); /* Hooks that are common to all the schedulers. */ -- cgit v1.2.1