diff options
author | Bernd Schmidt <bernds@codesourcery.com> | 2011-05-27 10:47:48 +0000 |
---|---|---|
committer | Bernd Schmidt <bernds@gcc.gnu.org> | 2011-05-27 10:47:48 +0000 |
commit | a95b23b4290ffaa95614a10eb13123251bcd7e90 (patch) | |
tree | bd7ae2e68beab28e466d425df5b2ef2fcb55a8e6 /gcc/sel-sched.c | |
parent | f8f972fc7e218a881005b41501692426c41d3a11 (diff) | |
download | gcc-a95b23b4290ffaa95614a10eb13123251bcd7e90.tar.gz |
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
Diffstat (limited to 'gcc/sel-sched.c')
-rw-r--r-- | gcc/sel-sched.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/gcc/sel-sched.c b/gcc/sel-sched.c index b176deaaef3..3f22a3cb6a9 100644 --- a/gcc/sel-sched.c +++ b/gcc/sel-sched.c @@ -6868,7 +6868,7 @@ sel_region_init (int rgn) for (i = 0; i < current_nr_blocks; i++) VEC_quick_push (basic_block, bbs, BASIC_BLOCK (BB_TO_BLOCK (i))); - sel_init_bbs (bbs, NULL); + sel_init_bbs (bbs); if (flag_sel_sched_pipelining) setup_current_loop_nest (rgn, &bbs); @@ -6877,13 +6877,13 @@ sel_region_init (int rgn) /* Initialize luids and dependence analysis which both sel-sched and haifa need. */ - sched_init_luids (bbs, NULL, NULL, NULL); + sched_init_luids (bbs); sched_deps_init (false); /* Initialize haifa data. */ rgn_setup_sched_infos (); sel_set_sched_flags (); - haifa_init_h_i_d (bbs, NULL, NULL, NULL); + haifa_init_h_i_d (bbs); sel_compute_priorities (rgn); init_deps_global (); @@ -7215,7 +7215,7 @@ sel_region_target_finish (bool reset_sched_cycles_p) /* Extend luids so that insns generated by the target will get zero luid. */ - sched_init_luids (NULL, NULL, NULL, NULL); + sched_extend_luids (); } } |