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

diff --git a/ir/ana/irbackedge.c b/ir/ana/irbackedge.c
index da5690b94..77b175043 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;
     }
@@ -81,22 +82,31 @@ static INLINE bool legal_backarray (ir_node *n) {
 }
 
 
-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,7 +114,26 @@ INLINE void fix_backedges(struct obstack *obst, ir_node *n) {
   }*/
 }
 
-/** Returns true if the predesessor pos is a backedge. */
+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 true if the predecessor pos is a backedge. */
 bool is_backedge (ir_node *n, int pos) {
   int *ba = get_backarray (n);
   if (ba) return ba[pos];
@@ -140,21 +169,21 @@ bool has_backedges (ir_node *n) {
 /** 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(false);
   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(true);
   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);
 }