renamed SubSP to SubSPandCopy, add some constants

[libfirm] / ir / be / bepeephole.c

diff --git a/ir/be/bepeephole.c b/ir/be/bepeephole.c
index 48e32bf..3194b4b 100644 (file)
--- a/ir/be/bepeephole.c
+++ b/ir/be/bepeephole.c
@@ -32,6 +32,7 @@
 #include "iredges_t.h"
 #include "irgwalk.h"
 #include "irprintf.h"
+#include "irgmod.h"
 #include "error.h"
 
 #include "beirg_t.h"
@@ -217,43 +218,24 @@ static void process_block(ir_node *block, void *data)
 /**
  * Walk through the block schedule and skip all barrier nodes.
  */
-static void skip_barrier(ir_node *ret_blk) {
+static void skip_barrier(ir_node *ret_blk, ir_graph *irg) {
        ir_node *irn;
 
        sched_foreach_reverse(ret_blk, irn) {
-               int i;
+               if (be_is_Barrier(irn)) {
+                       const ir_edge_t *edge, *next;
 
-               for (i = get_irn_arity(irn) - 1; i >= 0; --i) {
-                       ir_node *proj = get_irn_n(irn, i);
+                       foreach_out_edge_safe(irn, edge, next) {
+                               ir_node *proj = get_edge_src_irn(edge);
+                               int      pn   = (int)get_Proj_proj(proj);
+                               ir_node *pred = get_irn_n(irn, pn);
 
-                       if (is_Proj(proj)) {
-                               ir_node *barrier = get_Proj_pred(proj);
-
-                               if (be_is_Barrier(barrier)) {
-                                       int pn        = (int)get_Proj_proj(proj);
-                                       ir_node *pred = get_irn_n(barrier, pn);
-
-                                       set_irn_n(irn, i, pred);
-                                       if (sched_is_scheduled(barrier))
-                                               sched_remove(barrier);
-                               }
-                       }
-               }
-               for (i = get_irn_deps(irn) - 1; i >= 0; --i) {
-                       ir_node *proj = get_irn_dep(irn, i);
-
-                       if (is_Proj(proj)) {
-                               ir_node *barrier = get_Proj_pred(proj);
-
-                               if (be_is_Barrier(barrier)) {
-                                       int pn        = (int)get_Proj_proj(proj);
-                                       ir_node *pred = get_irn_n(barrier, pn);
-
-                                       set_irn_dep(irn, i, pred);
-                                       if (sched_is_scheduled(barrier))
-                                               sched_remove(barrier);
-                               }
+                               edges_reroute_kind(proj, pred, EDGE_KIND_NORMAL, irg);
+                               edges_reroute_kind(proj, pred, EDGE_KIND_DEP, irg);
                        }
+                       sched_remove(irn);
+                       kill_node(irn);
+                       break;
                }
        }
 }
@@ -271,14 +253,66 @@ static void       kill_barriers(ir_graph *irg) {
                ir_node *be_ret = get_Block_cfgpred(end_blk, i);
                ir_node *ret_blk = get_nodes_block(be_ret);
 
-               skip_barrier(ret_blk);
+               skip_barrier(ret_blk, irg);
        }
 
        /* skip the barrier on the start block */
        start_blk = get_irg_start_block(irg);
-       skip_barrier(start_blk);
+       skip_barrier(start_blk, irg);
 }
 
+/*
+ * Tries to optimize a beIncSp node with it's previous IncSP node.
+ * Must be run from a be_peephole_opt() context.
+ */
+void be_peephole_IncSP_IncSP(ir_node *node)
+{
+       int      pred_offs;
+       int      curr_offs;
+       int      offs;
+       ir_node *pred = be_get_IncSP_pred(node);
+       ir_node *predpred;
+
+       if (!be_is_IncSP(pred))
+               return;
+
+       if (get_irn_n_edges(pred) > 1)
+               return;
+
+       pred_offs = be_get_IncSP_offset(pred);
+       curr_offs = be_get_IncSP_offset(node);
+
+       if (pred_offs == BE_STACK_FRAME_SIZE_EXPAND) {
+               if (curr_offs != BE_STACK_FRAME_SIZE_SHRINK) {
+                       return;
+               }
+               offs = 0;
+       } else if (pred_offs == BE_STACK_FRAME_SIZE_SHRINK) {
+               if (curr_offs != BE_STACK_FRAME_SIZE_EXPAND) {
+                       return;
+               }
+               offs = 0;
+       } else if (curr_offs == BE_STACK_FRAME_SIZE_EXPAND ||
+                  curr_offs == BE_STACK_FRAME_SIZE_SHRINK) {
+               return;
+       } else {
+               offs = curr_offs + pred_offs;
+       }
+
+       /* add pred offset to ours and remove pred IncSP */
+       be_set_IncSP_offset(node, offs);
+
+       predpred = be_get_IncSP_pred(pred);
+       be_peephole_before_exchange(pred, predpred);
+
+       /* rewire dependency edges */
+       edges_reroute_kind(pred, predpred, EDGE_KIND_DEP, current_ir_graph);
+       be_set_IncSP_pred(node, predpred);
+       sched_remove(pred);
+       be_kill_node(pred);
+
+       be_peephole_after_exchange(predpred);
+}
 
 void be_peephole_opt(be_irg_t *birg)
 {