split irg and irp resources, add IRP_RESOURCE_TYPE_LINK

[libfirm] / ir / opt / return.c

diff --git a/ir/opt/return.c b/ir/opt/return.c
index ebfb2f3..7fac730 100644 (file)
--- a/ir/opt/return.c
+++ b/ir/opt/return.c
@@ -30,6 +30,7 @@
 #include "ircons_t.h"
 #include "irnode_t.h"
 #include "irgmod.h"
+#include "irpass.h"
 
 #define set_bit(n)      (returns[(n) >> 3] |= 1 << ((n) & 7))
 #define get_bit(n)      (returns[(n) >> 3] & (1 << ((n) & 7)))
@@ -57,7 +58,8 @@
  *   res = c;
  * return res;
  */
-void normalize_one_return(ir_graph *irg) {
+void normalize_one_return(ir_graph *irg)
+{
        ir_node *endbl = get_irg_end_block(irg);
        int i, j, k, n, last_idx, n_rets, n_ret_vals = -1;
        unsigned char *returns;
@@ -116,7 +118,7 @@ void normalize_one_return(ir_graph *irg) {
                        ir_node *block = get_nodes_block(ret);
 
                        /* create a new Jmp for every Ret and place the in in */
-                       in[j] = new_r_Jmp(irg, block);
+                       in[j] = new_r_Jmp(block);
 
                        /* save the return values and shuffle them */
                        for (k = 0; k < n_ret_vals; ++k)
@@ -149,10 +151,10 @@ void normalize_one_return(ir_graph *irg) {
                if (first)
                        in[i] = first;
                else
-                       in[i] = new_r_Phi(irg, block, n_rets, &retvals[j], get_irn_mode(retvals[j]));
+                       in[i] = new_r_Phi(block, n_rets, &retvals[j], get_irn_mode(retvals[j]));
        }
 
-       endbl_in[last_idx++] = new_rd_Return(combined_dbgi, irg, block, in[0], n_ret_vals-1, &in[1]);
+       endbl_in[last_idx++] = new_rd_Return(combined_dbgi, block, in[0], n_ret_vals-1, &in[1]);
 
        set_irn_in(endbl, last_idx, endbl_in);
 
@@ -161,9 +163,13 @@ void normalize_one_return(ir_graph *irg) {
         * trouts and callee-state should be still valid
         */
        set_irg_doms_inconsistent(irg);
-       set_irg_outs_inconsistent(irg);
        set_irg_extblk_inconsistent(irg);
-       set_irg_loopinfo_inconsistent(irg);
+}
+
+/* Create a graph pass. */
+ir_graph_pass_t *normalize_one_return_pass(const char *name)
+{
+       return def_graph_pass(name ? name : "one_ret", normalize_one_return);
 }
 
 /**
@@ -173,7 +179,7 @@ void normalize_one_return(ir_graph *irg) {
  * with the Return, otherwise they are dead (because the Return leaves
  * the graph, so no more users of the other nodes can exists.
  *
- * We can move a Return, if it's predecessors are Phi nodes or
+ * We can move a Return, if its predecessors are Phi nodes or
  * comes from another block. In the later case, it is always possible
  * to move the Return one block up, because the predecessor block must
  * dominate the Return block (SSA) and then it dominates the predecessor
@@ -182,7 +188,8 @@ void normalize_one_return(ir_graph *irg) {
  * All predecessors of the Return block must be Jmp's of course, or we
  * cannot move it up, so we add blocks if needed.
  */
-static int can_move_ret(ir_node *ret) {
+static int can_move_ret(ir_node *ret)
+{
        ir_node *retbl = get_nodes_block(ret);
        int i, n = get_irn_arity(ret);
 
@@ -199,7 +206,7 @@ static int can_move_ret(ir_node *ret) {
        /* check, that predecessors are Jmps */
        n = get_Block_n_cfgpreds(retbl);
        /* we cannot move above a labeled block, as this might kill the block */
-       if (n <= 1 || has_Block_label(retbl))
+       if (n <= 1 || has_Block_entity(retbl))
                return 0;
        for (i = 0; i < n; ++i) {
                ir_node *pred = get_Block_cfgpred(retbl, i);
@@ -209,7 +216,7 @@ static int can_move_ret(ir_node *ret) {
                        /* simply place a new block here */
                        ir_graph *irg  = get_irn_irg(retbl);
                        ir_node *block = new_r_Block(irg, 1, &pred);
-                       ir_node *jmp   = new_r_Jmp(irg, block);
+                       ir_node *jmp   = new_r_Jmp(block);
                        set_Block_cfgpred(retbl, i, jmp);
                }
        }
@@ -236,7 +243,8 @@ static int can_move_ret(ir_node *ret) {
  * else
  *   return c;
  */
-void normalize_n_returns(ir_graph *irg) {
+void normalize_n_returns(ir_graph *irg)
+{
        int i, j, n, n_rets, n_finals, n_ret_vals;
        ir_node *list  = NULL;
        ir_node *final = NULL;
@@ -287,7 +295,7 @@ void normalize_n_returns(ir_graph *irg) {
                dbg_info *dbgi  = get_irn_dbg_info(ret);
                ir_node  *phiM;
 
-               list = get_irn_link(ret);
+               list = (ir_node*)get_irn_link(ret);
                --n_rets;
 
                n = get_Block_n_cfgpreds(block);
@@ -308,7 +316,7 @@ void normalize_n_returns(ir_graph *irg) {
                                in[j] = (is_Phi(pred) && get_nodes_block(pred) == block) ? get_Phi_pred(pred, i) : pred;
                        }
 
-                       new_ret = new_rd_Return(dbgi, irg, new_bl, in[0], n_ret_vals - 1, &in[1]);
+                       new_ret = new_rd_Return(dbgi, new_bl, in[0], n_ret_vals - 1, &in[1]);
 
                        if (! is_Bad(new_ret)) {
                                /*
@@ -330,7 +338,7 @@ void normalize_n_returns(ir_graph *irg) {
                        }
 
                        /* remove the Jmp, we have placed a Return here */
-                       exchange(jmp, new_r_Bad(irg));
+                       exchange(jmp, new_r_Bad(irg, mode_X));
                }
 
                /*
@@ -343,7 +351,7 @@ void normalize_n_returns(ir_graph *irg) {
                        n = get_End_n_keepalives(end);
                        for (i = 0; i < n; ++i) {
                                if (get_End_keepalive(end, i) == phiM) {
-                                       set_End_keepalive(end, i, new_r_Bad(irg));
+                                       set_End_keepalive(end, i, new_r_Bad(irg, mode_M));
                                        break;
                                }
                        }
@@ -356,7 +364,7 @@ void normalize_n_returns(ir_graph *irg) {
         */
        in = ALLOCAN(ir_node*, n_finals);
 
-       for (i = 0; final; ++i, final = get_irn_link(final))
+       for (i = 0; final != NULL; ++i, final = (ir_node*)get_irn_link(final))
                in[i] = final;
 
        exchange(endbl, new_r_Block(irg, n_finals, in));
@@ -370,6 +378,10 @@ void normalize_n_returns(ir_graph *irg) {
         */
        set_irg_doms_inconsistent(irg);
        set_irg_extblk_inconsistent(irg);  /* may not be needed */
-       set_irg_outs_inconsistent(irg);
-       set_irg_loopinfo_inconsistent(current_ir_graph);
+}
+
+/* Create a graph pass. */
+ir_graph_pass_t *normalize_n_returns_pass(const char *name)
+{
+       return def_graph_pass(name ? name : "n_rets", normalize_n_returns);
 }