X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fana%2Firbackedge.c;h=2d60abf41db0dfbde5c0f2e8a71e3efe9d6d9d86;hb=58e533a640ff427362877a3d2f1a5142c96391e1;hp=da5690b94082014c41e772bfc6924842e72c02b0;hpb=573a548e0b35c4257e144725840d568895427d59;p=libfirm

diff --git a/ir/ana/irbackedge.c b/ir/ana/irbackedge.c
index da5690b94..2d60abf41 100644
--- a/ir/ana/irbackedge.c
+++ b/ir/ana/irbackedge.c
@@ -11,6 +11,7 @@
  */
 
 #include "irnode_t.h"
+#include "irgraph_t.h"
 #include "array.h"
 #include "irbackedge_t.h"
 
@@ -30,7 +31,7 @@ static INLINE int *mere_get_backarray(ir_node *n) {
   switch (get_irn_opcode(n)) {
   case iro_Block:
     if (!get_Block_matured(n)) return NULL;
-    if (interprocedural_view && n->attr.block.in_cg) {
+    if (get_interprocedural_view() && n->attr.block.in_cg) {
       assert(n->attr.block.cg_backedge && "backedge array not allocated!");
       return n->attr.block.cg_backedge;
     } else {
@@ -43,7 +44,7 @@ static INLINE int *mere_get_backarray(ir_node *n) {
     return n->attr.phi_backedge;
     break;
   case iro_Filter:
-    if (interprocedural_view) {
+    if (get_interprocedural_view()) {
       assert(n->attr.filter.backedge && "backedge array not allocated!");
       return n->attr.filter.backedge;
     }
@@ -70,33 +71,42 @@ static INLINE int *get_backarray(ir_node *n) {
 }
 
 /**
- * Returns true if node has no backarray, or
- *              if size of backarray == size of in array.
+ * Returns nin-zero if node has no backarray, or
+ *                  if size of backarray == size of in array.
  */
-static INLINE bool legal_backarray (ir_node *n) {
+static INLINE int legal_backarray (ir_node *n) {
   int *ba = mere_get_backarray(n);
   if (ba && (ARR_LEN(ba) != ARR_LEN(get_irn_in(n))-1))  /* Use get_irn_in -- sensitive to view! */
-    return false;
-  return true;
+    return 0;
+  return 1;
 }
 
 
-INLINE void fix_backedges(struct obstack *obst, ir_node *n) {
-  opcode opc = get_irn_opcode(n);
+void fix_backedges(struct obstack *obst, ir_node *n) {
   int *arr = mere_get_backarray(n);
-  if (ARR_LEN(arr) == ARR_LEN(get_irn_in(n))-1)
+  opcode opc;
+
+  if (! arr)
     return;
+
   if (ARR_LEN(arr) != ARR_LEN(get_irn_in(n))-1) {
     arr = new_backedge_arr(obst, ARR_LEN(get_irn_in(n))-1);
-    if (opc == iro_Phi)    n->attr.phi_backedge = arr;
-    if ((opc == iro_Block) && !interprocedural_view)
-      n->attr.block.backedge = arr;
-    if ((opc == iro_Block) && interprocedural_view)
-      n->attr.block.cg_backedge = arr;
-    if (opc == iro_Filter) n->attr.filter.backedge = arr;
-    return;
+
+    opc = get_irn_opcode(n);
+    if (opc == iro_Phi)
+      n->attr.phi_backedge = arr;
+    else if (opc == iro_Block) {
+      if (!get_interprocedural_view())
+        n->attr.block.backedge = arr;
+      else
+        n->attr.block.cg_backedge = arr;
+    }
+    else if (opc == iro_Filter)
+      n->attr.filter.backedge = arr;
   }
+
   assert(legal_backarray(n));
+
   /* @@@ more efficient in memory consumption, not possible with
    array implementation.
   if (ARR_LEN(arr) < ARR_LEN(get_irn_in(n))-1) {
@@ -104,57 +114,99 @@ INLINE void fix_backedges(struct obstack *obst, ir_node *n) {
   }*/
 }
 
-/** Returns true if the predesessor pos is a backedge. */
-bool is_backedge (ir_node *n, int pos) {
+int is_inter_backedge(ir_node *n, int pos) {
+  int res;
+  int rem = get_interprocedural_view();
+  set_interprocedural_view(0);
+  res = is_backedge(n, pos);
+  set_interprocedural_view(rem);
+  return res;
+}
+
+int is_intra_backedge(ir_node *n, int pos) {
+  int res;
+  int rem = get_interprocedural_view();
+  set_interprocedural_view(1);
+  res = is_backedge(n, pos);
+  set_interprocedural_view(rem);
+  return res;
+}
+
+
+/* Returns non-zero if the predecessor pos is a backedge. */
+int is_backedge (ir_node *n, int pos) {
   int *ba = get_backarray (n);
   if (ba) return ba[pos];
-  return false;
+  return 0;
 }
 
-/** Remarks that edge pos is a backedge. */
+/* Remarks that edge pos is a backedge. */
 void set_backedge (ir_node *n, int pos) {
   int *ba = get_backarray (n);
   assert(ba && "can only set backedges at Phi, Filter, Block nodes.");
   ba[pos] = 1;
 }
 
-/** Remarks that edge pos is a backedge. */
+/* Remarks that edge pos is a backedge. */
 void set_not_backedge (ir_node *n, int pos) {
   int *ba = get_backarray (n);
   assert(ba && "can only set backedges at Phi, Filter, Block nodes.");
   ba[pos] = 0;
 }
 
-/** Returns true if n has backedges. */
-bool has_backedges (ir_node *n) {
+/* Returns non-zero if n has backedges. */
+int has_backedges (ir_node *n) {
   int i;
   int *ba = get_backarray (n);
   if (ba) {
     int arity = get_irn_arity(n);
     for (i = 0; i < arity; i++)
-      if (ba[i]) return true;
+      if (ba[i]) return 1;
   }
-  return false;
+  return 0;
 }
 
 /** Sets all backedge information to zero. */
 void clear_backedges (ir_node *n) {
   int i, arity;
-  int rem = interprocedural_view;
+  int rem = get_interprocedural_view();
   int *ba;
-  interprocedural_view = 0;
+  set_interprocedural_view(0);
   ba = get_backarray (n);
   if (ba) {
     arity = get_irn_arity(n);
     for (i = 0; i < arity; i++)
       ba[i] = 0;
   }
-  interprocedural_view = 1;
+  set_interprocedural_view(1);
   ba = get_backarray (n);
   if (ba) {
     arity = get_irn_arity(n);
     for (i = 0; i < arity; i++)
       ba[i] = 0;
   }
-  interprocedural_view = rem;
+  set_interprocedural_view(rem);
+}
+
+int *new_backedge_arr(struct obstack *obst, int size) {
+  int *res = NEW_ARR_D (int, obst, size);
+  memset(res, 0, sizeof(int) * size);
+  return res;
+}
+
+/* TODO: add an ir_op operation */
+void new_backedge_info(ir_node *n) {
+  switch(get_irn_opcode(n)) {
+  case iro_Block:
+    n->attr.block.cg_backedge = NULL;
+    n->attr.block.backedge = new_backedge_arr(current_ir_graph->obst, get_irn_arity(n));
+    break;
+  case iro_Phi:
+    n->attr.phi_backedge = new_backedge_arr(current_ir_graph->obst, get_irn_arity(n));
+    break;
+  case iro_Filter:
+    n->attr.filter.backedge = new_backedge_arr(current_ir_graph->obst, get_irn_arity(n));
+    break;
+  default: ;
+  }
 }