X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fana%2Firmemory.c;h=2df5b07166b68bd5ffcbedab8eae5cee084121dd;hb=0ada12ba1e11d8ff2e39e3183eb43c4783df2d91;hp=52afe1bddc4c213f243494b7fe6ede162bf18cae;hpb=a9950b7e54fec21e54067548ba9748a298d20e55;p=libfirm diff --git a/ir/ana/irmemory.c b/ir/ana/irmemory.c index 52afe1bdd..2df5b0716 100644 --- a/ir/ana/irmemory.c +++ b/ir/ana/irmemory.c @@ -22,7 +22,6 @@ * @brief Memory disambiguator * @author Michael Beck * @date 27.12.2006 - * @version $Id$ */ #include "config.h" @@ -56,7 +55,6 @@ static DISAMBIGUATOR_FUNC language_disambuigator = NULL; /** The global memory disambiguator options. */ static unsigned global_mem_disamgig_opt = aa_opt_no_opt; -/* Returns a human readable name for an alias relation. */ const char *get_ir_alias_relation_name(ir_alias_relation rel) { #define X(a) case a: return #a @@ -70,32 +68,28 @@ const char *get_ir_alias_relation_name(ir_alias_relation rel) #undef X } -/* Get the memory disambiguator options for a graph. */ 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; return opt; -} /* get_irg_memory_disambiguator_options */ +} -/* Set the memory disambiguator options for a graph. */ void set_irg_memory_disambiguator_options(ir_graph *irg, unsigned options) { irg->mem_disambig_opt = options & ~aa_opt_inherited; -} /* set_irg_memory_disambiguator_options */ +} -/* Set the global disambiguator options for all graphs not having local options. */ void set_irp_memory_disambiguator_options(unsigned options) { global_mem_disamgig_opt = options; -} /* set_irp_memory_disambiguator_options */ +} -/* Get the base storage class (ignore modifier) */ ir_storage_class_class_t get_base_sc(ir_storage_class_class_t x) { return x & ~ir_sc_modifiers; -} /* get_base_sc */ +} /** * Find the base address and entity of an Sel node. @@ -115,7 +109,7 @@ static ir_node *find_base_adr(const ir_node *sel, ir_entity **pEnt) } *pEnt = get_Sel_entity(sel); return ptr; -} /* find_base_adr */ +} /** * Check if a given Const node is greater or equal a given size. @@ -134,7 +128,7 @@ static ir_alias_relation check_const(const ir_node *cns, int size) return tarval_is_null(tv) ? ir_may_alias : ir_no_alias; tv_size = new_tarval_from_long(size, get_tarval_mode(tv)); return tarval_cmp(tv_size, tv) & (ir_relation_less_equal) ? ir_no_alias : ir_may_alias; -} /* check_const */ +} /** * Treat idx1 and idx2 as integer indexes and check if they differ always more than size. @@ -298,10 +292,10 @@ static ir_alias_relation different_index(const ir_node *idx1, const ir_node *idx } return ir_may_alias; -} /* different_index */ +} /** - * Two Sel addresses have the same base address, check if there offsets are + * Two Sel addresses have the same base address, check if their offsets are * different. * * @param adr1 The first address. @@ -354,7 +348,7 @@ static ir_alias_relation different_sel_offsets(const ir_node *sel1, const ir_nod (void) different_index; #endif return ir_may_alias; -} /* different_sel_offsets */ +} /** * Determine the alias relation by checking if adr1 and adr2 are pointer @@ -367,13 +361,13 @@ static ir_alias_relation different_types(const ir_node *adr1, const ir_node *adr { ir_entity *ent1 = NULL, *ent2 = NULL; - if (is_Global(adr1)) - ent1 = get_Global_entity(adr1); + if (is_SymConst_addr_ent(adr1)) + ent1 = get_SymConst_entity(adr1); else if (is_Sel(adr1)) ent1 = get_Sel_entity(adr1); - if (is_Global(adr2)) - ent2 = get_Global_entity(adr2); + if (is_SymConst_addr_ent(adr2)) + ent2 = get_SymConst_entity(adr2); else if (is_Sel(adr2)) ent2 = get_Sel_entity(adr2); @@ -404,7 +398,7 @@ static ir_alias_relation different_types(const ir_node *adr1, const ir_node *adr } } return ir_may_alias; -} /* different_types */ +} /** * Returns non-zero if a node is a result on a malloc-like routine. @@ -420,23 +414,23 @@ static int is_malloc_Result(const ir_node *node) if (! is_Call(node)) return 0; node = get_Call_ptr(node); - if (is_Global(node)) { - ir_entity *ent = get_Global_entity(node); + if (is_SymConst_addr_ent(node)) { + ir_entity *ent = get_SymConst_entity(node); if (get_entity_additional_properties(ent) & mtp_property_malloc) return 1; return 0; } return 0; -} /* is_malloc_Result */ +} ir_storage_class_class_t classify_pointer(const ir_node *irn, const ir_entity *ent) { ir_graph *irg = get_irn_irg(irn); ir_storage_class_class_t res = ir_sc_pointer; - if (is_Global(irn)) { - ir_entity *entity = get_Global_entity(irn); + if (is_SymConst_addr_ent(irn)) { + ir_entity *entity = get_SymConst_entity(irn); ir_type *owner = get_entity_owner(entity); res = owner == get_tls_type() ? ir_sc_tls : ir_sc_globalvar; if (! (get_entity_usage(entity) & ir_usage_address_taken)) @@ -597,6 +591,16 @@ static ir_alias_relation _get_alias_relation( class1 = get_base_sc(mod1); class2 = get_base_sc(mod2); + /* struct-access cannot alias with variables */ + if (ent1 == NULL && ent2 != NULL && is_compound_type(get_entity_owner(ent2)) + && (class1 == ir_sc_globalvar || class1 == ir_sc_localvar || class1 == ir_sc_tls || class1 == ir_sc_globaladdr)) { + return ir_no_alias; + } + if (ent2 == NULL && ent1 != NULL && is_compound_type(get_entity_owner(ent1)) + && (class2 == ir_sc_globalvar || class2 == ir_sc_localvar || class2 == ir_sc_tls || class2 == ir_sc_globaladdr)) { + return ir_no_alias; + } + if (class1 == ir_sc_pointer || class2 == ir_sc_pointer) { /* swap pointer class to class1 */ if (class2 == ir_sc_pointer) { @@ -685,11 +689,8 @@ leave_type_based_alias:; /* access points-to information here */ return ir_may_alias; -} /* _get_alias_relation */ +} -/* - * Determine the alias relation between two addresses. - */ ir_alias_relation get_alias_relation( const ir_node *adr1, const ir_mode *mode1, const ir_node *adr2, const ir_mode *mode2) @@ -697,13 +698,12 @@ ir_alias_relation get_alias_relation( ir_alias_relation rel = _get_alias_relation(adr1, mode1, adr2, mode2); DB((dbg, LEVEL_1, "alias(%+F, %+F) = %s\n", adr1, adr2, get_ir_alias_relation_name(rel))); return rel; -} /* get_alias_relation */ +} -/* Set a source language specific memory disambiguator function. */ void set_language_memory_disambiguator(DISAMBIGUATOR_FUNC func) { language_disambuigator = func; -} /* set_language_memory_disambiguator */ +} /** The result cache for the memory disambiguator. */ static set *result_cache = NULL; @@ -717,7 +717,7 @@ typedef struct mem_disambig_entry { ir_alias_relation result; /**< The alias relation result. */ } mem_disambig_entry; -#define HASH_ENTRY(adr1, adr2) (HASH_PTR(adr1) ^ HASH_PTR(adr2)) +#define HASH_ENTRY(adr1, adr2) (hash_ptr(adr1) ^ hash_ptr(adr2)) /** * Compare two relation cache entries. @@ -730,19 +730,13 @@ static int cmp_mem_disambig_entry(const void *elt, const void *key, size_t size) return p1->adr1 == p2->adr1 && p1->adr2 == p2->adr2 && p1->mode1 == p2->mode1 && p1->mode2 == p2->mode2; -} /* cmp_mem_disambig_entry */ +} -/** - * Initialize the relation cache. - */ void mem_disambig_init(void) { result_cache = new_set(cmp_mem_disambig_entry, 8); -} /* mem_disambig_init */ +} -/* - * Determine the alias relation between two addresses. - */ ir_alias_relation get_alias_relation_ex( const ir_node *adr1, const ir_mode *mode1, const ir_node *adr2, const ir_mode *mode2) @@ -764,24 +758,23 @@ ir_alias_relation get_alias_relation_ex( key.adr2 = adr2; key.mode1 = mode1; key.mode2 = mode2; - entry = (mem_disambig_entry*) set_find(result_cache, &key, sizeof(key), HASH_ENTRY(adr1, adr2)); + entry = set_find(mem_disambig_entry, result_cache, &key, sizeof(key), HASH_ENTRY(adr1, adr2)); if (entry != NULL) return entry->result; key.result = get_alias_relation(adr1, mode1, adr2, mode2); - set_insert(result_cache, &key, sizeof(key), HASH_ENTRY(adr1, adr2)); + (void)set_insert(mem_disambig_entry, result_cache, &key, sizeof(key), HASH_ENTRY(adr1, adr2)); return key.result; -} /* get_alias_relation_ex */ +} -/* Free the relation cache. */ void mem_disambig_term(void) { if (result_cache != NULL) { del_set(result_cache); result_cache = NULL; } -} /* mem_disambig_term */ +} /** * Check the mode of a Load/Store with the mode of the entity @@ -810,13 +803,12 @@ static int is_hidden_cast(const ir_mode *mode, const ir_mode *ent_mode) if (ent_mode != mode) { if (ent_mode == NULL || get_mode_size_bits(ent_mode) != get_mode_size_bits(mode) || - get_mode_sort(ent_mode) != get_mode_sort(mode) || get_mode_arithmetic(ent_mode) != irma_twos_complement || get_mode_arithmetic(mode) != irma_twos_complement) return true; } return false; -} /* is_hidden_cast */ +} /** * Determine the usage state of a node (or its successor Sels). @@ -886,14 +878,14 @@ static ir_entity_usage determine_entity_usage(const ir_node *irn, ir_entity *ent res |= determine_entity_usage(succ, entity); break; case iro_Sel: { - ir_entity *entity = get_Sel_entity(succ); + ir_entity *sel_entity = get_Sel_entity(succ); /* this analysis can't handle unions correctly */ - if (is_Union_type(get_entity_owner(entity))) { + if (is_Union_type(get_entity_owner(sel_entity))) { res |= ir_usage_unknown; break; } /* Check the successor of irn. */ - res |= determine_entity_usage(succ, entity); + res |= determine_entity_usage(succ, sel_entity); break; } @@ -958,6 +950,8 @@ static void analyse_irg_entity_usage(ir_graph *irg) size_t i, n; int j, k, static_link_arg; + assure_irg_properties(irg, IR_GRAPH_PROPERTY_CONSISTENT_OUTS); + /* set initial state to not_taken, as this is the "smallest" state */ for (i = 0, n = get_class_n_members(ft); i < n; ++i) { ir_entity *ent = get_class_member(ft, i); @@ -971,8 +965,6 @@ static void analyse_irg_entity_usage(ir_graph *irg) } } - assure_irg_outs(irg); - irg_frame = get_irg_frame(irg); for (j = get_irn_n_outs(irg_frame) - 1; j >= 0; --j) { @@ -1029,24 +1021,13 @@ static void analyse_irg_entity_usage(ir_graph *irg) } } - /* now computed */ - irg->entity_usage_state = ir_entity_usage_computed; -} - -ir_entity_usage_computed_state get_irg_entity_usage_state(const ir_graph *irg) -{ - return irg->entity_usage_state; -} - -void set_irg_entity_usage_state(ir_graph *irg, ir_entity_usage_computed_state state) -{ - irg->entity_usage_state = state; + add_irg_properties(irg, IR_GRAPH_PROPERTY_CONSISTENT_ENTITY_USAGE); } void assure_irg_entity_usage_computed(ir_graph *irg) { - if (irg->entity_usage_state != ir_entity_usage_not_computed) + if (irg_has_properties(irg, IR_GRAPH_PROPERTY_CONSISTENT_ENTITY_USAGE)) return; analyse_irg_entity_usage(irg); @@ -1086,8 +1067,8 @@ static void check_initializer_nodes(ir_initializer_t *initializer) case IR_INITIALIZER_CONST: /* let's check if it's an address */ n = initializer->consti.value; - if (is_Global(n)) { - ir_entity *ent = get_Global_entity(n); + if (is_SymConst_addr_ent(n)) { + ir_entity *ent = get_SymConst_entity(n); set_entity_usage(ent, ir_usage_unknown); } return; @@ -1103,7 +1084,7 @@ static void check_initializer_nodes(ir_initializer_t *initializer) return; } panic("invalid initializer found"); -} /* check_initializer_nodes */ +} /** * Mark all entities used in the initializer for the given entity as unknown @@ -1122,18 +1103,6 @@ static void check_initializer(ir_entity *ent) if (ent->initializer != NULL) { check_initializer_nodes(ent->initializer); - } 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 an address */ - if (is_Global(irn)) { - ir_entity *ent = get_Global_entity(irn); - set_entity_usage(ent, ir_usage_unknown); - } - } } } @@ -1152,7 +1121,7 @@ static void check_initializers(ir_type *tp) check_initializer(ent); } -} /* check_initializers */ +} #ifdef DEBUG_libfirm /** @@ -1192,16 +1161,16 @@ static void check_global_address(ir_node *irn, void *data) unsigned flags; (void) data; - if (is_Global(irn)) { + if (is_SymConst_addr_ent(irn)) { /* A global. */ - ent = get_Global_entity(irn); + ent = get_SymConst_entity(irn); } else return; flags = get_entity_usage(ent); flags |= determine_entity_usage(irn, ent); set_entity_usage(ent, (ir_entity_usage) flags); -} /* check_global_address */ +} /** * Update the entity usage flags of all global entities. @@ -1240,19 +1209,16 @@ static void analyse_irp_globals_entity_usage(void) irp->globals_entity_usage_state = ir_entity_usage_computed; } -/* Returns the current address taken state of the globals. */ ir_entity_usage_computed_state get_irp_globals_entity_usage_state(void) { return irp->globals_entity_usage_state; } -/* Sets the current address taken state of the graph. */ void set_irp_globals_entity_usage_state(ir_entity_usage_computed_state state) { irp->globals_entity_usage_state = state; } -/* Assure that the address taken flag is computed for the globals. */ void assure_irp_globals_entity_usage_computed(void) { if (irp->globals_entity_usage_state != ir_entity_usage_not_computed) @@ -1278,17 +1244,15 @@ static pmap *mtp_map; */ static ir_type *clone_type_and_cache(ir_type *tp) { - ir_type *res; - pmap_entry *e = pmap_find(mtp_map, tp); + ir_type *res = pmap_get(ir_type, mtp_map, tp); - if (e != NULL) - return (ir_type*) e->value; - - res = clone_type_method(tp); - pmap_insert(mtp_map, tp, res); + if (res == NULL) { + res = clone_type_method(tp); + pmap_insert(mtp_map, tp, res); + } return res; -} /* clone_type_and_cache */ +} /** * Walker: clone all call types of Calls to methods having the @@ -1314,9 +1278,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) { size_t i, n; @@ -1352,10 +1315,9 @@ void mark_private_methods(void) all_irg_walk(NULL, update_calls_to_private, NULL); 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 */ +}