s/Block_not_block_visited(x)/!Block_block_visited(x)/.

[libfirm] / ir / ana / irdom.c

diff --git a/ir/ana/irdom.c b/ir/ana/irdom.c
index 3568972..62c842f 100644 (file)
--- a/ir/ana/irdom.c
+++ b/ir/ana/irdom.c
@@ -1,5 +1,5 @@
 /*
- * Copyrigth (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.
  *
@@ -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,73 +110,68 @@ 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;
 }
 
-unsigned get_Block_dom_tree_pre_num(const ir_node *bl)
-{
+unsigned get_Block_dom_tree_pre_num(const ir_node *bl) {
        assert(is_Block(bl));
        return get_dom_info(bl)->tree_pre_num;
 }
 
-unsigned get_Block_dom_max_subtree_pre_num(const ir_node *bl)
-{
+unsigned get_Block_dom_max_subtree_pre_num(const ir_node *bl) {
        assert(is_Block(bl));
        return get_dom_info(bl)->max_subtree_pre_num;
 }
 
-unsigned get_Block_pdom_tree_pre_num(const ir_node *bl)
-{
+unsigned get_Block_pdom_tree_pre_num(const ir_node *bl) {
        assert(is_Block(bl));
        return get_pdom_info(bl)->tree_pre_num;
 }
 
-unsigned get_Block_pdom_max_subtree_pre_num(const ir_node *bl)
-{
+unsigned get_Block_pdom_max_subtree_pre_num(const ir_node *bl) {
        assert(is_Block(bl));
        return get_pdom_info(bl)->max_subtree_pre_num;
 }
 
 /* Check, if a block dominates another block. */
-int block_dominates(const ir_node *a, const ir_node *b)
-{
+int block_dominates(const ir_node *a, const ir_node *b) {
        const ir_dom_info *ai, *bi;
 
        if (is_Block(a) && is_Block(b)) {
@@ -189,9 +184,13 @@ int block_dominates(const ir_node *a, const ir_node *b)
        return 0;
 }
 
+/* Check, if a block strictly dominates another block. */
+int block_strictly_dominates(const ir_node *a, const ir_node *b) {
+       return (a != b) && block_dominates(a, b);
+}
+
 /* Returns the smallest common dominator block of two nodes. */
-ir_node *node_smallest_common_dominator(ir_node *a, ir_node *b)
-{
+ir_node *node_smallest_common_dominator(ir_node *a, ir_node *b) {
        ir_node *bl_a   = is_Block(a) ? a : get_nodes_block(a);
        ir_node *bl_b   = is_Block(b) ? b : get_nodes_block(b);
        ir_node *dom_bl = NULL;
@@ -218,8 +217,7 @@ ir_node *node_smallest_common_dominator(ir_node *a, ir_node *b)
 }
 
 /* Returns the smallest common dominator block of all users of a node. */
-ir_node *node_users_smallest_common_dominator(ir_node *irn, int handle_phi)
-{
+ir_node *node_users_smallest_common_dominator(ir_node *irn, int handle_phi) {
        int n, j, i = 0, success;
        ir_node **user_blocks, *dom_bl;
        const ir_edge_t *edge;
@@ -276,23 +274,20 @@ ir_node *node_users_smallest_common_dominator(ir_node *irn, int handle_phi)
 
 
 /* Get the first node in the list of nodes dominated by a given block. */
-ir_node *get_Block_dominated_first(const ir_node *bl)
-{
+ir_node *get_Block_dominated_first(const ir_node *bl) {
        assert(is_Block(bl));
        return get_dom_info(bl)->first;
 }
 
 /* Get the next node in a list of nodes which are dominated by some
  * other node. */
-ir_node *get_Block_dominated_next(const ir_node *bl)
-{
+ir_node *get_Block_dominated_next(const ir_node *bl) {
        assert(is_Block(bl));
        return get_dom_info(bl)->next;
 }
 
 /* Check, if a block post dominates another block. */
-int block_postdominates(const ir_node *a, const ir_node *b)
-{
+int block_postdominates(const ir_node *a, const ir_node *b) {
        const ir_dom_info *ai, *bi;
 
        if (is_Block(a) && is_Block(b)) {
@@ -305,17 +300,21 @@ int block_postdominates(const ir_node *a, const ir_node *b)
        return 0;
 }
 
+/* Check, if a block strictly dominates another block. */
+int block_strictly_postdominates(const ir_node *a, const ir_node *b) {
+       return (a != b) && block_postdominates(a, b);
+}
+
+
 /* Get the first node in the list of nodes post dominated by a given block. */
-ir_node *get_Block_postdominated_first(const ir_node *bl)
-{
+ir_node *get_Block_postdominated_first(const ir_node *bl) {
        assert(is_Block(bl));
        return get_pdom_info(bl)->first;
 }
 
 /* Get the next node in a list of nodes which are post dominated by some
  * other node. */
-ir_node *get_Block_postdominated_next(const ir_node *bl)
-{
+ir_node *get_Block_postdominated_next(const ir_node *bl) {
        assert(is_Block(bl));
        return get_pdom_info(bl)->next;
 }
@@ -399,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;
@@ -424,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;
@@ -635,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;
                }
@@ -790,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... */
@@ -901,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... */