X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fana%2Firdom.c;h=a878a410b570fbade5637b837881ae169054735b;hb=d935aa267d00966c360931d2f0f43008030c0592;hp=481f0c54c6d6af5edb94ffdf663f72d0a82829f2;hpb=1ce363f80e6a204d4011f85813362d9bd1d0e7e4;p=libfirm

diff --git a/ir/ana/irdom.c b/ir/ana/irdom.c
index 481f0c54c..a878a410b 100644
--- a/ir/ana/irdom.c
+++ b/ir/ana/irdom.c
@@ -40,7 +40,7 @@
 #include "irgraph_t.h"   /* To access state field. */
 #include "irnode_t.h"
 #include "ircons_t.h"
-#include "array.h"
+#include "array_t.h"
 #include "iredges.h"
 
 
@@ -63,7 +63,7 @@ ir_node *get_Block_idom(const ir_node *bl) {
 void set_Block_idom(ir_node *bl, ir_node *n) {
 	ir_dom_info *bli = get_dom_info(bl);
 
-	assert(get_irn_op(bl) == op_Block);
+	assert(is_Block(bl));
 
 	/* Set the immediate dominator of bl to n */
 	bli->idom = n;
@@ -92,7 +92,7 @@ ir_node *get_Block_ipostdom(const ir_node *bl) {
 void set_Block_ipostdom(ir_node *bl, ir_node *n) {
 	ir_dom_info *bli = get_pdom_info(bl);
 
-	assert(get_irn_op(bl) == op_Block);
+	assert(is_Block(bl));
 
 	/* Set the immediate post dominator of bl to n */
 	bli->idom = n;
@@ -110,43 +110,43 @@ void set_Block_ipostdom(ir_node *bl, ir_node *n) {
 }
 
 int get_Block_dom_pre_num(const ir_node *bl) {
-	assert(get_irn_op(bl) == op_Block);
+	assert(is_Block(bl));
 	return get_dom_info(bl)->pre_num;
 }
 
 void set_Block_dom_pre_num(ir_node *bl, int num) {
-	assert(get_irn_op(bl) == op_Block);
+	assert(is_Block(bl));
 	get_dom_info(bl)->pre_num = num;
 }
 
 int get_Block_dom_depth(const ir_node *bl) {
-	assert(get_irn_op(bl) == op_Block);
+	assert(is_Block(bl));
 	return get_dom_info(bl)->dom_depth;
 }
 
 void set_Block_dom_depth(ir_node *bl, int depth) {
-	assert(get_irn_op(bl) == op_Block);
+	assert(is_Block(bl));
 	get_dom_info(bl)->dom_depth = depth;
 }
 
 
 int get_Block_postdom_pre_num(const ir_node *bl) {
-	assert(get_irn_op(bl) == op_Block);
+	assert(is_Block(bl));
 	return get_pdom_info(bl)->pre_num;
 }
 
 void set_Block_postdom_pre_num(ir_node *bl, int num) {
-	assert(get_irn_op(bl) == op_Block);
+	assert(is_Block(bl));
 	get_pdom_info(bl)->pre_num = num;
 }
 
 int get_Block_postdom_depth(const ir_node *bl) {
-	assert(get_irn_op(bl) == op_Block);
+	assert(is_Block(bl));
 	return get_pdom_info(bl)->dom_depth;
 }
 
 void set_Block_postdom_depth(ir_node *bl, int depth) {
-	assert(get_irn_op(bl) == op_Block);
+	assert(is_Block(bl));
 	get_pdom_info(bl)->dom_depth = depth;
 }
 
@@ -636,14 +636,13 @@ static int init_construction(ir_graph *irg, irg_walk_func *pre) {
 		for (i = j = 0; i < arity; i++) {
 			ir_node *pred = get_End_keepalive(end, i);
 
-			if (get_irn_op(pred) == op_Block) {
-				if (Block_not_block_visited(pred)) {
-					/* we found a endless loop */
-					dec_irg_block_visited(irg);
-					irg_block_walk(pred, pre, NULL, &n_blocks);
-				}
-				else
+			if (is_Block(pred)) {
+				if (Block_block_visited(pred))
 					continue;
+
+				/* we found an endless loop */
+				dec_irg_block_visited(irg);
+				irg_block_walk(pred, pre, NULL, &n_blocks);
 			}
 			in[j++] = pred;
 		}
@@ -677,7 +676,7 @@ void compute_doms(ir_graph *irg) {
 	n_blocks = init_construction(irg, count_and_init_blocks_dom);
 
 	/* Memory for temporary information. */
-	tdi_list = xcalloc(n_blocks, sizeof(tdi_list[0]));
+	tdi_list = XMALLOCNZ(tmp_dom_info, n_blocks);
 
 	/* We need the out data structure. */
 	assure_irg_outs(irg);
@@ -816,7 +815,7 @@ void compute_postdoms(ir_graph *irg) {
 	n_blocks = init_construction(irg, count_and_init_blocks_pdom);
 
 	/* Memory for temporary information. */
-	tdi_list = xcalloc(n_blocks, sizeof(tdi_list[0]));
+	tdi_list = XMALLOCNZ(tmp_dom_info, n_blocks);
 
 	/* We need the out data structure. */
 	assure_irg_outs(irg);