X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fana%2Fcgana.c;h=a4052fadef085d893a14f9e35e39270b830bb65e;hb=01c4c27c4b7824dd0020f6fd2218edbe9ab40548;hp=96391388c4a6b50807951fe59c33b98b85208e1d;hpb=5940087c829fe63ff7c16d36b915191ec5ae3e7c;p=libfirm diff --git a/ir/ana/cgana.c b/ir/ana/cgana.c index 96391388c..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. * @@ -36,7 +35,6 @@ #include #include "cgana.h" -#include "rta.h" #include "xmalloc.h" #include "irnode_t.h" @@ -52,7 +50,6 @@ #include "dbginfo_t.h" #include "iropt_dbg.h" -#include "eset.h" #include "pmap.h" #include "array.h" #include "error.h" @@ -62,7 +59,7 @@ /* unambiguous address used as a mark. */ static void *MARK = &MARK; -static eset *entities = NULL; +static pset *entities = NULL; /*--------------------------------------------------------------------------*/ /* The analysis */ @@ -76,68 +73,58 @@ 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, pset *set) { - int i; + size_t i; + size_t size = 0; if (get_entity_irg(method) != NULL) { - eset_insert(set, method); - ++(*size); + /* has an implementation */ + pset_insert_ptr(set, method); + ++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; + pset *set = pset_new_ptr_default(); + 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; + foreach_pset(set, ir_entity, ent) { + arr[--size] = ent; + } } - eset_destroy(set); + del_pset(set); return arr; } @@ -178,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. @@ -197,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; @@ -211,6 +199,7 @@ static void sel_methods_walker(ir_node *node, void *env) DBG_OPT_POLY(node, new_node); exchange(node, new_node); } +#endif } } @@ -227,12 +216,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) { + 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 */ if (entity_is_externally_visible(ent)) { @@ -285,7 +274,7 @@ static ir_entity ** get_Sel_arr(ir_node * sel) * * @param sel the Sel node */ -static int get_Sel_n_methods(ir_node * sel) +static size_t get_Sel_n_methods(ir_node * sel) { return ARR_LEN(get_Sel_arr(sel)); } @@ -293,17 +282,17 @@ static int get_Sel_n_methods(ir_node * sel) /** * Returns the ith possible called method entity at a Sel node. */ -static ir_entity * get_Sel_method(ir_node * sel, int pos) +static ir_entity * get_Sel_method(ir_node * sel, size_t pos) { ir_entity ** arr = get_Sel_arr(sel); - assert(pos >= 0 && pos < ARR_LEN(arr)); + assert(pos < ARR_LEN(arr)); return arr[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) { @@ -358,10 +347,8 @@ 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) { - int i; - if (get_irn_link(node) == MARK) return; /* already visited */ @@ -371,8 +358,9 @@ static void free_mark(ir_node *node, eset * set) case iro_Sel: { ir_entity *ent = get_Sel_entity(node); if (is_method_entity(ent)) { - for (i = get_Sel_n_methods(node) - 1; i >= 0; --i) { - eset_insert(set, get_Sel_method(node, i)); + size_t i, n; + for (i = 0, n = get_Sel_n_methods(node); i < n; ++i) { + pset_insert_ptr(set, get_Sel_method(node, i)); } } break; @@ -381,16 +369,19 @@ 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; case iro_Phi: - for (i = get_Phi_n_preds(node) - 1; i >= 0; --i) { + { + int i, n; + for (i = 0, n = get_Phi_n_preds(node); i < n; ++i) { free_mark(get_Phi_pred(node, i), set); } break; + } case iro_Proj: free_mark_proj(get_Proj_pred(node), get_Proj_proj(node), set); break; @@ -405,8 +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; - int i; + pset *set = (pset*) env; if (get_irn_link(node) == MARK) { /* already visited */ @@ -424,17 +414,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); @@ -446,13 +440,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; @@ -460,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; @@ -470,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: @@ -495,21 +490,19 @@ 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; * * 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_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)) @@ -517,18 +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)) { - for (i = get_compound_ent_n_values(ent) - 1; i >= 0; --i) { - n = 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_Method_type(get_entity_type(ent))) - eset_insert(set, ent); - } - } } } @@ -544,23 +525,21 @@ 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; + 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; - 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); + ir_entity *const ent = get_irg_entity(irg); linkage = get_entity_linkage(ent); - if (entity_is_externally_visible(ent) - || (linkage & IR_LINKAGE_HIDDEN_USER)) { - eset_insert(free_set, ent); + if ((linkage & IR_LINKAGE_HIDDEN_USER) || entity_is_externally_visible(ent)) { + pset_insert_ptr(free_set, ent); } ir_reserve_resources(irg, IR_RESOURCE_IRN_LINK); @@ -572,28 +551,29 @@ 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) { + ir_entity *const 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) { + 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; @@ -603,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) { @@ -624,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; @@ -635,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; } } @@ -646,10 +626,8 @@ 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) { - int i; - assert(mode_is_reference(get_irn_mode(node)) || is_Bad(node)); /* Beware of recursion */ if (get_irn_link(node) == MARK) { @@ -662,37 +640,41 @@ 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; } - case iro_Sel: + case iro_Sel: { /* polymorphic method */ - for (i = get_Sel_n_methods(node) - 1; i >= 0; --i) { + size_t i, n; + 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; + } case iro_Bad: /* nothing */ break; - case iro_Phi: + case iro_Phi: { + int i; for (i = get_Phi_n_preds(node) - 1; i >= 0; --i) { callee_ana_node(get_Phi_pred(node, i), methods); } break; + } case iro_Mux: callee_ana_node(get_Mux_false(node), methods); @@ -711,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: @@ -728,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; - int i; + 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); } } @@ -771,9 +753,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); @@ -788,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; @@ -813,10 +790,6 @@ static void destruct_walker(ir_node * node, void * env) } } -/*--------------------------------------------------------------------------*/ -/* Main drivers. */ -/*--------------------------------------------------------------------------*/ - size_t cgana(ir_entity ***free_methods) { size_t length; @@ -836,28 +809,28 @@ 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)); } } -/* 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(); }