X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Flower%2Flower_calls.c;h=a3eca0b25148f8ed4baeaa00137093a375c6a813;hb=950b1afbd460465ae6c8ff2a8fe606fe61ddbf22;hp=0491c49322d360dfd219699cb5f033391d880ecd;hpb=9d4e23060441530a20af5d331268435bfe18f305;p=libfirm diff --git a/ir/lower/lower_calls.c b/ir/lower/lower_calls.c index 0491c4932..a3eca0b25 100644 --- a/ir/lower/lower_calls.c +++ b/ir/lower/lower_calls.c @@ -75,20 +75,15 @@ static ir_type *def_find_pointer_type(ir_type *e_type, ir_mode *mode, */ static ir_type *create_modified_mtd_type(const lower_params_t *lp, ir_type *mtp) { - ir_type *lowered, *ptr_tp, *value_type; + ir_type *lowered, *ptr_tp; ir_type **params, **results, *res_tp; - int *param_map; + size_t *param_map; ir_mode *modes[MAX_REGISTER_RET_VAL]; - int n_ress, n_params, nn_ress, nn_params, i, first_variadic; + size_t n_ress, n_params, nn_ress, nn_params, i; add_hidden hidden_params; int changed = 0; ir_variadicity var; - if (is_lowered_type(mtp)) { - /* the type is already lowered. Not handled yet. */ - assert(0 && "lowered types NYI"); - } - lowered = get_associated_type(mtp); if (lowered != NULL) return lowered; @@ -99,9 +94,7 @@ 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); + NEW_ARR_A(size_t, param_map, n_params + n_ress); hidden_params = lp->hidden_params; if (hidden_params == ADD_HIDDEN_SMART && @@ -128,7 +121,7 @@ static ir_type *create_modified_mtd_type(const lower_params_t *lp, ir_type *mtp) 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; - param_map[nn_params] = -1 - i; + param_map[nn_params] = n_params + i; ++nn_params; changed++; if (lp->flags & LF_RETURN_HIDDEN) @@ -140,9 +133,6 @@ static ir_type *create_modified_mtd_type(const lower_params_t *lp, ir_type *mtp) } } - /* move the index of the first variadic parameter */ - first_variadic += nn_params; - for (i = 0; i < n_params; ++i, ++nn_params) { params[nn_params] = get_method_param_type(mtp, i); param_map[nn_params] = i; @@ -162,7 +152,7 @@ static ir_type *create_modified_mtd_type(const lower_params_t *lp, ir_type *mtp) 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; + param_map[nn_params] = n_params + i; ++nn_params; } else { results[nn_ress++] = res_tp; @@ -181,8 +171,6 @@ static ir_type *create_modified_mtd_type(const lower_params_t *lp, ir_type *mtp) var = get_method_variadicity(mtp); set_method_variadicity(lowered, var); - if (var == variadicity_variadic) - set_method_first_variadic_param_index(lowered, first_variadic); /* associate the lowered type with the original one for easier access */ if (changed) { @@ -191,30 +179,6 @@ 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; } @@ -232,8 +196,8 @@ 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. */ + size_t arg_shift; /**< The Argument index shift for parameters. */ + size_t 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. */ @@ -327,7 +291,6 @@ static void check_ptr(ir_node *ptr, wlk_env *env) 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; @@ -337,7 +300,7 @@ static void fix_args_and_collect_calls(ir_node *n, void *ctx) 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; + size_t 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); @@ -374,7 +337,8 @@ static void fix_args_and_collect_calls(ir_node *n, void *ctx) ctp = get_Call_type(n); if (env->params->flags & LF_COMPOUND_RETURN) { /* check for compound returns */ - for (i = get_method_n_ress(ctp) -1; i >= 0; --i) { + size_t i, n_res; + for (i = 0, n_res = get_method_n_ress(ctp); i < n_res; ++i) { if (is_compound_type(get_method_res_type(ctp, i))) { /* * This is a call with a compound return. As the result @@ -395,32 +359,17 @@ static void fix_args_and_collect_calls(ir_node *n, void *ctx) 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) { + 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)) { - /* 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; - } + 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; } } } @@ -462,7 +411,7 @@ typedef struct cr_pair { * Post walker: fixes all entities addresses for the copy-return * optimization. * - * Note: We expect the length of the cr_pair array (ie number of compound + * Note: We expect the length of the cr_pair array (i.e. number of compound * return values) to be 1 (C, C++) in almost all cases, so ignore the * linear search complexity here. */ @@ -532,49 +481,34 @@ static ir_node *get_dummy_sel(ir_graph *irg, ir_node *block, ir_type *tp, wlk_en * @param entry the call list * @param env the environment */ -static void add_hidden_param(ir_graph *irg, int n_com, ir_node **ins, cl_entry *entry, wlk_env *env) +static void add_hidden_param(ir_graph *irg, size_t n_com, ir_node **ins, cl_entry *entry, wlk_env *env) { - ir_node *p, *n, *src, *mem, *blk; - ir_entity *ent; - ir_type *owner; - int idx, n_args; + ir_node *p, *n, *mem, *blk; + size_t n_args; n_args = 0; for (p = entry->copyb; p; p = n) { - n = (ir_node*)get_irn_link(p); - src = get_CopyB_src(p); - - /* old scheme using value_res_ent */ - if (is_Sel(src)) { - ent = get_Sel_entity(src); - owner = get_entity_owner(ent); - - /* find the hidden parameter index */ - for (idx = 0; idx < get_struct_n_members(owner); ++idx) - if (get_struct_member(owner, idx) == ent) - break; - assert(idx < get_struct_n_members(owner)); - } else { - /* new scheme: compound returns are determined by the call type and are Proj's */ - idx = get_Proj_proj(src); - } + ir_node *src = get_CopyB_src(p); + size_t idx = get_Proj_proj(src); + n = (ir_node*)get_irn_link(p); ins[idx] = get_CopyB_dst(p); mem = get_CopyB_mem(p); blk = get_nodes_block(p); /* get rid of the CopyB */ - turn_into_tuple(p, pn_CopyB_max); + turn_into_tuple(p, pn_CopyB_max+1); 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)); + set_Tuple_pred(p, pn_CopyB_X_except, new_r_Bad(irg, mode_X)); ++n_args; } /* now create dummy entities for function with ignored return value */ if (n_args < n_com) { ir_type *ctp = get_Call_type(entry->call); - int i, j; + size_t i; + size_t j; if (is_lowered_type(ctp)) ctp = get_associated_type(ctp); @@ -603,7 +537,7 @@ static void fix_call_list(ir_graph *irg, wlk_env *env) ir_node *call, **new_in; ir_type *ctp, *lowered_mtp; add_hidden hidden_params; - int i, n_params, n_com, pos; + size_t i, n_res, n_params, n_com, pos; new_in = NEW_ARR_F(ir_node *, 0); for (p = env->cl_list; p; p = p->next) { @@ -620,7 +554,7 @@ static void fix_call_list(ir_graph *irg, wlk_env *env) n_params = get_Call_n_params(call); n_com = 0; - for (i = get_method_n_ress(ctp) - 1; i >= 0; --i) { + for (i = 0, n_res = get_method_n_ress(ctp); i < n_res; ++i) { if (is_compound_type(get_method_res_type(ctp, i))) ++n_com; } @@ -659,7 +593,7 @@ static void transform_irg(const lower_params_t *lp, ir_graph *irg) 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; + size_t i, j, k, n_ress = 0, n_ret_com = 0; size_t n_cr_opt; ir_node **new_in, *ret, *endbl, *bl, *mem, *copy; cr_pair *cr_opt; @@ -731,93 +665,96 @@ 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. - */ - env.changed = 1; + int idx; /* STEP 1: find the return. This is simple, we have normalized the graph. */ endbl = get_irg_end_block(irg); ret = NULL; - for (i = get_Block_n_cfgpreds(endbl) - 1; i >= 0; --i) { - ir_node *pred = get_Block_cfgpred(endbl, i); + for (idx = get_Block_n_cfgpreds(endbl) - 1; idx >= 0; --idx) { + ir_node *pred = get_Block_cfgpred(endbl, idx); if (is_Return(pred)) { ret = pred; break; } } - /* there should always be a return */ - assert(ret); - - /* - * STEP 2: fix it. For all compound return values add a CopyB, - * all others are copied. - */ - NEW_ARR_A(ir_node *, new_in, n_ress + 1); - - bl = get_nodes_block(ret); - mem = get_Return_mem(ret); - - ft = get_irg_frame_type(irg); - NEW_ARR_A(cr_pair, cr_opt, n_ret_com); - n_cr_opt = 0; - for (j = 1, i = k = 0; i < n_ress; ++i) { - ir_node *pred = get_Return_res(ret, i); - tp = get_method_res_type(mtp, i); - if (is_compound_type(tp)) { - ir_node *arg = get_irg_args(irg); - arg = new_r_Proj(arg, mode_P_data, env.first_hidden + k); - ++k; - - if (is_Unknown(pred)) { - /* The Return(Unknown) is the Firm construct for a missing return. - Do nothing. */ - } else { - /** - * 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; - ++n_cr_opt; - } else { /* copy-return optimization is impossible, do the copy. */ - copy = new_r_CopyB( - bl, - mem, - arg, - pred, - tp - ); - mem = new_r_Proj(copy, mode_M, pn_CopyB_M); + /* in case of infinite loops, there might be no return */ + if (ret != NULL) { + /* + * Now fix the Return node of the current graph. + */ + env.changed = 1; + + /* + * STEP 2: fix it. For all compound return values add a CopyB, + * all others are copied. + */ + NEW_ARR_A(ir_node *, new_in, n_ress + 1); + + bl = get_nodes_block(ret); + mem = get_Return_mem(ret); + + ft = get_irg_frame_type(irg); + NEW_ARR_A(cr_pair, cr_opt, n_ret_com); + n_cr_opt = 0; + for (j = 1, i = k = 0; i < n_ress; ++i) { + ir_node *pred = get_Return_res(ret, i); + tp = get_method_res_type(mtp, i); + + if (is_compound_type(tp)) { + ir_node *arg = get_irg_args(irg); + arg = new_r_Proj(arg, mode_P_data, env.first_hidden + k); + ++k; + + if (is_Unknown(pred)) { + /* The Return(Unknown) is the Firm construct for a missing return. + Do nothing. */ + } else { + /** + * 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; + ++n_cr_opt; + } else { /* copy-return optimization is impossible, do the copy. */ + copy = new_r_CopyB( + bl, + mem, + arg, + pred, + tp + ); + mem = new_r_Proj(copy, mode_M, pn_CopyB_M); + } } - } - if (lp->flags & LF_RETURN_HIDDEN) { - new_in[j] = arg; + if (lp->flags & LF_RETURN_HIDDEN) { + new_in[j] = arg; + ++j; + } + } else { /* scalar return value */ + new_in[j] = pred; ++j; } - } else { /* scalar return value */ - new_in[j] = pred; - ++j; } - } - /* replace the in of the Return */ - new_in[0] = mem; - set_irn_in(ret, j, new_in); + /* replace the in of the Return */ + new_in[0] = mem; + set_irn_in(ret, j, new_in); - if (n_cr_opt > 0) { - size_t i, n; + if (n_cr_opt > 0) { + size_t i, n; - irg_walk_graph(irg, NULL, do_copy_return_opt, cr_opt); + irg_walk_graph(irg, NULL, do_copy_return_opt, cr_opt); - for (i = 0, n = ARR_LEN(cr_opt); i < n; ++i) { - free_entity(cr_opt[i].ent); + for (i = 0, n = ARR_LEN(cr_opt); i < n; ++i) { + free_entity(cr_opt[i].ent); + } } } } /* if (n_ret_com) */ @@ -825,11 +762,6 @@ static void transform_irg(const lower_params_t *lp, ir_graph *irg) pmap_destroy(env.dummy_map); obstack_free(&env.obst, NULL); - if (env.changed) { - /* invalidate the analysis info */ - set_irg_outs_inconsistent(irg); - set_irg_loopinfo_state(irg, loopinfo_inconsistent); - } current_ir_graph = rem; } @@ -842,7 +774,7 @@ static void transform_irg(const lower_params_t *lp, ir_graph *irg) */ static int must_be_lowered(const lower_params_t *lp, ir_type *tp) { - int i, n_ress; + size_t i, n_ress; ir_type *res_tp; if (is_Method_type(tp)) { @@ -932,3 +864,4 @@ void lower_calls_with_compounds(const lower_params_t *params) if (type_map) pmap_destroy(type_map); } +