X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fana%2Firmemory.c;h=313b54a5dd79e1b005a0065ef45ac9e343445489;hb=1479bfdba32d70f164f61f1bdc8e31190df1269f;hp=0a4a33da01b971e42d49c68b028cfbd276cab698;hpb=435f2de77041f8056be00afb00b6ca5bc3ce53fc;p=libfirm diff --git a/ir/ana/irmemory.c b/ir/ana/irmemory.c index 0a4a33da0..313b54a5d 100644 --- a/ir/ana/irmemory.c +++ b/ir/ana/irmemory.c @@ -33,6 +33,7 @@ #include "irnode_t.h" #include "irgraph_t.h" #include "irprog_t.h" +#include "irmemory_t.h" #include "irmemory.h" #include "irflag.h" #include "hashptr.h" @@ -104,6 +105,9 @@ static ir_node *find_base_adr(ir_node *sel, ir_entity **pEnt) { /** * Check if a given Const node is greater or equal a given size. * + * @param cns a Const node + * @param size a integer size + * * @return ir_no_alias if the Const is greater, ir_may_alias else */ static ir_alias_relation check_const(ir_node *cns, int size) { @@ -119,6 +123,10 @@ static ir_alias_relation check_const(ir_node *cns, int size) { /** * Treat idx1 and idx2 as integer indexes and check if they differ always more than size. * + * @param idx1 a node representing the first index + * @param idx2 a node representing the second index + * @param size an integer size + * * @return ir_sure_alias iff idx1 == idx2 * ir_no_alias iff they ALWAYS differ more than size * ir_may_alias else @@ -181,7 +189,7 @@ static ir_alias_relation different_index(ir_node *idx1, ir_node *idx2, int size) return ir_no_alias; } /* tv_size > tv2, so we can subtract without overflow */ - tv2 = tarval_sub(tv_size, tv2); + tv2 = tarval_sub(tv_size, tv2, NULL); /* tv1 is < 0, so we can negate it */ tv1 = tarval_neg(tv1); @@ -200,7 +208,7 @@ static ir_alias_relation different_index(ir_node *idx1, ir_node *idx2, int size) tv2 = t; } /* tv1 is now the "smaller" one */ - tv = tarval_sub(tv2, tv1); + tv = tarval_sub(tv2, tv1, NULL); tv_size = new_tarval_from_long(size, get_tarval_mode(tv)); return tarval_cmp(tv_size, tv) & (pn_Cmp_Eq|pn_Cmp_Lt) ? ir_no_alias : ir_may_alias; } @@ -354,13 +362,13 @@ static ir_alias_relation different_types(ir_node *adr1, ir_node *adr2) ir_type *tp2 = get_entity_type(ent2); if (tp1 != tp2) { - if (is_Pointer_type(tp1) && is_Pointer_type(tp2)) { - /* do deref until no pointer types are found */ - do { - tp1 = get_pointer_points_to_type(tp1); - tp2 = get_pointer_points_to_type(tp2); - } while (is_Pointer_type(tp1) && is_Pointer_type(tp2)); +#if 0 + /* do deref until no pointer types are found */ + while (is_Pointer_type(tp1) && is_Pointer_type(tp2)) { + tp1 = get_pointer_points_to_type(tp1); + tp2 = get_pointer_points_to_type(tp2); } +#endif if (get_type_tpop(tp1) != get_type_tpop(tp2)) { /* different type structure */ @@ -380,20 +388,6 @@ static ir_alias_relation different_types(ir_node *adr1, ir_node *adr2) return ir_may_alias; } /* different_types */ -/** - * Returns non-zero if a node is a routine parameter. - * - * @param node the Proj node to test - */ -static int is_arg_Proj(ir_node *node) { - if (! is_Proj(node)) - return 0; - node = get_Proj_pred(node); - if (! is_Proj(node)) - return 0; - return pn_Start_T_args == get_Proj_proj(node) && is_Start(get_Proj_pred(node)); -} /* is_arg_Proj */ - /** * Returns non-zero if a node is a result on a malloc-like routine. * @@ -466,6 +460,14 @@ static ir_node *skip_Bitfield_Sels(ir_node *adr) { /** * Determine the alias relation between two addresses. + * + * @param irg the graph of both memory operations + * @param addr1 pointer address of the first memory operation + * @param mode1 the mode of the accessed data through addr1 + * @param addr2 pointer address of the second memory operation + * @param mode2 the mode of the accessed data through addr2 + * + * @return found memory relation */ static ir_alias_relation _get_alias_relation( ir_graph *irg, @@ -503,7 +505,7 @@ static ir_alias_relation _get_alias_relation( have_const_offsets = 1; while (is_Add(adr1)) { ir_node *add_right = get_Add_right(adr1); - if (is_Const(add_right)) { + if (is_Const(add_right) && !mode_is_reference(get_irn_mode(add_right))) { tarval *tv = get_Const_tarval(add_right); offset1 += get_tarval_long(tv); adr1 = get_Add_left(adr1); @@ -517,7 +519,7 @@ static ir_alias_relation _get_alias_relation( } while (is_Add(adr2)) { ir_node *add_right = get_Add_right(adr2); - if (is_Const(add_right)) { + if (is_Const(add_right) && !mode_is_reference(get_irn_mode(add_right))) { tarval *tv = get_Const_tarval(add_right); offset2 += get_tarval_long(tv); adr2 = get_Add_left(adr2); @@ -555,7 +557,7 @@ static ir_alias_relation _get_alias_relation( adr1 = skip_Bitfield_Sels(adr1); adr2 = skip_Bitfield_Sels(adr2); - /* skip sels */ + /* skip Sels */ base1 = adr1; base2 = adr2; ent1 = NULL; @@ -567,7 +569,7 @@ static ir_alias_relation _get_alias_relation( base2 = find_base_adr(adr2, &ent2); } - /* same base address -> compare sel entities */ + /* same base address -> compare Sel entities */ if (base1 == base2 && ent1 != NULL && ent2 != NULL) { if (ent1 != ent2) return ir_no_alias; @@ -580,33 +582,31 @@ static ir_alias_relation _get_alias_relation( 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; - } else { - return ir_may_alias; } } else if (class2 == ir_sc_pointer) { if (class1 & ir_sc_modifier_nottaken) { + /* a pointer and an object whose objects was never taken */ return ir_no_alias; - } else { - return ir_may_alias; } - } - - if (class1 != class2) { + } else if (class1 != class2) { + /* two objects from different memory spaces */ return ir_no_alias; - } - - if (class1 == ir_sc_globalvar) { - ir_entity *entity1 = get_SymConst_entity(base1); - ir_entity *entity2 = get_SymConst_entity(base2); - if (entity1 != entity2) - return ir_no_alias; + } else { + /* both classes are equal */ + if (class1 == ir_sc_globalvar) { + ir_entity *entity1 = get_SymConst_entity(base1); + ir_entity *entity2 = get_SymConst_entity(base2); + if (entity1 != entity2) + return ir_no_alias; - /* for some reason CSE didn't happen yet for the 2 SymConsts... */ - return ir_may_alias; + /* for some reason CSE didn't happen yet for the 2 SymConsts... */ + return ir_may_alias; + } } - /* Type based alias analysis */ + /* Type based alias analysis */ if (options & aa_opt_type_based) { ir_alias_relation rel; @@ -625,6 +625,10 @@ static ir_alias_relation _get_alias_relation( if (mode_is_reference(mode1) != mode_is_reference(mode2)) return ir_no_alias; + /* cheap test: if arithmetic is different, no alias */ + if (get_mode_arithmetic(mode1) != get_mode_arithmetic(mode2)) + return ir_no_alias; + /* try rule R5 */ rel = different_types(orig_adr1, orig_adr2); if (rel != ir_may_alias) @@ -938,11 +942,13 @@ static void check_initializer_nodes(ir_initializer_t *initializer) return; } } - panic("invalid initialzier found"); -} + panic("invalid initializer found"); +} /* check_initializer_nodes */ /** - * Mark all entities used in the initializer for the given entity as address taken + * Mark all entities used in the initializer for the given entity as address taken. + * + * @param ent the entity */ static void check_initializer(ir_entity *ent) { ir_node *n; @@ -952,8 +958,8 @@ static void check_initializer(ir_entity *ent) { if (get_entity_variability(ent) == variability_uninitialized) return; - /* Beware: Methods initialized with "themself". This does not count as a taken - address. */ + /* Beware: Methods are always initialized with "themself". This does not + count as a taken address. */ if (is_Method_type(get_entity_type(ent))) return; @@ -981,7 +987,9 @@ static void check_initializer(ir_entity *ent) { /** - * Mark all entities used in initializers as address taken + * Mark all entities used in initializers as address taken. + * + * @param tp a compound type */ static void check_initializers(ir_type *tp) { int i; @@ -996,6 +1004,8 @@ static void check_initializers(ir_type *tp) { #ifdef DEBUG_libfirm /** * Print the address taken state of all entities of a given type for debugging. + * + * @param tp a compound type */ static void print_address_taken_state(ir_type *tp) { int i; @@ -1043,8 +1053,6 @@ static void check_global_address(ir_node *irn, void *env) { static void analyse_irp_globals_address_taken(void) { int i; - FIRM_DBG_REGISTER(dbg, "firm.ana.irmemory"); - init_taken_flag(get_glob_type()); init_taken_flag(get_tls_type()); @@ -1085,6 +1093,10 @@ void assure_irp_globals_address_taken_computed(void) { analyse_irp_globals_address_taken(); } /* assure_irp_globals_address_taken_computed */ +void firm_init_memory_disambiguator(void) { + FIRM_DBG_REGISTER(dbg, "firm.ana.irmemory"); +} + #include #include "typerep.h" @@ -1096,6 +1108,8 @@ static pmap *mtp_map; /** * Clone a method type if not already cloned. + * + * @param tp the type to clone */ static ir_type *clone_type_and_cache(ir_type *tp) { static ident *prefix = NULL; @@ -1116,7 +1130,8 @@ static ir_type *clone_type_and_cache(ir_type *tp) { } /* clone_type_and_cache */ /** - * Copy the calling conventions from the entities to the call type. + * Walker: clone all call types of Calls to methods having the + * mtp_property_private property set. */ static void update_calls_to_private(ir_node *call, void *env) { (void) env; @@ -1156,8 +1171,11 @@ void mark_private_methods(void) { ir_entity *ent = get_irg_entity(irg); ir_address_taken_state state = get_entity_address_taken(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 && - state == ir_address_not_taken) { + state == ir_address_not_taken && + get_entity_stickyness(ent) != stickyness_sticky) { ir_type *mtp = get_entity_type(ent); set_entity_additional_property(ent, mtp_property_private);