use tv_t.h instead of tv.h

[libfirm] / ir / ir / irgmod.c

diff --git a/ir/ir/irgmod.c b/ir/ir/irgmod.c
index 9a5392e..b7c0a11 100644 (file)
--- a/ir/ir/irgmod.c
+++ b/ir/ir/irgmod.c
@@ -1,6 +1,6 @@
 /*
  * Project:     libFIRM
- * File name:   ir/ir/irgmod.h
+ * File name:   ir/ir/irgmod.c
  * Purpose:     Support for ir graph modification.
  * Author:      Martin Trapp, Christian Schaefer
  * Modified by: Goetz Lindenmaier
@@ -11,7 +11,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-# include <config.h>
+# include "config.h"
 #endif
 
 # include "irvrfy.h"
@@ -22,7 +22,8 @@
 # include "irgmod.h"
 # include "array.h"
 # include "ircons.h"
-# include "firmstat.h"
+# include "irhooks.h"
+# include "iredges_t.h"
 
 /* Turns a node into a "useless" Tuple.  The Tuple just forms a tuple
    from several inputs.
@@ -37,38 +38,54 @@ turn_into_tuple (ir_node *node, int arity)
     /* keep old array */
   } else {
     /* Allocate new array, don't free old in_array, it's on the obstack. */
-    ir_node *block = get_nodes_Block(node);
+    ir_node *block = get_nodes_block(node);
     node->in = NEW_ARR_D (ir_node *, current_ir_graph->obst, arity+1);
-    set_nodes_Block(node, block);
+               edges_invalidate(node, current_ir_graph);
+    set_nodes_block(node, block);
   }
 }
 
 /* Insert irnode `new' in place of irnode `old'
    Since `new' may be bigger than `old' replace `old'
    by an op_Id which is smaller than everything */
-INLINE void
+void
 exchange (ir_node *old, ir_node *nw)
 {
-  ir_node *block;
-  ir_graph *irg = get_irn_irg (old);
-
-  assert(old != nw);
-  assert (irg);
-  assert(get_irn_op(old)->opar != oparity_dynamic);
-
-  stat_turn_into_id(old);
-
-  block = old->in[0];
-  if (!block) {
-    if (is_Block(nw)) block = nw;
-    else (block = nw->in[0]);
-    if (!block) { DDMN(old); DDMN(nw); assert(0 && "cannot find legal block for id"); }
-  }
-
-  old->op = op_Id;
-  old->in = NEW_ARR_D (ir_node *, irg->obst, 2);
-  old->in[0] = block;
-  old->in[1] = nw;
+       /*
+        * If new outs are on, we can skip the id node creation and reroute
+        * the edges from the old node to the new directly.
+        */
+       if (edges_activated(current_ir_graph)) {
+               edges_reroute(old, nw, current_ir_graph);
+       }
+  else {
+    /* Else, do it the old-fashioned way. */
+
+               ir_graph *irg = get_irn_irg (old);
+               ir_node *block;
+
+               assert(old != nw);
+               assert (irg);
+               assert(get_irn_op(old)->opar != oparity_dynamic);
+
+               hook_turn_into_id(old);
+
+               block = old->in[0];
+               if (!block) {
+                       block = is_Block(nw) ? nw : get_nodes_block(nw);
+
+                       if (!block) {
+                               DDMN(old);
+                               DDMN(nw);
+                               assert(0 && "cannot find legal block for id");
+                       }
+               }
+
+               old->op = op_Id;
+               old->in = NEW_ARR_D (ir_node *, irg->obst, 2);
+               old->in[0] = block;
+               old->in[1] = nw;
+       }
 }
 
 /*--------------------------------------------------------------------*/
@@ -84,8 +101,8 @@ static void
 collect (ir_node *n, void *env) {
   ir_node *pred;
   if (get_irn_op(n) == op_Phi) {
-    set_irn_link(n, get_irn_link(get_nodes_Block(n)));
-    set_irn_link(get_nodes_Block(n), 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) {
     pred = n;
@@ -122,14 +139,14 @@ static void move (ir_node *node, ir_node *from_bl, ir_node *to_bl) {
   ir_node *proj, *pred;
 
   /* move this node */
-  set_nodes_Block(node, to_bl);
+  set_nodes_block(node, to_bl);
 
   /* move its projs */
   if (get_irn_mode(node) == mode_T) {
     proj = get_irn_link(node);
     while (proj) {
-      if (get_nodes_Block(proj) == from_bl)
-       set_nodes_Block(proj, to_bl);
+      if (get_nodes_block(proj) == from_bl)
+       set_nodes_block(proj, to_bl);
       proj = get_irn_link(proj);
     }
   }
@@ -140,7 +157,7 @@ static void move (ir_node *node, ir_node *from_bl, ir_node *to_bl) {
   arity = get_irn_arity(node);
   for (i = 0; i < arity; i++) {
     pred = get_irn_n(node, i);
-    if (get_nodes_Block(pred) == from_bl)
+    if (get_nodes_block(pred) == from_bl)
       move(pred, from_bl, to_bl);
   }
 }
@@ -155,7 +172,7 @@ void part_block(ir_node *node) {
   set_optimize(0);
 
   /* Transform the control flow */
-  old_block = get_nodes_Block(node);
+  old_block = get_nodes_block(node);
   new_block = new_Block(get_Block_n_cfgpreds(old_block),
             get_Block_cfgpred_arr(old_block));
   set_irg_current_block(current_ir_graph, new_block);
@@ -174,10 +191,10 @@ void part_block(ir_node *node) {
   set_irn_link(new_block, phi);
   set_irn_link(old_block, NULL);
   while (phi) {
-    if(get_nodes_Block(phi) == old_block);   /* @@@ inlinening chokes on phis that don't
+    if(get_nodes_block(phi) == old_block);   /* @@@ inlinening chokes on phis that don't
                            obey this condition.  How do they get into
                            the list??? Example: InterfaceIII */
-      set_nodes_Block(phi, new_block);
+      set_nodes_block(phi, new_block);
     phi = get_irn_link(phi);
   }