X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fana%2Firmemory.c;h=8ae19aa47e03304384880e4539cc70f806dcd2cd;hb=2af4a97900b435e35d7c20350604e3863aff2b4c;hp=84ff2954f45d7fdc1d61f65b3a03a67580bc23c2;hpb=a63ae9728ba0fbe891a2bb6c291c41b0e618af62;p=libfirm diff --git a/ir/ana/irmemory.c b/ir/ana/irmemory.c index 84ff2954f..8ae19aa47 100644 --- a/ir/ana/irmemory.c +++ b/ir/ana/irmemory.c @@ -44,6 +44,7 @@ #include "debug.h" #include "error.h" #include "typerep.h" +#include "irpass.h" /** The debug handle. */ DEBUG_ONLY(static firm_dbg_module_t *dbg = NULL;) @@ -68,7 +69,7 @@ const char *get_ir_alias_relation_name(ir_alias_relation rel) { } /* Get the memory disambiguator options for a graph. */ -unsigned get_irg_memory_disambiguator_options(ir_graph *irg) { +unsigned get_irg_memory_disambiguator_options(const ir_graph *irg) { unsigned opt = irg->mem_disambig_opt; if (opt & aa_opt_inherited) return global_mem_disamgig_opt; @@ -93,7 +94,7 @@ void set_irp_memory_disambiguator_options(unsigned options) { * * @return the base address. */ -static ir_node *find_base_adr(ir_node *sel, ir_entity **pEnt) { +static ir_node *find_base_adr(const ir_node *sel, ir_entity **pEnt) { ir_node *ptr = get_Sel_ptr(sel); while (is_Sel(ptr)) { @@ -112,7 +113,7 @@ static ir_node *find_base_adr(ir_node *sel, ir_entity **pEnt) { * * @return ir_no_alias if the Const is greater, ir_may_alias else */ -static ir_alias_relation check_const(ir_node *cns, int size) { +static ir_alias_relation check_const(const ir_node *cns, int size) { tarval *tv = get_Const_tarval(cns); tarval *tv_size; @@ -133,7 +134,7 @@ static ir_alias_relation check_const(ir_node *cns, int size) { * ir_no_alias iff they ALWAYS differ more than size * ir_may_alias else */ -static ir_alias_relation different_index(ir_node *idx1, ir_node *idx2, int size) { +static ir_alias_relation different_index(const ir_node *idx1, const ir_node *idx2, int size) { if (idx1 == idx2) return ir_sure_alias; if (is_Const(idx1) && is_Const(idx2)) { @@ -292,7 +293,7 @@ static ir_alias_relation different_index(ir_node *idx1, ir_node *idx2, int size) * @param adr1 The first address. * @param adr2 The second address. */ -static ir_alias_relation different_sel_offsets(ir_node *sel1, ir_node *sel2) { +static ir_alias_relation different_sel_offsets(const ir_node *sel1, const ir_node *sel2) { /* seems to be broken */ (void) sel1; (void) sel2; @@ -347,7 +348,7 @@ static ir_alias_relation different_sel_offsets(ir_node *sel1, ir_node *sel2) { * @param adr1 The first address. * @param adr2 The second address. */ -static ir_alias_relation different_types(ir_node *adr1, ir_node *adr2) +static ir_alias_relation different_types(const ir_node *adr1, const ir_node *adr2) { ir_entity *ent1 = NULL, *ent2 = NULL; @@ -395,7 +396,7 @@ static ir_alias_relation different_types(ir_node *adr1, ir_node *adr2) * * @param node the Proj node to test */ -static int is_malloc_Result(ir_node *node) { +static int is_malloc_Result(const ir_node *node) { node = get_Proj_pred(node); if (! is_Proj(node)) return 0; @@ -420,7 +421,7 @@ static int is_malloc_Result(ir_node *node) { * @param irn the node representing the base address * @param ent the base entity of the base address iff any */ -ir_storage_class_class_t classify_pointer(ir_graph *irg, ir_node *irn, ir_entity *ent) +ir_storage_class_class_t classify_pointer(const ir_graph *irg, const ir_node *irn, const ir_entity *ent) { ir_storage_class_class_t res = ir_sc_pointer; if (is_Global(irn)) { @@ -432,8 +433,6 @@ ir_storage_class_class_t classify_pointer(ir_graph *irg, ir_node *irn, ir_entity res = ir_sc_localvar; if (ent != NULL && !(get_entity_usage(ent) & ir_usage_address_taken)) res |= ir_sc_modifier_nottaken; - } else if (is_arg_Proj(irn)) { - return ir_sc_argument; } else if (irn == get_irg_tls(irg)) { res = ir_sc_tls; if (ent != NULL && !(get_entity_usage(ent) & ir_usage_address_taken)) @@ -442,6 +441,8 @@ ir_storage_class_class_t classify_pointer(ir_graph *irg, ir_node *irn, ir_entity return ir_sc_malloced; } else if (is_Const(irn)) { return ir_sc_globaladdr; + } else if (is_arg_Proj(irn)) { + res |= ir_sc_modifier_argument; } return res; @@ -450,7 +451,7 @@ ir_storage_class_class_t classify_pointer(ir_graph *irg, ir_node *irn, ir_entity /** * If adr represents a Bitfield Sel, skip it */ -static ir_node *skip_Bitfield_Sels(ir_node *adr) { +static const ir_node *skip_Bitfield_Sels(const ir_node *adr) { if (is_Sel(adr)) { ir_entity *ent = get_Sel_entity(adr); ir_type *bf_type = get_entity_type(ent); @@ -474,20 +475,20 @@ static ir_node *skip_Bitfield_Sels(ir_node *adr) { * @return found memory relation */ static ir_alias_relation _get_alias_relation( - ir_graph *irg, - ir_node *adr1, ir_mode *mode1, - ir_node *adr2, ir_mode *mode2) + const ir_graph *irg, + const ir_node *adr1, const ir_mode *mode1, + const ir_node *adr2, const ir_mode *mode2) { ir_entity *ent1, *ent2; unsigned options; long offset1 = 0; long offset2 = 0; - ir_node *base1; - ir_node *base2; - ir_node *orig_adr1 = adr1; - ir_node *orig_adr2 = adr2; + const ir_node *base1; + const ir_node *base2; + const ir_node *orig_adr1 = adr1; + const ir_node *orig_adr2 = adr2; unsigned mode_size; - ir_storage_class_class_t class1, class2; + ir_storage_class_class_t class1, class2, mod1, mod2; int have_const_offsets; if (! get_opt_alias_analysis()) @@ -581,19 +582,35 @@ static ir_alias_relation _get_alias_relation( return different_sel_offsets(adr1, adr2); } - class1 = classify_pointer(irg, base1, ent1); - class2 = classify_pointer(irg, base2, ent2); + mod1 = classify_pointer(irg, base1, ent1); + mod2 = classify_pointer(irg, base2, ent2); - if (class1 == ir_sc_pointer) { - if (class2 & ir_sc_modifier_nottaken) { - /* a pointer and an object whose objects was never taken */ - return ir_no_alias; + class1 = GET_BASE_SC(mod1); + class2 = GET_BASE_SC(mod2); + + if (class1 == ir_sc_pointer || class2 == ir_sc_pointer) { + /* swap pointer class to class1 */ + if (class2 == ir_sc_pointer) { + ir_storage_class_class_t temp = mod1; + mod1 = mod2; + mod2 = temp; + class1 = GET_BASE_SC(mod1); + class2 = GET_BASE_SC(mod2); } - } else if (class2 == ir_sc_pointer) { - if (class1 & ir_sc_modifier_nottaken) { - /* a pointer and an object whose objects was never taken */ + /* a pointer and an object whose address was never taken */ + if (mod2 & ir_sc_modifier_nottaken) { return ir_no_alias; } + if (mod1 & ir_sc_modifier_argument) { + if ( (options & aa_opt_no_alias_args) + && (mod2 & ir_sc_modifier_argument)) + return ir_no_alias; + if ( (options & aa_opt_no_alias_args_global) + && (class2 == ir_sc_globalvar + || class2 == ir_sc_tls + || class2 == ir_sc_globaladdr)) + return ir_no_alias; + } } else if (class1 != class2) { /* two objects from different memory spaces */ return ir_no_alias; @@ -651,8 +668,8 @@ leave_type_based_alias:; } /* do we have a language specific memory disambiguator? */ - if (language_disambuigator) { - ir_alias_relation rel = (*language_disambuigator)(irg, orig_adr1, mode1, orig_adr2, mode2); + if (language_disambuigator != NULL) { + ir_alias_relation rel = language_disambuigator(irg, orig_adr1, mode1, orig_adr2, mode2); if (rel != ir_may_alias) return rel; } @@ -665,9 +682,9 @@ leave_type_based_alias:; * Determine the alias relation between two addresses. */ ir_alias_relation get_alias_relation( - ir_graph *irg, - ir_node *adr1, ir_mode *mode1, - ir_node *adr2, ir_mode *mode2) + const ir_graph *irg, + const ir_node *adr1, const ir_mode *mode1, + const ir_node *adr2, const ir_mode *mode2) { ir_alias_relation rel = _get_alias_relation(irg, adr1, mode1, adr2, mode2); DB((dbg, LEVEL_1, "alias(%+F, %+F) = %s\n", adr1, adr2, get_ir_alias_relation_name(rel))); @@ -684,8 +701,10 @@ static set *result_cache = NULL; /** An entry in the relation cache. */ typedef struct mem_disambig_entry { - ir_node *adr1; /**< The first address. */ - ir_node *adr2; /**< The second address. */ + const ir_node *adr1; /**< The first address. */ + const ir_mode *mode1; /**< The first address mode. */ + const ir_node *adr2; /**< The second address. */ + const ir_mode *mode2; /**< The second address mode. */ ir_alias_relation result; /**< The alias relation result. */ } mem_disambig_entry; @@ -699,7 +718,8 @@ static int cmp_mem_disambig_entry(const void *elt, const void *key, size_t size) const mem_disambig_entry *p2 = key; (void) size; - return p1->adr1 == p2->adr1 && p1->adr2 == p2->adr2; + return p1->adr1 == p2->adr1 && p1->adr2 == p2->adr2 && + p1->mode1 == p2->mode1 && p1->mode2 == p2->mode2; } /* cmp_mem_disambig_entry */ /** @@ -713,9 +733,9 @@ void mem_disambig_init(void) { * Determine the alias relation between two addresses. */ ir_alias_relation get_alias_relation_ex( - ir_graph *irg, - ir_node *adr1, ir_mode *mode1, - ir_node *adr2, ir_mode *mode2) + const ir_graph *irg, + const ir_node *adr1, const ir_mode *mode1, + const ir_node *adr2, const ir_mode *mode2) { mem_disambig_entry key, *entry; @@ -725,15 +745,17 @@ ir_alias_relation get_alias_relation_ex( return ir_may_alias; if (get_irn_opcode(adr1) > get_irn_opcode(adr2)) { - ir_node *t = adr1; + const ir_node *t = adr1; adr1 = adr2; adr2 = t; } - key.adr1 = adr1; - key.adr2 = adr2; + key.adr1 = adr1; + key.adr2 = adr2; + key.mode1 = mode1; + key.mode2 = mode2; entry = set_find(result_cache, &key, sizeof(key), HASH_ENTRY(adr1, adr2)); - if (entry) + if (entry != NULL) return entry->result; key.result = get_alias_relation(irg, adr1, mode1, adr2, mode2); @@ -744,7 +766,7 @@ ir_alias_relation get_alias_relation_ex( /* Free the relation cache. */ void mem_disambig_term(void) { - if (result_cache) { + if (result_cache != NULL) { del_set(result_cache); result_cache = NULL; } @@ -769,7 +791,7 @@ void mem_disambig_term(void) { * * @return non-zero if the Load/Store is a hidden cast, zero else */ -static int is_hidden_cast(ir_mode *mode, ir_mode *ent_mode) { +static int is_hidden_cast(const ir_mode *mode, const ir_mode *ent_mode) { if (ent_mode == NULL) return false; @@ -847,7 +869,16 @@ static ir_entity_usage determine_entity_usage(const ir_node *irn, ir_entity *ent case iro_Add: case iro_Sub: + /* Check the successor of irn. */ + res |= determine_entity_usage(succ, entity); + break; case iro_Sel: { + ir_entity *entity = get_Sel_entity(succ); + /* this analysis can't handle unions correctly */ + if (is_Union_type(get_entity_owner(entity))) { + res |= ir_usage_unknown; + break; + } /* Check the successor of irn. */ res |= determine_entity_usage(succ, entity); break; @@ -909,7 +940,7 @@ static ir_entity_usage determine_entity_usage(const ir_node *irn, ir_entity *ent */ static void analyse_irg_entity_usage(ir_graph *irg) { ir_type *ft = get_irg_frame_type(irg); - ir_node *irg_frame, *args, *arg; + ir_node *irg_frame; int i, j, k, static_link_arg; /* set initial state to not_taken, as this is the "smallest" state */ @@ -918,8 +949,9 @@ static void analyse_irg_entity_usage(ir_graph *irg) { /* methods can only be analyzed globally */ if (! is_method_entity(ent)) { - ir_entity_usage flags = - get_entity_stickyness(ent) == stickyness_sticky ? ir_usage_unknown : 0; + ir_entity_usage flags = 0; + if (get_entity_linkage(ent) & IR_LINKAGE_HIDDEN_USER) + flags = ir_usage_unknown; set_entity_usage(ent, flags); } } @@ -933,7 +965,7 @@ static void analyse_irg_entity_usage(ir_graph *irg) { ir_entity *entity; ir_entity_usage flags; - if (!is_Sel(succ)) + if (!is_Sel(succ)) continue; entity = get_Sel_entity(succ); @@ -946,31 +978,35 @@ static void analyse_irg_entity_usage(ir_graph *irg) { static_link_arg = 0; for (i = get_class_n_members(ft) - 1; i >= 0; --i) { ir_entity *ent = get_class_member(ft, i); + ir_graph *inner_irg; + ir_node *args; + + if (! is_method_entity(ent)) + continue; - if (is_method_entity(ent)) { - ir_graph *inner_irg = get_entity_irg(ent); - ir_node *args; + inner_irg = get_entity_irg(ent); + if (inner_irg == NULL) + continue; - assure_irg_outs(inner_irg); - args = get_irg_args(inner_irg); - for (j = get_irn_n_outs(args) - 1; j >= 0; --j) { - ir_node *arg = get_irn_out(args, j); + assure_irg_outs(inner_irg); + args = get_irg_args(inner_irg); + for (j = get_irn_n_outs(args) - 1; j >= 0; --j) { + ir_node *arg = get_irn_out(args, j); - if (get_Proj_proj(arg) == static_link_arg) { - for (k = get_irn_n_outs(arg) - 1; k >= 0; --k) { - ir_node *succ = get_irn_out(arg, k); + if (get_Proj_proj(arg) == static_link_arg) { + for (k = get_irn_n_outs(arg) - 1; k >= 0; --k) { + ir_node *succ = get_irn_out(arg, k); - if (is_Sel(succ)) { - ir_entity *entity = get_Sel_entity(succ); + if (is_Sel(succ)) { + ir_entity *entity = get_Sel_entity(succ); - if (get_entity_owner(entity) == ft) { - /* found an access to the outer frame */ - ir_entity_usage flags; + if (get_entity_owner(entity) == ft) { + /* found an access to the outer frame */ + ir_entity_usage flags; - flags = get_entity_usage(entity); - flags |= determine_entity_usage(succ, entity); - set_entity_usage(entity, flags); - } + flags = get_entity_usage(entity); + flags |= determine_entity_usage(succ, entity); + set_entity_usage(entity, flags); } } } @@ -991,7 +1027,8 @@ void set_irg_entity_usage_state(ir_graph *irg, ir_entity_usage_computed_state st irg->entity_usage_state = state; } -void assure_irg_entity_usage_computed(ir_graph *irg) { +void assure_irg_entity_usage_computed(ir_graph *irg) +{ if (irg->entity_usage_state != ir_entity_usage_not_computed) return; @@ -1002,18 +1039,16 @@ void assure_irg_entity_usage_computed(ir_graph *irg) { /** * Initialize the entity_usage flag for a global type like type. */ -static void init_entity_usage(ir_type * tp) { +static void init_entity_usage(ir_type *tp) +{ int i; /* We have to be conservative: All external visible entities are unknown */ for (i = get_compound_n_members(tp) - 1; i >= 0; --i) { ir_entity *ent = get_compound_member(tp, i); ir_entity_usage flags = ir_usage_none; - ir_visibility vis = get_entity_visibility(ent); - if (vis == visibility_external_visible || - vis == visibility_external_allocated || - get_entity_stickyness(ent) == stickyness_sticky) { + if (entity_is_externally_visible(ent)) { flags |= ir_usage_unknown; } set_entity_usage(ent, flags); @@ -1059,29 +1094,21 @@ static void check_initializer_nodes(ir_initializer_t *initializer) * * @param ent the entity */ -static void check_initializer(ir_entity *ent) { +static void check_initializer(ir_entity *ent) +{ ir_node *n; int i; - /* do not check uninitialized values */ - if (get_entity_variability(ent) == variability_uninitialized) - return; - /* Beware: Methods are always initialized with "themself". This does not - count as a taken address. */ + * count as a taken address. + * TODO: this initialisation with "themself" is wrong and should be removed + */ if (is_Method_type(get_entity_type(ent))) return; - if (ent->has_initializer) { - check_initializer_nodes(ent->attr.initializer); - } else if (is_atomic_entity(ent)) { - /* let's check if it's an address */ - n = get_atomic_ent_value(ent); - if (is_Global(n)) { - ir_entity *ent = get_Global_entity(n); - set_entity_usage(ent, ir_usage_unknown); - } - } else { + if (ent->initializer != NULL) { + check_initializer_nodes(ent->initializer); + } 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); @@ -1092,7 +1119,7 @@ static void check_initializer(ir_entity *ent) { } } } -} /* check_initializer */ +} /** @@ -1167,12 +1194,12 @@ static void analyse_irp_globals_entity_usage(void) { int i; ir_segment_t s; - for (s = IR_SEGMENT_FIRST; s < IR_SEGMENT_COUNT; ++s) { + for (s = IR_SEGMENT_FIRST; s <= IR_SEGMENT_LAST; ++s) { ir_type *type = get_segment_type(s); init_entity_usage(type); } - for (s = IR_SEGMENT_FIRST; s < IR_SEGMENT_COUNT; ++s) { + for (s = IR_SEGMENT_FIRST; s <= IR_SEGMENT_LAST; ++s) { ir_type *type = get_segment_type(s); check_initializers(type); } @@ -1187,7 +1214,7 @@ static void analyse_irp_globals_entity_usage(void) { #ifdef DEBUG_libfirm if (firm_dbg_get_mask(dbg) & LEVEL_1) { ir_segment_t s; - for (s = IR_SEGMENT_FIRST; s < IR_SEGMENT_COUNT; ++s) { + for (s = IR_SEGMENT_FIRST; s <= IR_SEGMENT_LAST; ++s) { print_entity_usage_flags(get_segment_type(s)); } } @@ -1229,20 +1256,16 @@ static pmap *mtp_map; * * @param tp the type to clone */ -static ir_type *clone_type_and_cache(ir_type *tp) { - static ident *prefix = NULL; +static ir_type *clone_type_and_cache(ir_type *tp) +{ ir_type *res; pmap_entry *e = pmap_find(mtp_map, tp); if (e) return e->value; - if (prefix == NULL) - prefix = new_id_from_chars("C", 1); - - res = clone_type_method(tp, prefix); + res = clone_type_method(tp); pmap_insert(mtp_map, tp, res); - DB((dbgcall, LEVEL_2, "cloned type %+F into %+F\n", tp, res)); return res; } /* clone_type_and_cache */ @@ -1265,7 +1288,7 @@ static void update_calls_to_private(ir_node *call, void *env) { ctp = clone_type_and_cache(ctp); set_method_additional_property(ctp, mtp_property_private); set_Call_type(call, ctp); - DB((dbgcall, LEVEL_1, "changed call to private method %+F\n", ent)); + DB((dbgcall, LEVEL_1, "changed call to private method %+F using cloned type %+F\n", ent, ctp)); } } } @@ -1273,7 +1296,8 @@ static void update_calls_to_private(ir_node *call, void *env) { } /* update_calls_to_private */ /* Mark all private methods, i.e. those of which all call sites are known. */ -void mark_private_methods(void) { +void mark_private_methods(void) +{ int i; int changed = 0; @@ -1287,11 +1311,8 @@ void mark_private_methods(void) { ir_entity *ent = get_irg_entity(irg); ir_entity_usage flags = get_entity_usage(ent); - /* If an entity is sticky, it might be called from external - places (like inline assembler), so do NOT mark it as private. */ - if (get_entity_visibility(ent) == visibility_local && - !(flags & ir_usage_address_taken) && - get_entity_stickyness(ent) != stickyness_sticky) { + if (!entity_is_externally_visible(ent) && + !(flags & ir_usage_address_taken)) { ir_type *mtp = get_entity_type(ent); set_entity_additional_property(ent, mtp_property_private); @@ -1299,8 +1320,9 @@ void mark_private_methods(void) { if ((get_method_additional_properties(mtp) & mtp_property_private) == 0) { /* need a new type */ mtp = clone_type_and_cache(mtp); - set_entity_type(ent, mtp); set_method_additional_property(mtp, mtp_property_private); + set_entity_type(ent, mtp); + DB((dbgcall, LEVEL_2, "changed entity type of %+F to %+F\n", ent, mtp)); changed = 1; } } @@ -1311,3 +1333,8 @@ void mark_private_methods(void) { pmap_destroy(mtp_map); } /* mark_private_methods */ + +/* create a pass for mark_private_methods() */ +ir_prog_pass_t *mark_private_methods_pass(const char *name) { + return def_prog_pass(name ? name : "mark_private_methods", mark_private_methods); +} /* mark_private_methods_pass */