X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Flower%2Flower_calls.c;h=86bc3b6df15f648411f1378ce2f5556933ebf08e;hb=3e889332cb054e5cee1a12bba6dd0209121100cf;hp=7712f40cb921a7475f4835fb74a63adbb5c7f1b2;hpb=69c991e03a0eb1b284e6d0c41623d340a8e26d16;p=libfirm diff --git a/ir/lower/lower_calls.c b/ir/lower/lower_calls.c index 7712f40cb..86bc3b6df 100644 --- a/ir/lower/lower_calls.c +++ b/ir/lower/lower_calls.c @@ -48,18 +48,15 @@ static pmap *type_map; * Default implementation for finding a pointer type for a given element type. * Simple create a new one. */ -static ir_type *def_find_pointer_type(ir_type *e_type, ir_mode *mode, int alignment) +static ir_type *def_find_pointer_type(ir_type *e_type, ir_mode *mode, + int alignment) { - ir_type *res; - pmap_entry *e; - /* 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) - res = e->value; - else { - res = new_type_pointer(mangle_u(get_type_ident(e_type), new_id_from_chars("Ptr", 3)), e_type, mode); + ir_type *res = (ir_type*)pmap_get(type_map, e_type); + if (res == NULL || get_type_mode(res) != 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); } @@ -78,14 +75,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. */ @@ -93,7 +90,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); @@ -102,6 +99,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; @@ -128,43 +127,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) @@ -184,6 +191,30 @@ static ir_type *create_modified_mtd_type(const lower_params_t *lp, ir_type *mtp) 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; } @@ -200,7 +231,7 @@ struct cl_entry { /** * Walker environment for fix_args_and_collect_calls(). */ -typedef struct _wlk_env_t { +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. */ @@ -222,10 +253,11 @@ typedef struct _wlk_env_t { * @param call A Call node. * @param env The environment. */ -static cl_entry *get_Call_entry(ir_node *call, wlk_env *env) { - cl_entry *res = get_irn_link(call); +static cl_entry *get_Call_entry(ir_node *call, wlk_env *env) +{ + cl_entry *res = (cl_entry*)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; @@ -242,7 +274,8 @@ static cl_entry *get_Call_entry(ir_node *call, wlk_env *env) { * @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) { +static ir_node *find_base_adr(ir_node *ptr, ir_entity **pEnt) +{ ir_entity *ent = NULL; assert(mode_is_reference(get_irn_mode(ptr))); @@ -271,13 +304,14 @@ static ir_node *find_base_adr(ir_node *ptr, ir_entity **pEnt) { /** * Check if a given pointer represents non-local memory. */ -static void check_ptr(ir_node *ptr, wlk_env *env) { +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); + sc = get_base_sc(classify_pointer(ptr, ent)); if (sc != ir_sc_localvar && sc != ir_sc_malloced) { /* non-local memory access */ env->only_local_mem = 0; @@ -290,8 +324,9 @@ static void check_ptr(ir_node *ptr, wlk_env *env) { * 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; +static void fix_args_and_collect_calls(ir_node *n, void *ctx) +{ + wlk_env *env = (wlk_env*)ctx; int i; ir_type *ctp; ir_node *ptr; @@ -307,7 +342,7 @@ static void fix_args_and_collect_calls(ir_node *n, void *ctx) { new_ent = get_method_value_param_ent(env->lowered_mtp, pos); set_entity_ident(new_ent, get_entity_ident(ent)); - set_Sel_entity(n, ent); + set_Sel_entity(n, new_ent); } } break; @@ -431,8 +466,9 @@ typedef struct cr_pair { * return values) to be 1 (C, C++) in almost all cases, so ignore the * linear search complexity here. */ -static void do_copy_return_opt(ir_node *n, void *ctx) { - cr_pair *arr = ctx; +static void do_copy_return_opt(ir_node *n, void *ctx) +{ + cr_pair *arr = (cr_pair*)ctx; int i; if (is_Sel(n)) { @@ -467,7 +503,7 @@ static ir_node *get_dummy_sel(ir_graph *irg, ir_node *block, ir_type *tp, wlk_en /* use a map the check if we already create such an entity */ e = pmap_find(env->dummy_map, tp); if (e) - ent = e->value; + ent = (ir_entity*)e->value; else { ir_type *ft = get_irg_frame_type(irg); char buf[16]; @@ -482,7 +518,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), @@ -507,7 +542,7 @@ static void add_hidden_param(ir_graph *irg, int n_com, ir_node **ins, cl_entry * n_args = 0; for (p = entry->copyb; p; p = n) { - n = get_irn_link(p); + n = (ir_node*)get_irn_link(p); src = get_CopyB_src(p); /* old scheme using value_res_ent */ @@ -531,9 +566,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; } @@ -563,7 +597,8 @@ static void add_hidden_param(ir_graph *irg, int n_com, ir_node **ins, cl_entry * * @param irg the graph * @param env the environment */ -static void fix_call_list(ir_graph *irg, wlk_env *env) { +static void fix_call_list(ir_graph *irg, wlk_env *env) +{ const lower_params_t *lp = env->params; cl_entry *p; ir_node *call, **new_in; @@ -733,7 +768,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(arg, mode_P_data, env.first_hidden + k); ++k; if (is_Unknown(pred)) { @@ -754,13 +789,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(copy, mode_M, pn_CopyB_M); } } if (lp->flags & LF_RETURN_HIDDEN) { @@ -780,7 +815,7 @@ static void transform_irg(const lower_params_t *lp, ir_graph *irg) irg_walk_graph(irg, NULL, do_copy_return_opt, cr_opt); for (i = ARR_LEN(cr_opt) - 1; i >= 0; --i) { - remove_class_member(ft, cr_opt[i].ent); + free_entity(cr_opt[i].ent); } } } /* if (n_ret_com) */ @@ -803,7 +838,8 @@ static void transform_irg(const lower_params_t *lp, ir_graph *irg) * @param lp lowering parameters * @param tp The type. */ -static int must_be_lowered(const lower_params_t *lp, ir_type *tp) { +static int must_be_lowered(const lower_params_t *lp, ir_type *tp) +{ int i, n_ress; ir_type *res_tp; @@ -828,7 +864,7 @@ static int must_be_lowered(const lower_params_t *lp, ir_type *tp) { */ static void lower_method_types(type_or_ent tore, void *env) { - const lower_params_t *lp = env; + const lower_params_t *lp = (const lower_params_t*)env; ir_type *tp; /* fix method entities */