From c60fa3a778a01ab52008d1bd4d832658ca8943e6 Mon Sep 17 00:00:00 2001 From: hubicka Date: Thu, 3 Jul 2003 18:40:29 +0000 Subject: * basic-block.h (create_basic_block, merge_blocks_nomove): Kill. * cfgcleanup.c (merge_blocks): Rename to merge_blocks_move. (merge_blocks_move_predecessor_nojumps, merge_blocks_move_successor_nojumps): Use merge_blocks. (try_optimize_cfg): Use merge_blocks_move. * cfgrtl.c (create_basic_block): Rename to rtl_create_basic_block. (merge_blocks_nomove): Rename to rtl_merge_blocks. (cfg_layout_create_basic_block): New. (rtl_can_merge_blocks): New. (cfg_layout_split_block): Do not alloc aux by hand. * cfghooks.h (cfg_hooks): Add create_basic_block, can_merge_blocks_p, merge_blocks. (create_basic_block, can_merge_blocks_p, merge_blocks): New macros. * cfglayout.c (cfg_layout_duplicate_bb): Do not allocate aux by hand. * cfgloopmanip.c (loop_split_edge_with): Likewise. * ifcvt.c (merge_if_block): Use merge_blocks_nomove. * basic-block.h (basic_block_def): Add field 'rbi'. * bb-reorder.c (find_traces, rotate_loop, mark_bb_visited, find_traces_1_round, copy_bb, connect_traces): Update use of rbi. * cfg.c (entry_exit_blocks): Add new field. * cfglayout.c: Include alloc-pool.h; (cfg_layout_pool): New. (record_effective_endpoints, fixup_reorder_chain, fixup_fallthru_exit_predecessor, cfg_layout_duplicate_bb): Update use of rbi. (cfg_layout_initialize_rbi): New function. (cfg_layout_initialize): Use it. (cfg_layout_finalize): Clear rbi fields. * cfglayout.h (RBI): Kill. (cfg_layout_initialize_rbi): Declare. * cfgloopmanip.c (copy_bbs): Use rbi. (record_exit_edges): Likewise. (duplicate_loop_to_header_edge): Likewise. * cfgrtl.c (cfg_layout_create_basic_block): Use cfg_layout_initialize_rbi. (cfg_layout_split_block): Use rbi. (cfg_layout_delete_block): Likewise. * loop-init.c (loop_optimizer_finalize): Likewise. * loop-unswitch.c (unswitch_loop): Likewise. * tracer.c (seen, tail_duplicate, layout_superblocks): Likewise. * cfgrtl.c: Update comments. (try_redirect_by_replacing_jump): New argument. (redirect_branch_edge): Break out from ... (rtl_redirect_edge_and_branch): ... this one. (update_cfg_after_block_merging): Break out from ... (rtl_merge_blocks): ... this one. (cfg_layout_split_edge): New. (cfg_layout_merge_blocks): New. (cfg_layout_can_merge_blocks_p): New. (cfg_layout_redirect_edge_and_branch): Reorganize. (cfg_layout_rtl_cfg_hooks): Fill in. (cfg_layout_delete_block): Kill barriers. * cfganal.c (can_fallthru): Deal with exit blocks * cfglayout.c (cfg_layout_function_header): New function (record_effective_endpoints): Record function header. (fixup_reorder_chain): Fixup dead jumptables; place header * basic-block.h (CLEANUP_CFGLAYOUT): New flag. * bb-reorder.c (cfg_layout_initialize): Update call. * cfgcleanup.c (try_optimize_cfg): Supress optimizations of fallthru edges in cfglayout mode. * cfglayout.c (cleanup_unconditional_jumps): Kill. (cfg_layout_initialize): Kill agrument loops; use cfgcleanup. * cfglayout.h (cfg_layout_initialize): Update prototype. * cfgloop.h (CP_INSIDE_CFGLAYOUT): Kill. * cfgloopmanip.c (loop_split_edge_with): Use split_edge. * flow.c (propagate_block): Do not crash when basic block ends by first insn in the chain. * loop-init.c (loop_optimizer_init): First enter cfglayout mode; later do loop discovery. * tracer.c (tracer): Update call of cfg_layout_initialize. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@68899 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/cfghooks.h | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'gcc/cfghooks.h') diff --git a/gcc/cfghooks.h b/gcc/cfghooks.h index 00a98163059..a44a208a337 100644 --- a/gcc/cfghooks.h +++ b/gcc/cfghooks.h @@ -31,6 +31,9 @@ struct cfg_hooks /* Basic CFG manipulation. */ + /* Return new basic block */ + basic_block (*create_basic_block) PARAMS ((void *head, void *end, basic_block after)); + /* Redirect edge E to the given basic block B and update underlying program representation. Returns false when edge is not easily redirectable for whatever reason. */ @@ -47,6 +50,12 @@ struct cfg_hooks /* Split basic block B after specified instruction I. */ edge (*split_block) (basic_block b, void * i); + /* Return true when blocks A and B can be merged into single basic block. */ + bool (*can_merge_blocks_p) PARAMS ((basic_block a, basic_block b)); + + /* Merge blocks A and B. */ + void (*merge_blocks) PARAMS ((basic_block a, basic_block b)); + /* Higher level functions representable by primitive operations above if we didn't have some oddities in RTL and Tree representations. */ basic_block (*cfgh_split_edge) (edge); @@ -57,6 +66,9 @@ struct cfg_hooks #define split_block(e,i) cfg_hooks->split_block (e,i) #define delete_block(b) cfg_hooks->delete_block (b) #define split_edge(e) cfg_hooks->cfgh_split_edge (e) +#define create_basic_block(h,e,a) cfg_hooks->create_basic_block (h,e,a) +#define can_merge_blocks_p(a,b) cfg_hooks->can_merge_blocks_p (a,b) +#define merge_blocks(a,b) cfg_hooks->merge_blocks (a,b) /* Hooks containers. */ extern struct cfg_hooks rtl_cfg_hooks; -- cgit v1.2.1