X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fana%2Firbackedge.c;h=13fee326f6925c57a7baa2ad84907b1bfc9e98f7;hb=d5d7159c209a9e5c5fa276f770b5b28a217990a8;hp=7bfd1c0c2108742c08ad4387483e1452c8a9167c;hpb=974215da1a935f250766874d0f7a7ddfa34bc4ef;p=libfirm

diff --git a/ir/ana/irbackedge.c b/ir/ana/irbackedge.c
index 7bfd1c0c2..13fee326f 100644
--- a/ir/ana/irbackedge.c
+++ b/ir/ana/irbackedge.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1995-2007 University of Karlsruhe.  All right reserved.
+ * Copyright (C) 1995-2011 University of Karlsruhe.  All right reserved.
  *
  * This file is part of libFirm.
  *
@@ -24,14 +24,13 @@
  * @date      7.2002
  * @version   $Id$
  */
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include "irnode_t.h"
 #include "irgraph_t.h"
 #include "array.h"
 #include "irbackedge_t.h"
+#include "raw_bitset.h"
 
 /*--------------------------------------------------------------------*/
 /* Backedge information.                                              */
@@ -45,188 +44,126 @@
  * Does not assert whether the backarray is correct -- use
  * very careful!
  */
-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 (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;
-  case iro_Phi:
-      assert(n->attr.phi_backedge && "backedge array not allocated!");
-    return n->attr.phi_backedge;
-    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;
+static bitset_t *mere_get_backarray(ir_node *n)
+{
+	switch (get_irn_opcode(n)) {
+	case iro_Block:
+		if (!get_Block_matured(n)) return NULL;
+
+		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;
+	}
+	return NULL;
 }
 
 /**
  * Returns backarray if the node can have backedges, else returns
  * NULL.
  */
-static INLINE int *get_backarray(ir_node *n) {
-  int *ba = mere_get_backarray(n);
+static bitset_t *get_backarray(ir_node *n)
+{
+	bitset_t *ba = mere_get_backarray(n);
 
 #ifndef NDEBUG
-  if (ba) {
-    int bal = ARR_LEN(ba);  /* avoid makro expansion in assertion. */
-    int inl = ARR_LEN(get_irn_in(n)) -1;  /* Use get_irn_in -- sensitive to view! */
-    assert(bal == inl && "backedge array with faulty length");
-  }
+	if (ba) {
+		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
 
-  return ba;
+	return ba;
 }
 
+#ifndef NDEBUG
 /**
- * Returns nin-zero if node has no backarray, or
+ * Returns non-zero if node has no backarray, or
  *                  if size of backarray == size of in array.
  */
-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 0;
-  return 1;
+static int legal_backarray(ir_node *n)
+{
+	bitset_t *ba = mere_get_backarray(n);
+	if (ba && (bitset_size(ba) != (unsigned) get_irn_arity(n)))
+		return 0;
+	return 1;
 }
+#endif
 
+void fix_backedges(struct obstack *obst, ir_node *n)
+{
+	bitset_t *arr = mere_get_backarray(n);
+	unsigned opc;
+	int arity;
 
-void fix_backedges(struct obstack *obst, ir_node *n) {
-  int *arr = mere_get_backarray(n);
-  ir_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);
-
-    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) {
-    ARR_SETLEN(int, arr, ARR_LEN(get_irn_in(n))-1);
-  }*/
-}
+	if (! arr)
+		return;
 
-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;
-}
+	arity = get_irn_arity(n);
+	if (bitset_size(arr) != (unsigned) arity) {
+		arr = new_backedge_arr(obst, arity);
 
-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;
-}
+		opc = get_irn_opcode(n);
+		if (opc == iro_Phi)
+			n->attr.phi.u.backedge = arr;
+		else if (opc == iro_Block) {
+			n->attr.block.backedge = arr;
+		}
+	}
 
+	assert(legal_backarray(n));
+}
 
 /* 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 0;
+int is_backedge(ir_node *n, int pos)
+{
+	bitset_t *ba = get_backarray(n);
+	if (ba)
+		return bitset_is_set(ba, pos);
+	return 0;
 }
 
 /* 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;
+void set_backedge(ir_node *n, int 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) {
-  int *ba = get_backarray (n);
-  assert(ba && "can only set backedges at Phi, Filter, Block nodes.");
-  ba[pos] = 0;
+void set_not_backedge(ir_node *n, int 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 i;
-  int *ba = get_backarray (n);
-  if (ba) {
-    int arity = get_irn_arity(n);
-    for (i = 0; i < arity; i++)
-      if (ba[i]) return 1;
-  }
-  return 0;
+int has_backedges(ir_node *n)
+{
+	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;
-  int rem = get_interprocedural_view();
-  int *ba;
-  set_interprocedural_view(0);
-  ba = get_backarray (n);
-  if (ba) {
-    arity = get_irn_arity(n);
-    for (i = 0; i < arity; i++)
-      ba[i] = 0;
-  }
-  set_interprocedural_view(1);
-  ba = get_backarray (n);
-  if (ba) {
-    arity = get_irn_arity(n);
-    for (i = 0; i < arity; i++)
-      ba[i] = 0;
-  }
-  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;
+void clear_backedges(ir_node *n)
+{
+	bitset_t *ba = get_backarray(n);
+	if (ba != NULL) {
+		bitset_clear_all(ba);
+	}
 }
 
-/* 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: ;
-  }
+/* Allocate a new backedge array on the obstack for given size. */
+bitset_t *new_backedge_arr(struct obstack *obst, size_t size)
+{
+	return bitset_obstack_alloc(obst, size);
 }