revert change for now breaks 255.vortex and 253.perlbmk

[libfirm] / ir / ana / irdom.c

diff --git a/ir/ana/irdom.c b/ir/ana/irdom.c
index 97a1079..a878a41 100644 (file)
--- a/ir/ana/irdom.c
+++ b/ir/ana/irdom.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1995-2007 University of Karlsruhe.  All right reserved.
+ * Copyright (C) 1995-2008 University of Karlsruhe.  All right reserved.
  *
  * This file is part of libFirm.
  *
@@ -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;
 }
 
@@ -398,6 +398,7 @@ static void assign_tree_dom_pre_order_max(ir_node *bl, void *data)
        ir_node *p;
        unsigned max = 0;
        unsigned children = 0;
+       (void) data;
 
        for(p = bi->first; p; p = get_dom_info(p)->next) {
                unsigned max_p = get_dom_info(p)->max_subtree_pre_num;
@@ -423,6 +424,7 @@ static void assign_tree_postdom_pre_order_max(ir_node *bl, void *data)
        ir_node *p;
        unsigned max = 0;
        unsigned children = 0;
+       (void) data;
 
        for(p = bi->first; p; p = get_pdom_info(p)->next) {
                unsigned max_p = get_pdom_info(p)->max_subtree_pre_num;
@@ -634,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;
                }
@@ -675,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);
@@ -789,8 +790,8 @@ void assure_doms(ir_graph *irg) {
 
 void free_dom(ir_graph *irg) {
        /* Update graph state */
-       assert(get_irg_phase_state(current_ir_graph) != phase_building);
-       current_ir_graph->dom_state = dom_none;
+       assert(get_irg_phase_state(irg) != phase_building);
+       irg->dom_state = dom_none;
 
        /* With the implementation right now there is nothing to free,
           but better call it anyways... */
@@ -814,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);
@@ -900,8 +901,8 @@ void assure_postdoms(ir_graph *irg) {
 
 void free_postdom(ir_graph *irg) {
        /* Update graph state */
-       assert(get_irg_phase_state(current_ir_graph) != phase_building);
-       current_ir_graph->pdom_state = dom_none;
+       assert(get_irg_phase_state(irg) != phase_building);
+       irg->pdom_state = dom_none;
 
        /* With the implementation right now there is nothing to free,
           but better call it anyways... */