X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fana%2Fcgana.c;h=0ffdd8b9fc0928c451fe01f4a7bb686c0d00fed5;hb=3d4caa9272d4bcfad93c55428478aa420b21b296;hp=722f6f352b7ef576ce50b267f0f9effe8373970d;hpb=9b8d6b2f436d24e691205370b9bbc6fbed89d6b2;p=libfirm diff --git a/ir/ana/cgana.c b/ir/ana/cgana.c index 722f6f352..0ffdd8b9f 100644 --- a/ir/ana/cgana.c +++ b/ir/ana/cgana.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. * @@ -23,7 +23,7 @@ * @author Hubert Schmid * @date 09.06.2002 * @version $Id$ - * @summary + * @brief * Interprocedural analysis to estimate the calling relation. * * This analysis computes all entities representing methods that @@ -31,13 +31,9 @@ * methods that are 'free', i.e., their adress is handled by * the program directly, or they are visible external. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" -#ifdef HAVE_STRING_H -# include -#endif +#include #include "cgana.h" #include "rta.h" @@ -63,10 +59,6 @@ #include "irdump.h" -#include "irhooks.h" - - - /* unambiguous address used as a mark. */ static void *MARK = &MARK; @@ -82,84 +74,58 @@ static eset *entities = NULL; /* call target computations. */ /*--------------------------------------------------------------------------*/ -/** Returns the entity that contains the implementation of the inherited - * entity if available, else returns the entity passed. */ -static ir_entity *get_inherited_methods_implementation(ir_entity *inh_meth) { - ir_node *value = get_atomic_ent_value(inh_meth); - assert(value && "constant entity without value"); - assert(is_SymConst_addr_ent(value) && - "Complex constant values not supported -- address of method should be straight constant!"); - - return get_SymConst_entity(value); -} - /** 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) { - int i; - ir_entity *impl; - - /* Add the implementation to the set if it contains an irg, else - remember that there are more methods called. */ - impl = method; - if (get_entity_peculiarity(method) == peculiarity_inherited) - impl = get_inherited_methods_implementation(method); +static size_t collect_impls(ir_entity *method, eset *set) +{ + size_t i; + size_t size = 0; - if (get_entity_peculiarity(method) != peculiarity_description) { - eset_insert(set, impl); - ++(*size); + if (get_entity_irg(method) != NULL) { + /* has an implementation */ + eset_insert(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) { - eset * set = eset_create(); - int size = 0; - ir_entity ** arr; - int open = 0; +static ir_entity **get_impl_methods(ir_entity *method) +{ + 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 = eset_first(set); size > 0; ent = eset_next(set), --size) - arr[size] = ent; } else { ir_entity * ent; arr = NEW_ARR_F(ir_entity *, size); - for (size -= 1, ent = eset_first(set); size >= 0; ent = 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; @@ -185,9 +151,10 @@ static ir_entity ** get_impl_methods(ir_entity * method) { * @param node The node to analyze * @param env A map that maps names of entities to the entities. */ -static void sel_methods_walker(ir_node *node, void *env) { - pmap *ldname_map = env; +static void sel_methods_walker(ir_node *node, void *env) +{ ir_entity **arr; + (void)env; /* Call standard optimizations */ if (is_Sel(node)) { @@ -198,18 +165,8 @@ static void sel_methods_walker(ir_node *node, void *env) { } } - /* replace SymConst(name)-operations by SymConst(ent) */ - if (is_SymConst(node)) { - if (get_SymConst_kind(node) == symconst_addr_name) { - pmap_entry *entry = pmap_find(ldname_map, get_SymConst_name(node)); - if (entry != NULL) { /* Method is declared in the compiled code */ - assert(!"There should not be a SymConst[addr_name] addressing a method with an implementation" - "in this compilation unit. Use a SymConst[addr_ent]."); - } - } - } else if (is_Sel(node) && is_Method_type(get_entity_type(get_Sel_entity(node)))) { + 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))); - assert(get_entity_peculiarity(ent) != peculiarity_inherited); if (!eset_contains(entities, ent)) { /* Entity not yet handled. Find all (internal or external) @@ -221,14 +178,14 @@ static void sel_methods_walker(ir_node *node, void *env) { /* -- As an add on we get an optimization that removes polymorphic calls. This optimization is more powerful than that in transform_node_Sel(). -- */ - arr = get_entity_link(ent); + arr = (ir_entity**) get_entity_link(ent); if (arr == NULL) { /* * The Sel node never returns a pointer to a usable method. * We could not call it, but it may be description: * We call a method in a dead part of the program. */ - assert(get_entity_peculiarity(ent) == peculiarity_description); + assert(get_entity_irg(ent) == NULL); } else if (get_opt_closed_world() && get_opt_dyn_meth_dispatch() && (ARR_LEN(arr) == 1 && arr[0] != NULL)) { @@ -239,10 +196,8 @@ static void sel_methods_walker(ir_node *node, void *env) { * So we could replace the Sel node by a SymConst. * This method must exists. */ - set_irg_current_block(current_ir_graph, get_nodes_block(node)); - assert(get_entity_peculiarity(get_SymConst_entity(get_atomic_ent_value(arr[0]))) == - peculiarity_existent); - new_node = copy_const_value(get_irn_dbg_info(node), get_atomic_ent_value(arr[0])); + assert(get_entity_irg(arr[0]) != NULL); + new_node = copy_const_value(get_irn_dbg_info(node), get_atomic_ent_value(arr[0]), get_nodes_block(node)); DBG_OPT_POLY(node, new_node); exchange(node, new_node); } @@ -260,21 +215,22 @@ static void sel_methods_walker(ir_node *node, void *env) { * Finally asserts if there is a SymConst(name) if there could be a * SymConst(ent). */ -static void sel_methods_init(void) { - int i; +static void sel_methods_init(void) +{ + 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 (get_entity_visibility(ent) != visibility_local) { + if (entity_is_externally_visible(ent)) { pmap_insert(ldname_map, (void *)get_entity_ld_ident(ent), ent); } } - all_irg_walk(sel_methods_walker, NULL, ldname_map); + all_irg_walk(sel_methods_walker, NULL, NULL); pmap_destroy(ldname_map); } @@ -291,22 +247,22 @@ static void sel_methods_init(void) { * * @param sel the Sel node */ -static ir_entity ** get_Sel_arr(ir_node * sel) { +static ir_entity ** get_Sel_arr(ir_node * sel) +{ static ir_entity ** NULL_ARRAY = NULL; ir_entity * ent; ir_entity ** arr; assert(is_Sel(sel)); ent = get_Sel_entity(sel); - ent = get_inherited_methods_implementation(ent); assert(is_Method_type(get_entity_type(ent))); /* what else? */ - arr = get_entity_link(ent); + arr = (ir_entity**) get_entity_link(ent); if (arr) { return arr; } else { /* "NULL" zeigt an, dass keine Implementierung existiert. Dies - * kann für polymorphe (abstrakte) Methoden passieren. */ + * kann f�r polymorphe (abstrakte) Methoden passieren. */ if (!NULL_ARRAY) { NULL_ARRAY = NEW_ARR_F(ir_entity *, 0); } @@ -319,23 +275,26 @@ 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)); } /** * 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_proj(ir_node * node, long n, eset * set) { +static void free_mark_proj(ir_node * node, long n, eset * set) +{ assert(get_irn_mode(node) == mode_T); if (get_irn_link(node) == MARK) { /* already visited */ @@ -348,7 +307,7 @@ static void free_mark_proj(ir_node * node, long n, eset * set) { * op_Tuple oder ein Knoten, der in "free_ana_walker" behandelt * wird. */ ir_node * pred = get_Proj_pred(node); - if (get_irn_link(pred) != MARK && get_irn_op(pred) == op_Tuple) { + if (get_irn_link(pred) != MARK && is_Tuple(pred)) { free_mark_proj(get_Tuple_pred(pred, get_Proj_proj(node)), n, set); } else { /* nothing: da in "free_ana_walker" behandelt. */ @@ -389,8 +348,9 @@ 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) { - int i; +static void free_mark(ir_node *node, eset * set) +{ + size_t i, n; if (get_irn_link(node) == MARK) return; /* already visited */ @@ -401,7 +361,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)) { - for (i = get_Sel_n_methods(node) - 1; i >= 0; --i) { + for (i = 0, n = get_Sel_n_methods(node); i < n; ++i) { eset_insert(set, get_Sel_method(node, i)); } } @@ -413,17 +373,17 @@ static void free_mark(ir_node *node, eset * set) { if (is_method_entity(ent)) { eset_insert(set, ent); } - } else { - assert(get_SymConst_kind(node) == symconst_addr_name); - /* nothing: SymConst points to extern method */ } 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; @@ -436,8 +396,9 @@ static void free_mark(ir_node *node, eset * set) { /** * post-walker. Find method addresses. */ -static void free_ana_walker(ir_node *node, void *env) { - eset *set = env; +static void free_ana_walker(ir_node *node, void *env) +{ + eset *set = (eset*) env; int i; if (get_irn_link(node) == MARK) { @@ -456,18 +417,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: - /* other nodes: Alle anderen Knoten nehmen wir als Verräter an, bis + /* other nodes: Alle anderen Knoten nehmen wir als Verr�ter an, bis * jemand das Gegenteil implementiert. */ set_irn_link(node, MARK); for (i = get_irn_arity(node) - 1; i >= 0; --i) { @@ -484,7 +448,7 @@ static void free_ana_walker(ir_node *node, void *env) { * 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; @@ -527,7 +491,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; @@ -536,38 +500,25 @@ 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; - /* do not check uninitialized values */ - if (get_entity_variability(ent) == variability_uninitialized) + /* 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)) return; - if (ent->has_initializer) { + if (ent->initializer != NULL) { add_method_address_inititializer(get_entity_initializer(ent), set); - } else if (is_atomic_entity(ent)) { - tp = get_entity_type(ent); - - /* ignore methods: these of course reference it's address */ - if (is_Method_type(tp)) - return; - - /* let's check if it's the address of a function */ - n = get_atomic_ent_value(ent); - if (is_Global(n)) { - ent = get_Global_entity(n); - - if (is_Method_type(get_entity_type(ent))) - eset_insert(set, ent); - } - } else { - for (i = get_compound_ent_n_values(ent) - 1; i >= 0; --i) { - n = get_compound_ent_value(ent, i); + } 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(n)) { - ir_entity *ent = get_Global_entity(n); + if (is_Global(irn)) { + ir_entity *ent = get_Global_entity(irn); if (is_Method_type(get_entity_type(ent))) eset_insert(set, ent); @@ -580,48 +531,48 @@ static void add_method_address(ir_entity *ent, eset *set) * returns a list of 'free' methods, i.e., the methods that can be called * from external or via function pointers. * - * Die Datenstrukturen für sel-Methoden (sel_methods) muß vor dem + * Die Datenstrukturen für sel-Methoden (sel_methods) muß vor dem * Aufruf von "get_free_methods" aufgebaut sein. Die (internen) - * SymConst(name)-Operationen müssen in passende SymConst(ent)-Operationen + * SymConst(name)-Operationen müssen in passende SymConst(ent)-Operationen * umgewandelt worden sein, d.h. SymConst-Operationen verweisen immer * auf eine echt externe Methode. */ -static ir_entity **get_free_methods(int *length) +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); - if (get_entity_visibility(ent) != visibility_local) { - /* insert non-local (external) methods. */ - eset_insert(free_set, ent); - } else if (get_entity_stickyness(ent) == stickyness_sticky) { - /* insert "sticky" methods. */ + linkage = get_entity_linkage(ent); + + if ((linkage & IR_LINKAGE_HIDDEN_USER) || entity_is_externally_visible(ent)) { eset_insert(free_set, ent); } - set_using_irn_link(irg); + ir_reserve_resources(irg, IR_RESOURCE_IRN_LINK); /* Find all method entities that gets "visible" through this graphs, * for instance because their address is stored. */ irg_walk_graph(irg, firm_clear_link, free_ana_walker, free_set); - clear_using_irn_link(irg); + ir_free_resources(irg, IR_RESOURCE_IRN_LINK); } /* 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_struct_n_members(tp) - 1; i >= 0; --i) { - ent = get_struct_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); } @@ -631,14 +582,15 @@ static ir_entity **get_free_methods(int *length) eset_insert(free_set, get_irg_entity(irg)); /* Finally, transform the set into an array. */ - *length = eset_count(free_set); - arr = xmalloc(sizeof(ir_entity *) * (*length)); - for (i = 0, ent = eset_first(free_set); ent; ent = eset_next(free_set)) { + length = eset_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)) { arr[i++] = ent; } eset_destroy(free_set); - return arr; + *free_methods = arr; + return length; } /*--------------------------------------------------------------------------*/ @@ -647,7 +599,8 @@ static ir_entity **get_free_methods(int *length) static void callee_ana_node(ir_node * node, eset * methods); -static void callee_ana_proj(ir_node *node, long n, eset *methods) { +static void callee_ana_proj(ir_node *node, long n, eset *methods) +{ assert(get_irn_mode(node) == mode_T); if (get_irn_link(node) == MARK) { /* already visited */ @@ -659,7 +612,7 @@ static void callee_ana_proj(ir_node *node, long n, eset *methods) { case iro_Proj: { /* proj_proj: in einem "sinnvollen" Graphen kommt jetzt ein * op_Tuple oder ein Knoten, der eine "freie Methode" - * zurückgibt. */ + * zur�ckgibt. */ ir_node *pred = get_Proj_pred(node); if (get_irn_link(pred) != MARK) { if (is_Tuple(pred)) { @@ -687,9 +640,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) { - int i; - +static void callee_ana_node(ir_node *node, eset *methods) +{ assert(mode_is_reference(get_irn_mode(node)) || is_Bad(node)); /* Beware of recursion */ if (get_irn_link(node) == MARK) { @@ -704,20 +656,18 @@ static void callee_ana_node(ir_node *node, eset *methods) { call and ignore it completely. */ eset_insert(methods, unknown_entity); /* free method -> unknown */ break; - case iro_SymConst: - if (get_SymConst_kind(node) == symconst_addr_ent) { - ir_entity *ent = get_SymConst_entity(node); - assert(ent && is_method_entity(ent)); - eset_insert(methods, ent); - } else { - assert(get_SymConst_kind(node) == symconst_addr_name); - /* external method (because fix_symconst()!) */ - eset_insert(methods, unknown_entity); /* free method -> unknown */ - } + + case iro_SymConst: { + ir_entity *ent = get_SymConst_entity(node); + assert(ent && is_method_entity(ent)); + eset_insert(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); @@ -726,29 +676,25 @@ static void callee_ana_node(ir_node *node, eset *methods) { } } 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); callee_ana_node(get_Mux_true(node), methods); break; - case iro_Psi: - for (i = get_Psi_n_conds(node) - 1; i >= 0; --i) { - callee_ana_node(get_Psi_val(node, i), methods); - } - callee_ana_node(get_Psi_default(node), methods); - break; - case iro_Id: callee_ana_node(get_Id_pred(node), methods); break; @@ -774,17 +720,18 @@ static void callee_ana_node(ir_node *node, eset *methods) { * Walker: Analyses every Call node and calculates an array of possible * callees for that call. */ -static void callee_walker(ir_node *call, void *env) { +static void callee_walker(ir_node *call, void *env) +{ (void) env; if (is_Call(call)) { eset *methods = eset_create(); ir_entity *ent; 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 = eset_first(methods); ent; ent = eset_next(methods)) { + for (i = 0, ent = (ir_entity*) eset_first(methods); ent; ent = (ir_entity*) eset_next(methods)) { arr[i] = ent; /* we want the unknown_entity on the zero position for easy tests later */ if (ent == unknown_entity) { @@ -802,7 +749,8 @@ static void callee_walker(ir_node *call, void *env) { /** * Walker: Removes all tuple. */ -static void remove_Tuples(ir_node *proj, void *env) { +static void remove_Tuples(ir_node *proj, void *env) +{ ir_node *nn; (void) env; if (! is_Proj(proj)) return; @@ -817,10 +765,11 @@ static void remove_Tuples(ir_node *proj, void *env) { * inside the Call (@see set_Call_callee()). * Uses the sel_methods set with much be already calculated. */ -static void callee_ana(void) { - int i; +static void callee_ana(void) +{ + 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); @@ -833,11 +782,12 @@ static void callee_ana(void) { /*--------------------------------------------------------------------------*/ /** Frees intermediate data structures. */ -static void sel_methods_dispose(void) { +static void sel_methods_dispose(void) +{ ir_entity * ent; assert(entities); - for (ent = eset_first(entities); ent; ent = eset_next(entities)) { - ir_entity ** arr = get_entity_link(ent); + 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) { DEL_ARR_F(arr); } @@ -851,7 +801,8 @@ static void sel_methods_dispose(void) { /* Freeing the callee arrays. */ /*--------------------------------------------------------------------------*/ -static void destruct_walker(ir_node * node, void * env) { +static void destruct_walker(ir_node * node, void * env) +{ (void) env; if (is_Call(node)) { remove_Call_callee_arr(node); @@ -862,22 +813,27 @@ static void destruct_walker(ir_node * node, void * env) { /* Main drivers. */ /*--------------------------------------------------------------------------*/ -void cgana(int *length, ir_entity ***free_methods) { +size_t cgana(ir_entity ***free_methods) +{ + size_t length; /* Optimize Sel/SymConst nodes and compute all methods that implement an entity. */ sel_methods_init(); - *free_methods = get_free_methods(length); + length = get_free_methods(free_methods); callee_ana(); sel_methods_dispose(); + return length; } -void free_callee_info(ir_graph *irg) { +void free_callee_info(ir_graph *irg) +{ irg_walk_graph(irg, destruct_walker, NULL, NULL); set_irg_callee_info_state(irg, irg_callee_info_none); } -void free_irp_callee_info(void) { - int i; - for (i = get_irp_n_irgs() - 1; i >= 0; --i) { +void free_irp_callee_info(void) +{ + size_t i, n; + for (i = 0, n = get_irp_n_irgs(); i < n; ++i) { free_callee_info(get_irp_irg(i)); } } @@ -896,7 +852,8 @@ void free_irp_callee_info(void) { * by Const nodes referring to the entity that implements the method in * the type given by the Alloc node. */ -void opt_call_addrs(void) { +void opt_call_addrs(void) +{ sel_methods_init(); sel_methods_dispose(); }