X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fana%2Fcgana.c;h=c63da592d59853db5e822bfefc1c52c07712bcf1;hb=ebdaa596d904a0651c8d794481288d2d629bdb3a;hp=8c034616e61602b728175a8f6f94bcdd179f7710;hpb=e30e5834fd8c1c3a7d28fc66e99b91a84993bde8;p=libfirm diff --git a/ir/ana/cgana.c b/ir/ana/cgana.c index 8c034616e..c63da592d 100644 --- a/ir/ana/cgana.c +++ b/ir/ana/cgana.c @@ -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,17 +74,6 @@ 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". @@ -106,18 +87,12 @@ static ir_entity *get_inherited_methods_implementation(ir_entity *inh_meth) { * @param size Number of entities in set. * @param open */ -static void collect_impls(ir_entity *method, eset *set, int *size, int *open) { +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); - if (get_entity_peculiarity(method) != peculiarity_description) { - eset_insert(set, impl); + if (get_entity_irg(method) != NULL) { + eset_insert(set, method); ++(*size); } @@ -126,17 +101,18 @@ static void collect_impls(ir_entity *method, eset *set, int *size, int *open) { collect_impls(get_entity_overwrittenby(method, i), set, size, open); } -/** 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. +/** 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. * * @param 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; @@ -147,7 +123,7 @@ static ir_entity ** get_impl_methods(ir_entity * method) { /* Vorgaenger einfuegen. */ if (size == 0 && !open) { - /* keine implementierte überschriebene Methode */ + /* keine implementierte �berschriebene Methode */ arr = NULL; } else if (open) { ir_entity * ent; @@ -185,7 +161,8 @@ 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) { +static void sel_methods_walker(ir_node *node, void *env) +{ pmap *ldname_map = env; ir_entity **arr; @@ -209,7 +186,6 @@ static void sel_methods_walker(ir_node *node, void *env) { } } else 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) @@ -228,7 +204,7 @@ static void sel_methods_walker(ir_node *node, void *env) { * 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)) { @@ -240,8 +216,7 @@ static void sel_methods_walker(ir_node *node, void *env) { * 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); + assert(get_entity_irg(arr[0]) != NULL); new_node = copy_const_value(get_irn_dbg_info(node), get_atomic_ent_value(arr[0])); DBG_OPT_POLY(node, new_node); exchange(node, new_node); @@ -260,7 +235,8 @@ 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) { +static void sel_methods_init(void) +{ int i; pmap *ldname_map = pmap_create(); /* Map entity names to entities: to replace SymConst(name) by SymConst(ent). */ @@ -269,7 +245,7 @@ static void sel_methods_init(void) { for (i = get_irp_n_irgs() - 1; i >= 0; --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); } } @@ -291,14 +267,14 @@ 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); @@ -306,7 +282,7 @@ static ir_entity ** get_Sel_arr(ir_node * sel) { 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,14 +295,16 @@ static ir_entity ** get_Sel_arr(ir_node * sel) { * * @param sel the Sel node */ -static int get_Sel_n_methods(ir_node * sel) { +static int 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, int pos) +{ ir_entity ** arr = get_Sel_arr(sel); assert(pos >= 0 && pos < ARR_LEN(arr)); return arr[pos]; @@ -335,7 +313,8 @@ static ir_entity * get_Sel_method(ir_node * sel, int 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 +327,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,7 +368,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, eset * set) +{ int i; if (get_irn_link(node) == MARK) @@ -413,9 +393,6 @@ 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; @@ -436,7 +413,8 @@ static void free_mark(ir_node *node, eset * set) { /** * post-walker. Find method addresses. */ -static void free_ana_walker(ir_node *node, void *env) { +static void free_ana_walker(ir_node *node, void *env) +{ eset *set = env; int i; @@ -467,7 +445,7 @@ static void free_ana_walker(ir_node *node, void *env) { } 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) { @@ -540,28 +518,16 @@ static void add_method_address(ir_entity *ent, eset *set) ir_type *tp; int i; - /* do not check uninitialized values */ - if (get_entity_variability(ent) == variability_uninitialized) + /* ignore methods: these of course reference it's address + * TODO: remove this later once this incorrect self-intialisation 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 { + } 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); @@ -580,9 +546,9 @@ 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. */ @@ -596,13 +562,13 @@ static ir_entity **get_free_methods(int *length) ir_type *tp; for (i = get_irp_n_irgs() - 1; i >= 0; --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_LOCAL) + || (linkage & IR_LINKAGE_HIDDEN_USER)) { eset_insert(free_set, ent); } @@ -632,7 +598,7 @@ static ir_entity **get_free_methods(int *length) /* Finally, transform the set into an array. */ *length = eset_count(free_set); - arr = xmalloc(sizeof(ir_entity *) * (*length)); + arr = XMALLOCN(ir_entity*, *length); for (i = 0, ent = eset_first(free_set); ent; ent = eset_next(free_set)) { arr[i++] = ent; } @@ -647,7 +613,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 +626,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,7 +654,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, eset *methods) +{ int i; assert(mode_is_reference(get_irn_mode(node)) || is_Bad(node)); @@ -767,7 +735,8 @@ 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(); @@ -795,7 +764,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; @@ -810,7 +780,8 @@ 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) { +static void callee_ana(void) +{ int i; /* analyse all graphs */ for (i = get_irp_n_irgs() - 1; i >= 0; --i) { @@ -826,7 +797,8 @@ 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)) { @@ -844,7 +816,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); @@ -855,7 +828,8 @@ static void destruct_walker(ir_node * node, void * env) { /* Main drivers. */ /*--------------------------------------------------------------------------*/ -void cgana(int *length, ir_entity ***free_methods) { +void cgana(int *length, ir_entity ***free_methods) +{ /* Optimize Sel/SymConst nodes and compute all methods that implement an entity. */ sel_methods_init(); *free_methods = get_free_methods(length); @@ -863,12 +837,14 @@ void cgana(int *length, ir_entity ***free_methods) { sel_methods_dispose(); } -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) { +void free_irp_callee_info(void) +{ int i; for (i = get_irp_n_irgs() - 1; i >= 0; --i) { free_callee_info(get_irp_irg(i)); @@ -889,7 +865,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(); }