X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Flower%2Flower_calls.c;h=f99bf7e74f3afbcd82be3b53ee1ce987f0313b6d;hb=04906225f6fe1bc22f73b5d6a98eb9c0992a9b54;hp=6b4d41052246717e0a54a5497dc32aeb33b50191;hpb=1ce363f80e6a204d4011f85813362d9bd1d0e7e4;p=libfirm diff --git a/ir/lower/lower_calls.c b/ir/lower/lower_calls.c index 6b4d41052..f99bf7e74 100644 --- a/ir/lower/lower_calls.c +++ b/ir/lower/lower_calls.c @@ -24,9 +24,7 @@ * @version $Id$ */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include "lowering.h" #include "irprog_t.h" @@ -36,11 +34,12 @@ #include "ircons.h" #include "irgmod.h" #include "irgwalk.h" +#include "irmemory.h" #include "irtools.h" #include "iroptimize.h" -#include "array.h" +#include "array_t.h" #include "pmap.h" -#include "xmalloc.h" +#include "error.h" /** A type map for def_find_pointer_type. */ static pmap *type_map; @@ -123,7 +122,7 @@ static ir_type *create_modified_mtd_type(const lower_params_t *lp, ir_type *mtp) if (n_regs > 0) { /* this compound will be returned solely in registers */ - assert(0); + panic("Returning compounds in registers not yet implemented"); } else { /* this compound will be allocated on callers stack and its @@ -201,14 +200,15 @@ struct cl_entry { * Walker environment for fix_args_and_collect_calls(). */ typedef struct _wlk_env_t { - int arg_shift; /**< The Argument index shift for parameters. */ - int first_hidden; /**< The index of the first hidden argument. */ - struct obstack obst; /**< An obstack to allocate the data on. */ - cl_entry *cl_list; /**< The call list. */ - pmap *dummy_map; /**< A map for finding the dummy arguments. */ - unsigned dnr; /**< The dummy index number. */ - const lower_params_t *params; /**< lowering parameters */ - int changed; /**< set if the current graph was changed */ + int arg_shift; /**< The Argument index shift for parameters. */ + int first_hidden; /**< The index of the first hidden argument. */ + struct obstack obst; /**< An obstack to allocate the data on. */ + cl_entry *cl_list; /**< The call list. */ + pmap *dummy_map; /**< A map for finding the dummy arguments. */ + unsigned dnr; /**< The dummy index number. */ + const lower_params_t *params; /**< Lowering parameters. */ + unsigned only_local_mem:1; /**< Set if only local memory access was found. */ + unsigned changed:1; /**< Set if the current graph was changed. */ } wlk_env; /** @@ -233,25 +233,92 @@ static cl_entry *get_Call_entry(ir_node *call, wlk_env *env) { } /** - * Post walker: shift all parameter indeces + * Finds the base address of an address by skipping Sel's and address + * calculation. + * + * @param adr the address + * @param pEnt points to the base entity if any + */ +static ir_node *find_base_adr(ir_node *ptr, ir_entity **pEnt) { + ir_entity *ent = NULL; + assert(mode_is_reference(get_irn_mode(ptr))); + + for (;;) { + if (is_Sel(ptr)) { + ent = get_Sel_entity(ptr); + ptr = get_Sel_ptr(ptr); + } + else if (is_Add(ptr)) { + ir_node *left = get_Add_left(ptr); + if (mode_is_reference(get_irn_mode(left))) + ptr = left; + else + ptr = get_Add_right(ptr); + ent = NULL; + } else if (is_Sub(ptr)) { + ptr = get_Sub_left(ptr); + ent = NULL; + } else { + *pEnt = ent; + return ptr; + } + } +} + +/** + * Check if a given pointer represents non-local memory. + */ +static void check_ptr(ir_node *ptr, wlk_env *env) { + ir_storage_class_class_t sc; + ir_entity *ent; + + /* still alias free */ + ptr = find_base_adr(ptr, &ent); + sc = classify_pointer(current_ir_graph, ptr, ent); + if (sc != ir_sc_localvar && sc != ir_sc_malloced) { + /* non-local memory access */ + env->only_local_mem = 0; + } +} + +/** + * Post walker: shift all parameter indexes * and collect Calls with compound returns in the call list. + * If a non-alias free memory access is found, reset the alias free + * flag. */ static void fix_args_and_collect_calls(ir_node *n, void *ctx) { wlk_env *env = ctx; - int i; + int i; ir_type *ctp; - ir_op *op = get_irn_op(n); - - if (env->arg_shift > 0 && op == op_Proj) { - ir_node *pred = get_Proj_pred(n); - - /* Fix the argument numbers */ - if (pred == get_irg_args(current_ir_graph)) { - long pnr = get_Proj_proj(n); - set_Proj_proj(n, pnr + env->arg_shift); - env->changed = 1; + ir_node *ptr; + + switch (get_irn_opcode(n)) { + case iro_Load: + case iro_Store: + if (env->only_local_mem) { + ptr = get_irn_n(n, 1); + check_ptr(ptr, env); + } + break; + case iro_Proj: + if (env->arg_shift > 0) { + ir_node *pred = get_Proj_pred(n); + + /* Fix the argument numbers */ + if (pred == get_irg_args(current_ir_graph)) { + long pnr = get_Proj_proj(n); + set_Proj_proj(n, pnr + env->arg_shift); + env->changed = 1; + } } - } else if (op == op_Call) { + break; + case iro_Call: + if (! is_self_recursive_Call(n)) { + /* any non self recursive call might access global memory */ + env->only_local_mem = 0; + } + ctp = get_Call_type(n); if (env->params->flags & LF_COMPOUND_RETURN) { /* check for compound returns */ @@ -266,38 +333,51 @@ static void fix_args_and_collect_calls(ir_node *n, void *ctx) { } } } - } else if (op == op_CopyB && env->params->flags & LF_COMPOUND_RETURN) { - /* check for compound returns */ - ir_node *src = get_CopyB_src(n); - /* older scheme using value_res_ent */ - if (is_Sel(src)) { - ir_node *proj = get_Sel_ptr(src); - if (is_Proj(proj) && get_Proj_proj(proj) == pn_Call_P_value_res_base) { - ir_node *call = get_Proj_pred(proj); - if (is_Call(call)) { - /* found a CopyB from compound Call result */ - cl_entry *e = get_Call_entry(call, env); - set_irn_link(n, e->copyb); - e->copyb = n; - } - } - } else - /* new scheme: compound results are determined by the call type only */ - if (is_Proj(src)) { - ir_node *proj = get_Proj_pred(src); - if (is_Proj(proj) && get_Proj_proj(proj) == pn_Call_T_result) { + break; + case iro_CopyB: + if (env->only_local_mem) { + check_ptr(get_CopyB_src(n), env); + if (env->only_local_mem) + check_ptr(get_CopyB_dst(n), env); + } + if (env->params->flags & LF_COMPOUND_RETURN) { + /* check for compound returns */ + ir_node *src = get_CopyB_src(n); + /* older scheme using value_res_ent */ + if (is_Sel(src)) { + ir_node *proj = get_Sel_ptr(src); + if (is_Proj(proj) && get_Proj_proj(proj) == pn_Call_P_value_res_base) { ir_node *call = get_Proj_pred(proj); if (is_Call(call)) { - ctp = get_Call_type(call); - if (is_compound_type(get_method_res_type(ctp, get_Proj_proj(src)))) { - /* found a CopyB from compound Call result */ - cl_entry *e = get_Call_entry(call, env); - set_irn_link(n, e->copyb); - e->copyb = n; + /* found a CopyB from compound Call result */ + cl_entry *e = get_Call_entry(call, env); + set_irn_link(n, e->copyb); + e->copyb = n; + } + } + } else { + /* new scheme: compound results are determined by the call type only */ + if (is_Proj(src)) { + ir_node *proj = get_Proj_pred(src); + if (is_Proj(proj) && get_Proj_proj(proj) == pn_Call_T_result) { + ir_node *call = get_Proj_pred(proj); + if (is_Call(call)) { + ctp = get_Call_type(call); + if (is_compound_type(get_method_res_type(ctp, get_Proj_proj(src)))) { + /* found a CopyB from compound Call result */ + cl_entry *e = get_Call_entry(call, env); + set_irn_link(n, e->copyb); + e->copyb = n; + } } } } } + } + break; + default: + /* do nothing */ + break; } } @@ -423,11 +503,10 @@ static void add_hidden_param(ir_graph *irg, int n_com, ir_node **ins, cl_entry * if (get_struct_member(owner, idx) == ent) break; assert(idx < get_struct_n_members(owner)); - } - else - + } else { /* new scheme: compound returns are determined by the call type and are Proj's */ idx = get_Proj_proj(src); + } ins[idx] = get_CopyB_dst(p); mem = get_CopyB_mem(p); @@ -526,14 +605,17 @@ static void fix_call_list(ir_graph *irg, wlk_env *env) { */ static void transform_irg(const lower_params_t *lp, ir_graph *irg) { - ir_entity *ent = get_irg_entity(irg); - ir_type *mtp, *lowered_mtp, *tp, *ft; - int i, j, k, n_ress = 0, n_ret_com = 0, n_cr_opt; - ir_node **new_in, *ret, *endbl, *bl, *mem, *copy; - cr_pair *cr_opt; - wlk_env env; + ir_graph * rem = current_ir_graph; + ir_entity *ent = get_irg_entity(irg); + ir_type *mtp, *lowered_mtp, *tp, *ft; + int i, j, k, n_ress = 0, n_ret_com = 0, n_cr_opt; + ir_node **new_in, *ret, *endbl, *bl, *mem, *copy; + cr_pair *cr_opt; + wlk_env env; add_hidden hidden_params; + current_ir_graph = irg; + assert(ent && "Cannot transform graph without an entity"); assert(get_irg_phase_state(irg) == phase_high && "call lowering must be done in phase high"); @@ -567,8 +649,7 @@ static void transform_irg(const lower_params_t *lp, ir_graph *irg) /* hidden arguments are added first */ env.arg_shift = n_ret_com; env.first_hidden = 0; - } - else { + } else { /* hidden arguments are added last */ env.arg_shift = 0; env.first_hidden = get_method_n_params(mtp); @@ -578,11 +659,12 @@ static void transform_irg(const lower_params_t *lp, ir_graph *irg) env.arg_shift = 0; } obstack_init(&env.obst); - env.cl_list = NULL; - env.dummy_map = pmap_create_ex(8); - env.dnr = 0; - env.params = lp; - env.changed = 0; + env.cl_list = NULL; + env.dummy_map = pmap_create_ex(8); + env.dnr = 0; + env.params = lp; + env.only_local_mem = 1; + env.changed = 0; /* scan the code, fix argument numbers and collect calls. */ irg_walk_graph(irg, firm_clear_link, fix_args_and_collect_calls, &env); @@ -595,8 +677,8 @@ static void transform_irg(const lower_params_t *lp, ir_graph *irg) if (n_ret_com) { /* - * Now fix the Return node of the current graph. - */ + * Now fix the Return node of the current graph. + */ env.changed = 1; /* STEP 1: find the return. This is simple, we have normalized the graph. */ @@ -638,7 +720,14 @@ static void transform_irg(const lower_params_t *lp, ir_graph *irg) /* The Return(Unknown) is the Firm construct for a missing return. Do nothing. */ } else { - if (is_compound_address(ft, pred)) { + /** + * Sorrily detecting that copy-return is possible isn't that simple. + * We must check, that the hidden address is alias free during the whole + * function. + * A simple heuristic: all Loads/Stores inside + * the function access only local frame. + */ + if (env.only_local_mem && is_compound_address(ft, pred)) { /* we can do the copy-return optimization here */ cr_opt[n_cr_opt].ent = get_Sel_entity(pred); cr_opt[n_cr_opt].arg = arg; @@ -684,6 +773,7 @@ static void transform_irg(const lower_params_t *lp, ir_graph *irg) set_irg_outs_inconsistent(irg); set_irg_loopinfo_state(irg, loopinfo_inconsistent); } + current_ir_graph = rem; } /** @@ -716,14 +806,14 @@ static int must_be_lowered(const lower_params_t *lp, ir_type *tp) { * type-walker: lower all method types of entities * and points-to types. */ -static void lower_method_types(type_or_ent *tore, void *env) +static void lower_method_types(type_or_ent tore, void *env) { const lower_params_t *lp = env; ir_type *tp; /* fix method entities */ - if (is_entity(tore)) { - ir_entity *ent = (ir_entity *)tore; + if (is_entity(tore.ent)) { + ir_entity *ent = tore.ent; tp = get_entity_type(ent); if (must_be_lowered(lp, tp)) { @@ -731,7 +821,7 @@ static void lower_method_types(type_or_ent *tore, void *env) set_entity_type(ent, tp); } } else { - tp = (ir_type *)tore; + tp = tore.typ; /* fix pointer to methods */ if (is_Pointer_type(tp)) {