X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fir%2Firgmod.c;h=3de1fa2c724990a68e8b9ba6eb7efa829634a7ef;hb=cb91bddc9cacdab7c28e4336847bd3dc248aa549;hp=dbbc6962dc80a63e8f445c47ed5e4e23f112b50f;hpb=c2b4a9f3d77fda7989e9cbd6293b9f9f58f4221c;p=libfirm

diff --git a/ir/ir/irgmod.c b/ir/ir/irgmod.c
index dbbc6962d..3de1fa2c7 100644
--- a/ir/ir/irgmod.c
+++ b/ir/ir/irgmod.c
@@ -15,13 +15,14 @@
 #endif
 
 # include "irvrfy.h"
-# include "irflag.h"
+# include "irflag_t.h"
 # include "irgwalk.h"
 # include "irnode_t.h"
 # include "irgraph_t.h"
 # include "irgmod.h"
 # include "array.h"
 # include "ircons.h"
+# include "firmstat.h"
 
 /* Turns a node into a "useless" Tuple.  The Tuple just forms a tuple
    from several inputs.
@@ -36,9 +37,9 @@ 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);
+    set_nodes_block(node, block);
   }
 }
 
@@ -48,17 +49,31 @@ turn_into_tuple (ir_node *node, int arity)
 INLINE void
 exchange (ir_node *old, ir_node *nw)
 {
-  ir_node *block = old->in[0];
+  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 *, current_ir_graph->obst, 2);
+  old->in = NEW_ARR_D (ir_node *, irg->obst, 2);
   old->in[0] = block;
   old->in[1] = nw;
 }
 
-/**********************************************************************/
-/*  Functionality for collect_phis                                     */
-/**********************************************************************/
+/*--------------------------------------------------------------------*/
+/*  Functionality for collect_phis                                    */
+/*--------------------------------------------------------------------*/
 
 static void
 clear_link (ir_node *n, void *env) {
@@ -69,8 +84,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;
@@ -94,26 +109,27 @@ void collect_phiprojs(ir_graph *irg) {
 }
 
 
-/**********************************************************************/
-/*  Funcionality for part_block                                       */
-/**********************************************************************/
-
-/* Moves node and all predecessors of node from from_bl to to_bl.
-   Does not move predecessors of Phi nodes (or block nodes). */
+/*--------------------------------------------------------------------*/
+/*  Functionality for part_block                                      */
+/*--------------------------------------------------------------------*/
 
+/**
+ * Moves node and all predecessors of node from from_bl to to_bl.
+ * Does not move predecessors of Phi nodes (or block nodes).
+ */
 static void move (ir_node *node, ir_node *from_bl, ir_node *to_bl) {
-  int i;
+  int i, arity;
   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);
     }
   }
@@ -121,9 +137,10 @@ static void move (ir_node *node, ir_node *from_bl, ir_node *to_bl) {
   /* recursion ... */
   if (get_irn_op(node) == op_Phi) return;
 
-  for (i = 0; i < get_irn_arity(node); i++) {
+  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);
   }
 }
@@ -134,13 +151,13 @@ void part_block(ir_node *node) {
   ir_node *phi;
 
   /* Turn off optimizations so that blocks are not merged again. */
-  int rem_opt = get_optimize();
+  int rem_opt = get_opt_optimize();
   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));
+            get_Block_cfgpred_arr(old_block));
   set_irg_current_block(current_ir_graph, new_block);
   {
     ir_node *in[1];
@@ -157,10 +174,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
-					       obey this condition.  How do they get into
-					       the list??? Example: InterfaceIII */
-      set_nodes_Block(phi, new_block);
+    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);
     phi = get_irn_link(phi);
   }