- get_Block_cfgpred_arr() IS supported, but should not be in the official

[libfirm] / ir / ana / irdom.c

diff --git a/ir/ana/irdom.c b/ir/ana/irdom.c
index 481f0c5..d9a4dc7 100644 (file)
--- a/ir/ana/irdom.c
+++ b/ir/ana/irdom.c
@@ -24,13 +24,9 @@
  * @date      2.2002
  * @version   $Id$
  */
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
-#ifdef HAVE_STRING_H
 #include <string.h>
-#endif
 
 #include "irouts.h"
 
@@ -40,7 +36,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 +59,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 +88,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 +106,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;
 }
 
@@ -579,14 +575,14 @@ static void dom_compress(tmp_dom_info *v) {
  * if V is a root, return v, else return the vertex u, not being the
  * root, with minimum u->semi on the path from v to its root.
  */
-INLINE static tmp_dom_info *dom_eval(tmp_dom_info *v) {
+inline static tmp_dom_info *dom_eval(tmp_dom_info *v) {
        if (!v->ancestor) return v;
        dom_compress (v);
        return v->label;
 }
 
 /** make V W's ancestor */
-INLINE static void dom_link(tmp_dom_info *v, tmp_dom_info *w) {
+inline static void dom_link(tmp_dom_info *v, tmp_dom_info *w) {
        w->ancestor = v;
 }
 
@@ -636,19 +632,19 @@ 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)) {
+                               pred = get_nodes_block(pred);
+                               if (!is_Block(pred)) {
+                                       /* a node which has a bad block input: kill it */
                                        continue;
+                               }
                        }
+                       dec_irg_block_visited(irg);
+                       irg_block_walk(pred, pre, NULL, &n_blocks);
                        in[j++] = pred;
                }
                if (j != arity) {
-                       /* we kill some Block keep-alives */
+                       /* we kill some keep-alives */
                        set_End_keepalives(end, j, in);
                        set_irg_outs_inconsistent(irg);
                }
@@ -677,7 +673,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 +812,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);