X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Flower%2Flower_calls.c;h=59bb85f38e99da7da0e6235a2cebe2efd4cb2734;hb=8b5aac95f0921dc70b53f2526f7a7413df3f6f85;hp=6f71e0f9068bb19ba36574ea0102200e013c374a;hpb=9d564d6198d8a1e36a3a9c9ec9ca4d13c6acd153;p=libfirm diff --git a/ir/lower/lower_calls.c b/ir/lower/lower_calls.c index 6f71e0f90..59bb85f38 100644 --- a/ir/lower/lower_calls.c +++ b/ir/lower/lower_calls.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 1995-2008 University of Karlsruhe. All right reserved. + * Copyright (C) 1995-2011 University of Karlsruhe. All right reserved. * * This file is part of libFirm. * @@ -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, 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 { + 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); } @@ -129,7 +126,7 @@ static ir_type *create_modified_mtd_type(const lower_params_t *lp, ir_type *mtp) 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, lp->def_ptr_alignment); + 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; ++nn_params; @@ -164,7 +161,7 @@ static ir_type *create_modified_mtd_type(const lower_params_t *lp, ir_type *mtp) res_tp = get_method_res_type(mtp, i); if (is_compound_type(res_tp)) { - params[nn_params] = lp->find_pointer_type(res_tp, lp->def_ptr_alignment); + 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 { @@ -234,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. */ @@ -256,8 +253,9 @@ 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 = OALLOC(&env->obst, cl_entry); res->next = env->cl_list; @@ -276,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))); @@ -305,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 = GET_BASE_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; @@ -324,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; @@ -465,14 +466,14 @@ 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; - int i; - +static void do_copy_return_opt(ir_node *n, void *ctx) +{ if (is_Sel(n)) { ir_entity *ent = get_Sel_entity(n); + cr_pair *arr = (cr_pair*)ctx; + size_t i, l; - for (i = ARR_LEN(arr) - 1; i >= 0; --i) { + for (i = 0, l = ARR_LEN(arr); i < l; ++i) { if (ent == arr[i].ent) { exchange(n, arr[i].arg); break; @@ -501,7 +502,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]; @@ -536,11 +537,12 @@ static void add_hidden_param(ir_graph *irg, int n_com, ir_node **ins, cl_entry * ir_node *p, *n, *src, *mem, *blk; ir_entity *ent; ir_type *owner; - int idx, n_args; + int n_args; n_args = 0; for (p = entry->copyb; p; p = n) { - n = get_irn_link(p); + size_t idx; + n = (ir_node*)get_irn_link(p); src = get_CopyB_src(p); /* old scheme using value_res_ent */ @@ -573,7 +575,8 @@ static void add_hidden_param(ir_graph *irg, int n_com, ir_node **ins, cl_entry * /* 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); @@ -595,7 +598,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; @@ -654,10 +658,11 @@ static void fix_call_list(ir_graph *irg, wlk_env *env) { */ static void transform_irg(const lower_params_t *lp, ir_graph *irg) { - ir_graph * rem = current_ir_graph; + 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; + int 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; wlk_env env; @@ -765,7 +770,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(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)) { @@ -792,7 +797,7 @@ static void transform_irg(const lower_params_t *lp, ir_graph *irg) pred, tp ); - mem = new_r_Proj(bl, copy, mode_M, pn_CopyB_M); + mem = new_r_Proj(copy, mode_M, pn_CopyB_M); } } if (lp->flags & LF_RETURN_HIDDEN) { @@ -809,10 +814,12 @@ static void transform_irg(const lower_params_t *lp, ir_graph *irg) set_irn_in(ret, j, new_in); if (n_cr_opt > 0) { + size_t i, n; + 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); + for (i = 0, n = ARR_LEN(cr_opt); i < n; ++i) { + free_entity(cr_opt[i].ent); } } } /* if (n_ret_com) */ @@ -835,7 +842,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; @@ -860,7 +868,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 */ @@ -903,7 +911,7 @@ static void lower_method_types(type_or_ent tore, void *env) */ void lower_calls_with_compounds(const lower_params_t *params) { - int i; + size_t i, n; ir_graph *irg; lower_params_t param = *params; @@ -914,7 +922,7 @@ void lower_calls_with_compounds(const lower_params_t *params) type_map = NULL; /* first step: Transform all graphs */ - for (i = get_irp_n_irgs() - 1; i >= 0; --i) { + for (i = 0, n = get_irp_n_irgs(); i < n; ++i) { irg = get_irp_irg(i); transform_irg(¶m, irg);