Simple Load/Store optimization

[libfirm] / ir / opt / tailrec.c

diff --git a/ir/opt/tailrec.c b/ir/opt/tailrec.c
index 70b9ba2..356ee94 100644 (file)
--- a/ir/opt/tailrec.c
+++ b/ir/opt/tailrec.c
@@ -24,7 +24,6 @@
 #include "irgraph_t.h"
 #include "ircons.h"
 #include "irflag.h"
-#include "tv.h"
 #include "firmstat.h"
 
 /**
@@ -33,6 +32,7 @@
 typedef struct _collect_t {
   ir_node *proj_X;             /**< initial exec proj */
   ir_node *block;              /**< old first block */
+  int     blk_idx;             /**< cfgpred index of the initial exec in block */
   ir_node *proj_m;             /**< linked list of memory from start proj's */
   ir_node *proj_data;          /**< linked list of all parameter access proj's */
 } collect_t;
@@ -46,15 +46,15 @@ static void collect_data(ir_node *node, void *env)
   ir_node *pred;
   ir_op *op;
 
-  switch (intern_get_irn_opcode(node)) {
+  switch (get_irn_opcode(node)) {
   case iro_Proj:
     pred = get_Proj_pred(node);
 
-    op = intern_get_irn_op(pred);
+    op = get_irn_op(pred);
     if (op == op_Proj) {
       ir_node *start = get_Proj_pred(pred);
 
-      if (intern_get_irn_op(start) == op_Start) {
+      if (get_irn_op(start) == op_Start) {
        if (get_Proj_proj(pred) == pn_Start_T_args) {
          /* found Proj(ProjT(Start)) */
          set_irn_link(node, data->proj_data);
@@ -87,7 +87,8 @@ static void collect_data(ir_node *node, void *env)
     if (node != current_ir_graph->start_block) {
       for (i = 0; i < n_pred; ++i) {
        if (get_Block_cfgpred(node, i) == data->proj_X) {
-         data->block = node;
+         data->block   = node;
+         data->blk_idx = i;
          break;
        }
       }
@@ -135,6 +136,7 @@ static void do_opt_tail_rec(ir_graph *irg, ir_node *rets, int n_tail_calls)
   /* collect needed data */
   data.proj_X    = NULL;
   data.block     = NULL;
+  data.blk_idx   = -1;
   data.proj_m    = NULL;
   data.proj_data = NULL;
   irg_walk_graph(irg, NULL, collect_data, &data);
@@ -159,7 +161,7 @@ static void do_opt_tail_rec(ir_graph *irg, ir_node *rets, int n_tail_calls)
   for (i = 1, p = rets; p; p = get_irn_link(p)) {
     ir_node *jmp;
 
-    switch_block(get_nodes_Block(p));
+    set_cur_block(get_nodes_block(p));
     jmp = new_Jmp();
 
     exchange(p, new_Bad());
@@ -173,12 +175,7 @@ static void do_opt_tail_rec(ir_graph *irg, ir_node *rets, int n_tail_calls)
   jmp   = new_Jmp();
 
   /* the old first block is now the second one */
-  for (i = 0; i < get_Block_n_cfgpreds(data.block); ++i) {
-    if (get_Block_cfgpred(data.block, i) == data.proj_X) {
-      set_Block_cfgpred(data.block, i, jmp);
-      break;
-    }
-  }
+  set_Block_cfgpred(data.block, data.blk_idx, jmp);
 
   /* allocate phi's, position 0 contains the memory phi */
   NEW_ARR_A(ir_node *, phis, n_params + 1);
@@ -192,6 +189,8 @@ static void do_opt_tail_rec(ir_graph *irg, ir_node *rets, int n_tail_calls)
     in[i] = get_Call_mem(calls);
     ++i;
   }
+  assert(i == n_tail_calls + 1);
+
   phis[0] = new_rd_Phi(NULL, irg, block, n_tail_calls + 1, in, mode_M);
 
   /* build the data phi's */
@@ -255,36 +254,34 @@ void opt_tail_rec_irg(ir_graph *irg)
   for (i = 0; i < n_preds; ++i) {
     ir_node *ret = get_Block_cfgpred(end_block, i);
     ir_node *proj_m, *call, *call_ptr;
-    tarval *tv;
     entity *ent;
     int j, n_ress;
     ir_node **ress;
 
     /* search all returns of a block */
-    if (intern_get_irn_op(ret) != op_Return)
+    if (get_irn_op(ret) != op_Return)
       continue;
 
     /* check, if it's a Return self() */
     proj_m = get_Return_mem(ret);
 
-    if (intern_get_irn_op(proj_m) != op_Proj)
+    if (get_irn_op(proj_m) != op_Proj)
       continue;
 
     call = get_Proj_pred(proj_m);
-    if (intern_get_irn_op(call) != op_Call)
+    if (get_irn_op(call) != op_Call)
       continue;
 
     /* check if it's a recursive call */
     call_ptr = get_Call_ptr(call);
 
-    if (intern_get_irn_op(call_ptr) != op_Const)
+    if (get_irn_op(call_ptr) != op_SymConst)
       continue;
 
-    tv = get_Const_tarval(call_ptr);
-    if (! tarval_is_entity(tv))
+    if (get_SymConst_kind(call_ptr) != symconst_addr_ent)
       continue;
 
-    ent = tarval_to_entity(tv);
+    ent = get_SymConst_entity(call_ptr);
     if (!ent || get_entity_irg(ent) != irg)
       continue;
 
@@ -297,14 +294,14 @@ void opt_tail_rec_irg(ir_graph *irg)
       ir_node *proj_proj;
       ir_node *irn;
 
-      if (intern_get_irn_op(proj) != op_Proj) {
+      if (get_irn_op(proj) != op_Proj) {
        /* not routed to a call */
        break;
       }
 
       proj_proj = get_Proj_pred(proj);
 
-      if (intern_get_irn_op(proj) != op_Proj) {
+      if (get_irn_op(proj) != op_Proj) {
        /* not routed to a call */
        break;
       }