X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Flower%2Flower_calls.c;h=7f15ee5ffe786adc133941e3d5cc9f3b2f82f7b3;hb=aa5c48c22eb13b5c64a340fe8dca931d4bedd1e7;hp=c1ec226b58d9bcc99b162a2d41cee194cb222456;hpb=637548dc5e5b11748b901b39738d8084b948ba1a;p=libfirm diff --git a/ir/lower/lower_calls.c b/ir/lower/lower_calls.c index c1ec226b5..7f15ee5ff 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; @@ -57,10 +56,11 @@ static ir_type *def_find_pointer_type(ir_type *e_type, ir_mode *mode, int alignm /* Mode and alignment are always identical in all calls to def_find_pointer_type(), so we simply can use a map from the element type to the pointer type. */ e = pmap_find(type_map, e_type); - if (e) + if (e && get_type_mode(e->value) == mode) res = e->value; else { - res = new_type_pointer(mangle_u(get_type_ident(e_type), new_id_from_chars("Ptr", 3)), e_type, mode); + res = new_type_pointer(e_type); + set_type_mode(res, mode); set_type_alignment_bytes(res, alignment); pmap_insert(type_map, e_type, res); } @@ -79,14 +79,14 @@ static ir_type *def_find_pointer_type(ir_type *e_type, ir_mode *mode, int alignm */ static ir_type *create_modified_mtd_type(const lower_params_t *lp, ir_type *mtp) { - ir_type *lowered, *ptr_tp; + ir_type *lowered, *ptr_tp, *value_type; ir_type **params, **results, *res_tp; + int *param_map; ir_mode *modes[MAX_REGISTER_RET_VAL]; int n_ress, n_params, nn_ress, nn_params, i, first_variadic; - ident *id; add_hidden hidden_params; int changed = 0; - variadicity var; + ir_variadicity var; if (is_lowered_type(mtp)) { /* the type is already lowered. Not handled yet. */ @@ -94,7 +94,7 @@ static ir_type *create_modified_mtd_type(const lower_params_t *lp, ir_type *mtp) } lowered = get_associated_type(mtp); - if (lowered) + if (lowered != NULL) return lowered; n_ress = get_method_n_ress(mtp); @@ -103,6 +103,8 @@ static ir_type *create_modified_mtd_type(const lower_params_t *lp, ir_type *mtp) n_params = get_method_n_params(mtp); NEW_ARR_A(ir_type *, params, n_params + n_ress); + NEW_ARR_A(int, param_map, n_params + n_ress); + first_variadic = get_method_first_variadic_param_index(mtp); hidden_params = lp->hidden_params; @@ -123,49 +125,57 @@ 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 address will be transmitted as a hidden parameter. */ ptr_tp = lp->find_pointer_type(res_tp, get_modeP_data(), lp->def_ptr_alignment); - params[nn_params++] = ptr_tp; + params[nn_params] = ptr_tp; + param_map[nn_params] = -1 - i; + ++nn_params; changed++; if (lp->flags & LF_RETURN_HIDDEN) results[nn_ress++] = ptr_tp; } - } - else + } else { + /* scalar result */ results[nn_ress++] = res_tp; + } } /* move the index of the first variadic parameter */ first_variadic += nn_params; - for (i = 0; i < n_params; ++i) - params[nn_params++] = get_method_param_type(mtp, i); - } - else { + for (i = 0; i < n_params; ++i, ++nn_params) { + params[nn_params] = get_method_param_type(mtp, i); + param_map[nn_params] = i; + } + } else { /* add hidden parameters last */ assert(get_method_variadicity(mtp) == variadicity_non_variadic && "Cannot add hidden parameters at end of variadic function"); - for (nn_params = 0; nn_params < n_params; ++nn_params) - params[nn_params] = get_method_param_type(mtp, nn_params); + for (nn_params = 0; nn_params < n_params; ++nn_params) { + params[nn_params] = get_method_param_type(mtp, nn_params); + param_map[nn_params] = nn_params; + } for (nn_ress = i = 0; i < n_ress; ++i) { res_tp = get_method_res_type(mtp, i); - if (is_compound_type(res_tp)) - params[nn_params++] = lp->find_pointer_type(res_tp, get_modeP_data(), lp->def_ptr_alignment); - else + if (is_compound_type(res_tp)) { + params[nn_params] = lp->find_pointer_type(res_tp, get_modeP_data(), lp->def_ptr_alignment); + param_map[nn_params] = -1 - i; + ++nn_params; + } else { results[nn_ress++] = res_tp; + } } } /* create the new type */ - id = mangle_u(new_id_from_chars("L", 1), get_type_ident(mtp)); - lowered = new_d_type_method(id, nn_params, nn_ress, get_type_dbg_info(mtp)); + lowered = new_d_type_method(nn_params, nn_ress, get_type_dbg_info(mtp)); /* fill it */ for (i = 0; i < nn_params; ++i) @@ -179,11 +189,36 @@ static ir_type *create_modified_mtd_type(const lower_params_t *lp, ir_type *mtp) set_method_first_variadic_param_index(lowered, first_variadic); /* associate the lowered type with the original one for easier access */ - if(changed) { + if (changed) { set_method_calling_convention(lowered, get_method_calling_convention(mtp) | cc_compound_ret); } + set_lowered_type(mtp, lowered); + value_type = get_method_value_param_type(mtp); + if (value_type != NULL) { + /* set new param positions */ + for (i = 0; i < nn_params; ++i) { + ir_entity *ent = get_method_value_param_ent(lowered, i); + int pos = param_map[i]; + ident *id; + + set_entity_link(ent, INT_TO_PTR(pos)); + if (pos < 0) { + /* formally return value, ignore for now */ + continue; + } + + id = get_method_param_ident(mtp, pos); + if (id != NULL) { + set_method_param_ident(lowered, i, id); + set_entity_ident(ent, id); + } + } + + set_lowered_type(value_type, get_method_value_param_type(lowered)); + } + return lowered; } @@ -201,15 +236,17 @@ 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. */ - unsigned non_local_mem:1; /**< Set if non-local memory access was found. */ - unsigned changed:1; /**< 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. */ + ir_type *lowered_mtp; /**< The lowered method type of the current irg if any. */ + ir_type *value_params; /**< The value params type if any. */ + 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; /** @@ -223,7 +260,7 @@ typedef struct _wlk_env_t { static cl_entry *get_Call_entry(ir_node *call, wlk_env *env) { cl_entry *res = get_irn_link(call); if (res == NULL) { - cl_entry *res = obstack_alloc(&env->obst, sizeof(*res)); + cl_entry *res = OALLOC(&env->obst, cl_entry); res->next = env->cl_list; res->call = call; res->copyb = NULL; @@ -234,32 +271,106 @@ 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 = GET_BASE_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_opcode code = get_irn_opcode(n); - - if (code == iro_Load || code == iro_Store) { - ir_node *ptr = get_irn_n(n, 1); - - if (! is_Sel(ptr)) - env->non_local_mem = 1; - else if (get_Sel_ptr(ptr) != get_irg_frame(current_ir_graph)) - env->non_local_mem = 1; - } else if (env->arg_shift > 0 && code == iro_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_Sel: + if (env->lowered_mtp != NULL && env->value_params != NULL) { + ir_entity *ent = get_Sel_entity(n); + + if (get_entity_owner(ent) == env->value_params) { + int pos = get_struct_member_index(env->value_params, ent) + env->arg_shift; + ir_entity *new_ent; + + new_ent = get_method_value_param_ent(env->lowered_mtp, pos); + set_entity_ident(new_ent, get_entity_ident(ent)); + set_Sel_entity(n, new_ent); + } + } + break; + case iro_Load: + case iro_Store: + if (env->only_local_mem) { + ptr = get_irn_n(n, 1); + check_ptr(ptr, env); } - } else if (code == iro_Call) { + 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; + } + } + 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 */ @@ -274,39 +385,51 @@ static void fix_args_and_collect_calls(ir_node *n, void *ctx) { } } } - } else if (code == iro_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; } } @@ -394,7 +517,6 @@ static ir_node *get_dummy_sel(ir_graph *irg, ir_node *block, ir_type *tp, wlk_en } } return new_r_simpleSel( - irg, block, get_irg_no_mem(irg), get_irg_frame(irg), @@ -443,9 +565,8 @@ static void add_hidden_param(ir_graph *irg, int n_com, ir_node **ins, cl_entry * /* get rid of the CopyB */ turn_into_tuple(p, pn_CopyB_max); - set_Tuple_pred(p, pn_CopyB_M_regular, mem); - set_Tuple_pred(p, pn_CopyB_M_except, get_irg_bad(irg)); - set_Tuple_pred(p, pn_CopyB_X_regular, new_r_Jmp(irg, blk)); + set_Tuple_pred(p, pn_CopyB_M, mem); + set_Tuple_pred(p, pn_CopyB_X_regular, new_r_Jmp(blk)); set_Tuple_pred(p, pn_CopyB_X_except, get_irg_bad(irg)); ++n_args; } @@ -586,14 +707,17 @@ static void transform_irg(const lower_params_t *lp, ir_graph *irg) } else { /* we must only search for calls */ env.arg_shift = 0; + lowered_mtp = NULL; } obstack_init(&env.obst); - env.cl_list = NULL; - env.dummy_map = pmap_create_ex(8); - env.dnr = 0; - env.params = lp; - env.non_local_mem = 0; - env.changed = 0; + env.cl_list = NULL; + env.dummy_map = pmap_create_ex(8); + env.dnr = 0; + env.params = lp; + env.lowered_mtp = lowered_mtp; + env.value_params = get_method_value_param_type(mtp); + 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); @@ -642,7 +766,7 @@ static void transform_irg(const lower_params_t *lp, ir_graph *irg) if (is_compound_type(tp)) { ir_node *arg = get_irg_args(irg); - arg = new_r_Proj(irg, get_nodes_block(arg), arg, mode_P_data, env.first_hidden + k); + arg = new_r_Proj(get_nodes_block(arg), arg, mode_P_data, env.first_hidden + k); ++k; if (is_Unknown(pred)) { @@ -656,20 +780,20 @@ static void transform_irg(const lower_params_t *lp, ir_graph *irg) * A simple heuristic: all Loads/Stores inside * the function access only local frame. */ - if (!env.non_local_mem && is_compound_address(ft, pred)) { + 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; ++n_cr_opt; } else { /* copy-return optimization is impossible, do the copy. */ copy = new_r_CopyB( - irg, bl, + bl, mem, arg, pred, tp ); - mem = new_r_Proj(irg, bl, copy, mode_M, pn_CopyB_M_regular); + mem = new_r_Proj(bl, copy, mode_M, pn_CopyB_M); } } if (lp->flags & LF_RETURN_HIDDEN) { @@ -735,14 +859,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)) { @@ -750,7 +874,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)) { @@ -794,9 +918,6 @@ void lower_calls_with_compounds(const lower_params_t *params) for (i = get_irp_n_irgs() - 1; i >= 0; --i) { irg = get_irp_irg(i); - if (irg == get_const_code_irg()) - continue; - transform_irg(¶m, irg); }