X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fana%2Fcgana.c;h=e70ece616459637104a35e28d14479a393a7fe2a;hb=6ccff2965d94c272f71df2a1655336af47bb7753;hp=9f97c3f1df89b7526041d5b6dc03d01a5b258b55;hpb=e88385016800d3c56c3fa09770e9f7995c42e106;p=libfirm

diff --git a/ir/ana/cgana.c b/ir/ana/cgana.c
index 9f97c3f1d..e70ece616 100644
--- a/ir/ana/cgana.c
+++ b/ir/ana/cgana.c
@@ -22,7 +22,6 @@
  * @brief      Intraprozedural analyses to estimate the call graph.
  * @author     Hubert Schmid
  * @date       09.06.2002
- * @version    $Id$
  * @brief
  *  Interprocedural analysis to estimate the calling relation.
  *
@@ -36,7 +35,6 @@
 #include <string.h>
 
 #include "cgana.h"
-#include "rta.h"
 
 #include "xmalloc.h"
 #include "irnode_t.h"
@@ -76,66 +74,56 @@ static eset *entities = NULL;
 
 /** Collect the entity representing the implementation of this
  *  method (not the same if inherited) and all entities for overwriting
- *  implementations in "set".
- *  If the implementation of the method is not included in the
- *  compilation unit "open" is set to true.
+ *  implementations in parameter set.
  *  A recursive descend in the overwritten relation.
  *  Cycle-free, therefore must terminate.
  *
- * @param method
+ * @param method   the overwritten method
  * @param set      A set of entities.
- * @param size     Number of entities in set.
- * @param open
+ *
+ * @return Number of entities in set.
  */
-static void collect_impls(ir_entity *method, eset *set, int *size, int *open)
+static size_t collect_impls(ir_entity *method, eset *set)
 {
-	int i;
+	size_t i;
+	size_t size = 0;
 
 	if (get_entity_irg(method) != NULL) {
+		/* has an implementation */
 		eset_insert(set, method);
-		++(*size);
+		++size;
 	}
 
 	/*- recursive descent -*/
-	for (i = get_entity_n_overwrittenby(method) - 1; i >= 0; --i)
-		collect_impls(get_entity_overwrittenby(method, i), set, size, open);
+	for (i = get_entity_n_overwrittenby(method); i > 0;)
+		size += collect_impls(get_entity_overwrittenby(method, --i), set);
+	return size;
 }
 
-/** Alle Methoden bestimmen, die die �bergebene Methode �berschreiben
- *  (und implementieren). In der zur�ckgegebenen Reihung kommt jede
- *  Methode nur einmal vor. Der Wert 'NULL' steht f�r unbekannte
- *  (externe) Methoden. Die zur�ckgegebene Reihung mu� vom Aufrufer
- *  wieder freigegeben werden (siehe "DEL_ARR_F"). Gibt es �berhaupt
- *  keine Methoden, die "method" �berschreiben, so gibt die Methode
- *  "NULL" zur�ck.
+/**
+ * Determine all methods that overwrite the given method (and implement it).
+ * The returned array must be freed by the caller (see DEL_ARR_F).
+ * If the set of overwriting methods is empty, returns NULL.
  *
- *  @param method
+ * @param method  the method
  */
-static ir_entity ** get_impl_methods(ir_entity * method)
+static ir_entity **get_impl_methods(ir_entity *method)
 {
-	eset * set = eset_create();
-	int size = 0;
-	ir_entity ** arr;
-	int open = 0;
+	ir_entity **arr;
+	eset      *set = eset_create();
+	size_t    size;
 
 	/* Collect all method entities that can be called here */
-	collect_impls(method, set, &size, &open);
+	size = collect_impls(method, set);
 
-	/* Vorgaenger einfuegen. */
-	if (size == 0 && !open) {
-		/* keine implementierte �berschriebene Methode */
+	if (size == 0) {
+		/* no overwriting methods found */
 		arr = NULL;
-	} else if (open) {
-		ir_entity * ent;
-		arr = NEW_ARR_F(ir_entity *, size + 1);
-		arr[0] = NULL;  /* Represents open method */
-		for (ent = (ir_entity*) eset_first(set); size > 0; ent = (ir_entity*) eset_next(set), --size)
-			arr[size] = ent;
 	} else {
 		ir_entity * ent;
 		arr = NEW_ARR_F(ir_entity *, size);
-		for (size -= 1, ent = (ir_entity*) eset_first(set); size >= 0; ent = (ir_entity*) eset_next(set), --size)
-			arr[size] = ent;
+		for (ent = (ir_entity*) eset_first(set); size > 0; ent = (ir_entity*) eset_next(set))
+			arr[--size] = ent;
 	}
 	eset_destroy(set);
 	return arr;
@@ -227,12 +215,12 @@ static void sel_methods_walker(ir_node *node, void *env)
  */
 static void sel_methods_init(void)
 {
-	int i;
+	size_t i, n;
 	pmap *ldname_map = pmap_create();   /* Map entity names to entities: to replace
 	                                       SymConst(name) by SymConst(ent). */
 	assert(entities == NULL);
 	entities = eset_create();
-	for (i = get_irp_n_irgs() - 1; i >= 0; --i) {
+	for (i = 0, n = get_irp_n_irgs(); i < n; ++i) {
 		ir_entity * ent = get_irg_entity(get_irp_irg(i));
 		/* only external visible methods are allowed to call by a SymConst_ptr_name */
 		if (entity_is_externally_visible(ent)) {
@@ -360,8 +348,6 @@ static void free_mark_proj(ir_node * node, long n, eset * set)
  */
 static void free_mark(ir_node *node, eset * set)
 {
-	size_t i, n;
-
 	if (get_irn_link(node) == MARK)
 		return; /* already visited */
 
@@ -371,6 +357,7 @@ static void free_mark(ir_node *node, eset * set)
 	case iro_Sel: {
 		ir_entity *ent = get_Sel_entity(node);
 		if (is_method_entity(ent)) {
+			size_t i, n;
 			for (i = 0, n = get_Sel_n_methods(node); i < n; ++i) {
 				eset_insert(set, get_Sel_method(node, i));
 			}
@@ -409,7 +396,6 @@ static void free_mark(ir_node *node, eset * set)
 static void free_ana_walker(ir_node *node, void *env)
 {
 	eset *set = (eset*) env;
-	int i;
 
 	if (get_irn_link(node) == MARK) {
 		/* already visited */
@@ -427,17 +413,21 @@ static void free_ana_walker(ir_node *node, void *env)
 		/* nothing */
 		break;
 	case iro_Call:
+	{
+		size_t i, n;
 		/* we must handle Call nodes specially, because their call address input
 		   do not expose a method address. */
 		set_irn_link(node, MARK);
-		for (i = get_Call_n_params(node) - 1; i >= 0; --i) {
+		for (i = 0, n = get_Call_n_params(node); i < n; ++i) {
 			ir_node *pred = get_Call_param(node, i);
 			if (mode_is_reference(get_irn_mode(pred))) {
 				free_mark(pred, set);
 			}
 		}
 		break;
-	default:
+	}
+	default: {
+		int i;
 		/* other nodes: Alle anderen Knoten nehmen wir als Verr�ter an, bis
 		 * jemand das Gegenteil implementiert. */
 		set_irn_link(node, MARK);
@@ -449,13 +439,14 @@ static void free_ana_walker(ir_node *node, void *env)
 		}
 		break;
 	}
+	}
 }
 
 /**
  * Add all method addresses in global new style initializers to the set.
  *
  * @note
- * We do NOT check the type here, just it it's an entity address.
+ * We do NOT check the type here, just if it's an entity address.
  * The reason for this is code like:
  *
  * void *p = function;
@@ -473,8 +464,8 @@ static void add_method_address_inititializer(ir_initializer_t *initializer,
 		n = initializer->consti.value;
 
 		/* let's check if it's the address of a function */
-		if (is_Global(n)) {
-			ir_entity *ent = get_Global_entity(n);
+		if (is_SymConst_addr_ent(n)) {
+			ir_entity *ent = get_SymConst_entity(n);
 
 			if (is_Method_type(get_entity_type(ent)))
 				eset_insert(set, ent);
@@ -498,7 +489,7 @@ static void add_method_address_inititializer(ir_initializer_t *initializer,
  * Add all method addresses in global initializers to the set.
  *
  * @note
- * We do NOT check the type here, just it it's an entity address.
+ * We do NOT check the type here, just if it's an entity address.
  * The reason for this is code like:
  *
  * void *p = function;
@@ -507,12 +498,10 @@ static void add_method_address_inititializer(ir_initializer_t *initializer,
  */
 static void add_method_address(ir_entity *ent, eset *set)
 {
-	ir_node *n;
 	ir_type *tp;
-	int i;
 
-	/* ignore methods: these of course reference it's address
-	 * TODO: remove this later once this incorrect self-intialisation is gone
+	/* ignore methods: these of course reference their addresses
+	 * TODO: remove this later once this incorrect self-initialisation is gone
 	 */
 	tp = get_entity_type(ent);
 	if (is_Method_type(tp))
@@ -521,15 +510,16 @@ static void add_method_address(ir_entity *ent, eset *set)
 	if (ent->initializer != NULL) {
 		add_method_address_inititializer(get_entity_initializer(ent), set);
 	} else if (entity_has_compound_ent_values(ent)) {
-		for (i = get_compound_ent_n_values(ent) - 1; i >= 0; --i) {
-			n = get_compound_ent_value(ent, i);
+		size_t i, n;
+		for (i = 0, n = get_compound_ent_n_values(ent); i < n; ++i) {
+			ir_node *irn = get_compound_ent_value(ent, i);
 
 			/* let's check if it's the address of a function */
-			if (is_Global(n)) {
-				ir_entity *ent = get_Global_entity(n);
+			if (is_SymConst_addr_ent(irn)) {
+				ir_entity *ent2 = get_SymConst_entity(irn);
 
-				if (is_Method_type(get_entity_type(ent)))
-					eset_insert(set, ent);
+				if (is_Method_type(get_entity_type(ent2)))
+					eset_insert(set, ent2);
 			}
 		}
 	}
@@ -548,21 +538,20 @@ static void add_method_address(ir_entity *ent, eset *set)
 static size_t get_free_methods(ir_entity ***free_methods)
 {
 	eset *free_set = eset_create();
-	int i;
+	size_t i, n, j, m;
 	ir_entity **arr;
 	ir_entity *ent;
 	ir_graph *irg;
 	ir_type *tp;
 	size_t length;
 
-	for (i = get_irp_n_irgs() - 1; i >= 0; --i) {
+	for (i = 0, n = get_irp_n_irgs(); i < n; ++i) {
 		ir_linkage linkage;
 		irg = get_irp_irg(i);
 		ent = get_irg_entity(irg);
 		linkage = get_entity_linkage(ent);
 
-		if (entity_is_externally_visible(ent)
-				|| (linkage & IR_LINKAGE_HIDDEN_USER)) {
+		if ((linkage & IR_LINKAGE_HIDDEN_USER) || entity_is_externally_visible(ent)) {
 			eset_insert(free_set, ent);
 		}
 
@@ -575,13 +564,13 @@ static size_t get_free_methods(ir_entity ***free_methods)
 
 	/* insert all methods that are used in global variables initializers */
 	tp = get_glob_type();
-	for (i = get_class_n_members(tp) - 1; i >= 0; --i) {
-		ent = get_class_member(tp, i);
+	for (j = 0, m = get_class_n_members(tp); j < m; ++j) {
+		ent = get_class_member(tp, j);
 		add_method_address(ent, free_set);
 	}
 	tp = get_tls_type();
-	for (i = get_class_n_members(tp) - 1; i >= 0; --i) {
-		ent = get_class_member(tp, i);
+	for (j = 0, m = get_compound_n_members(tp); j < m; ++j) {
+		ent = get_compound_member(tp, j);
 		add_method_address(ent, free_set);
 	}
 
@@ -776,9 +765,9 @@ static void remove_Tuples(ir_node *proj, void *env)
  */
 static void callee_ana(void)
 {
-	int i;
+	size_t i, n;
 	/* analyse all graphs */
-	for (i = get_irp_n_irgs() - 1; i >= 0; --i) {
+	for (i = 0, n = get_irp_n_irgs(); i < n; ++i) {
 		ir_graph *irg = get_irp_irg(i);
 		irg_walk_graph(irg, callee_walker, remove_Tuples, NULL);
 		set_irg_callee_info_state(irg, irg_callee_info_consistent);
@@ -841,8 +830,8 @@ void free_callee_info(ir_graph *irg)
 
 void free_irp_callee_info(void)
 {
-	int i;
-	for (i = get_irp_n_irgs() - 1; i >= 0; --i) {
+	size_t i, n;
+	for (i = 0, n = get_irp_n_irgs(); i < n; ++i) {
 		free_callee_info(get_irp_irg(i));
 	}
 }