gen_docu: fix missing attributes, show generation time at the end
[libfirm] / ir / ana / irdom.c
index 2726b48..312e1db 100644 (file)
@@ -22,7 +22,6 @@
  * @brief     Construct and access dominator / post dominator tree.
  * @author    Goetz Lindenmaier, Michael Beck, Rubino Geiss
  * @date      2.2002
- * @version   $Id$
  */
 #include "config.h"
 
@@ -52,7 +51,8 @@ ir_node *get_Block_idom(const ir_node *bl)
        assert(is_Block(bl));
        if (get_Block_dom_depth(bl) == -1) {
                /* This block is not reachable from Start */
-               return new_Bad();
+               ir_graph *irg = get_irn_irg(bl);
+               return new_r_Bad(irg, mode_BB);
        }
        return get_dom_info(bl)->idom;
 }
@@ -83,7 +83,8 @@ ir_node *get_Block_ipostdom(const ir_node *bl)
        assert(is_Block(bl));
        if (get_Block_postdom_depth(bl) == -1) {
                /* This block is not reachable from Start */
-               return new_Bad();
+               ir_graph *irg = get_irn_irg(bl);
+               return new_r_Bad(irg, mode_BB);
        }
        return get_pdom_info(bl)->idom;
 }
@@ -382,7 +383,7 @@ void dom_tree_walk_irg(ir_graph *irg, irg_walk_func *pre,
        /* The root of the dominator tree should be the Start block. */
        ir_node *root = get_irg_start_block(irg);
 
-       assert(irg->dom_state == dom_consistent
+       assert(is_irg_state(irg, IR_GRAPH_STATE_CONSISTENT_DOMINANCE)
                        && "The dominators of the irg must be consistent");
        assert(root && "The start block of the graph is NULL?");
        assert(get_dom_info(root)->idom == NULL
@@ -394,10 +395,10 @@ void dom_tree_walk_irg(ir_graph *irg, irg_walk_func *pre,
 void postdom_tree_walk_irg(ir_graph *irg, irg_walk_func *pre,
                irg_walk_func *post, void *env)
 {
-       /* The root of the dominator tree should be the End block. */
+       /* The root of the post dominator tree should be the End block. */
        ir_node *root = get_irg_end_block(irg);
 
-       assert(irg->pdom_state == dom_consistent
+       assert(is_irg_state(irg, IR_GRAPH_STATE_CONSISTENT_POSTDOMINANCE)
                        && "The dominators of the irg must be consistent");
        assert(root && "The end block of the graph is NULL?");
        assert(get_pdom_info(root)->idom == NULL
@@ -408,7 +409,7 @@ void postdom_tree_walk_irg(ir_graph *irg, irg_walk_func *pre,
 
 static void assign_tree_dom_pre_order(ir_node *bl, void *data)
 {
-       unsigned *num = data;
+       unsigned *num = (unsigned*) data;
        ir_dom_info *bi = get_dom_info(bl);
 
        bi->tree_pre_num = (*num)++;
@@ -434,7 +435,7 @@ static void assign_tree_dom_pre_order_max(ir_node *bl, void *data)
 
 static void assign_tree_postdom_pre_order(ir_node *bl, void *data)
 {
-       unsigned *num = data;
+       unsigned *num = (unsigned*) data;
        ir_dom_info *bi = get_pdom_info(bl);
 
        bi->tree_pre_num = (*num)++;
@@ -468,6 +469,7 @@ static void assign_tree_postdom_pre_order_max(ir_node *bl, void *data)
 static void count_and_init_blocks_pdom(ir_node *bl, void *env)
 {
        int *n_blocks = (int *) env;
+
        (*n_blocks) ++;
 
        memset(get_pdom_info(bl), 0, sizeof(ir_dom_info));
@@ -512,7 +514,7 @@ static void init_tmp_dom_info(ir_node *bl, tmp_dom_info *parent,
        int i;
 
        assert(is_Block(bl));
-       if (get_irg_block_visited(current_ir_graph) == get_Block_block_visited(bl))
+       if (Block_block_visited(bl))
          return;
        mark_Block_block_visited(bl);
        set_Block_dom_pre_num(bl, *used);
@@ -628,6 +630,7 @@ inline static void dom_link(tmp_dom_info *v, tmp_dom_info *w)
 static void count_and_init_blocks_dom(ir_node *bl, void *env)
 {
        int *n_blocks = (int *) env;
+
        (*n_blocks) ++;
 
        memset(get_dom_info(bl), 0, sizeof(ir_dom_info));
@@ -636,66 +639,7 @@ static void count_and_init_blocks_dom(ir_node *bl, void *env)
        set_Block_dom_depth(bl, -1);
 }
 
-/**
- * Initialize the dominance/postdominance construction:
- *
- * - count the number of blocks
- * - clear the dominance info
- * - remove Block-keepalives of live blocks to reduce
- *   the number of "phantom" block edges
- *
- * @param irg  the graph
- * @param pre  a walker function that will be called for every block in the graph
- */
-static int init_construction(ir_graph *irg, irg_walk_func *pre)
-{
-       ir_graph *rem = current_ir_graph;
-       ir_node *end;
-       int arity;
-       int n_blocks = 0;
-
-       current_ir_graph = irg;
-
-       /* this visits only the reachable blocks */
-       irg_block_walk(get_irg_end_block(irg), pre, NULL, &n_blocks);
-
-       /* now visit the unreachable (from End) Blocks and remove unnecessary keep-alives */
-       end   = get_irg_end(irg);
-       arity = get_End_n_keepalives(end);
-       if (arity) {    /* we have keep-alives */
-               ir_node **in;
-               int i, j;
-
-               NEW_ARR_A(ir_node *, in, arity);
-               for (i = j = 0; i < arity; i++) {
-                       ir_node *pred = get_End_keepalive(end, i);
-
-                       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 keep-alives */
-                       set_End_keepalives(end, j, in);
-                       set_irg_outs_inconsistent(irg);
-               }
-       }
-
-       current_ir_graph = rem;
-       return n_blocks;
-}
-
-
-/* Computes the dominator trees.  Sets a flag in irg to "dom_consistent".
-   If the control flow of the graph is changed this flag must be set to
-   "dom_inconsistent".  */
+/* Computes the dominator trees. */
 void compute_doms(ir_graph *irg)
 {
        ir_graph *rem = current_ir_graph;
@@ -706,10 +650,10 @@ void compute_doms(ir_graph *irg)
 
        /* Update graph state */
        assert(get_irg_phase_state(irg) != phase_building);
-       irg->dom_state = dom_consistent;
 
        /* Count the number of blocks in the graph. */
-       n_blocks = init_construction(irg, count_and_init_blocks_dom);
+       n_blocks = 0;
+       irg_block_walk_graph(irg, count_and_init_blocks_dom, NULL, &n_blocks);
 
        /* Memory for temporary information. */
        tdi_list = XMALLOCNZ(tmp_dom_info, n_blocks);
@@ -730,25 +674,28 @@ void compute_doms(ir_graph *irg)
 
 
        for (i = n_blocks-1; i > 0; i--) {  /* Don't iterate the root, it's done. */
-               int irn_arity;
-               tmp_dom_info *w = &tdi_list[i];
+               tmp_dom_info *w     = &tdi_list[i];
+               ir_node      *block = w->block;
                tmp_dom_info *v;
+               int           irn_arity;
 
                /* Step 2 */
-               irn_arity = get_irn_arity(w->block);
+               irn_arity = get_irn_arity(block);
                for (j = 0; j < irn_arity;  j++) {
-                       ir_node *pred = get_Block_cfgpred_block(w->block, j);
+                       ir_node *pred       = get_Block_cfgpred(block, j);
+                       ir_node *pred_block = get_nodes_block(pred);
                        tmp_dom_info *u;
 
-                       if (is_Bad(pred) || (get_Block_dom_pre_num (pred) == -1))
-                               continue;       /* control-dead */
+                       if (is_Bad(pred) || (get_Block_dom_pre_num (pred_block) == -1))
+                               continue;    /* unreachable */
 
-                       u = dom_eval (&tdi_list[get_Block_dom_pre_num(pred)]);
-                       if (u->semi < w->semi) w->semi = u->semi;
+                       u = dom_eval (&tdi_list[get_Block_dom_pre_num(pred_block)]);
+                       if (u->semi < w->semi)
+                               w->semi = u->semi;
                }
 
                /* handle keep-alives if we are at the end block */
-               if (w->block == get_irg_end_block(irg)) {
+               if (block == get_irg_end_block(irg)) {
                        ir_node *end = get_irg_end(irg);
 
                        irn_arity = get_irn_arity(end);
@@ -756,11 +703,12 @@ void compute_doms(ir_graph *irg)
                                ir_node *pred = get_irn_n(end, j);
                                tmp_dom_info *u;
 
-                               if (is_no_Block(pred) || get_Block_dom_pre_num(pred) == -1)
-                                       continue;       /* control-dead */
+                               if (!is_Block(pred) || get_Block_dom_pre_num(pred) == -1)
+                                       continue;   /* unreachable */
 
                                u = dom_eval (&tdi_list[get_Block_dom_pre_num(pred)]);
-                               if (u->semi < w->semi) w->semi = u->semi;
+                               if (u->semi < w->semi)
+                                       w->semi = u->semi;
                        }
                }
 
@@ -797,7 +745,8 @@ void compute_doms(ir_graph *irg)
                if (! w->dom)
                        continue; /* control dead */
 
-               if (w->dom != w->semi) w->dom = w->dom->dom;
+               if (w->dom != w->semi)
+                       w->dom = w->dom->dom;
                set_Block_idom(w->block, w->dom->block);
 
                /* blocks dominated by dead one's are still dead */
@@ -813,15 +762,16 @@ void compute_doms(ir_graph *irg)
        /* Do a walk over the tree and assign the tree pre orders. */
        {
                unsigned tree_pre_order = 0;
-               dom_tree_walk_irg(irg, assign_tree_dom_pre_order,
-                       assign_tree_dom_pre_order_max, &tree_pre_order);
+               dom_tree_walk(get_irg_start_block(irg), assign_tree_dom_pre_order,
+                                 assign_tree_dom_pre_order_max, &tree_pre_order);
        }
        current_ir_graph = rem;
+       set_irg_state(irg, IR_GRAPH_STATE_CONSISTENT_DOMINANCE);
 }
 
 void assure_doms(ir_graph *irg)
 {
-       if (get_irg_dom_state(irg) != dom_consistent)
+       if (! is_irg_state(irg, IR_GRAPH_STATE_CONSISTENT_DOMINANCE))
                compute_doms(irg);
 }
 
@@ -829,15 +779,13 @@ void free_dom(ir_graph *irg)
 {
        /* Update graph state */
        assert(get_irg_phase_state(irg) != phase_building);
-       irg->dom_state = dom_none;
+       clear_irg_state(irg, IR_GRAPH_STATE_CONSISTENT_DOMINANCE);
 
        /* With the implementation right now there is nothing to free,
           but better call it anyways... */
 }
 
-/* Computes the post dominator trees.  Sets a flag in irg to "dom_consistent".
-   If the control flow of the graph is changed this flag must be set to
-   "dom_inconsistent".  */
+/* Computes the post dominator trees. */
 void compute_postdoms(ir_graph *irg)
 {
        ir_graph *rem = current_ir_graph;
@@ -848,10 +796,10 @@ void compute_postdoms(ir_graph *irg)
 
        /* Update graph state */
        assert(get_irg_phase_state(irg) != phase_building);
-       irg->pdom_state = dom_consistent;
 
        /* Count the number of blocks in the graph. */
-       n_blocks = init_construction(irg, count_and_init_blocks_pdom);
+       n_blocks = 0;
+       irg_block_walk_graph(irg, count_and_init_blocks_pdom, NULL, &n_blocks);
 
        /* Memory for temporary information. */
        tdi_list = XMALLOCNZ(tmp_dom_info, n_blocks);
@@ -882,7 +830,7 @@ void compute_postdoms(ir_graph *irg)
                        tmp_dom_info *u;
 
                        if (get_Block_postdom_pre_num (succ) == -1)
-                               continue;       /* endless-loop */
+                               continue;    /* endless-loop */
 
                        u = dom_eval (&tdi_list[get_Block_postdom_pre_num(succ)]);
                        if (u->semi < w->semi) w->semi = u->semi;
@@ -927,15 +875,16 @@ void compute_postdoms(ir_graph *irg)
        /* Do a walk over the tree and assign the tree pre orders. */
        {
                unsigned tree_pre_order = 0;
-               postdom_tree_walk_irg(irg, assign_tree_postdom_pre_order,
+               postdom_tree_walk(get_irg_end_block(irg), assign_tree_postdom_pre_order,
                        assign_tree_postdom_pre_order_max, &tree_pre_order);
        }
        current_ir_graph = rem;
+       set_irg_state(irg, IR_GRAPH_STATE_CONSISTENT_POSTDOMINANCE);
 }
 
 void assure_postdoms(ir_graph *irg)
 {
-       if (get_irg_postdom_state(irg) != dom_consistent)
+       if (! is_irg_state(irg, IR_GRAPH_STATE_CONSISTENT_POSTDOMINANCE))
                compute_postdoms(irg);
 }
 
@@ -943,7 +892,7 @@ void free_postdom(ir_graph *irg)
 {
        /* Update graph state */
        assert(get_irg_phase_state(irg) != phase_building);
-       irg->pdom_state = dom_none;
+       clear_irg_state(irg, IR_GRAPH_STATE_CONSISTENT_POSTDOMINANCE);
 
        /* With the implementation right now there is nothing to free,
           but better call it anyways... */