renamed type opcode to ir_opcode

[libfirm] / ir / ir / irgmod.c

diff --git a/ir/ir/irgmod.c b/ir/ir/irgmod.c
index 260e2a8..b604240 100644 (file)
--- a/ir/ir/irgmod.c
+++ b/ir/ir/irgmod.c
@@ -40,7 +40,7 @@ turn_into_tuple (ir_node *node, int arity)
   } else {
     /* Allocate new array, don't free old in_array, it's on the obstack. */
     ir_node *block = get_nodes_block(node);
-    edges_invalidate(node, current_ir_graph);
+    edges_node_deleted(node, current_ir_graph);
     node->in = NEW_ARR_D(ir_node *, current_ir_graph->obst, arity+1);
     /* clear the new in array, else edge_notify tries to delete garbage */
     memset(node->in, 0, (arity+1) * sizeof(node->in[0]));
@@ -61,7 +61,13 @@ exchange (ir_node *old, ir_node *nw)
    * the edges from the old node to the new directly.
    */
   if (edges_activated(current_ir_graph)) {
+    /* copy all dependencies from old to new */
+    add_irn_deps(nw, old);
+
     edges_reroute(old, nw, current_ir_graph);
+    edges_reroute_kind(old, nw, EDGE_KIND_DEP, current_ir_graph);
+    edges_node_deleted(old, current_ir_graph);
+    old->op = op_Bad;
   }
   else {
     /* Else, do it the old-fashioned way. */
@@ -97,32 +103,30 @@ exchange (ir_node *old, ir_node *nw)
 /*  Functionality for collect_phis                                    */
 /*--------------------------------------------------------------------*/
 
-static void
-collect (ir_node *n, void *env) {
+/**
+ * Walker: links all Phi nodes to their Blocks and
+ *         all Proj nodes to there predecessors
+ */
+static void collect(ir_node *n, void *env) {
   ir_node *pred;
-  if (get_irn_op(n) == op_Phi) {
+
+  if (is_Phi(n)) {
     set_irn_link(n, get_irn_link(get_nodes_block(n)));
     set_irn_link(get_nodes_block(n), n);
   }
-  if (get_irn_op(n) == op_Proj) {
+  else if (is_Proj(n)) {
     pred = n;
-    while (get_irn_op(pred) == op_Proj)
+    do {
       pred = get_Proj_pred(pred);
+    } while (is_Proj(pred));
+
     set_irn_link(n, get_irn_link(pred));
     set_irn_link(pred, n);
   }
 }
 
 void collect_phiprojs(ir_graph *irg) {
-  ir_graph *rem;
-
-  /* Remember external state of current_ir_graph. */
-  rem = current_ir_graph;
-  current_ir_graph = irg;
-
-  irg_walk(get_irg_end(current_ir_graph), firm_clear_link, collect, NULL);
-
-  current_ir_graph = rem;
+  irg_walk_graph(irg, firm_clear_link, collect, NULL);
 }
 
 
@@ -146,7 +150,7 @@ static void move (ir_node *node, ir_node *from_bl, ir_node *to_bl) {
     proj = get_irn_link(node);
     while (proj) {
       if (get_nodes_block(proj) == from_bl)
-       set_nodes_block(proj, to_bl);
+        set_nodes_block(proj, to_bl);
       proj = get_irn_link(proj);
     }
   }