X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fana%2Firmemory.c;h=32d63413203af029d52516a33049718d1669429a;hb=fb729d6eefa68ee2aa9db0f444ab2bc7abfec46a;hp=43a97854f110ae5ce5eb29efe564f9434a04829e;hpb=2e94f5d2069684c470776a53907fda8e93492f31;p=libfirm diff --git a/ir/ana/irmemory.c b/ir/ana/irmemory.c index 43a97854f..32d634132 100644 --- a/ir/ana/irmemory.c +++ b/ir/ana/irmemory.c @@ -40,6 +40,10 @@ #include "irouts.h" #include "irgwalk.h" #include "irprintf.h" +#include "debug.h" + +/** The debug handle. */ +DEBUG_ONLY(static firm_dbg_module_t *dbg = NULL;) /** The source language specific language disambiguator function. */ static DISAMBIGUATOR_FUNC language_disambuigator = NULL; @@ -85,50 +89,48 @@ static ir_node *find_base_adr(ir_node *sel, ir_entity **pEnt) { } /* find_base_adr */ /** - * Check if the address can be decomposed into base PLUS offset. + * Check if a given Const node is greater or equal a given size. + * + * @return no_alias if the Const is greater, may_alias else */ -static int has_offset(ir_node *adr, int *offset) { - if (is_SymConst(adr)) { - *offset = 0; - return 1; - } - if (is_Sel(adr)) { - ir_entity *ent = get_Sel_entity(adr); - ir_type *owner = get_entity_owner(ent); +static ir_alias_relation check_const(ir_node *cns, int size) { + tarval *tv = get_Const_tarval(cns); + tarval *tv_size; - if (get_type_state(owner) != layout_fixed) { - /* The layout is NOT fixed yet, symbolic evaluation needed */ - } - } - return 0; -} /* has_offset */ + if (size == 0) + return classify_tarval(tv) != TV_CLASSIFY_NULL ? no_alias : may_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; +} /* check_const */ /** - * Two address expressions have the same base address, - * check if there offsets are different. + * Treat idx1 and idx2 as integer indexes and check if they differ always more than size. * - * @param adr1 The first address. - * @param adr2 The second address. + * @return sure_alias iff idx1 == idx2 + * no_alias iff they ALWAYS differ more than size + * may_alias else */ -static ir_alias_relation different_offsets(ir_node *adr1, ir_node *adr2) { - int offset1, offset2; - if (has_offset(adr1, &offset1) && has_offset(adr2, &offset2)) { - /* */ - } - return may_alias; -} /* different_offsets */ - -/** - * idx1 and idx2 represent two integer indexes. Check if they could be classified - */ -static ir_alias_relation different_index(ir_node *idx1, ir_node *idx2) { - ir_alias_relation res = may_alias; - +static ir_alias_relation different_index(ir_node *idx1, ir_node *idx2, int size) { if (idx1 == idx2) return sure_alias; if (is_Const(idx1) && is_Const(idx2)) { /* both are const, we can compare them */ - return get_Const_tarval(idx1) == get_Const_tarval(idx2) ? sure_alias : no_alias; + tarval *tv1 = get_Const_tarval(idx1); + tarval *tv2 = get_Const_tarval(idx2); + tarval *tv, *tv_size; + + if (size == 0) + return tv1 == tv2 ? sure_alias : no_alias; + + if (tarval_cmp(tv1, tv2) == pn_Cmp_Gt) { + tarval *t = tv1; + tv1 = tv2; + tv2 = t; + } + /* tv1 is now the "smaller" one */ + tv = tarval_sub(tv2, tv1); + 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; } /* Note: we rely here on the fact that normalization puts constants on the RIGHT side */ @@ -138,25 +140,22 @@ static ir_alias_relation different_index(ir_node *idx1, ir_node *idx2) { if (l1 == idx2) { /* x + c == y */ - if (is_Const(r1)) { - return classify_Const(r1) == CNST_NULL ? sure_alias : no_alias; - } + if (is_Const(r1)) + return check_const(r1, size); } if (is_Add(idx2)) { - /* both are Adds, check if they are of x + c kind */ + /* both are Adds, check if they are of x + a == x + b kind */ ir_node *l2 = get_Add_left(idx2); ir_node *r2 = get_Add_right(idx2); if (l1 == l2) - res = different_index(r1, r2); + return different_index(r1, r2, size); else if (l1 == r2) - res = different_index(r1, l2); + return different_index(r1, l2, size); else if (r1 == r2) - res = different_index(l1, l2); + return different_index(l1, l2, size); else if (r1 == l2) - res = different_index(l1, r2); - if (res != may_alias) - return res; + return different_index(l1, r2, size); } } if (is_Add(idx2)) { @@ -165,9 +164,8 @@ static ir_alias_relation different_index(ir_node *idx1, ir_node *idx2) { if (l2 == idx1) { /* x + c == y */ - if (is_Const(r2)) { - return classify_Const(r2) == CNST_NULL ? sure_alias : no_alias; - } + if (is_Const(r2)) + return check_const(r2, size); } } @@ -177,22 +175,19 @@ static ir_alias_relation different_index(ir_node *idx1, ir_node *idx2) { if (l1 == idx2) { /* x - c == y */ - if (is_Const(r1)) { - return classify_Const(r1) == CNST_NULL ? sure_alias : no_alias; - } + if (is_Const(r1)) + return check_const(r1, size); } if (is_Sub(idx2)) { - /* both are Subs, check if they are of x - c kind */ + /* both are Subs, check if they are of x - a == x - b kind */ ir_node *l2 = get_Sub_left(idx2); if (l1 == l2) { ir_node *r2 = get_Sub_right(idx2); - res = different_index(r1, r2); + return different_index(r1, r2, size); } } - if (res != may_alias) - return res; } if (is_Sub(idx2)) { ir_node *l2 = get_Sub_left(idx2); @@ -200,9 +195,8 @@ static ir_alias_relation different_index(ir_node *idx1, ir_node *idx2) { if (l2 == idx1) { /* x - c == y */ - if (is_Const(r2)) { - return classify_Const(r2) == CNST_NULL ? sure_alias : no_alias; - } + if (is_Const(r2)) + return check_const(r2, size); } } @@ -229,7 +223,7 @@ static ir_alias_relation different_sel_offsets(ir_node *sel1, ir_node *sel2) { if (tp1 == tp2) check_arr = 1; else if (get_type_state(tp1) == layout_fixed && get_type_state(tp2) == layout_fixed && - get_type_size_bytes(tp1) == get_type_size_bytes(tp2)) + get_type_size_bits(tp1) == get_type_size_bits(tp2)) check_arr = 1; } if (check_arr) { @@ -242,7 +236,7 @@ static ir_alias_relation different_sel_offsets(ir_node *sel1, ir_node *sel2) { for (i = 0; i < n; ++i) { ir_node *idx1 = get_Sel_index(sel1, i); ir_node *idx2 = get_Sel_index(sel2, i); - ir_alias_relation res = different_index(idx1, idx2); + ir_alias_relation res = different_index(idx1, idx2, 0); /* we can safely IGNORE the size here if it's at least >0 */ if (res == may_alias) return may_alias; @@ -308,6 +302,82 @@ static ir_alias_relation different_types(ir_node *adr1, ir_node *adr2) return may_alias; } /* different_types */ +/** + * Check if an offset is a constant and these constant is bigger or equal + * than a given size. + */ +static int check_const_offset(ir_node *offset, int size) { + ir_mode *mode = get_irn_mode(offset); + + /* ok, we found an offset, check for constant */ + if (is_Const(offset) && mode_is_int(mode)) { + tarval *tv = new_tarval_from_long(size, mode); + + /* size <= offset ? */ + if (tarval_cmp(tv, get_Const_tarval(offset)) & (pn_Cmp_Eq|pn_Cmp_Lt)) + return 1; + } + return 0; +} /* check_const_offset */ + +/** + * Check if we can determine that the two pointers always have an offset bigger then size + */ +static ir_alias_relation _different_pointer(ir_node *adr1, ir_node *adr2, int size) { + int found = 0; + + if (is_Add(adr1)) { + /* first address is the result of a pointer addition */ + ir_node *l1 = get_Add_left(adr1); + ir_node *r1 = get_Add_right(adr1); + + if (l1 == adr2) { + found = check_const_offset(r1, size); + } else if (r1 == adr2) { + found = check_const_offset(l1, size); + } else if (is_Add(adr2)) { + /* second address is the result of a pointer addition */ + ir_node *l2 = get_Add_left(adr2); + ir_node *r2 = get_Add_right(adr2); + + if (l1 == l2) { + return _different_pointer(r1, r2, size); + } else if (l1 == r2) { + return _different_pointer(r1, l2, size); + } else if (r1 == l2) { + return _different_pointer(l1, r2, size); + } else if (r1 == r2) { + return _different_pointer(l1, l2, size); + } + } + } else if (is_Add(adr2)) { + /* second address is the result of a pointer addition */ + ir_node *l2 = get_Add_left(adr2); + ir_node *r2 = get_Add_right(adr2); + + if (l2 == adr1) { + found = check_const_offset(r2, size); + } else if (r2 == adr1) { + found = check_const_offset(l2, size); + } + } else { + return different_index(adr1, adr2, size); + } + return found ? no_alias : may_alias; +} /* _different_pointer */ + +/** + * Check if we can determine that the two pointers always have an offset bigger then the maximum size of mode1, mode2 + */ +static ir_alias_relation different_pointer(ir_node *adr1, ir_mode *mode1, ir_node *adr2, ir_mode *mode2) { + int size = get_mode_size_bytes(mode1); + int n = get_mode_size_bytes(mode2); + + if (n > size) + size = n; + return _different_pointer(adr1, adr2, size); +} /* different_pointer */ + /** * Returns non-zero if a node is a routine parameter. * @@ -377,7 +447,7 @@ static ir_alias_relation _get_alias_relation( if (get_SymConst_entity(adr1) != get_SymConst_entity(adr2)) return no_alias; else { - /* equal addresses */ + /* equal entity addresses */ return sure_alias; } } @@ -388,8 +458,6 @@ static ir_alias_relation _get_alias_relation( /* base2 address is a global var (R1 a) */ if (adr1 != base2) return no_alias; - else - return different_offsets(adr1, adr2); } else if (base2 == get_irg_frame(irg)) { /* the second one is a local variable so they are always different (R1 b) */ @@ -413,14 +481,15 @@ static ir_alias_relation _get_alias_relation( ir_node *base1 = find_base_adr(adr1, &ent1); if (base1 == get_irg_frame(irg)) { - /* the first is a local variable */ + /* first is a local variable ent1 */ if (is_Sel(adr2)) { /* the second address is a Sel */ ir_node *base2 = find_base_adr(adr2, &ent2); - if (base1 == base2) + if (base1 == base2) { + /* identical bases: check for different offsets */ return different_sel_offsets(adr1, adr2); - else if (base2 == get_irg_frame(irg)) { + } else if (base2 == get_irg_frame(irg)) { /* both addresses are local variables and we know they are different (R1 a) */ if (ent1 != ent2) @@ -501,8 +570,14 @@ static ir_alias_relation _get_alias_relation( } } } + } else { + /* some pointers, check if they have the same base buf constant offset */ + ir_alias_relation rel = different_pointer(adr1, mode1, adr2, mode2); + if (rel != may_alias) + return rel; } + if (options & aa_opt_type_based) { /* Type based alias analysis */ ir_alias_relation rel; @@ -570,6 +645,7 @@ typedef struct mem_disambig_entry { static int cmp_mem_disambig_entry(const void *elt, const void *key, size_t size) { const mem_disambig_entry *p1 = elt; const mem_disambig_entry *p2 = key; + (void) size; return p1->adr1 == p2->adr1 && p1->adr2 == p2->adr2; } /* cmp_mem_disambig_entry */ @@ -657,7 +733,7 @@ static int is_hidden_cast(ir_mode *mode, ir_mode *ent_mode) { * @param irn the node */ static ir_address_taken_state find_address_taken_state(ir_node *irn) { - int i; + int i, j; ir_mode *emode, *mode; ir_node *value; ir_entity *ent; @@ -699,7 +775,12 @@ static ir_address_taken_state find_address_taken_state(ir_node *irn) { case iro_Call: /* Only the call address is not an address taker but this is an uninteresting case, so we ignore it here. */ - return ir_address_taken; + 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; + } + break; default: /* another op, the address may be taken */ @@ -782,7 +863,7 @@ static void init_taken_flag(ir_type * tp) { } } /* init_taken_flag */ -#if 0 +#ifdef DEBUG_libfirm /** * Print the address taken state of all entities of a given type for debugging. */ @@ -793,12 +874,12 @@ static void print_address_taken_state(ir_type *tp) { ir_address_taken_state state = get_entity_address_taken(ent); if (state != ir_address_not_taken) { - assert(ir_address_not_taken <= state && state <= ir_address_taken); + assert(ir_address_not_taken <= (int) state && state <= ir_address_taken); ir_printf("%+F: %s\n", ent, get_address_taken_state_name(state)); } } } /* print_address_taken_state */ -#endif +#endif /* DEBUG_libfirm */ /** * Post-walker: check for global entity address @@ -832,6 +913,8 @@ 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()); @@ -841,8 +924,13 @@ static void analyse_irp_globals_address_taken(void) { assure_irg_outs(irg); irg_walk_graph(irg, NULL, check_global_address, get_irg_tls(irg)); } - //print_address_taken_state(get_glob_type()); - //print_address_taken_state(get_tls_type()); + +#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()); + } +#endif /* DEBUG_libfirm */ /* now computed */ irp->globals_adr_taken_state = ir_address_taken_computed; @@ -863,3 +951,56 @@ 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 */ + + +DEBUG_ONLY(static firm_dbg_module_t *dbgcall = NULL;) + +/** + * Copy the calling conventions from the entities to the call type. + */ +static void update_calls(ir_node *call, void *env) { + (void) env; + if (is_Call(call)) { + ir_node *ptr = get_Call_ptr(call); + + if (is_SymConst(ptr)) { + ir_entity *ent = get_SymConst_entity(ptr); + ir_type *mtp = get_entity_type(ent); + ir_type *ctp = get_Call_type(call); + + if (mtp != ctp && get_method_additional_properties(mtp) & mtp_property_private) { + set_method_additional_property(ctp, mtp_property_private); + DB((dbgcall, LEVEL_1, "changed call to private method %+F\n", ent)); + } + } + } +} + +/* Mark all private methods, i.e. those of which all call sites are known. */ +void mark_private_methods(void) { + int i; + int changed = 0; + + FIRM_DBG_REGISTER(dbgcall, "firm.opt.cc"); + + assure_irp_globals_address_taken_computed(); + + /* 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); + + if (get_entity_visibility(ent) == visibility_local && + state == ir_address_not_taken) { + ir_type *mtp = get_entity_type(ent); + + set_method_additional_property(mtp, mtp_property_private); + changed = 1; + DB((dbgcall, LEVEL_1, "found private method %+F\n", ent)); + } + } + + if (changed) + all_irg_walk(NULL, update_calls, NULL); +}