X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fana%2Firlivechk.c;h=bbe8cbbc096823aaca07320d621dbe10ff6ab840;hb=b603d9c9887767bf890cc53c7284ba583b60c397;hp=4aa00d86c999c29fe75901b0999cde4071604dec;hpb=edc739b393d7982e78a573d854113f47293c96b1;p=libfirm diff --git a/ir/ana/irlivechk.c b/ir/ana/irlivechk.c index 4aa00d86c..bbe8cbbc0 100644 --- a/ir/ana/irlivechk.c +++ b/ir/ana/irlivechk.c @@ -37,9 +37,7 @@ * * The precomputation remains valid as long as the CFG is not altered. */ -#ifdef HAVE_CONFIG_H #include -#endif #include @@ -61,7 +59,7 @@ #include "statev.h" typedef struct _bl_info_t { - ir_node *block; /**< The block. */ + const ir_node *block; /**< The block. */ int be_tgt_calc : 1; int id : 31; /**< a tight number for the block. @@ -80,14 +78,14 @@ typedef struct _bl_info_t { struct _lv_chk_t { ir_phase ph; const dfs_t *dfs; - DEBUG_ONLY(firm_dbg_module_t *dbg;) int n_blocks; bitset_t *back_edge_src; bitset_t *back_edge_tgt; bl_info_t **map; + DEBUG_ONLY(firm_dbg_module_t *dbg;) }; -static void *init_block_data(ir_phase *ph, ir_node *irn, void *old) +static void *init_block_data(ir_phase *ph, const ir_node *irn, void *old) { lv_chk_t *lv = container_of(ph, lv_chk_t, ph); bl_info_t *bi = phase_alloc(ph, sizeof(bi[0])); @@ -106,12 +104,13 @@ static void *init_block_data(ir_phase *ph, ir_node *irn, void *old) * @param irn A node. * @return 1 if the node shall be considered in liveness, 0 if not. */ -static INLINE int is_liveness_node(const ir_node *irn) +static inline int is_liveness_node(const ir_node *irn) { - switch(get_irn_opcode(irn)) { + switch (get_irn_opcode(irn)) { case iro_Block: case iro_Bad: case iro_End: + case iro_Anchor: return 0; default:; } @@ -164,7 +163,7 @@ static void red_trans_closure(lv_chk_t *lv) } -static void compute_back_edge_chain(lv_chk_t *lv, ir_node *bl) +static void compute_back_edge_chain(lv_chk_t *lv, const ir_node *bl) { bitset_t *tmp = bitset_alloca(lv->n_blocks); bl_info_t *bi = get_block_info(lv, bl); @@ -204,7 +203,7 @@ static void compute_back_edge_chain(lv_chk_t *lv, ir_node *bl) } -static INLINE void compute_back_edge_chains(lv_chk_t *lv) +static inline void compute_back_edge_chains(lv_chk_t *lv) { bitset_pos_t elm; int i, n; @@ -243,10 +242,14 @@ static INLINE void compute_back_edge_chains(lv_chk_t *lv) lv_chk_t *lv_chk_new(ir_graph *irg, const dfs_t *dfs) { - lv_chk_t *res = xmalloc(sizeof(res[0])); + lv_chk_t *res = XMALLOC(lv_chk_t); struct obstack *obst; int i; + edges_deactivate(irg); + edges_activate(irg); + compute_doms(irg); + stat_ev_tim_push(); phase_init(&res->ph, "liveness check", irg, PHASE_DEFAULT_GROWTH, init_block_data, NULL); obst = phase_obst(&res->ph); @@ -258,6 +261,7 @@ lv_chk_t *lv_chk_new(ir_graph *irg, const dfs_t *dfs) res->back_edge_src = bitset_obstack_alloc(obst, res->n_blocks); res->back_edge_tgt = bitset_obstack_alloc(obst, res->n_blocks); res->map = obstack_alloc(obst, res->n_blocks * sizeof(res->map[0])); + memset(res->map, 0, res->n_blocks * sizeof(res->map[0])); #if 0 { @@ -276,6 +280,8 @@ lv_chk_t *lv_chk_new(ir_graph *irg, const dfs_t *dfs) for (i = res->n_blocks - 1; i >= 0; --i) { ir_node *irn = (ir_node *) dfs_get_pre_num_node(res->dfs, i); bl_info_t *bi = phase_get_or_set_irn_data(&res->ph, irn); + assert(bi->id < res->n_blocks); + assert(res->map[bi->id] == NULL); res->map[bi->id] = bi; } @@ -305,7 +311,7 @@ lv_chk_t *lv_chk_new(ir_graph *irg, const dfs_t *dfs) void lv_chk_free(lv_chk_t *lv) { - obstack_free(phase_obst(&lv->ph), NULL); + phase_free(&lv->ph); xfree(lv); } @@ -328,11 +334,11 @@ void lv_chk_free(lv_chk_t *lv) */ unsigned lv_chk_bl_in_mask(const lv_chk_t *lv, const ir_node *bl, const ir_node *var) { - stat_ev_cnt_decl(uses); - ir_node *def_bl; const ir_edge_t *edge; + stat_ev_cnt_decl(uses); + int res = 0; assert(is_Block(bl) && "can only check for liveness in a block"); @@ -408,11 +414,11 @@ end: unsigned lv_chk_bl_end_mask(const lv_chk_t *lv, const ir_node *bl, const ir_node *var) { - stat_ev_cnt_decl(uses); - ir_node *def_bl; const ir_edge_t *edge; + stat_ev_cnt_decl(uses); + int res = 0; assert(is_Block(bl) && "can only check for liveness in a block"); @@ -423,9 +429,7 @@ unsigned lv_chk_bl_end_mask(const lv_chk_t *lv, const ir_node *bl, const ir_node def_bl = get_nodes_block(var); if (!block_dominates(def_bl, bl)) { goto end; - } - - else { + } else { bitset_t *uses = bitset_alloca(lv->n_blocks); bitset_t *tmp = bitset_alloca(lv->n_blocks); int min_dom = get_Block_dom_tree_pre_num(def_bl) + 1; @@ -492,11 +496,10 @@ end: */ unsigned lv_chk_bl_xxx(const lv_chk_t *lv, const ir_node *bl, const ir_node *var) { - stat_ev_cnt_decl(uses); - stat_ev_cnt_decl(iter); - int res = 0; ir_node *def_bl; + stat_ev_cnt_decl(uses); + stat_ev_cnt_decl(iter); assert(is_Block(bl) && "can only check for liveness in a block"); @@ -556,7 +559,7 @@ unsigned lv_chk_bl_xxx(const lv_chk_t *lv, const ir_node *bl, const ir_node *var * We try to gather as much information as possible during looking * at the uses. * - * Note that we know for shure that bl != def_bl. That is sometimes + * Note that we know for sure that bl != def_bl. That is sometimes * silently exploited below. */ else { @@ -646,11 +649,11 @@ unsigned lv_chk_bl_xxx(const lv_chk_t *lv, const ir_node *bl, const ir_node *var stat_ev_cnt_inc(iter); /* - * This is somehat tricky. Since this routine handles both, live in + * This is somewhat tricky. Since this routine handles both, live in * and end/out we have to handle all the border cases correctly. * Each node is in its own red_reachable set (see calculation * function above). That means, that in the case where bl == t, the - * intersection check of uses and rechability below will always + * intersection check of uses and reachability below will always * find an intersection, namely t. * * However, if a block contains a use and the variable is dead