alloc has a count not a size argument, reflect this in method names
[libfirm] / ir / ir / irgwalk_blk.c
index 1947e8d..ca98317 100644 (file)
  * @author  Michael Beck
  * @version $Id$
  */
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include "config.h"
 
 #include "irnode_t.h"
-#include "irgraph_t.h" /* visited flag */
+#include "irgraph_t.h"
 #include "irgwalk.h"
 #include "pset.h"
 #include "irhooks.h"
@@ -64,7 +62,8 @@ typedef struct _block_entry_t {
 /**
  * compare two block_entries
  */
-static int addr_cmp(const void *elt, const void *key) {
+static int addr_cmp(const void *elt, const void *key)
+{
        const block_entry_t *e1 = elt;
        const block_entry_t *e2 = key;
 
@@ -84,7 +83,7 @@ static block_entry_t *block_find_entry(ir_node *block, blk_collect_data_t *ctx)
        if (elem)
                return elem;
 
-       elem = obstack_alloc(&ctx->obst, sizeof(*elem));
+       elem = OALLOC(&ctx->obst, block_entry_t);
 
        elem->block      = block;
        elem->phi_list   = NEW_ARR_F(ir_node *, 0);
@@ -95,33 +94,68 @@ static block_entry_t *block_find_entry(ir_node *block, blk_collect_data_t *ctx)
        return pset_insert(ctx->blk_map, elem, HASH_PTR(block));
 }
 
+/**
+ * Traverse a block in pre order.
+ */
+static void traverse_block_pre(ir_node *block, block_entry_t *entry, irg_walk_func *pre, void *env)
+{
+       int j;
+
+       for (j = ARR_LEN(entry->cf_list) - 1; j >= 0; --j) {
+               ir_node *node = entry->cf_list[j];
+               pre(node, env);
+       }
+
+       for (j = ARR_LEN(entry->df_list) - 1; j >= 0; --j) {
+               ir_node *node = entry->df_list[j];
+               pre(node, env);
+       }
+
+       for (j = ARR_LEN(entry->phi_list) - 1; j >= 0; --j) {
+               ir_node *node = entry->phi_list[j];
+               pre(node, env);
+       }
+
+       pre(block, env);
+}
+
+/**
+ * Traverse a block in post order.
+ */
+void traverse_block_post(ir_node *block, block_entry_t *entry, irg_walk_func *post, void *env)
+{
+       int j, n;
+
+       post(block, env);
+
+       for (j = 0, n = ARR_LEN(entry->phi_list); j < n; ++j) {
+               ir_node *node = entry->phi_list[j];
+               post(node, env);
+       }
+
+       for (j = 0, n = ARR_LEN(entry->df_list); j < n; ++j) {
+               ir_node *node = entry->df_list[j];
+               post(node, env);
+       }
+
+       for (j = 0, n = ARR_LEN(entry->cf_list); j < n; ++j) {
+               ir_node *node = entry->cf_list[j];
+               post(node, env);
+       }
+}
+
 /**
  * traverse the pre order only, from End to Start
  */
-static void traverse_pre(blk_collect_data_tblks, irg_walk_func *pre, void *env)
+static void traverse_pre(blk_collect_data_t *blks, irg_walk_func *pre, void *env)
 {
-       int i, j;
+       int i;
 
        for (i = ARR_LEN(blks->blk_list) - 1; i >= 0; --i) {
                ir_node       *block = blks->blk_list[i];
                block_entry_t *entry = block_find_entry(block, blks);
 
-               for (j = ARR_LEN(entry->cf_list) - 1; j >= 0; --j) {
-                       ir_node *node = entry->cf_list[j];
-                       pre(node, env);
-               }
-
-               for (j = ARR_LEN(entry->df_list) - 1; j >= 0; --j) {
-                       ir_node *node = entry->df_list[j];
-                       pre(node, env);
-               }
-
-               for (j = ARR_LEN(entry->phi_list) - 1; j >= 0; --j) {
-                       ir_node *node = entry->phi_list[j];
-                       pre(node, env);
-               }
-
-               pre(block, env);
+               traverse_block_pre(block, entry, pre, env);
 
                DEL_ARR_F(entry->entry_list);
                DEL_ARR_F(entry->phi_list);
@@ -133,30 +167,15 @@ static void traverse_pre(blk_collect_data_t* blks, irg_walk_func *pre, void *env
 /**
  * traverse the post order only, from Start to End
  */
-static void traverse_post(blk_collect_data_tblks, irg_walk_func *post, void *env)
+static void traverse_post(blk_collect_data_t *blks, irg_walk_func *post, void *env)
 {
-       int i, j;
+       int i, k;
 
-       for (i = 0; i < ARR_LEN(blks->blk_list); ++i) {
+       for (i = 0, k = ARR_LEN(blks->blk_list); i < k; ++i) {
                ir_node       *block = blks->blk_list[i];
                block_entry_t *entry = block_find_entry(block, blks);
 
-               post(block, env);
-
-               for (j = 0; j < ARR_LEN(entry->phi_list); ++j) {
-                       ir_node *node = entry->phi_list[j];
-                       post(node, env);
-               }
-
-               for (j = 0; j < ARR_LEN(entry->df_list); ++j) {
-                       ir_node *node = entry->df_list[j];
-                       post(node, env);
-               }
-
-               for (j = 0; j < ARR_LEN(entry->cf_list); ++j) {
-                       ir_node *node = entry->cf_list[j];
-                       post(node, env);
-               }
+               traverse_block_post(block, entry, post, env);
 
                DEL_ARR_F(entry->entry_list);
                DEL_ARR_F(entry->phi_list);
@@ -168,30 +187,15 @@ static void traverse_post(blk_collect_data_t* blks, irg_walk_func *post, void *e
 /**
  * traverse both
  */
-static void traverse_both(blk_collect_data_tblks, irg_walk_func *pre, irg_walk_func *post, void *env)
+static void traverse_both(blk_collect_data_t *blks, irg_walk_func *pre, irg_walk_func *post, void *env)
 {
-       int i, j;
+       int i;
 
        for (i = ARR_LEN(blks->blk_list) - 1; i >= 0; --i) {
                ir_node       *block = blks->blk_list[i];
                block_entry_t *entry = block_find_entry(block, blks);
 
-               for (j = ARR_LEN(entry->cf_list) - 1; j >= 0; --j) {
-                       ir_node *node = entry->cf_list[j];
-                       pre(node, env);
-               }
-
-               for (j = ARR_LEN(entry->df_list) - 1; j >= 0; --j) {
-                       ir_node *node = entry->df_list[j];
-                       pre(node, env);
-               }
-
-               for (j = ARR_LEN(entry->phi_list) - 1; j >= 0; --j) {
-                       ir_node *node = entry->phi_list[j];
-                       pre(node, env);
-               }
-
-               pre(block, env);
+               traverse_block_pre(block, entry, pre, env);
        }
 
        /* second step */
@@ -199,15 +203,76 @@ static void traverse_both(blk_collect_data_t* blks, irg_walk_func *pre, irg_walk
 }
 
 /**
- * Do the traversal
+ * Do the traversal.
  */
-static void traverse(blk_collect_data_t* blks, irg_walk_func *pre, irg_walk_func *post, void *env)
+static void traverse_blocks(blk_collect_data_t *blks, irg_walk_func *pre, irg_walk_func *post, void *env)
 {
        if      (!post) traverse_pre (blks, pre, env);
        else if (!pre)  traverse_post(blks, post, env);
        else            traverse_both(blks, pre, post, env);
 }
 
+typedef struct dom_traversal_t {
+       blk_collect_data_t *blks;
+       irg_walk_func      *pre;
+       irg_walk_func      *post;
+       void               *env;
+} dom_traversal_t;
+
+/**
+ * Dom block walker. Visit all nodes in pre oder.
+ */
+static void dom_block_visit_pre(ir_node *block, void *env)
+{
+       dom_traversal_t *ctx   = env;
+       block_entry_t   *entry = block_find_entry(block, ctx->blks);
+
+       traverse_block_pre(block, entry, ctx->pre, ctx->env);
+}
+
+/**
+ * Dom block walker. Visit all nodes in post oder.
+ */
+static void dom_block_visit_post(ir_node *block, void *env)
+{
+       dom_traversal_t *ctx   = env;
+       block_entry_t   *entry = block_find_entry(block, ctx->blks);
+
+       traverse_block_post(block, entry, ctx->post, ctx->env);
+}
+
+/**
+ * Dom block walker. Visit all nodes in pre oder, than in post order.
+ */
+static void dom_block_visit_both(ir_node *block, void *env)
+{
+       dom_traversal_t *ctx   = env;
+       block_entry_t   *entry = block_find_entry(block, ctx->blks);
+
+       traverse_block_pre(block, entry, ctx->pre, ctx->env);
+       traverse_block_post(block, entry, ctx->post, ctx->env);
+}
+
+/**
+ * Do the traversal in the dominator tree in top-down order.
+ */
+static void traverse_dom_blocks_top_down(blk_collect_data_t* blks, irg_walk_func *pre, irg_walk_func *post, void *env)
+{
+       dom_traversal_t ctx;
+
+       ctx.blks = blks;
+       ctx.pre  = pre;
+       ctx.post = post;
+       ctx.env  = env;
+
+       if (pre != NULL && post != NULL)
+               dom_tree_walk_irg(current_ir_graph,     dom_block_visit_both, NULL, &ctx);
+       else if (pre != NULL)
+               dom_tree_walk_irg(current_ir_graph,     dom_block_visit_pre, NULL, &ctx);
+       else if (post != NULL)
+               dom_tree_walk_irg(current_ir_graph,     dom_block_visit_post, NULL, &ctx);
+}
+
 /**
  * walks over the graph and collects all blocks and all block entries
  */
@@ -346,8 +411,9 @@ static void collect_lists(blk_collect_data_t *env)
 /**
  * Intraprozedural graph walker over blocks.
  */
-static void
-do_irg_walk_blk(ir_graph *irg, irg_walk_func *pre, irg_walk_func *post, void *env, unsigned follow_deps)
+static void do_irg_walk_blk(ir_graph *irg, irg_walk_func *pre,
+       irg_walk_func *post, void *env, unsigned follow_deps,
+       void (*traverse)(blk_collect_data_t* blks, irg_walk_func *pre, irg_walk_func *post, void *env))
 {
        ir_node            *end_node = get_irg_end(irg);
        ir_node            *end_blk = get_irg_end_block(irg);
@@ -392,21 +458,32 @@ do_irg_walk_blk(ir_graph *irg, irg_walk_func *pre, irg_walk_func *post, void *en
        ir_free_resources(irg, IR_RESOURCE_IRN_VISITED);
 }
 
-void irg_walk_blkwise_graph(ir_graph *irg, irg_walk_func *pre, irg_walk_func *post, void *env) {
+void irg_walk_blkwise_graph(ir_graph *irg, irg_walk_func *pre, irg_walk_func *post, void *env)
+{
        ir_graph * rem = current_ir_graph;
 
        hook_irg_walk_blkwise(irg, (generic_func *)pre, (generic_func *)post);
        current_ir_graph = irg;
-       do_irg_walk_blk(irg, pre, post, env, 0);
+       do_irg_walk_blk(irg, pre, post, env, 0, traverse_blocks);
        current_ir_graph = rem;
 }
 
+void irg_walk_in_or_dep_blkwise_graph(ir_graph *irg, irg_walk_func *pre, irg_walk_func *post, void *env)
+{
+       ir_graph * rem = current_ir_graph;
 
-void irg_walk_in_or_dep_blkwise_graph(ir_graph *irg, irg_walk_func *pre, irg_walk_func *post, void *env) {
+       hook_irg_walk_blkwise(irg, (generic_func *)pre, (generic_func *)post);
+       current_ir_graph = irg;
+       do_irg_walk_blk(irg, pre, post, env, 1, traverse_blocks);
+       current_ir_graph = rem;
+}
+
+void irg_walk_blkwise_dom_top_down(ir_graph *irg, irg_walk_func *pre, irg_walk_func *post, void *env)
+{
        ir_graph * rem = current_ir_graph;
 
        hook_irg_walk_blkwise(irg, (generic_func *)pre, (generic_func *)post);
        current_ir_graph = irg;
-       do_irg_walk_blk(irg, pre, post, env, 1);
+       do_irg_walk_blk(irg, pre, post, env, 0, traverse_dom_blocks_top_down);
        current_ir_graph = rem;
 }