Prefer get_mode_null() over get_tarval_null().

[libfirm] / ir / ir / irgmod.c

diff --git a/ir/ir/irgmod.c b/ir/ir/irgmod.c
index d3bdaf2..1003739 100644 (file)
--- a/ir/ir/irgmod.c
+++ b/ir/ir/irgmod.c
@@ -44,7 +44,8 @@
  * This is useful if a node returning a tuple is removed, but the Projs
  * extracting values from the tuple are not available.
  */
-void turn_into_tuple(ir_node *node, int arity) {
+void turn_into_tuple(ir_node *node, int arity)
+{
        assert(node);
        set_irn_op(node, op_Tuple);
        if (get_irn_arity(node) == arity) {
@@ -67,7 +68,8 @@ void turn_into_tuple(ir_node *node, int arity) {
  * Since `new' may be bigger than `old' replace `old'
  * by an op_Id which is smaller than everything.
  */
-void exchange(ir_node *old, ir_node *nw) {
+void exchange(ir_node *old, ir_node *nw)
+{
        ir_graph *irg;
 
        assert(old && nw);
@@ -125,7 +127,8 @@ void exchange(ir_node *old, ir_node *nw) {
  *         all Proj nodes to there predecessors and all
  *         partBlocks to there MacroBlock header.
  */
-static void collect_phiprojs_walker(ir_node *n, void *env) {
+static void collect_phiprojs_walker(ir_node *n, void *env)
+{
        ir_node *pred;
        (void) env;
 
@@ -150,23 +153,11 @@ static void collect_phiprojs_walker(ir_node *n, void *env) {
        }
 }
 
-/**
- * clear all links, including the Phi list of blocks and Phi nodes.
- */
-static void clear_node_and_phis_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) {
+void collect_phiprojs(ir_graph *irg)
+{
        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, clear_node_and_phis_links, collect_phiprojs_walker, NULL);
+       irg_walk_graph(irg, firm_clear_node_and_phi_links, collect_phiprojs_walker, NULL);
 }
 
 /*--------------------------------------------------------------------*/
@@ -177,7 +168,8 @@ void collect_phiprojs(ir_graph *irg) {
  * 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) {
+static void move(ir_node *node, ir_node *from_bl, ir_node *to_bl)
+{
        int i, arity;
 
        /* move this node */
@@ -205,17 +197,18 @@ static void move(ir_node *node, ir_node *from_bl, ir_node *to_bl) {
        }
 }
 
-void part_block(ir_node *node) {
-       ir_node *new_block;
-       ir_node *old_block;
-       ir_node *phi;
-       ir_node *mbh;
-       ir_node *next, *block;
+void part_block(ir_node *node)
+{
+       ir_node *new_block, *old_block, *mbh;
+       ir_node *phi, *jmp, *next, *block;
+       ir_graph *rem = current_ir_graph;
 
        /* Turn off optimizations so that blocks are not merged again. */
        int rem_opt = get_opt_optimize();
        set_optimize(0);
 
+       current_ir_graph = get_irn_irg(node);
+
        /* Transform the control flow */
        old_block = get_nodes_block(node);
        mbh       = get_Block_MacroBlock(old_block);
@@ -229,12 +222,10 @@ void part_block(ir_node *node) {
                /* we are splitting a header: this creates a new header */
                set_Block_MacroBlock(new_block, new_block);
        }
-       set_irg_current_block(current_ir_graph, new_block);
-       {
-               ir_node *jmp = new_Jmp();
-               set_irn_in(old_block, 1, &jmp);
-               irn_vrfy_irg(old_block, current_ir_graph);
-       }
+
+       /* create a jump from new_block to old_block, which is now the lower one */
+       jmp = new_r_Jmp(new_block);
+       set_irn_in(old_block, 1, &jmp);
 
        /* move node and its predecessors to new_block */
        move(node, old_block, new_block);
@@ -248,14 +239,17 @@ void part_block(ir_node *node) {
                phi = get_Phi_next(phi);
        }
 
-       /* rewire partBlocks */
+       /* rewire partBlocks: This is necessary, because old_block is a new MacroBlock
+          header now */
        if (mbh != old_block) {
                ir_node *list = NULL;
 
                /* move blocks from mbh to old_block if old_block dominates them */
                block = get_irn_link(mbh);
 
+               /* mbh's list will be rebuild */
                set_irn_link(mbh, NULL);
+               /* old_block is a new mbh */
                set_Block_MacroBlock(old_block, old_block);
 
                /* note that we must splice the list of partBlock here */
@@ -265,8 +259,10 @@ void part_block(ir_node *node) {
 
                        next = get_irn_link(block);
 
-                       if (block == old_block)
+                       if (block == old_block) {
+                               /* this effectively removed old_block from mbh's list */
                                continue;
+                       }
 
                        assert(get_Block_MacroBlock(curr) == mbh);
 
@@ -298,26 +294,17 @@ void part_block(ir_node *node) {
                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);
-               }
+               /* old_block is the mbh, as well as new_block */
+               set_Block_MacroBlock(new_block, new_block);
        }
 
        set_optimize(rem_opt);
+       current_ir_graph = rem;
 }
 
 /* kill a node by setting its predecessors to Bad and finally exchange the node by Bad itself. */
-void kill_node(ir_node *node) {
+void kill_node(ir_node *node)
+{
        ir_graph *irg = get_irn_irg(node);
        ir_node *bad = get_irg_bad(irg);
        int i;