update for release

[libfirm] / ir / common / irtools.c

diff --git a/ir/common/irtools.c b/ir/common/irtools.c
index 426ff8f..e0a0f82 100644 (file)
--- a/ir/common/irtools.c
+++ b/ir/common/irtools.c
@@ -21,7 +21,6 @@
  * @file
  * @brief     Some often needed tool-functions
  * @author    Michael Beck
- * @version   $Id$
  */
 #include "config.h"
 
@@ -54,8 +53,11 @@ void firm_clear_node_and_phi_links(ir_node *n, void *env)
 void firm_clear_block_phis(ir_node *node, void *env)
 {
        (void) env;
-       if (is_Block(node))
+       if (is_Block(node)) {
                set_Block_phis(node, NULL);
+       } else if (is_Phi(node)) {
+               set_Phi_next(node, NULL);
+       }
 }
 
 void firm_collect_block_phis(ir_node *node, void *env)
@@ -67,28 +69,33 @@ void firm_collect_block_phis(ir_node *node, void *env)
 
 void copy_irn_to_irg(ir_node *n, ir_graph *irg)
 {
-       ir_op *op = get_irn_op(n);
        ir_graph *old_irg;
        ir_node *nn = NULL;
 
        /* do not copy standard nodes */
-       if (op == op_NoMem)
+       switch (get_irn_opcode(n)) {
+       case iro_NoMem:
                n = get_irg_no_mem(irg);
-       else if (op == op_Block) {
-               old_irg = get_irn_irg(n);
+               break;
 
+       case iro_Block:
+               old_irg = get_irn_irg(n);
                if (n == get_irg_start_block(old_irg))
                        nn = get_irg_start_block(irg);
                else if (n == get_irg_end_block(old_irg))
                        nn = get_irg_end_block(irg);
-       }
-       else if (op == op_Start)
+               break;
+
+       case iro_Start:
                nn = get_irg_start(irg);
-       else if (op == op_End)
+               break;
+
+       case iro_End:
                nn = get_irg_end(irg);
-       else if (op == op_Proj) {
-               old_irg = get_irn_irg(n);
+               break;
 
+       case iro_Proj:
+               old_irg = get_irn_irg(n);
                if (n == get_irg_initial_exec(old_irg))
                        nn = get_irg_initial_exec(irg);
                else if (n == get_irg_frame(old_irg))
@@ -97,6 +104,7 @@ void copy_irn_to_irg(ir_node *n, ir_graph *irg)
                        nn = get_irg_initial_mem(irg);
                else if (n == get_irg_args(old_irg))
                        nn = get_irg_args(irg);
+               break;
        }
 
        if (nn) {
@@ -107,7 +115,7 @@ void copy_irn_to_irg(ir_node *n, ir_graph *irg)
        nn = new_ir_node(get_irn_dbg_info(n),
                         irg,
                         NULL,            /* no block yet, will be set later */
-                        op,
+                        get_irn_op(n),
                         get_irn_mode(n),
                         get_irn_arity(n),
                         get_irn_in(n) + 1);
@@ -178,6 +186,7 @@ void irn_rewire_inputs(ir_node *node)
 {
        ir_node *new_node;
        int      arity;
+       int      n_deps;
        int      i;
 
        new_node = get_new_node(node);
@@ -195,15 +204,20 @@ void irn_rewire_inputs(ir_node *node)
                set_irn_n(new_node, i, new_in);
        }
 
+       n_deps = get_irn_deps(new_node);
+       for (i = 0; i < n_deps; ++i) {
+               ir_node *dep     = get_irn_dep(node, i);
+               ir_node *new_dep = get_new_node(dep);
+               set_irn_dep(new_node, i, new_dep);
+       }
+
        /* Now the new node is complete. We can add it to the hash table for CSE. */
        add_identities(new_node);
 }
 
 void firm_pset_dump(pset *set)
 {
-       void *obj;
-
-       foreach_pset(set, void*, obj) {
+       foreach_pset(set, void, obj) {
                ir_fprintf(stderr, "%+F\n", obj);
        }
 }