X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Flower%2Flower_calls.c;h=7f15ee5ffe786adc133941e3d5cc9f3b2f82f7b3;hb=80e7f8c6416845453f540584d38ffb79e7bfc3e9;hp=72a93ab2e336f3deab6586e7c3cfff1462814e2c;hpb=c28fcf22c08f71b02ccd8edb2e091c1b6c22e540;p=libfirm diff --git a/ir/lower/lower_calls.c b/ir/lower/lower_calls.c index 72a93ab2e..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" @@ -39,9 +37,8 @@ #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. */ @@ -59,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); } @@ -81,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. */ @@ -96,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); @@ -105,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; @@ -131,43 +131,51 @@ static ir_type *create_modified_mtd_type(const lower_params_t *lp, ir_type *mtp) /* 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) @@ -181,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; } @@ -210,6 +243,8 @@ typedef struct _wlk_env_t { 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; @@ -225,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; @@ -277,7 +312,7 @@ static void check_ptr(ir_node *ptr, wlk_env *env) { /* still alias free */ ptr = find_base_adr(ptr, &ent); - sc = classify_pointer(current_ir_graph, 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; @@ -297,6 +332,20 @@ static void fix_args_and_collect_calls(ir_node *n, void *ctx) { 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) { @@ -468,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), @@ -517,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; } @@ -660,12 +707,15 @@ 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.lowered_mtp = lowered_mtp; + env.value_params = get_method_value_param_type(mtp); env.only_local_mem = 1; env.changed = 0; @@ -716,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)) { @@ -737,13 +787,13 @@ static void transform_irg(const lower_params_t *lp, ir_graph *irg) ++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) { @@ -868,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); }