X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fana%2Firlivechk.c;h=f3d436f2e7bc9b4af1a66f43e9030d964a4b3893;hb=0e975a6e5046ba66cf78d946bd924efe3876f95c;hp=39090bc031bd3540c2843f579388f0590004cab8;hpb=0e5f781d021c0b1e20ba08f583d4971419fedb5d;p=libfirm

diff --git a/ir/ana/irlivechk.c b/ir/ana/irlivechk.c
index 39090bc03..f3d436f2e 100644
--- a/ir/ana/irlivechk.c
+++ b/ir/ana/irlivechk.c
@@ -22,7 +22,7 @@
  * @date    21.04.2007
  * @author  Sebastian Hack
  * @version $Id$
- * @summary
+ * @brief
  *
  * Liveness checks as developed by Benoit Boissinot, Fabrice Rastello and myself.
  *
@@ -37,9 +37,7 @@
  *
  * The precomputation remains valid as long as the CFG is not altered.
  */
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif
 
 #include <stdio.h>
 
@@ -80,11 +78,11 @@ 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, const ir_node *irn, void *old)
@@ -106,12 +104,13 @@ static void *init_block_data(ir_phase *ph, const 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:;
 	}
@@ -204,7 +203,7 @@ static void compute_back_edge_chain(lv_chk_t *lv, const 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,7 +242,7 @@ 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;
 
@@ -261,8 +260,7 @@ lv_chk_t *lv_chk_new(ir_graph *irg, const dfs_t *dfs)
 	res->n_blocks      = dfs_get_n_nodes(res->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]));
+	res->map           = OALLOCNZ(obst, bl_info_t*, res->n_blocks);
 
 #if 0
 	{
@@ -312,7 +310,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);
 }
 
@@ -335,11 +333,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");
@@ -415,11 +413,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");
@@ -430,9 +428,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;
@@ -499,11 +495,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");
 
@@ -563,7 +558,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,18 +641,18 @@ unsigned lv_chk_bl_xxx(const lv_chk_t *lv, const ir_node *bl, const ir_node *var
 		 * will be left. */
 		DBG((lv->dbg, LEVEL_2, "\tbe tgt reach: %B, dom span: [%d, %d]\n", Tq, min_dom, max_dom));
 		i = bitset_next_set(Tq, min_dom);
-		while(i <= max_dom) {
+		while (i <= max_dom) {
 			bl_info_t *ti = lv->map[i];
 			int use_in_current_block = bitset_is_set(uses, ti->id);
 
 			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