X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fana%2Firmemory.c;h=77e71c3d7602e47dac36a5adfe876b7c63088d59;hb=00894f1e0b6e74ca6c12d253dd30f7d873808977;hp=c5931b7c40017e54ef1f46c0a4f7b2f4a6b88eb4;hpb=55ca37efd06c4de5888854c011db75442abfed35;p=libfirm diff --git a/ir/ana/irmemory.c b/ir/ana/irmemory.c index c5931b7c4..77e71c3d7 100644 --- a/ir/ana/irmemory.c +++ b/ir/ana/irmemory.c @@ -29,10 +29,13 @@ #endif #include +#include +#include "adt/pmap.h" #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" @@ -42,9 +45,11 @@ #include "irprintf.h" #include "debug.h" #include "error.h" +#include "typerep.h" /** The debug handle. */ DEBUG_ONLY(static firm_dbg_module_t *dbg = NULL;) +DEBUG_ONLY(static firm_dbg_module_t *dbgcall = NULL;) /** The source language specific language disambiguator function. */ static DISAMBIGUATOR_FUNC language_disambuigator = NULL; @@ -56,9 +61,9 @@ static unsigned global_mem_disamgig_opt = aa_opt_no_opt; const char *get_ir_alias_relation_name(ir_alias_relation rel) { #define X(a) case a: return #a switch (rel) { - X(no_alias); - X(may_alias); - X(sure_alias); + X(ir_no_alias); + X(ir_may_alias); + X(ir_sure_alias); default: assert(0); return "UNKNOWN"; } #undef X @@ -104,28 +109,35 @@ 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. * - * @return no_alias if the Const is greater, may_alias else + * @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) { tarval *tv = get_Const_tarval(cns); tarval *tv_size; if (size == 0) - return tarval_is_null(tv) ? may_alias : no_alias; + 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) & (pn_Cmp_Eq|pn_Cmp_Lt) ? no_alias : may_alias; + return tarval_cmp(tv_size, tv) & (pn_Cmp_Eq|pn_Cmp_Lt) ? ir_no_alias : ir_may_alias; } /* check_const */ /** * Treat idx1 and idx2 as integer indexes and check if they differ always more than size. * - * @return sure_alias iff idx1 == idx2 - * no_alias iff they ALWAYS differ more than size - * may_alias else + * @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 */ static ir_alias_relation different_index(ir_node *idx1, ir_node *idx2, int size) { if (idx1 == idx2) - return sure_alias; + return ir_sure_alias; if (is_Const(idx1) && is_Const(idx2)) { /* both are const, we can compare them */ tarval *tv1 = get_Const_tarval(idx1); @@ -134,7 +146,7 @@ static ir_alias_relation different_index(ir_node *idx1, ir_node *idx2, int size) ir_mode *m1, *m2; if (size == 0) - return tv1 == tv2 ? sure_alias : no_alias; + return tv1 == tv2 ? ir_sure_alias : ir_no_alias; /* arg, modes may be different */ m1 = get_tarval_mode(tv1); @@ -147,7 +159,7 @@ static ir_alias_relation different_index(ir_node *idx1, ir_node *idx2, int size) m1 = mode_is_signed(m1) ? find_signed_mode(m2) : find_unsigned_mode(m2); if (m1 == NULL) { /* should NOT happen, but if it does we give up here */ - return may_alias; + return ir_may_alias; } tv1 = tarval_convert_to(tv1, m1); } else if (size > 0) { @@ -155,7 +167,7 @@ static ir_alias_relation different_index(ir_node *idx1, ir_node *idx2, int size) m2 = mode_is_signed(m2) ? find_signed_mode(m1) : find_unsigned_mode(m1); if (m2 == NULL) { /* should NOT happen, but if it does we give up here */ - return may_alias; + return ir_may_alias; } tv2 = tarval_convert_to(tv2, m2); } @@ -178,10 +190,10 @@ static ir_alias_relation different_index(ir_node *idx1, ir_node *idx2, int size) if (tarval_cmp(tv2, tv_size) & (pn_Cmp_Eq|pn_Cmp_Gt)) { /* tv1 is negative and tv2 >= tv_size, so the difference is bigger than size */ - return no_alias; + 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); @@ -190,7 +202,7 @@ static ir_alias_relation different_index(ir_node *idx1, ir_node *idx2, int size) tv1 = tarval_convert_to(tv1, m2); /* now we can compare without overflow */ - return tarval_cmp(tv1, tv2) & (pn_Cmp_Eq|pn_Cmp_Gt) ? no_alias : may_alias; + return tarval_cmp(tv1, tv2) & (pn_Cmp_Eq|pn_Cmp_Gt) ? ir_no_alias : ir_may_alias; } } } @@ -200,9 +212,9 @@ 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) ? no_alias : may_alias; + return tarval_cmp(tv_size, tv) & (pn_Cmp_Eq|pn_Cmp_Lt) ? ir_no_alias : ir_may_alias; } /* Note: we rely here on the fact that normalization puts constants on the RIGHT side */ @@ -272,7 +284,7 @@ static ir_alias_relation different_index(ir_node *idx1, ir_node *idx2, int size) } } - return may_alias; + return ir_may_alias; } /* different_index */ /** @@ -325,7 +337,7 @@ static ir_alias_relation different_sel_offsets(ir_node *sel1, ir_node *sel2) { } } #endif - return may_alias; + return ir_may_alias; } /* different_sel_offsets */ /** @@ -339,13 +351,13 @@ static ir_alias_relation different_types(ir_node *adr1, ir_node *adr2) { ir_entity *ent1 = NULL, *ent2 = NULL; - if (is_SymConst_addr_ent(adr1)) - ent1 = get_SymConst_entity(adr1); + if (is_Global(adr1)) + ent1 = get_Global_entity(adr1); else if (is_Sel(adr1)) ent1 = get_Sel_entity(adr1); - if (is_SymConst_addr_ent(adr2)) - ent2 = get_SymConst_entity(adr2); + if (is_Global(adr2)) + ent2 = get_Global_entity(adr2); else if (is_Sel(adr2)) ent2 = get_Sel_entity(adr2); @@ -354,46 +366,30 @@ 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)); + /* 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); } if (get_type_tpop(tp1) != get_type_tpop(tp2)) { /* different type structure */ - return no_alias; + return ir_no_alias; } if (is_Class_type(tp1)) { /* check class hierarchy */ if (! is_SubClass_of(tp1, tp2) && ! is_SubClass_of(tp2, tp1)) - return no_alias; + return ir_no_alias; } else { /* different types */ - return no_alias; + return ir_no_alias; } } } - return may_alias; + 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. * @@ -407,8 +403,8 @@ static int is_malloc_Result(ir_node *node) { if (! is_Call(node)) return 0; node = get_Call_ptr(node); - if (is_SymConst_addr_ent(node)) { - ir_entity *ent = get_SymConst_entity(node); + if (is_Global(node)) { + ir_entity *ent = get_Global_entity(node); if (get_entity_additional_properties(ent) & mtp_property_malloc) return 1; @@ -417,32 +413,6 @@ static int is_malloc_Result(ir_node *node) { return 0; } /* is_malloc_Result */ -/** - * Returns true if an address represents a global variable. - * - * @param irn the node representing the address - */ -static INLINE int is_global_var(ir_node *irn) { - return is_SymConst_addr_ent(irn); -} /* is_global_var */ - -/** - * classify storage locations. - * Except STORAGE_CLASS_POINTER they are all disjoint. - * STORAGE_CLASS_POINTER potentially aliases all classes which don't have a - * NOTTAKEN modifier. - */ -typedef enum { - STORAGE_CLASS_POINTER = 0x0000, - STORAGE_CLASS_GLOBALVAR = 0x0001, - STORAGE_CLASS_LOCALVAR = 0x0002, - STORAGE_CLASS_ARGUMENT = 0x0003, - STORAGE_CLASS_TLS = 0x0004, - STORAGE_CLASS_MALLOCED = 0x0005, - - STORAGE_CLASS_MODIFIER_NOTTAKEN = 0x1000, -} storage_class_class_t; - /** * Classify a base pointer. * @@ -450,33 +420,56 @@ typedef enum { * @param irn the node representing the base address * @param ent the base entity of the base address iff any */ -static storage_class_class_t classify_pointer(ir_graph *irg, ir_node *irn, ir_entity *ent) +ir_storage_class_class_t classify_pointer(ir_graph *irg, ir_node *irn, ir_entity *ent) { - storage_class_class_t res = STORAGE_CLASS_POINTER; - if (is_SymConst_addr_ent(irn)) { - ir_entity *entity = get_SymConst_entity(irn); - res = STORAGE_CLASS_GLOBALVAR; - if (get_entity_address_taken(entity) == ir_address_not_taken) - res |= STORAGE_CLASS_MODIFIER_NOTTAKEN; + ir_storage_class_class_t res = ir_sc_pointer; + if (is_Global(irn)) { + ir_entity *entity = get_Global_entity(irn); + res = ir_sc_globalvar; + if (! (get_entity_usage(entity) & ir_usage_address_taken)) + res |= ir_sc_modifier_nottaken; } else if (irn == get_irg_frame(irg)) { - res = STORAGE_CLASS_LOCALVAR; - if (ent != NULL && get_entity_address_taken(ent) == ir_address_not_taken) - res |= STORAGE_CLASS_MODIFIER_NOTTAKEN; + 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 STORAGE_CLASS_ARGUMENT; + return ir_sc_argument; } else if (irn == get_irg_tls(irg)) { - res = STORAGE_CLASS_TLS; - if (ent != NULL && get_entity_address_taken(ent) == ir_address_not_taken) - res |= STORAGE_CLASS_MODIFIER_NOTTAKEN; + res = ir_sc_tls; + if (ent != NULL && !(get_entity_usage(ent) & ir_usage_address_taken)) + res |= ir_sc_modifier_nottaken; } else if (is_Proj(irn) && is_malloc_Result(irn)) { - return STORAGE_CLASS_MALLOCED; + return ir_sc_malloced; } return res; } +/** + * If adr represents a Bitfield Sel, skip it + */ +static ir_node *skip_Bitfield_Sels(ir_node *adr) { + if (is_Sel(adr)) { + ir_entity *ent = get_Sel_entity(adr); + ir_type *bf_type = get_entity_type(ent); + + /* is it a bitfield type? */ + if (is_Primitive_type(bf_type) && get_primitive_base_type(bf_type) != NULL) + adr = get_Sel_ptr(adr); + } + return 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, @@ -492,20 +485,20 @@ static ir_alias_relation _get_alias_relation( ir_node *orig_adr1 = adr1; ir_node *orig_adr2 = adr2; unsigned mode_size; - storage_class_class_t class1, class2; + ir_storage_class_class_t class1, class2; int have_const_offsets; if (! get_opt_alias_analysis()) - return may_alias; + return ir_may_alias; if (adr1 == adr2) - return sure_alias; + return ir_sure_alias; options = get_irg_memory_disambiguator_options(irg); /* The Armageddon switch */ if (options & aa_opt_no_alias) - return no_alias; + return ir_no_alias; /* do the addresses have constants offsets? * Note: nodes are normalized to have constants at right inputs, @@ -514,7 +507,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); @@ -528,7 +521,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); @@ -551,12 +544,22 @@ static ir_alias_relation _get_alias_relation( */ if (adr1 == adr2 && have_const_offsets) { if ((unsigned long)labs(offset2 - offset1) >= mode_size) - return no_alias; + return ir_no_alias; else - return sure_alias; + return ir_sure_alias; } - /* skip sels */ + /* + * Bitfields can be constructed as Sels from its base address. + * As they have different entities, the disambiguator would find that they are + * alias free. While this is true for it's values, it is false for the addresses + * (strictly speaking, the Sel's are NOT the addresses of the bitfields). + * So, skip those bitfield selecting Sel's. + */ + adr1 = skip_Bitfield_Sels(adr1); + adr2 = skip_Bitfield_Sels(adr2); + + /* skip Sels */ base1 = adr1; base2 = adr2; ent1 = NULL; @@ -568,10 +571,10 @@ 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 no_alias; + return ir_no_alias; else if (have_const_offsets) return different_sel_offsets(adr1, adr2); } @@ -579,56 +582,58 @@ static ir_alias_relation _get_alias_relation( class1 = classify_pointer(irg, base1, ent1); class2 = classify_pointer(irg, base2, ent2); - if (class1 == STORAGE_CLASS_POINTER) { - if (class2 & STORAGE_CLASS_MODIFIER_NOTTAKEN) { - return no_alias; - } else { - return may_alias; + 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 if (class2 == STORAGE_CLASS_POINTER) { - if (class1 & STORAGE_CLASS_MODIFIER_NOTTAKEN) { - return no_alias; - } else { - return 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 if (class1 != class2) { + /* two objects from different memory spaces */ + 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; } } - if (class1 != class2) { - return no_alias; - } - - if (class1 == STORAGE_CLASS_GLOBALVAR) { - ir_entity *entity1 = get_SymConst_entity(base1); - ir_entity *entity2 = get_SymConst_entity(base2); - if (entity1 != entity2) - return no_alias; - - /* for some reason CSE didn't happen yet for the 2 SymConsts... */ - return may_alias; - } - - /* Type based alias analysis */ + /* Type based alias analysis */ if (options & aa_opt_type_based) { ir_alias_relation rel; if (options & aa_opt_byte_type_may_alias) { if (get_mode_size_bits(mode1) == 8 || get_mode_size_bits(mode2) == 8) { - /* One of the modes address a byte. Assume a may_alias and leave + /* One of the modes address a byte. Assume a ir_may_alias and leave the type based check. */ goto leave_type_based_alias; } } /* cheap check: If the mode sizes did not match, the types MUST be different */ if (get_mode_size_bits(mode1) != get_mode_size_bits(mode2)) - return no_alias; + return ir_no_alias; /* cheap test: if only one is a reference mode, no alias */ if (mode_is_reference(mode1) != mode_is_reference(mode2)) - return no_alias; + 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 != may_alias) + if (rel != ir_may_alias) return rel; leave_type_based_alias:; } @@ -636,12 +641,12 @@ 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 (rel != may_alias) + if (rel != ir_may_alias) return rel; } /* access points-to information here */ - return may_alias; + return ir_may_alias; } /* _get_alias_relation */ /* @@ -705,7 +710,7 @@ ir_alias_relation get_alias_relation_ex( ir_fprintf(stderr, "%+F <-> %+F\n", adr1, adr2); if (! get_opt_alias_analysis()) - return may_alias; + return ir_may_alias; if (get_irn_opcode(adr1) > get_irn_opcode(adr2)) { ir_node *t = adr1; @@ -753,105 +758,154 @@ 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) { + if (ent_mode == NULL) + return false; + 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 1; + return true; } - return 0; + return false; } /* is_hidden_cast */ /** - * Determine the address_taken state of a node (or it's successor Sels). + * Determine the usage state of a node (or its successor Sels). * * @param irn the node */ -static ir_address_taken_state find_address_taken_state(ir_node *irn) { - int i, j; +static ir_entity_usage determine_entity_usage(const ir_node *irn, ir_entity *entity) { + int i; ir_mode *emode, *mode; ir_node *value; - ir_entity *ent; ir_type *tp; + ir_entity_usage res = 0; for (i = get_irn_n_outs(irn) - 1; i >= 0; --i) { ir_node *succ = get_irn_out(irn, i); switch (get_irn_opcode(succ)) { case iro_Load: + assert(irn == get_Load_ptr(succ)); + res |= ir_usage_read; + /* check if this load is not a hidden conversion */ - mode = get_Load_mode(succ); - ent = is_SymConst(irn) ? get_SymConst_entity(irn) : get_Sel_entity(irn); - emode = get_type_mode(get_entity_type(ent)); + mode = get_Load_mode(succ); + emode = get_type_mode(get_entity_type(entity)); if (is_hidden_cast(mode, emode)) - return ir_address_taken; + res |= ir_usage_reinterpret_cast; break; case iro_Store: /* check that the node is not the Store's value */ - value = get_Store_value(succ); - if (value == irn) - return ir_address_taken; - /* check if this Store is not a hidden conversion */ - mode = get_irn_mode(value); - ent = is_SymConst(irn) ? get_SymConst_entity(irn) : get_Sel_entity(irn); - emode = get_type_mode(get_entity_type(ent)); - if (is_hidden_cast(mode, emode)) - return ir_address_taken; + if (irn == get_Store_value(succ)) { + res |= ir_usage_unknown; + } + if (irn == get_Store_ptr(succ)) { + res |= ir_usage_write; + + /* check if this Store is not a hidden conversion */ + value = get_Store_value(succ); + mode = get_irn_mode(value); + emode = get_type_mode(get_entity_type(entity)); + if (is_hidden_cast(mode, emode)) + res |= ir_usage_reinterpret_cast; + } + assert(irn != get_Store_mem(succ)); break; case iro_CopyB: /* CopyB are like Loads/Stores */ - ent = is_SymConst(irn) ? get_SymConst_entity(irn) : get_Sel_entity(irn); - tp = get_entity_type(ent); + tp = get_entity_type(entity); if (tp != get_CopyB_type(succ)) { /* bad, different types, might be a hidden conversion */ - return ir_address_taken; + res |= ir_usage_reinterpret_cast; + } + if (irn == get_CopyB_dst(succ)) { + res |= ir_usage_write; + } else { + assert(irn == get_CopyB_src(succ)); + res |= ir_usage_read; } break; + case iro_Add: + case iro_Sub: case iro_Sel: { /* Check the successor of irn. */ - ir_address_taken_state res = find_address_taken_state(succ); - if (res != ir_address_not_taken) - return res; + res |= determine_entity_usage(succ, entity); break; } case iro_Call: - /* Only the call address is not an address taker but - this is an uninteresting case, so we ignore it here. */ - for (j = get_Call_n_params(succ) - 1; j >= 0; --j) { - ir_node *param = get_Call_param(succ, j); - if (param == irn) - return ir_address_taken; + if (irn == get_Call_ptr(succ)) { + /* TODO: we could check for reinterpret casts here... + * But I doubt anyone is interested in that bit for + * function entities and I'm too lazy to write the code now. + */ + res |= ir_usage_read; + } else { + assert(irn != get_Call_mem(succ)); + res |= ir_usage_unknown; } break; + /* skip identities */ + case iro_Id: + res |= determine_entity_usage(succ, entity); + break; + + /* skip tuples */ + case iro_Tuple: { + int input_nr; + for (input_nr = get_Tuple_n_preds(succ) - 1; input_nr >= 0; + --input_nr) { + ir_node *pred = get_Tuple_pred(succ, input_nr); + if (pred == irn) { + int k; + /* we found one input */ + for (k = get_irn_n_outs(succ) - 1; k >= 0; --k) { + ir_node *proj = get_irn_out(succ, k); + + if (is_Proj(proj) && get_Proj_proj(proj) == input_nr) { + res |= determine_entity_usage(proj, entity); + break; + } + } + } + } + break; + } + default: - /* another op, the address may be taken */ - return ir_address_taken_unknown; + /* another op, we don't know anything (we could do more advanced + * things like a dataflow analysis here) */ + res |= ir_usage_unknown; + break; } } - /* All successors finished, the address is not taken. */ - return ir_address_not_taken; -} /* find_address_taken_state */ + + return res; +} /** - * Update the "address taken" flag of all frame entities. + * Update the usage flags of all frame entities. */ -static void analyse_irg_address_taken(ir_graph *irg) { +static void analyse_irg_entity_usage(ir_graph *irg) { ir_type *ft = get_irg_frame_type(irg); ir_node *irg_frame; int i; /* set initial state to not_taken, as this is the "smallest" state */ for (i = get_class_n_members(ft) - 1; i >= 0; --i) { - ir_entity *ent = get_class_member(ft, i); + ir_entity *ent = get_class_member(ft, i); + ir_entity_usage flags = + get_entity_stickyness(ent) == stickyness_sticky ? ir_usage_unknown : 0; - set_entity_address_taken(ent, ir_address_not_taken); + set_entity_usage(ent, flags); } assure_irg_outs(irg); @@ -859,91 +913,98 @@ static void analyse_irg_address_taken(ir_graph *irg) { irg_frame = get_irg_frame(irg); for (i = get_irn_n_outs(irg_frame) - 1; i >= 0; --i) { - ir_node *succ = get_irn_out(irg_frame, i); - ir_address_taken_state state; + ir_node *succ = get_irn_out(irg_frame, i); + ir_entity *entity; + ir_entity_usage flags; - if (is_Sel(succ)) { - ir_entity *ent = get_Sel_entity(succ); + if (!is_Sel(succ)) + continue; - if (get_entity_address_taken(ent) == ir_address_taken) - continue; - - state = find_address_taken_state(succ); - if (state > get_entity_address_taken(ent)) - set_entity_address_taken(ent, state); - } + entity = get_Sel_entity(succ); + flags = get_entity_usage(entity); + flags |= determine_entity_usage(succ, entity); + set_entity_usage(entity, flags); } + /* now computed */ - irg->adr_taken_state = ir_address_taken_computed; -} /* analyse_address_taken */ + 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; +} -/* Returns the current address taken state of the graph. */ -ir_address_taken_computed_state get_irg_address_taken_state(const ir_graph *irg) { - return irg->adr_taken_state; -} /* get_irg_address_taken_state */ +void set_irg_entity_usage_state(ir_graph *irg, ir_entity_usage_computed_state state) { + irg->entity_usage_state = state; +} -/* Sets the current address taken state of the graph. */ -void set_irg_address_taken_state(ir_graph *irg, ir_address_taken_computed_state state) { - irg->adr_taken_state = state; -} /* set_irg_address_taken_state */ +void assure_irg_entity_usage_computed(ir_graph *irg) { + if (irg->entity_usage_state != ir_entity_usage_not_computed) + return; -/* Assure that the address taken flag is computed for the given graph. */ -void assure_irg_address_taken_computed(ir_graph *irg) { - if (irg->adr_taken_state == ir_address_taken_not_computed) - analyse_irg_address_taken(irg); -} /* assure_irg_address_taken_computed */ + analyse_irg_entity_usage(irg); +} /** - * Initialize the address_taken flag for a global type like type. + * Initialize the entity_usage flag for a global type like type. */ -static void init_taken_flag(ir_type * tp) { +static void init_entity_usage(ir_type * tp) { int i; - /* All external visible entities are at least - ir_address_taken_unknown. This is very conservative. */ + /* 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_address_taken_state state; - - state = get_entity_visibility(ent) == visibility_external_visible ? - ir_address_taken_unknown : ir_address_not_taken ; - set_entity_address_taken(ent, state); + 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) { + flags |= ir_usage_unknown; + } + set_entity_usage(ent, flags); } -} /* init_taken_flag */ +} +/** + * Mark all entities used in the initializer as unknown usage. + * + * @param initializer the initializer to check + */ static void check_initializer_nodes(ir_initializer_t *initializer) { - switch(initializer->kind) { - case IR_INITIALIZER_CONST: { - ir_node *n = initializer->consti.value; + unsigned i; + ir_node *n; + switch (initializer->kind) { + case IR_INITIALIZER_CONST: /* let's check if it's an address */ - if (is_SymConst_addr_ent(n)) { - ir_entity *ent = get_SymConst_entity(n); - set_entity_address_taken(ent, ir_address_taken); + n = initializer->consti.value; + if (is_Global(n)) { + ir_entity *ent = get_Global_entity(n); + set_entity_usage(ent, ir_usage_unknown); } return; - } case IR_INITIALIZER_TARVAL: case IR_INITIALIZER_NULL: return; - case IR_INITIALIZER_COMPOUND: { - size_t i; - - for(i = 0; i < initializer->compound.n_initializers; ++i) { + case IR_INITIALIZER_COMPOUND: + for (i = 0; i < initializer->compound.n_initializers; ++i) { ir_initializer_t *sub_initializer = initializer->compound.initializers[i]; check_initializer_nodes(sub_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 unknown + * usage. + * + * @param ent the entity */ static void check_initializer(ir_entity *ent) { ir_node *n; @@ -953,8 +1014,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; @@ -963,18 +1024,18 @@ static void check_initializer(ir_entity *ent) { } else if (is_atomic_entity(ent)) { /* let's check if it's an address */ n = get_atomic_ent_value(ent); - if (is_SymConst_addr_ent(n)) { - ir_entity *ent = get_SymConst_entity(n); - set_entity_address_taken(ent, ir_address_taken); + if (is_Global(n)) { + ir_entity *ent = get_Global_entity(n); + set_entity_usage(ent, ir_usage_unknown); } } else { for (i = get_compound_ent_n_values(ent) - 1; i >= 0; --i) { n = get_compound_ent_value(ent, i); /* let's check if it's an address */ - if (is_SymConst_addr_ent(n)) { - ir_entity *ent = get_SymConst_entity(n); - set_entity_address_taken(ent, ir_address_taken); + if (is_Global(n)) { + ir_entity *ent = get_Global_entity(n); + set_entity_usage(ent, ir_usage_unknown); } } } @@ -982,7 +1043,9 @@ static void check_initializer(ir_entity *ent) { /** - * Mark all entities used in initializers as address taken + * Mark all entities used in initializers as unknown usage. + * + * @param tp a compound type */ static void check_initializers(ir_type *tp) { int i; @@ -996,20 +1059,30 @@ static void check_initializers(ir_type *tp) { #ifdef DEBUG_libfirm /** - * Print the address taken state of all entities of a given type for debugging. + * Print the entity usage flags of all entities of a given type for debugging. + * + * @param tp a compound type */ -static void print_address_taken_state(ir_type *tp) { +static void print_entity_usage_flags(ir_type *tp) { int i; for (i = get_compound_n_members(tp) - 1; i >= 0; --i) { ir_entity *ent = get_compound_member(tp, i); - ir_address_taken_state state = get_entity_address_taken(ent); - - if (state != ir_address_not_taken) { - assert(ir_address_not_taken <= (int) state && state <= ir_address_taken); - ir_printf("%+F: %s\n", ent, get_address_taken_state_name(state)); - } + ir_entity_usage flags = get_entity_usage(ent); + + if (flags == 0) + continue; + ir_printf("%+F:", ent); + if (flags & ir_usage_address_taken) + printf(" address_taken"); + if (flags & ir_usage_read) + printf(" read"); + if (flags & ir_usage_write) + printf(" write"); + if (flags & ir_usage_reinterpret_cast) + printf(" reinterp_cast"); + printf("\n"); } -} /* print_address_taken_state */ +} #endif /* DEBUG_libfirm */ /** @@ -1018,39 +1091,38 @@ static void print_address_taken_state(ir_type *tp) { static void check_global_address(ir_node *irn, void *env) { ir_node *tls = env; ir_entity *ent; - ir_address_taken_state state; + ir_entity_usage flags; - if (is_SymConst_addr_ent(irn)) { + if (is_Global(irn)) { /* A global. */ - ent = get_SymConst_entity(irn); + ent = get_Global_entity(irn); } else if (is_Sel(irn) && get_Sel_ptr(irn) == tls) { /* A TLS variable. */ ent = get_Sel_entity(irn); } else return; - if (get_entity_address_taken(ent) >= ir_address_taken) { - /* Already at the maximum. */ - return; - } - state = find_address_taken_state(irn); - if (state > get_entity_address_taken(ent)) - set_entity_address_taken(ent, state); + flags = get_entity_usage(ent); + flags |= determine_entity_usage(irn, ent); + set_entity_usage(ent, flags); } /* check_global_address */ /** - * Update the "address taken" flag of all global entities. + * Update the entity usage flags of all global entities. */ -static void analyse_irp_globals_address_taken(void) { +static void analyse_irp_globals_entity_usage(void) { int i; + ir_segment_t s; - FIRM_DBG_REGISTER(dbg, "firm.ana.irmemory"); - - init_taken_flag(get_glob_type()); - init_taken_flag(get_tls_type()); + for (s = IR_SEGMENT_FIRST; s < IR_SEGMENT_COUNT; ++s) { + ir_type *type = get_segment_type(s); + init_entity_usage(type); + } - check_initializers(get_glob_type()); - check_initializers(get_tls_type()); + for (s = IR_SEGMENT_FIRST; s < IR_SEGMENT_COUNT; ++s) { + ir_type *type = get_segment_type(s); + check_initializers(type); + } for (i = get_irp_n_irgs() - 1; i >= 0; --i) { ir_graph *irg = get_irp_irg(i); @@ -1061,42 +1133,48 @@ static void analyse_irp_globals_address_taken(void) { #ifdef DEBUG_libfirm if (firm_dbg_get_mask(dbg) & LEVEL_1) { - print_address_taken_state(get_glob_type()); - print_address_taken_state(get_tls_type()); + ir_segment_t s; + for (s = IR_SEGMENT_FIRST; s < IR_SEGMENT_COUNT; ++s) { + print_entity_usage_flags(get_segment_type(s)); + } } #endif /* DEBUG_libfirm */ /* now computed */ - irp->globals_adr_taken_state = ir_address_taken_computed; -} /* analyse_irp_globals_address_taken */ + irp->globals_entity_usage_state = ir_entity_usage_computed; +} /* Returns the current address taken state of the globals. */ -ir_address_taken_computed_state get_irp_globals_address_taken_state(void) { - return irp->globals_adr_taken_state; -} /* get_irp_globals_address_taken_state */ +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_address_taken_state(ir_address_taken_computed_state state) { - irp->globals_adr_taken_state = state; -} /* set_irg_address_taken_state */ +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_address_taken_computed(void) { - if (irp->globals_adr_taken_state == ir_address_taken_not_computed) - analyse_irp_globals_address_taken(); -} /* assure_irp_globals_address_taken_computed */ +void assure_irp_globals_entity_usage_computed(void) { + if (irp->globals_entity_usage_state != ir_entity_usage_not_computed) + return; + analyse_irp_globals_entity_usage(); +} -#include -#include "typerep.h" +void firm_init_memory_disambiguator(void) { + FIRM_DBG_REGISTER(dbg, "firm.ana.irmemory"); + FIRM_DBG_REGISTER(dbgcall, "firm.opt.cc"); +} -DEBUG_ONLY(static firm_dbg_module_t *dbgcall = NULL;) /** Maps method types to cloned method types. */ 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; @@ -1117,7 +1195,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; @@ -1145,20 +1224,21 @@ void mark_private_methods(void) { int i; int changed = 0; - FIRM_DBG_REGISTER(dbgcall, "firm.opt.cc"); - - assure_irp_globals_address_taken_computed(); + assure_irp_globals_entity_usage_computed(); mtp_map = pmap_create(); /* first step: change the calling conventions of the local non-escaped entities */ for (i = get_irp_n_irgs() - 1; i >= 0; --i) { - ir_graph *irg = get_irp_irg(i); - ir_entity *ent = get_irg_entity(irg); - ir_address_taken_state state = get_entity_address_taken(ent); + ir_graph *irg = get_irp_irg(i); + 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 && - state == ir_address_not_taken) { + !(flags & ir_usage_address_taken) && + get_entity_stickyness(ent) != stickyness_sticky) { ir_type *mtp = get_entity_type(ent); set_entity_additional_property(ent, mtp_property_private);