new GVN-PRE implementation

[libfirm] / ir / ir / irnode.c

diff --git a/ir/ir/irnode.c b/ir/ir/irnode.c
index cbe41f8..260f18a 100644 (file)
--- a/ir/ir/irnode.c
+++ b/ir/ir/irnode.c
@@ -927,22 +927,35 @@ void set_End_keepalives(ir_node *end, int n, ir_node *in[]) {
 
 /* Set new keep-alives from old keep-alives, skipping irn */
 void remove_End_keepalive(ir_node *end, ir_node *irn) {
-       int     n = get_End_n_keepalives(end);
-       ir_node **in;
-       int     i, idx;
-
-       NEW_ARR_A(ir_node *, in, n);
-
-       for (idx = i = 0; i < n; ++i) {
-               ir_node *old_ka = get_End_keepalive(end, i);
-
-               /* skip irn */
-               if (old_ka != irn)
-                       in[idx++] = old_ka;
+       int      n = get_End_n_keepalives(end);
+       int      i, idx;
+       ir_graph *irg;
+
+       idx = -1;
+       for (i = n -1; i >= 0; --i) {
+               ir_node *old_ka = end->in[1 + END_KEEPALIVE_OFFSET + i];
+
+               /* find irn */
+               if (old_ka == irn) {
+                       idx = i;
+                       goto found;
+               }
        }
-
-       /* set new keep-alives */
-       set_End_keepalives(end, idx, in);
+       return;
+found:
+       irg = get_irn_irg(end);
+
+       /* remove the edge */
+       edges_notify_edge(end, idx, NULL, irn, irg);
+
+       if (idx != n - 1) {
+               /* exchange with the last one */
+               ir_node *old = end->in[1 + END_KEEPALIVE_OFFSET + n - 1];
+               edges_notify_edge(end, n - 1, NULL, old, irg);
+               end->in[1 + END_KEEPALIVE_OFFSET + idx] = old;
+               edges_notify_edge(end, idx, old, NULL, irg);
+       }
+       ARR_RESIZE(ir_node *, end->in, (n - 1) + 1 + END_KEEPALIVE_OFFSET);
 }
 
 void
@@ -1502,7 +1515,7 @@ UNOP(Not)
 BINOP(Shl)
 BINOP(Shr)
 BINOP(Shrs)
-BINOP(Rot)
+BINOP(Rotl)
 BINOP(Cmp)
 UNOP(Conv)
 UNOP(Cast)
@@ -2051,6 +2064,11 @@ set_Proj_proj(ir_node *node, long proj) {
 #endif /* INTERPROCEDURAL_VIEW */
 }
 
+/* Returns non-zero if a node is a routine parameter. */
+int (is_arg_Proj)(const ir_node *node) {
+       return _is_arg_Proj(node);
+}
+
 ir_node **
 get_Tuple_preds_arr(ir_node *node) {
        assert(is_Tuple(node));
@@ -2715,8 +2733,8 @@ int
 }
 
 int
-(is_Rot)(const ir_node *node) {
-       return _is_Rot(node);
+(is_Rotl)(const ir_node *node) {
+       return _is_Rotl(node);
 }
 
 int