use xmalloc instead of malloc

[libfirm] / ir / ir / irgwalk_blk.c

diff --git a/ir/ir/irgwalk_blk.c b/ir/ir/irgwalk_blk.c
index 0eba700..0a9f10f 100644 (file)
--- a/ir/ir/irgwalk_blk.c
+++ b/ir/ir/irgwalk_blk.c
@@ -19,6 +19,7 @@
 #include "pset.h"
 #include "irhooks.h"
 #include "array.h"
+#include "hashptr.h"
 
 /**
  * Metadata for block walker
@@ -50,14 +51,6 @@ static int addr_cmp(const void *elt, const void *key) {
   return e1->block != e2->block;
 }
 
-/**
- * calculates a hash value for an block address
- * Addresses are typically aligned at 32bit, so we ignore the lowest bits
- */
-static INLINE unsigned block_hash(const ir_node *node) {
-  return (unsigned)node >> 3;
-}
-
 /**
  * Returns the associates block_entry_t for an block
  */
@@ -67,7 +60,7 @@ static block_entry_t *block_find_entry(ir_node *block, blk_collect_data_t *ctx)
   block_entry_t *elem;
 
   key.block = block;
-  elem = pset_find(ctx->blk_map, &key, block_hash(block));
+  elem = pset_find(ctx->blk_map, &key, HASH_PTR(block));
   if (elem)
     return elem;
 
@@ -79,7 +72,7 @@ static block_entry_t *block_find_entry(ir_node *block, blk_collect_data_t *ctx)
   elem->cf_list    = NEW_ARR_F(ir_node *, 0);
   elem->entry_list = NEW_ARR_F(ir_node *, 0);
 
-  return pset_insert(ctx->blk_map, elem, block_hash(block));
+  return pset_insert(ctx->blk_map, elem, HASH_PTR(block));
 }
 
 /**
@@ -206,7 +199,7 @@ static void collect_walk(ir_node *node, blk_collect_data_t *env)
   block_entry_t *entry;
   ir_node       *block;
 
-  set_irn_visited(node, current_ir_graph->visited);
+  mark_irn_visited(node);
 
   if (node->op == op_Block) {
     /* predecessors of a block are control flow nodes */
@@ -214,7 +207,7 @@ static void collect_walk(ir_node *node, blk_collect_data_t *env)
       ir_node *pred = get_irn_n(node, i);
       ir_node *blk  = get_nodes_block(pred);
 
-      if (pred->visited < current_ir_graph->visited) {
+      if (irn_not_visited(pred)) {
         collect_walk(pred, env);
 
         /* control flow predecessors are always block inputs */
@@ -237,24 +230,28 @@ static void collect_walk(ir_node *node, blk_collect_data_t *env)
   else {
     block = get_nodes_block(node);
 
-    if (block->visited < current_ir_graph->visited)
+    if (irn_not_visited(block))
       collect_walk(block, env);
 
     is_phi = is_Phi(node);
     for (i = get_irn_arity(node) - 1; i >= 0; --i) {
       ir_node *pred = get_irn_n(node, i);
-      ir_node *blk  = get_nodes_block(pred);
 
-      if (pred->visited < current_ir_graph->visited) {
+      if (irn_not_visited(pred)) {
         collect_walk(pred, env);
 
-        /*
-         * Note that Phi predecessors are always block entries
-         * because Phi edges are always "outside" a block
-         */
-        if (block != blk || is_phi) {
-          entry = block_find_entry(blk, env);
-          ARR_APP1(ir_node *, entry->entry_list, pred);
+      /* BEWARE: predecessors of End nodes might be blocks */
+      if (is_no_Block(pred)) {
+        ir_node *blk  = get_nodes_block(pred);
+
+          /*
+           * Note that Phi predecessors are always block entries
+           * because Phi edges are always "outside" a block
+           */
+          if (block != blk || is_phi) {
+            entry = block_find_entry(blk, env);
+            ARR_APP1(ir_node *, entry->entry_list, pred);
+          }
         }
       }
     }
@@ -270,7 +267,7 @@ static void collect_blks_lists(ir_node *node, ir_node *block,
 {
   int i;
 
-  set_irn_visited(node, current_ir_graph->visited);
+  mark_irn_visited(node);
 
   /*
    * Do not descent into Phi predecessors, these are always
@@ -280,12 +277,16 @@ static void collect_blks_lists(ir_node *node, ir_node *block,
   if (! is_Phi(node)) {
     for (i = get_irn_arity(node) - 1; i >= 0; --i) {
       ir_node *pred = get_irn_n(node, i);
-      ir_node *blk  = get_nodes_block(pred);
 
-      if (pred->visited < current_ir_graph->visited) {
-        if (block != blk)
-          continue;
-        collect_blks_lists(pred, block, entry, env);
+      /* BEWARE: predecessors of End nodes might be blocks */
+      if (is_no_Block(pred)) {
+        ir_node *blk  = get_nodes_block(pred);
+
+        if (irn_not_visited(pred)) {
+          if (block != blk)
+            continue;
+          collect_blks_lists(pred, block, entry, env);
+        }
       }
     }
   }
@@ -340,7 +341,7 @@ do_irg_walk_blk(ir_graph *irg, irg_walk_func *pre, irg_walk_func *post, void *en
   block_entry_t      *entry;
 
   /* switch off interprocedural view */
-  set_interprocedural_view(false);
+  set_interprocedural_view(0);
 
   obstack_init(&blks.obst);
   blks.blk_map  = new_pset(addr_cmp, 1);
@@ -373,7 +374,7 @@ void irg_walk_blkwise_graph(ir_graph *irg, irg_walk_func *pre, irg_walk_func *po
 {
   ir_graph * rem = current_ir_graph;
 
-  hook_irg_walk_blkwise(irg, (void *)pre, (void *)post);
+  hook_irg_walk_blkwise(irg, (generic_func *)pre, (generic_func *)post);
   current_ir_graph = irg;
   do_irg_walk_blk(irg, pre, post, env);
   current_ir_graph = rem;