X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fana%2Fcgana.c;h=a4052fadef085d893a14f9e35e39270b830bb65e;hb=01c4c27c4b7824dd0020f6fd2218edbe9ab40548;hp=7a5e26e483da173490a16371177ed11e3d0a553b;hpb=35a87ce18bd20e50e2d6b1b20a3f5476a092fe4f;p=libfirm

diff --git a/ir/ana/cgana.c b/ir/ana/cgana.c
index 7a5e26e48..a4052fade 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.
  *
@@ -51,7 +50,6 @@
 #include "dbginfo_t.h"
 #include "iropt_dbg.h"
 
-#include "eset.h"
 #include "pmap.h"
 #include "array.h"
 #include "error.h"
@@ -61,7 +59,7 @@
 /* unambiguous address used as a mark. */
 static void *MARK = &MARK;
 
-static eset *entities = NULL;
+static pset *entities = NULL;
 
 /*--------------------------------------------------------------------------*/
 /* The analysis                                                             */
@@ -84,14 +82,14 @@ static eset *entities = NULL;
  *
  * @return Number of entities in set.
  */
-static size_t collect_impls(ir_entity *method, eset *set)
+static size_t collect_impls(ir_entity *method, pset *set)
 {
 	size_t i;
 	size_t size = 0;
 
 	if (get_entity_irg(method) != NULL) {
 		/* has an implementation */
-		eset_insert(set, method);
+		pset_insert_ptr(set, method);
 		++size;
 	}
 
@@ -111,7 +109,7 @@ static size_t collect_impls(ir_entity *method, eset *set)
 static ir_entity **get_impl_methods(ir_entity *method)
 {
 	ir_entity **arr;
-	eset      *set = eset_create();
+	pset      *set = pset_new_ptr_default();
 	size_t    size;
 
 	/* Collect all method entities that can be called here */
@@ -121,12 +119,12 @@ static ir_entity **get_impl_methods(ir_entity *method)
 		/* no overwriting methods found */
 		arr = NULL;
 	} else {
-		ir_entity * ent;
 		arr = NEW_ARR_F(ir_entity *, size);
-		for (ent = (ir_entity*) eset_first(set); size > 0; ent = (ir_entity*) eset_next(set))
+		foreach_pset(set, ir_entity, ent) {
 			arr[--size] = ent;
+		}
 	}
-	eset_destroy(set);
+	del_pset(set);
 	return arr;
 }
 
@@ -167,12 +165,12 @@ static void sel_methods_walker(ir_node *node, void *env)
 	if (is_Sel(node) && is_Method_type(get_entity_type(get_Sel_entity(node)))) {
 		ir_entity *ent = get_SymConst_entity(get_atomic_ent_value(get_Sel_entity(node)));
 
-		if (!eset_contains(entities, ent)) {
+		if (!pset_find_ptr(entities, ent)) {
 			/* Entity not yet handled. Find all (internal or external)
 			 * implemented methods that overwrites this entity.
 			 * This set is stored in the entity link. */
 			set_entity_link(ent, get_impl_methods(ent));
-			eset_insert(entities, ent);
+			pset_insert_ptr(entities, ent);
 		}
 
 		/* -- As an add on we get an optimization that removes polymorphic calls.
@@ -186,6 +184,7 @@ static void sel_methods_walker(ir_node *node, void *env)
 			 */
 			assert(get_entity_irg(ent) == NULL);
 		}
+#if 0
 		else if (get_opt_closed_world() && get_opt_dyn_meth_dispatch() &&
 			(ARR_LEN(arr) == 1 && arr[0] != NULL)) {
 			ir_node *new_node;
@@ -200,6 +199,7 @@ static void sel_methods_walker(ir_node *node, void *env)
 			DBG_OPT_POLY(node, new_node);
 			exchange(node, new_node);
 		}
+#endif
 	}
 }
 
@@ -220,7 +220,7 @@ static void sel_methods_init(void)
 	pmap *ldname_map = pmap_create();   /* Map entity names to entities: to replace
 	                                       SymConst(name) by SymConst(ent). */
 	assert(entities == NULL);
-	entities = eset_create();
+	entities = pset_new_ptr_default();
 	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 */
@@ -290,9 +290,9 @@ static ir_entity * get_Sel_method(ir_node * sel, size_t pos)
 }
 
 /* forward */
-static void free_mark(ir_node * node, eset * set);
+static void free_mark(ir_node *node, pset *set);
 
-static void free_mark_proj(ir_node * node, long n, eset * set)
+static void free_mark_proj(ir_node *node, long n, pset *set)
 {
 	assert(get_irn_mode(node) == mode_T);
 	if (get_irn_link(node) == MARK) {
@@ -347,7 +347,7 @@ static void free_mark_proj(ir_node * node, long n, eset * set)
  * @param node  the current visited node
  * @param set   the set of all free methods
  */
-static void free_mark(ir_node *node, eset * set)
+static void free_mark(ir_node *node, pset *set)
 {
 	if (get_irn_link(node) == MARK)
 		return; /* already visited */
@@ -360,7 +360,7 @@ static void free_mark(ir_node *node, eset * set)
 		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));
+				pset_insert_ptr(set, get_Sel_method(node, i));
 			}
 		}
 		break;
@@ -369,7 +369,7 @@ static void free_mark(ir_node *node, eset * set)
 		if (get_SymConst_kind(node) == symconst_addr_ent) {
 			ir_entity *ent = get_SymConst_entity(node);
 			if (is_method_entity(ent)) {
-				eset_insert(set, ent);
+				pset_insert_ptr(set, ent);
 			}
 		}
 		break;
@@ -396,7 +396,7 @@ static void free_mark(ir_node *node, eset * set)
  */
 static void free_ana_walker(ir_node *node, void *env)
 {
-	eset *set = (eset*) env;
+	pset *set = (pset*) env;
 
 	if (get_irn_link(node) == MARK) {
 		/* already visited */
@@ -455,7 +455,7 @@ static void free_ana_walker(ir_node *node, void *env)
  * which is sometimes used to anchor functions.
  */
 static void add_method_address_inititializer(ir_initializer_t *initializer,
-                                             eset *set)
+                                             pset *set)
 {
 	ir_node *n;
 	size_t  i;
@@ -465,11 +465,11 @@ 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);
+				pset_insert_ptr(set, ent);
 		}
 		return;
 	case IR_INITIALIZER_TARVAL:
@@ -497,7 +497,7 @@ static void add_method_address_inititializer(ir_initializer_t *initializer,
  *
  * which is sometimes used to anchor functions.
  */
-static void add_method_address(ir_entity *ent, eset *set)
+static void add_method_address(ir_entity *ent, pset *set)
 {
 	ir_type *tp;
 
@@ -510,19 +510,6 @@ 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)) {
-		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(irn)) {
-				ir_entity *ent2 = get_Global_entity(irn);
-
-				if (is_Method_type(get_entity_type(ent2)))
-					eset_insert(set, ent2);
-			}
-		}
 	}
 }
 
@@ -538,10 +525,9 @@ 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();
+	pset *free_set = pset_new_ptr_default();
 	size_t i, n, j, m;
 	ir_entity **arr;
-	ir_entity *ent;
 	ir_graph *irg;
 	ir_type *tp;
 	size_t length;
@@ -549,11 +535,11 @@ static size_t get_free_methods(ir_entity ***free_methods)
 	for (i = 0, n = get_irp_n_irgs(); i < n; ++i) {
 		ir_linkage linkage;
 		irg = get_irp_irg(i);
-		ent = get_irg_entity(irg);
+		ir_entity *const ent = get_irg_entity(irg);
 		linkage = get_entity_linkage(ent);
 
 		if ((linkage & IR_LINKAGE_HIDDEN_USER) || entity_is_externally_visible(ent)) {
-			eset_insert(free_set, ent);
+			pset_insert_ptr(free_set, ent);
 		}
 
 		ir_reserve_resources(irg, IR_RESOURCE_IRN_LINK);
@@ -566,27 +552,28 @@ 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 (j = 0, m = get_class_n_members(tp); j < m; ++j) {
-		ent = get_class_member(tp, j);
+		ir_entity *const ent = get_class_member(tp, j);
 		add_method_address(ent, free_set);
 	}
 	tp = get_tls_type();
 	for (j = 0, m = get_compound_n_members(tp); j < m; ++j) {
-		ent = get_compound_member(tp, j);
+		ir_entity *const ent = get_compound_member(tp, j);
 		add_method_address(ent, free_set);
 	}
 
 	/* the main program is even then "free", if it's not external visible. */
 	irg = get_irp_main_irg();
 	if (irg != NULL)
-		eset_insert(free_set, get_irg_entity(irg));
+		pset_insert_ptr(free_set, get_irg_entity(irg));
 
 	/* Finally, transform the set into an array. */
-	length = eset_count(free_set);
+	length = pset_count(free_set);
 	arr = XMALLOCN(ir_entity*, length);
-	for (i = 0, ent = (ir_entity*) eset_first(free_set); ent; ent = (ir_entity*) eset_next(free_set)) {
+	i = 0;
+	foreach_pset(free_set, ir_entity, ent) {
 		arr[i++] = ent;
 	}
-	eset_destroy(free_set);
+	del_pset(free_set);
 
 	*free_methods = arr;
 	return length;
@@ -596,9 +583,9 @@ static size_t get_free_methods(ir_entity ***free_methods)
 /* Callee analysis.                                                         */
 /*--------------------------------------------------------------------------*/
 
-static void callee_ana_node(ir_node * node, eset * methods);
+static void callee_ana_node(ir_node *node, pset *methods);
 
-static void callee_ana_proj(ir_node *node, long n, eset *methods)
+static void callee_ana_proj(ir_node *node, long n, pset *methods)
 {
 	assert(get_irn_mode(node) == mode_T);
 	if (get_irn_link(node) == MARK) {
@@ -617,7 +604,7 @@ static void callee_ana_proj(ir_node *node, long n, eset *methods)
 			if (is_Tuple(pred)) {
 				callee_ana_proj(get_Tuple_pred(pred, get_Proj_proj(node)), n, methods);
 			} else {
-				eset_insert(methods, unknown_entity); /* free method -> unknown */
+				pset_insert_ptr(methods, get_unknown_entity()); /* free method -> unknown */
 			}
 		}
 		break;
@@ -628,7 +615,7 @@ static void callee_ana_proj(ir_node *node, long n, eset *methods)
 		break;
 
 	default:
-		eset_insert(methods, unknown_entity); /* free method -> unknown */
+		pset_insert_ptr(methods, get_unknown_entity()); /* free method -> unknown */
 		break;
 	}
 }
@@ -639,7 +626,7 @@ static void callee_ana_proj(ir_node *node, long n, eset *methods)
  * @param node     the node representing the call address
  * @param methods  after call contains the set of all possibly called entities
  */
-static void callee_ana_node(ir_node *node, eset *methods)
+static void callee_ana_node(ir_node *node, pset *methods)
 {
 	assert(mode_is_reference(get_irn_mode(node)) || is_Bad(node));
 	/* Beware of recursion */
@@ -653,13 +640,13 @@ static void callee_ana_node(ir_node *node, eset *methods)
 	case iro_Const:
 		/* A direct address call. We tread this as an external
 		   call and ignore it completely. */
-		eset_insert(methods, unknown_entity); /* free method -> unknown */
+		pset_insert_ptr(methods, get_unknown_entity()); /* free method -> unknown */
 		break;
 
 	case iro_SymConst: {
 		ir_entity *ent = get_SymConst_entity(node);
 		assert(ent && is_method_entity(ent));
-		eset_insert(methods, ent);
+		pset_insert_ptr(methods, ent);
 		break;
 	}
 
@@ -669,9 +656,9 @@ static void callee_ana_node(ir_node *node, eset *methods)
 		for (i = 0, n = get_Sel_n_methods(node); i < n; ++i) {
 			ir_entity *ent = get_Sel_method(node, i);
 			if (ent != NULL) {
-				eset_insert(methods, ent);
+				pset_insert_ptr(methods, ent);
 			} else {
-				eset_insert(methods, unknown_entity);
+				pset_insert_ptr(methods, get_unknown_entity());
 			}
 		}
 		break;
@@ -706,7 +693,7 @@ static void callee_ana_node(ir_node *node, eset *methods)
 	case iro_Sub:
 	case iro_Conv:
 		/* extern */
-		eset_insert(methods, unknown_entity); /* free method -> unknown */
+		pset_insert_ptr(methods, get_unknown_entity()); /* free method -> unknown */
 		break;
 
 	default:
@@ -723,25 +710,25 @@ static void callee_walker(ir_node *call, void *env)
 {
 	(void) env;
 	if (is_Call(call)) {
-		eset *methods = eset_create();
-		ir_entity *ent;
+		pset *methods = pset_new_ptr_default();
 		ir_entity **arr;
 		size_t i;
 
 		callee_ana_node(get_Call_ptr(call), methods);
-		arr = NEW_ARR_F(ir_entity *, eset_count(methods));
-		for (i = 0, ent = (ir_entity*) eset_first(methods); ent; ent = (ir_entity*) eset_next(methods)) {
+		arr = NEW_ARR_F(ir_entity*, pset_count(methods));
+		i = 0;
+		foreach_pset(methods, ir_entity, ent) {
 			arr[i] = ent;
 			/* we want the unknown_entity on the zero position for easy tests later */
-			if (ent == unknown_entity) {
+			if (is_unknown_entity(ent)) {
 				arr[i] = arr[0];
-				arr[0] = unknown_entity;
+				arr[0] = get_unknown_entity();
 			}
 			++i;
 		}
 		set_Call_callee_arr(call, ARR_LEN(arr), arr);
 		DEL_ARR_F(arr);
-		eset_destroy(methods);
+		del_pset(methods);
 	}
 }
 
@@ -783,23 +770,18 @@ static void callee_ana(void)
 /** Frees intermediate data structures. */
 static void sel_methods_dispose(void)
 {
-	ir_entity * ent;
 	assert(entities);
-	for (ent = (ir_entity*) eset_first(entities); ent; ent = (ir_entity*) eset_next(entities)) {
-		ir_entity ** arr = (ir_entity**) get_entity_link(ent);
-		if (arr) {
+	foreach_pset(entities, ir_entity, ent) {
+		ir_entity **arr = (ir_entity**) get_entity_link(ent);
+		if (arr != NULL) {
 			DEL_ARR_F(arr);
 		}
 		set_entity_link(ent, NULL);
 	}
-	eset_destroy(entities);
+	del_pset(entities);
 	entities = NULL;
 }
 
-/*--------------------------------------------------------------------------*/
-/* Freeing the callee arrays.                                               */
-/*--------------------------------------------------------------------------*/
-
 static void destruct_walker(ir_node * node, void * env)
 {
 	(void) env;
@@ -808,10 +790,6 @@ static void destruct_walker(ir_node * node, void * env)
 	}
 }
 
-/*--------------------------------------------------------------------------*/
-/* Main drivers.                                                            */
-/*--------------------------------------------------------------------------*/
-
 size_t cgana(ir_entity ***free_methods)
 {
 	size_t length;
@@ -837,22 +815,22 @@ void free_irp_callee_info(void)
 	}
 }
 
-/* Optimize the address expressions passed to call nodes.
- *
- * This optimization performs the following transformations for
- * all ir graphs:
- * - All SymConst operations that refer to intern methods are replaced
- *   by Const operations referring to the corresponding entity.
- * - Sel nodes, that select entities that are not overwritten are
- *   replaced by Const nodes referring to the selected entity.
- * - Sel nodes, for which no method exists at all are replaced by Bad
- *   nodes.
- * - Sel nodes with a pointer input that is an Alloc node are replaced
- *   by Const nodes referring to the entity that implements the method in
- *   the type given by the Alloc node.
- */
 void opt_call_addrs(void)
 {
+	/* Optimize the address expressions passed to call nodes.
+	 *
+	 * This optimization performs the following transformations for
+	 * all ir graphs:
+	 * - All SymConst operations that refer to intern methods are replaced
+	 *   by Const operations referring to the corresponding entity.
+	 * - Sel nodes, that select entities that are not overwritten are
+	 *   replaced by Const nodes referring to the selected entity.
+	 * - Sel nodes, for which no method exists at all are replaced by Bad
+	 *   nodes.
+	 * - Sel nodes with a pointer input that is an Alloc node are replaced
+	 *   by Const nodes referring to the entity that implements the method in
+	 *   the type given by the Alloc node.
+	 */
 	sel_methods_init();
 	sel_methods_dispose();
 }