- implemented firm_clear_node_and_phi_links()

[libfirm] / ir / ir / irgmod.c

diff --git a/ir/ir/irgmod.c b/ir/ir/irgmod.c
index a354df2..d7f9705 100644 (file)
--- a/ir/ir/irgmod.c
+++ b/ir/ir/irgmod.c
@@ -23,9 +23,7 @@
  * @author   Martin Trapp, Christian Schaefer, Goetz Lindenmaier
  * @version  $Id$
  */
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include "config.h"
 
 #include "irvrfy.h"
 #include "irflag_t.h"
@@ -96,8 +94,6 @@ void exchange(ir_node *old, ir_node *nw) {
                /* Else, do it the old-fashioned way. */
                ir_node *block;
 
-               assert(get_irn_op(old)->opar != oparity_dynamic);
-
                hook_turn_into_id(old);
 
                block = old->in[0];
@@ -109,6 +105,10 @@ void exchange(ir_node *old, ir_node *nw) {
                        }
                }
 
+               if (get_irn_op(old)->opar == oparity_dynamic) {
+                       DEL_ARR_F(get_irn_in(old));
+               }
+
                old->op    = op_Id;
                old->in    = NEW_ARR_D (ir_node *, irg->obst, 2);
                old->in[0] = block;
@@ -125,14 +125,13 @@ void exchange(ir_node *old, ir_node *nw) {
  *         all Proj nodes to there predecessors and all
  *         partBlocks to there MacroBlock header.
  */
-static void collect(ir_node *n, void *env) {
+static void collect_phiprojs_walker(ir_node *n, void *env) {
        ir_node *pred;
        (void) env;
 
        if (is_Phi(n)) {
                ir_node *block = get_nodes_block(n);
-               set_Phi_next(n, get_Block_phis(block));
-               set_Block_phis(block, n);
+               add_Block_phi(block, n);
        } else if (is_Proj(n)) {
                pred = n;
                do {
@@ -151,24 +150,12 @@ static void collect(ir_node *n, void *env) {
        }
 }
 
-/**
- * clear all links, including the Phi list of blocks and Phi nodes.
- */
-static void clear_links(ir_node *n, void *env) {
-       (void) env;
-
-       set_irn_link(n, NULL);
-       if (is_Block(n))
-               set_Block_phis(n, NULL);
-       else if (is_Phi(n))
-               set_Phi_next(n, NULL);
-}
-
 void collect_phiprojs(ir_graph *irg) {
-       irg_walk_graph(irg, clear_links, collect, NULL);
+       assert((ir_resources_reserved(irg) & (IR_RESOURCE_IRN_LINK|IR_RESOURCE_PHI_LIST)) ==
+               (IR_RESOURCE_IRN_LINK|IR_RESOURCE_PHI_LIST));
+       irg_walk_graph(irg, firm_clear_node_and_phi_links, collect_phiprojs_walker, NULL);
 }
 
-
 /*--------------------------------------------------------------------*/
 /*  Functionality for part_block                                      */
 /*--------------------------------------------------------------------*/
@@ -210,6 +197,7 @@ void part_block(ir_node *node) {
        ir_node *old_block;
        ir_node *phi;
        ir_node *mbh;
+       ir_node *next, *block;
 
        /* Turn off optimizations so that blocks are not merged again. */
        int rem_opt = get_opt_optimize();
@@ -249,10 +237,13 @@ void part_block(ir_node *node) {
 
        /* rewire partBlocks */
        if (mbh != old_block) {
-               ir_node *next, *block = get_irn_link(mbh);
+               ir_node *list = NULL;
+
+               /* move blocks from mbh to old_block if old_block dominates them */
+               block = get_irn_link(mbh);
 
                set_irn_link(mbh, NULL);
-               set_irn_link(old_block, NULL);
+               set_Block_MacroBlock(old_block, old_block);
 
                /* note that we must splice the list of partBlock here */
                for (; block != NULL; block = next) {
@@ -260,6 +251,10 @@ void part_block(ir_node *node) {
                        assert(is_Block(curr));
 
                        next = get_irn_link(block);
+
+                       if (block == old_block)
+                               continue;
+
                        assert(get_Block_MacroBlock(curr) == mbh);
 
                        for (;;) {
@@ -267,8 +262,8 @@ void part_block(ir_node *node) {
                                        /* old_block dominates the block, so old_block will be
                                           the new macro block header */
                                        set_Block_MacroBlock(block, old_block);
-                                       set_irn_link(block, get_irn_link(old_block));
-                                       set_irn_link(old_block, block);
+                                       set_irn_link(block, list);
+                                       list = block;
                                        break;
                                }
                                if (curr == mbh) {
@@ -282,6 +277,27 @@ void part_block(ir_node *node) {
                                curr = get_Block_cfgpred_block(curr, 0);
                        }
                }
+               /* beware: do NOT directly manipulate old_block's list, as old_block is
+                  in mbh's list and this would destroy the list! */
+               set_irn_link(old_block, list);
+
+               /* finally add new_block to mbh's list */
+               set_irn_link(new_block, get_irn_link(mbh));
+               set_irn_link(mbh, new_block);
+       } else {
+               /* move blocks from mbh to new_block */
+               block = get_irn_link(mbh);
+
+               set_irn_link(mbh, NULL);
+               set_irn_link(new_block, NULL);
+
+               for (; block != NULL; block = next) {
+                       next = get_irn_link(block);
+
+                       set_Block_MacroBlock(block, new_block);
+                       set_irn_link(block, get_irn_link(new_block));
+                       set_irn_link(new_block, block);
+               }
        }
 
        set_optimize(rem_opt);