From 6580ee7781f9039547bd7e61c19064b4993227e9 Mon Sep 17 00:00:00 2001 From: Jan Hubicka Date: Thu, 16 Jun 2005 01:05:23 +0200 Subject: Makefile.in (cfg.o): Add new dependencies. * Makefile.in (cfg.o): Add new dependencies. * basic-block.h (reorder_block_def): Kill original/copy/duplicated/copy_number fields. (BB_DUPLICATED): New flag. (initialize_original_copy_tables, free_original_copy_tables, set_bb_original, get_bb_original, set_bb_copy, get_bb_copy): New. * cfg.c: Include hashtab.h and alloc-pool.h (bb_original, bb_copy, original_copy_bb_pool): New static vars. (htab_bb_copy_original_entry): New struct. (bb_copy_original_hash, bb_copy_original_eq): New static functions. (initialize_original_copy_tables, free_original_copy_tables, set_bb_original, get_bb_original, set_bb_copy, get_bb_copy): New global functions. * cfghooks.c (duplicate_block): Update original/copy handling. * cfglayout.c (fixup_reorder_chain): Likewise. (cfg_layout_initialize): Initialize orignal_copy tables. (cfg_layout_finalize): FInalize original_copy tables. (can_copy_bbs_p): Use BB_DUPLICATED flag. (copy_bbs): Likewise. * cfgloopmanip.c (update-single_exits_after_duplication): Likewise. (duplicate_loop_to_header_edge): Likewise; update handling of copy_number. (loop_version): Likewise. * dominance.c (get_dominated_by_region): Use BB_DUPLICATED_FLAG. * except.c (expand_resx_expr): Check that reg->resume is not set. * loop-unroll.c (unroll_loop_constant_iterations, unroll_loop_runtime_iterations, apply_opt_in_copies): Update copy/original handling. * loop-unwitch.c (unswitch_loop): Likewise. * tree-cfg.c (create_bb): Do not initialize RBI. (disband_implicit_edges): Do not kill RBI. (add_phi_args_after_copy_bb): Use new original/copy mapping. (add_phi_args_after_copy): Use BB_DUPLICATED flag. (tree_duplicate_sese_region): Update original/copy handling. * tree-ssa-loop-ivcanon.c (try_unroll_loop_completely): Likewise. * tree-ssa-loop-manip.c (copy_phi_node_args): Likewise. * tree-ssa-loop-unswitch.c (tree_unswitch_single_loop): Likewise. From-SVN: r101000 --- gcc/cfg.c | 144 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 144 insertions(+) (limited to 'gcc/cfg.c') diff --git a/gcc/cfg.c b/gcc/cfg.c index e842a50..f33a950 100644 --- a/gcc/cfg.c +++ b/gcc/cfg.c @@ -63,6 +63,8 @@ Software Foundation, 59 Temple Place - Suite 330, Boston, MA #include "obstack.h" #include "timevar.h" #include "ggc.h" +#include "hashtab.h" +#include "alloc-pool.h" /* The obstack on which the flow graph components are allocated. */ @@ -940,3 +942,145 @@ scale_bbs_frequencies_gcov_type (basic_block *bbs, int nbbs, gcov_type num, e->count = (e->count * num) /den; } } + +/* Datastructures used to maintain mapping between basic blocks and copies. */ +static htab_t bb_original; +static htab_t bb_copy; +static alloc_pool original_copy_bb_pool; + +struct htab_bb_copy_original_entry +{ + /* Block we are attaching info to. */ + int index1; + /* Index of original or copy (depending on the hashtable) */ + int index2; +}; + +static hashval_t +bb_copy_original_hash (const void *p) +{ + struct htab_bb_copy_original_entry *data + = ((struct htab_bb_copy_original_entry *)p); + + return data->index1; +} +static int +bb_copy_original_eq (const void *p, const void *q) +{ + struct htab_bb_copy_original_entry *data + = ((struct htab_bb_copy_original_entry *)p); + struct htab_bb_copy_original_entry *data2 + = ((struct htab_bb_copy_original_entry *)q); + + return data->index1 == data2->index1; +} + +/* Initialize the datstructures to maintain mapping between blocks and it's copies. */ +void +initialize_original_copy_tables (void) +{ + gcc_assert (!original_copy_bb_pool); + original_copy_bb_pool + = create_alloc_pool ("original_copy", + sizeof (struct htab_bb_copy_original_entry), 10); + bb_original = htab_create (10, bb_copy_original_hash, + bb_copy_original_eq, NULL); + bb_copy = htab_create (10, bb_copy_original_hash, bb_copy_original_eq, NULL); +} + +/* Free the datstructures to maintain mapping between blocks and it's copies. */ +void +free_original_copy_tables (void) +{ + gcc_assert (original_copy_bb_pool); + htab_delete (bb_copy); + htab_delete (bb_original); + free_alloc_pool (original_copy_bb_pool); + bb_copy = NULL; + bb_original = NULL; + original_copy_bb_pool = NULL; +} + +/* Set original for basic block. Do nothing when datstructures are not + intialized so passes not needing this don't need to care. */ +void +set_bb_original (basic_block bb, basic_block original) +{ + if (original_copy_bb_pool) + { + struct htab_bb_copy_original_entry **slot; + struct htab_bb_copy_original_entry key; + + key.index1 = bb->index; + slot = + (struct htab_bb_copy_original_entry **) htab_find_slot (bb_original, + &key, INSERT); + if (*slot) + (*slot)->index2 = original->index; + else + { + *slot = pool_alloc (original_copy_bb_pool); + (*slot)->index1 = bb->index; + (*slot)->index2 = original->index; + } + } +} + +/* Get the original basic block. */ +basic_block +get_bb_original (basic_block bb) +{ + struct htab_bb_copy_original_entry *entry; + struct htab_bb_copy_original_entry key; + + gcc_assert (original_copy_bb_pool); + + key.index1 = bb->index; + entry = (struct htab_bb_copy_original_entry *) htab_find (bb_original, &key); + if (entry) + return BASIC_BLOCK (entry->index2); + else + return NULL; +} + +/* Set copy for basic block. Do nothing when datstructures are not + intialized so passes not needing this don't need to care. */ +void +set_bb_copy (basic_block bb, basic_block copy) +{ + if (original_copy_bb_pool) + { + struct htab_bb_copy_original_entry **slot; + struct htab_bb_copy_original_entry key; + + key.index1 = bb->index; + slot = + (struct htab_bb_copy_original_entry **) htab_find_slot (bb_copy, + &key, INSERT); + if (*slot) + (*slot)->index2 = copy->index; + else + { + *slot = pool_alloc (original_copy_bb_pool); + (*slot)->index1 = bb->index; + (*slot)->index2 = copy->index; + } + } +} + +/* Get the copy of basic block. */ +basic_block +get_bb_copy (basic_block bb) +{ + struct htab_bb_copy_original_entry *entry; + struct htab_bb_copy_original_entry key; + + gcc_assert (original_copy_bb_pool); + + key.index1 = bb->index; + entry = (struct htab_bb_copy_original_entry *) htab_find (bb_copy, &key); + if (entry) + return BASIC_BLOCK (entry->index2); + else + return NULL; +} -- cgit v1.1