X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fana%2Firbackedge.c;h=8a39fe23e9ea705b93b2c6a32876386408674b1d;hb=4bad1346ff2abc3923beea23e5ac949acc7ca514;hp=9387fb24cc28ac15244b657855fe3fbe41a3bb16;hpb=ac7a8d6d17e3080b94233fb5ab099591b9dc757b;p=libfirm

diff --git a/ir/ana/irbackedge.c b/ir/ana/irbackedge.c
index 9387fb24c..8a39fe23e 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,7 +82,7 @@ static INLINE bool legal_backarray (ir_node *n) {
 }
 
 
-INLINE void fix_backedges(struct obstack *obst, ir_node *n) {
+void fix_backedges(struct obstack *obst, ir_node *n) {
   opcode opc = get_irn_opcode(n);
   int *arr = mere_get_backarray(n);
   if (ARR_LEN(arr) == ARR_LEN(get_irn_in(n))-1)
@@ -89,9 +90,9 @@ INLINE void fix_backedges(struct obstack *obst, ir_node *n) {
   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)
+    if ((opc == iro_Block) && !get_interprocedural_view())
       n->attr.block.backedge = arr;
-    if ((opc == iro_Block) && interprocedural_view)
+    if ((opc == iro_Block) && get_interprocedural_view())
       n->attr.block.cg_backedge = arr;
     if (opc == iro_Filter) n->attr.filter.backedge = arr;
     return;
@@ -104,7 +105,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];
@@ -129,25 +149,32 @@ void set_not_backedge (ir_node *n, int pos) {
 bool has_backedges (ir_node *n) {
   int i;
   int *ba = get_backarray (n);
-  if (ba)
-    for (i = 0; i < get_irn_arity(n); i++)
+  if (ba) {
+    int arity = get_irn_arity(n);
+    for (i = 0; i < arity; i++)
       if (ba[i]) return true;
+  }
   return false;
 }
 
 /** Sets all backedge information to zero. */
 void clear_backedges (ir_node *n) {
-  int i, rem = interprocedural_view;
+  int i, arity;
+  int rem = get_interprocedural_view();
   int *ba;
-  interprocedural_view = 0;
+  set_interprocedural_view(false);
   ba = get_backarray (n);
-  if (ba)
-    for (i = 0; i < get_irn_arity(n); i++)
+  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)
-    for (i = 0; i < get_irn_arity(n); i++)
+  if (ba) {
+    arity = get_irn_arity(n);
+    for (i = 0; i < arity; i++)
       ba[i] = 0;
-  interprocedural_view = rem;
+  }
+  set_interprocedural_view(rem);
 }