X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fana%2Firbackedge.c;h=d0aca0e1f283d6b5cf4fbd98849a88eac8eca5b6;hb=5dd864dc8ffa757c3f44b2e49fd6c6f09ad25a03;hp=b5f37b095ec387d88af0f4de905d231132313308;hpb=2807bb5b1ed34c23dc30d228ab0686c6fc9d6ae3;p=libfirm

diff --git a/ir/ana/irbackedge.c b/ir/ana/irbackedge.c
index b5f37b095..d0aca0e1f 100644
--- a/ir/ana/irbackedge.c
+++ b/ir/ana/irbackedge.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1995-2008 University of Karlsruhe.  All right reserved.
+ * Copyright (C) 1995-2011 University of Karlsruhe.  All right reserved.
  *
  * This file is part of libFirm.
  *
@@ -22,7 +22,6 @@
  * @brief     Access function for backedges.
  * @author    Goetz Lindenmaier
  * @date      7.2002
- * @version   $Id$
  */
 #include "config.h"
 
@@ -44,30 +43,19 @@
  * Does not assert whether the backarray is correct -- use
  * very careful!
  */
-static unsigned *mere_get_backarray(ir_node *n)
+static bitset_t *mere_get_backarray(const ir_node *n)
 {
 	switch (get_irn_opcode(n)) {
 	case iro_Block:
 		if (!get_Block_matured(n)) return NULL;
-		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 {
-			assert(n->attr.block.backedge && "backedge array not allocated!");
-			return n->attr.block.backedge;
-		}
-		break;
+
+		assert(n->attr.block.backedge && "backedge array not allocated!");
+		return n->attr.block.backedge;
 	case iro_Phi:
 		assert(n->attr.phi.u.backedge && "backedge array not allocated!");
 		return n->attr.phi.u.backedge;
+	default:
 		break;
-	case iro_Filter:
-		if (get_interprocedural_view()) {
-			assert(n->attr.filter.backedge && "backedge array not allocated!");
-			return n->attr.filter.backedge;
-		}
-		break;
-	default: ;
 	}
 	return NULL;
 }
@@ -76,14 +64,14 @@ static unsigned *mere_get_backarray(ir_node *n)
  * Returns backarray if the node can have backedges, else returns
  * NULL.
  */
-static unsigned *get_backarray(ir_node *n)
+static bitset_t *get_backarray(const ir_node *n)
 {
-	unsigned *ba = mere_get_backarray(n);
+	bitset_t *ba = mere_get_backarray(n);
 
 #ifndef NDEBUG
 	if (ba) {
-		int bal = rbitset_size(ba);  /* avoid macro expansion in assertion. */
-		int inl = get_irn_arity(n);
+		size_t bal = bitset_size(ba);  /* avoid macro expansion in assertion. */
+		size_t inl = get_irn_arity(n);
 		assert(bal == inl && "backedge array with faulty length");
 	}
 #endif
@@ -96,10 +84,10 @@ static unsigned *get_backarray(ir_node *n)
  * Returns non-zero if node has no backarray, or
  *                  if size of backarray == size of in array.
  */
-static int legal_backarray(ir_node *n)
+static int legal_backarray(const ir_node *n)
 {
-	unsigned *ba = mere_get_backarray(n);
-	if (ba && (rbitset_size(ba) != (unsigned) get_irn_arity(n)))
+	bitset_t *ba = mere_get_backarray(n);
+	if (ba && (bitset_size(ba) != (unsigned) get_irn_arity(n)))
 		return 0;
 	return 1;
 }
@@ -107,121 +95,68 @@ static int legal_backarray(ir_node *n)
 
 void fix_backedges(struct obstack *obst, ir_node *n)
 {
-	unsigned *arr = mere_get_backarray(n);
-	ir_opcode opc;
+	bitset_t *arr = mere_get_backarray(n);
+	unsigned opc;
 	int arity;
 
 	if (! arr)
 		return;
 
 	arity = get_irn_arity(n);
-	if (rbitset_size(arr) != (unsigned) arity) {
+	if (bitset_size(arr) != (unsigned) arity) {
 		arr = new_backedge_arr(obst, arity);
 
 		opc = get_irn_opcode(n);
 		if (opc == iro_Phi)
 			n->attr.phi.u.backedge = arr;
 		else if (opc == iro_Block) {
-			if (!get_interprocedural_view())
-				n->attr.block.backedge = arr;
-			else
-				n->attr.block.cg_backedge = arr;
+			n->attr.block.backedge = arr;
 		}
-		else if (opc == iro_Filter)
-			n->attr.filter.backedge = arr;
 	}
 
 	assert(legal_backarray(n));
 }
 
-#ifdef INTERPROCEDURAL_VIEW
-int is_inter_backedge(ir_node *n, int pos)
+int is_backedge(const 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;
-}
-#endif
-
-
-/* Returns non-zero if the predecessor pos is a backedge. */
-int is_backedge(ir_node *n, int pos)
-{
-	unsigned *ba = get_backarray(n);
+	bitset_t *ba = get_backarray(n);
 	if (ba)
-		return rbitset_is_set(ba, pos);
+		return bitset_is_set(ba, pos);
 	return 0;
 }
 
-/* Remarks that edge pos is a backedge. */
 void set_backedge(ir_node *n, int pos)
 {
-	unsigned *ba = get_backarray(n);
-	assert(ba && "can only set backedges at Phi, Filter, Block nodes.");
-	rbitset_set(ba, pos);
+	bitset_t *ba = get_backarray(n);
+	assert(ba && "can only set backedges at Phi, Block nodes.");
+	bitset_set(ba, pos);
 }
 
-/* Remarks that edge pos is a backedge. */
 void set_not_backedge(ir_node *n, int pos)
 {
-	unsigned *ba = get_backarray(n);
-	assert(ba && "can only set backedges at Phi, Filter, Block nodes.");
-	rbitset_clear(ba, pos);
+	bitset_t *ba = get_backarray(n);
+	assert(ba && "can only set backedges at Phi, Block nodes.");
+	bitset_clear(ba, pos);
 }
 
-/* Returns non-zero if n has backedges. */
-int has_backedges(ir_node *n)
+int has_backedges(const ir_node *n)
 {
-	unsigned *ba = get_backarray(n);
-	if (ba) {
-		int arity = get_irn_arity(n);
-		return !rbitset_is_empty(ba, arity);
+	bitset_t *ba = get_backarray(n);
+	if (ba != NULL) {
+		return !bitset_is_empty(ba);
 	}
 	return 0;
 }
 
-/** Sets all backedge information to zero. */
 void clear_backedges(ir_node *n)
 {
-	int i, arity;
-	unsigned *ba;
-#ifdef INTERPROCEDURAL_VIEW
-	int rem = get_interprocedural_view();
-	set_interprocedural_view(0);
-#endif
-	ba = get_backarray(n);
-	if (ba) {
-		arity = get_irn_arity(n);
-		for (i = 0; i < arity; i++)
-			rbitset_clear(ba, i);
-	}
-#ifdef INTERPROCEDURAL_VIEW
-	set_interprocedural_view(1);
-	ba = get_backarray (n);
-	if (ba) {
-		arity = get_irn_arity(n);
-		for (i = 0; i < arity; i++)
-			rbitset_clear(ba, i);
+	bitset_t *ba = get_backarray(n);
+	if (ba != NULL) {
+		bitset_clear_all(ba);
 	}
-	set_interprocedural_view(rem);
-#endif
 }
 
-/* Allocate a new backedge array on the obstack for given size. */
-unsigned *new_backedge_arr(struct obstack *obst, unsigned size)
+bitset_t *new_backedge_arr(struct obstack *obst, size_t size)
 {
-	return rbitset_w_size_obstack_alloc(obst, size);
+	return bitset_obstack_alloc(obst, size);
 }