X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;ds=sidebyside;f=ir%2Fbe%2Fbeabi.c;h=e56c13e77b1ba7d692428591d9f2d002992d9ac4;hb=c32482bc042c9f0591bec432ccb6dfcadbad4cb7;hp=084bf4f7d7700abd31ba117604125cc538624e98;hpb=f0570c5883d01b28fdb59010bfc18fdc3b15413b;p=libfirm diff --git a/ir/be/beabi.c b/ir/be/beabi.c index 084bf4f7d..e56c13e77 100644 --- a/ir/be/beabi.c +++ b/ir/be/beabi.c @@ -21,7 +21,6 @@ * @file * @brief Backend ABI implementation. * @author Sebastian Hack, Michael Beck - * @version $Id$ */ #include "config.h" @@ -37,11 +36,11 @@ #include "irgwalk.h" #include "irprintf_t.h" #include "irgopt.h" -#include "irbitset.h" #include "iropt_t.h" +#include "irtools.h" #include "heights.h" #include "pdeq.h" -#include "irtools.h" +#include "util.h" #include "raw_bitset.h" #include "error.h" #include "pset_new.h" @@ -109,7 +108,7 @@ static int be_omit_fp = 1; static ir_node *be_abi_reg_map_get(pmap *map, const arch_register_t *reg) { - return (ir_node*)pmap_get(map, reg); + return pmap_get(ir_node, map, reg); } static void be_abi_reg_map_set(pmap *map, const arch_register_t* reg, @@ -118,6 +117,32 @@ static void be_abi_reg_map_set(pmap *map, const arch_register_t* reg, pmap_insert(map, reg, node); } +/** + * Check if the given register is callee save, ie. will be saved by the callee. + */ +static bool arch_register_is_callee_save( + const arch_env_t *arch_env, + const arch_register_t *reg) +{ + if (arch_env->impl->register_saved_by) + return arch_env->impl->register_saved_by(reg, /*callee=*/1); + return false; +} + +/** + * Check if the given register is caller save, ie. must be saved by the caller. + */ +static bool arch_register_is_caller_save( + const arch_env_t *arch_env, + const arch_register_t *reg) +{ + if (arch_env->impl->register_saved_by) + return arch_env->impl->register_saved_by(reg, /*callee=*/0); + return false; +} + + + /* _ ____ ___ ____ _ _ _ _ / \ | __ )_ _| / ___|__ _| | | |__ __ _ ___| | _____ @@ -160,7 +185,7 @@ static be_abi_call_arg_t *get_call_arg(be_abi_call_t *call, int is_res, int pos, hash = is_res * 128 + pos; - return (be_abi_call_arg_t*)set_find(call->params, &arg, sizeof(arg), hash); + return set_find(be_abi_call_arg_t, call->params, &arg, sizeof(arg), hash); } /** @@ -171,11 +196,11 @@ static void remember_call_arg(be_abi_call_arg_t *arg, be_abi_call_t *call, be_ab unsigned hash = arg->is_res * 128 + arg->pos; if (context & ABI_CONTEXT_CALLEE) { arg->callee = 1; - set_insert(call->params, arg, sizeof(*arg), hash); + (void)set_insert(be_abi_call_arg_t, call->params, arg, sizeof(*arg), hash); } if (context & ABI_CONTEXT_CALLER) { arg->callee = 0; - set_insert(call->params, arg, sizeof(*arg), hash); + (void)set_insert(be_abi_call_arg_t, call->params, arg, sizeof(*arg), hash); } } @@ -288,13 +313,11 @@ static void be_abi_call_free(be_abi_call_t *call) * @param args the stack argument layout type * @param between the between layout type * @param locals the method frame type - * @param param_map an array mapping method argument positions to the stack argument type * * @return the initialized stack layout */ static be_stack_layout_t *stack_frame_init(be_stack_layout_t *frame, ir_type *args, - ir_type *between, ir_type *locals, - ir_entity *param_map[]) + ir_type *between, ir_type *locals) { frame->arg_type = args; frame->between_type = between; @@ -302,7 +325,6 @@ static be_stack_layout_t *stack_frame_init(be_stack_layout_t *frame, ir_type *ar frame->initial_offset = 0; frame->initial_bias = 0; frame->order[1] = between; - frame->param_map = param_map; /* typical decreasing stack: locals have the * lowest addresses, arguments the highest */ @@ -343,9 +365,7 @@ static ir_node *adjust_call(be_abi_irg_t *env, ir_node *irn, ir_node *curr_sp) const arch_register_t *sp = arch_env->sp; be_abi_call_t *call = be_abi_call_new(sp->reg_class); ir_mode *mach_mode = sp->reg_class->mode; - int no_alloc = call->flags.bits.frame_is_setup_on_call; int n_res = get_method_n_ress(call_tp); - int do_seq = call->flags.bits.store_args_sequential && !no_alloc; ir_node *res_proj = NULL; int n_reg_params = 0; @@ -358,10 +378,10 @@ static ir_node *adjust_call(be_abi_irg_t *env, ir_node *irn, ir_node *curr_sp) ir_node **in; ir_node **res_projs; int n_reg_results = 0; - const ir_edge_t *edge; int *reg_param_idxs; int *stack_param_idx; - int i, n, destroy_all_regs; + int i, n; + int throws_exception; size_t s; size_t p; dbg_info *dbgi; @@ -370,7 +390,7 @@ static ir_node *adjust_call(be_abi_irg_t *env, ir_node *irn, ir_node *curr_sp) arch_env_get_call_abi(arch_env, call_tp, call); /* Insert code to put the stack arguments on the stack. */ - assert(get_Call_n_params(irn) == n_params); + assert((size_t)get_Call_n_params(irn) == n_params); stack_param_idx = ALLOCAN(int, n_params); for (p = 0; p < n_params; ++p) { be_abi_call_arg_t *arg = get_call_arg(call, 0, p, 0); @@ -404,9 +424,7 @@ static ir_node *adjust_call(be_abi_irg_t *env, ir_node *irn, ir_node *curr_sp) * Note: we also have to do this for stack_size == 0, because we may have * to adjust stack alignment for the call. */ - if (!do_seq && !no_alloc) { - curr_sp = be_new_IncSP(sp, bl, curr_sp, stack_size, 1); - } + curr_sp = be_new_IncSP(sp, bl, curr_sp, stack_size, 1); dbgi = get_irn_dbg_info(irn); /* If there are some parameters which shall be passed on the stack. */ @@ -415,24 +433,8 @@ static ir_node *adjust_call(be_abi_irg_t *env, ir_node *irn, ir_node *curr_sp) ir_node **in = ALLOCAN(ir_node*, n_stack_params+1); unsigned n_in = 0; - /* - * Reverse list of stack parameters if call arguments are from left to right. - * We must them reverse again if they are pushed (not stored) and the stack - * direction is downwards. - */ - if (call->flags.bits.left_to_right ^ do_seq) { - for (i = 0; i < n_stack_params >> 1; ++i) { - int other = n_stack_params - i - 1; - int tmp = stack_param_idx[i]; - stack_param_idx[i] = stack_param_idx[other]; - stack_param_idx[other] = tmp; - } - } - curr_mem = get_Call_mem(irn); - if (! do_seq) { - in[n_in++] = curr_mem; - } + in[n_in++] = curr_mem; for (i = 0; i < n_stack_params; ++i) { int p = stack_param_idx[i]; @@ -448,30 +450,23 @@ static ir_node *adjust_call(be_abi_irg_t *env, ir_node *irn, ir_node *curr_sp) * the stack pointer for the next must be incremented, * and the memory value propagated. */ - if (do_seq) { - curr_ofs = 0; - addr = curr_sp = be_new_IncSP(sp, bl, curr_sp, - param_size + arg->space_before, 0); - add_irn_dep(curr_sp, curr_mem); - } else { - curr_ofs += arg->space_before; - curr_ofs = round_up2(curr_ofs, arg->alignment); - - /* Make the expression to compute the argument's offset. */ - if (curr_ofs > 0) { - ir_mode *constmode = mach_mode; - if (mode_is_reference(mach_mode)) { - constmode = mode_Is; - } - addr = new_r_Const_long(irg, constmode, curr_ofs); - addr = new_r_Add(bl, curr_sp, addr, mach_mode); + curr_ofs += arg->space_before; + curr_ofs = round_up2(curr_ofs, arg->alignment); + + /* Make the expression to compute the argument's offset. */ + if (curr_ofs > 0) { + ir_mode *constmode = mach_mode; + if (mode_is_reference(mach_mode)) { + constmode = mode_Is; } + addr = new_r_Const_long(irg, constmode, curr_ofs); + addr = new_r_Add(bl, curr_sp, addr, mach_mode); } /* Insert a store for primitive arguments. */ if (is_atomic_type(param_type)) { ir_node *nomem = get_irg_no_mem(irg); - ir_node *mem_input = do_seq ? curr_mem : nomem; + ir_node *mem_input = nomem; ir_node *store = new_rd_Store(dbgi, bl, mem_input, addr, param, cons_none); mem = new_r_Proj(store, mode_M, pn_Store_M); } else { @@ -485,36 +480,17 @@ static ir_node *adjust_call(be_abi_irg_t *env, ir_node *irn, ir_node *curr_sp) curr_ofs += param_size; - if (do_seq) - curr_mem = mem; - else - in[n_in++] = mem; + in[n_in++] = mem; } /* We need the sync only, if we didn't build the stores sequentially. */ - if (! do_seq) { - if (n_stack_params >= 1) { - curr_mem = new_r_Sync(bl, n_in, in); - } else { - curr_mem = get_Call_mem(irn); - } + if (n_stack_params >= 1) { + curr_mem = new_r_Sync(bl, n_in, in); + } else { + curr_mem = get_Call_mem(irn); } } - /* check for the return_twice property */ - destroy_all_regs = 0; - if (is_SymConst_addr_ent(call_ptr)) { - ir_entity *ent = get_SymConst_entity(call_ptr); - - if (get_entity_additional_properties(ent) & mtp_property_returns_twice) - destroy_all_regs = 1; - } else { - ir_type *call_tp = get_Call_type(irn); - - if (get_method_additional_properties(call_tp) & mtp_property_returns_twice) - destroy_all_regs = 1; - } - /* Put caller save into the destroyed set and state registers in the states * set */ for (i = 0, n = arch_env->n_register_classes; i < n; ++i) { @@ -535,7 +511,7 @@ static ir_node *adjust_call(be_abi_irg_t *env, ir_node *irn, ir_node *curr_sp) * checking */ continue; } - if (destroy_all_regs || (reg->type & arch_register_type_caller_save)) { + if (arch_register_is_caller_save(arch_env, reg)) { if (!(reg->type & arch_register_type_ignore)) { ARR_APP1(const arch_register_t*, destroyed_regs, reg); } @@ -547,8 +523,7 @@ static ir_node *adjust_call(be_abi_irg_t *env, ir_node *irn, ir_node *curr_sp) res_projs = ALLOCANZ(ir_node*, n_res); foreach_out_edge(irn, edge) { - const ir_edge_t *res_edge; - ir_node *irn = get_edge_src_irn(edge); + ir_node *irn = get_edge_src_irn(edge); if (!is_Proj(irn) || get_Proj_proj(irn) != pn_Call_T_result) continue; @@ -584,13 +559,14 @@ static ir_node *adjust_call(be_abi_irg_t *env, ir_node *irn, ir_node *curr_sp) /* add state registers ins */ for (s = 0; s < ARR_LEN(states); ++s) { const arch_register_t *reg = states[s]; - const arch_register_class_t *cls = arch_register_get_class(reg); - ir_node *regnode = new_r_Unknown(irg, arch_register_class_mode(cls)); + const arch_register_class_t *cls = reg->reg_class; + ir_node *regnode = new_r_Unknown(irg, cls->mode); in[n_ins++] = regnode; } assert(n_ins == (int) (n_reg_params + ARR_LEN(states))); /* ins collected, build the call */ + throws_exception = ir_throws_exception(irn); if (env->call->flags.bits.call_has_imm && is_SymConst(call_ptr)) { /* direct call */ low_call = be_new_Call(dbgi, irg, bl, curr_mem, curr_sp, curr_sp, @@ -603,6 +579,7 @@ static ir_node *adjust_call(be_abi_irg_t *env, ir_node *irn, ir_node *curr_sp) n_reg_results + pn_be_Call_first_res + ARR_LEN(destroyed_regs), n_ins, in, get_Call_type(irn)); } + ir_set_throws_exception(low_call, throws_exception); be_Call_set_pop(low_call, call->pop); /* put the call into the list of all calls for later processing */ @@ -616,9 +593,9 @@ static ir_node *adjust_call(be_abi_irg_t *env, ir_node *irn, ir_node *curr_sp) /* now handle results */ for (i = 0; i < n_res; ++i) { - int pn; ir_node *proj = res_projs[i]; be_abi_call_arg_t *arg = get_call_arg(call, 1, i, 0); + long pn = i + pn_be_Call_first_res; /* returns values on stack not supported yet */ assert(arg->in_reg); @@ -733,7 +710,7 @@ static ir_node *adjust_call(be_abi_irg_t *env, ir_node *irn, ir_node *curr_sp) keep = be_new_Keep(bl, n, in); for (i = 0; i < n; ++i) { const arch_register_t *reg = (const arch_register_t*)get_irn_link(in[i]); - be_node_set_reg_class_in(keep, i, reg->reg_class); + be_node_set_reg_class_in(keep, i, arch_register_get_class(reg)); } } @@ -753,14 +730,12 @@ static ir_node *adjust_call(be_abi_irg_t *env, ir_node *irn, ir_node *curr_sp) } if (! mem_proj) { - mem_proj = new_r_Proj(low_call, mode_M, pn_be_Call_M_regular); + mem_proj = new_r_Proj(low_call, mode_M, pn_be_Call_M); keep_alive(mem_proj); } } /* Clean up the stack frame or revert alignment fixes if we allocated it */ - if (! no_alloc) { - curr_sp = be_new_IncSP(sp, bl, curr_sp, -stack_size, 0); - } + curr_sp = be_new_IncSP(sp, bl, curr_sp, -stack_size, 0); be_abi_call_free(call); @@ -817,7 +792,6 @@ static ir_node *adjust_alloc(be_abi_irg_t *env, ir_node *alloc, ir_node *curr_sp ir_type *type = get_Alloc_type(alloc); dbg_info *dbg; - const ir_edge_t *edge; ir_node *new_alloc; ir_node *count; ir_node *size; @@ -855,7 +829,7 @@ static ir_node *adjust_alloc(be_abi_irg_t *env, ir_node *alloc, ir_node *curr_sp count = get_Alloc_count(alloc); /* we might need to multiply the count with the element size */ - if (type != firm_unknown_type && get_type_size_bytes(type) != 1) { + if (!is_unknown_type(type) && get_type_size_bytes(type) != 1) { ir_mode *mode = get_irn_mode(count); ir_tarval *tv = new_tarval_from_long(get_type_size_bytes(type), mode); @@ -920,14 +894,14 @@ static ir_node *adjust_free(be_abi_irg_t *env, ir_node *free, ir_node *curr_sp) assert(get_Free_where(free) == stack_alloc); /* we might need to multiply the size with the element size */ - if (type != firm_unknown_type && get_type_size_bytes(type) != 1) { + if (!is_unknown_type(type) && get_type_size_bytes(type) != 1) { ir_tarval *tv = new_tarval_from_long(get_type_size_bytes(type), mode_Iu); ir_node *cnst = new_rd_Const(dbg, irg, tv); - ir_node *mul = new_rd_Mul(dbg, block, get_Free_size(free), + ir_node *mul = new_rd_Mul(dbg, block, get_Free_count(free), cnst, mode_Iu); size = mul; } else { - size = get_Free_size(free); + size = get_Free_count(free); } stack_alignment = 1 << arch_env->stack_alignment; @@ -1005,7 +979,6 @@ static int cmp_call_dependency(const void *c1, const void *c2) /** * Walker: links all Call/Alloc/Free nodes to the Block they are contained. - * Clears the irg_is_leaf flag if a Call is detected. */ static void link_ops_in_block_walker(ir_node *irn, void *data) { @@ -1018,9 +991,6 @@ static void link_ops_in_block_walker(ir_node *irn, void *data) ir_node *bl = get_nodes_block(irn); void *save = get_irn_link(bl); - if (code == iro_Call) - env->call->flags.bits.irg_is_leaf = 0; - set_irn_link(irn, save); set_irn_link(bl, irn); } @@ -1117,7 +1087,6 @@ static void process_calls(ir_graph *irg) { be_abi_irg_t *abi = be_get_irg_abi(irg); - abi->call->flags.bits.irg_is_leaf = 1; irg_walk_graph(irg, firm_clear_link, link_ops_in_block_walker, abi); ir_heights = heights_new(irg); @@ -1130,61 +1099,82 @@ static void process_calls(ir_graph *irg) * Changes a possibly allocated value param type by moving * entities to the stack layout type. * - * @param env the ABI environment * @param call the current call ABI * @param method_type the method type - * @param val_param_tp the value parameter type, will be destroyed - * @param param_map an array mapping method arguments to the stack layout type * * @return the stack argument layout type */ -static ir_type *compute_arg_type(be_abi_irg_t *env, ir_graph *irg, - be_abi_call_t *call, - ir_type *method_type, ir_type *val_param_tp, - ir_entity ***param_map) +static ir_type *compute_arg_type(ir_graph *irg, be_abi_call_t *call, + ir_type *method_type) { - int dir = env->call->flags.bits.left_to_right ? 1 : -1; - int inc = -dir; - int n = get_method_n_params(method_type); - int curr = inc > 0 ? 0 : n - 1; struct obstack *obst = be_get_be_obst(irg); - int ofs = 0; + ir_type *frame_type = get_irg_frame_type(irg); + size_t n_params = get_method_n_params(method_type); + size_t n_frame_members = get_compound_n_members(frame_type); + ir_entity *va_start_entity = NULL; + size_t f; + int ofs = 0; - char buf[128]; ir_type *res; - int i; - ident *id = get_entity_ident(get_irg_entity(irg)); - ir_entity **map; + size_t i; + ir_entity **map = OALLOCNZ(obst, ir_entity*, n_params); + res = new_type_struct(new_id_from_chars("arg_type", 8)); - *param_map = map = OALLOCN(obst, ir_entity*, n); - res = new_type_struct(id_mangle_u(id, new_id_from_chars("arg_type", 8))); - for (i = 0; i < n; ++i, curr += inc) { - ir_type *param_type = get_method_param_type(method_type, curr); - be_abi_call_arg_t *arg = get_call_arg(call, 0, curr, 1); + /* collect existing entities for value_param_types */ + for (f = n_frame_members; f > 0; ) { + ir_entity *entity = get_compound_member(frame_type, --f); + size_t num; - map[i] = NULL; - if (arg->on_stack) { - if (val_param_tp != NULL) { - /* the entity was already created, create a copy in the param type */ - ir_entity *val_ent = get_method_value_param_ent(method_type, i); - arg->stack_ent = copy_entity_own(val_ent, res); - set_entity_link(val_ent, arg->stack_ent); - set_entity_link(arg->stack_ent, NULL); - } else { - /* create a new entity */ - snprintf(buf, sizeof(buf), "param_%d", i); - arg->stack_ent = new_entity(res, new_id_from_str(buf), param_type); - } - ofs += arg->space_before; - ofs = round_up2(ofs, arg->alignment); - set_entity_offset(arg->stack_ent, ofs); - ofs += arg->space_after; - ofs += get_type_size_bytes(param_type); - map[i] = arg->stack_ent; + set_entity_link(entity, NULL); + if (!is_parameter_entity(entity)) + continue; + num = get_entity_parameter_number(entity); + if (num == IR_VA_START_PARAMETER_NUMBER) { + /* move entity to new arg_type */ + set_entity_owner(entity, res); + va_start_entity = entity; + continue; + } + assert(num < n_params); + if (map[num] != NULL) + panic("multiple entities for parameter %u in %+F found", f, irg); + + if (num != n_params && !get_call_arg(call, 0, num, 1)->on_stack) { + /* don't move this entity */ + continue; + } + + map[num] = entity; + /* move entity to new arg_type */ + set_entity_owner(entity, res); + } + + for (i = 0; i < n_params; ++i) { + be_abi_call_arg_t *arg = get_call_arg(call, 0, i, 1); + ir_type *param_type = get_method_param_type(method_type, i); + ir_entity *entity; + + if (!arg->on_stack) { + continue; } + entity = map[i]; + if (entity == NULL) { + /* create a new entity */ + entity = new_parameter_entity(res, i, param_type); + } + ofs += arg->space_before; + ofs = round_up2(ofs, arg->alignment); + set_entity_offset(entity, ofs); + ofs += arg->space_after; + ofs += get_type_size_bytes(param_type); + arg->stack_ent = entity; + } + if (va_start_entity != NULL) { + set_entity_offset(va_start_entity, ofs); } set_type_size_bytes(res, ofs); set_type_state(res, layout_fixed); + return res; } @@ -1236,7 +1226,7 @@ static ir_node *create_be_return(be_abi_irg_t *env, ir_node *irn, ir_node *bl, const arch_env_t *arch_env = be_get_irg_arch_env(irg); dbg_info *dbgi; pmap *reg_map = pmap_create(); - ir_node *keep = (ir_node*)pmap_get(env->keep_map, bl); + ir_node *keep = pmap_get(ir_node, env->keep_map, bl); size_t in_max; ir_node *ret; int i, n; @@ -1271,7 +1261,7 @@ static ir_node *create_be_return(be_abi_irg_t *env, ir_node *irn, ir_node *bl, /* Add uses of the callee save registers. */ foreach_pmap(env->regs, ent) { const arch_register_t *reg = (const arch_register_t*)ent->key; - if (reg->type & (arch_register_type_callee_save | arch_register_type_ignore)) + if ((reg->type & arch_register_type_ignore) || arch_register_is_callee_save(arch_env, reg)) pmap_insert(reg_map, ent->key, ent->value); } @@ -1336,57 +1326,14 @@ static ir_node *create_be_return(be_abi_irg_t *env, ir_node *irn, ir_node *bl, return ret; } -typedef struct ent_pos_pair ent_pos_pair; -struct ent_pos_pair { - ir_entity *ent; /**< a value param entity */ - int pos; /**< its parameter number */ - ent_pos_pair *next; /**< for linking */ -}; - typedef struct lower_frame_sels_env_t { - ent_pos_pair *value_param_list; /**< the list of all value param entities */ ir_node *frame; /**< the current frame */ const arch_register_class_t *sp_class; /**< register class of the stack pointer */ const arch_register_class_t *link_class; /**< register class of the link pointer */ - ir_type *value_tp; /**< the value type if any */ ir_type *frame_tp; /**< the frame type */ int static_link_pos; /**< argument number of the hidden static link */ } lower_frame_sels_env_t; -/** - * Return an entity from the backend for an value param entity. - * - * @param ent an value param type entity - * @param ctx context - */ -static ir_entity *get_argument_entity(ir_entity *ent, lower_frame_sels_env_t *ctx) -{ - ir_entity *argument_ent = (ir_entity*)get_entity_link(ent); - - if (argument_ent == NULL) { - /* we have NO argument entity yet: This is bad, as we will - * need one for backing store. - * Create one here. - */ - ir_type *frame_tp = ctx->frame_tp; - unsigned offset = get_type_size_bytes(frame_tp); - ir_type *tp = get_entity_type(ent); - unsigned align = get_type_alignment_bytes(tp); - - offset += align - 1; - offset &= ~(align - 1); - - argument_ent = copy_entity_own(ent, frame_tp); - - /* must be automatic to set a fixed layout */ - set_entity_offset(argument_ent, offset); - offset += get_type_size_bytes(tp); - - set_type_size_bytes(frame_tp, offset); - set_entity_link(ent, argument_ent); - } - return argument_ent; -} /** * Walker: Replaces Sels of frame type and * value param type entities by FrameAddress. @@ -1403,143 +1350,10 @@ static void lower_frame_sels_walker(ir_node *irn, void *data) ir_entity *ent = get_Sel_entity(irn); ir_node *bl = get_nodes_block(irn); ir_node *nw; - int pos = 0; - int is_value_param = 0; - - if (get_entity_owner(ent) == ctx->value_tp) { - is_value_param = 1; - - /* replace by its copy from the argument type */ - pos = get_struct_member_index(ctx->value_tp, ent); - ent = get_argument_entity(ent, ctx); - } nw = be_new_FrameAddr(ctx->sp_class, bl, ctx->frame, ent); exchange(irn, nw); - - /* check, if it's a param Sel and if have not seen this entity before */ - if (is_value_param && get_entity_link(ent) == NULL) { - ent_pos_pair pair; - - pair.ent = ent; - pair.pos = pos; - pair.next = NULL; - ARR_APP1(ent_pos_pair, ctx->value_param_list, pair); - /* just a mark */ - set_entity_link(ent, ctx->value_param_list); - } - } - } -} - -/** - * Check if a value parameter is transmitted as a register. - * This might happen if the address of an parameter is taken which is - * transmitted in registers. - * - * Note that on some architectures this case must be handled specially - * because the place of the backing store is determined by their ABI. - * - * In the default case we move the entity to the frame type and create - * a backing store into the first block. - */ -static void fix_address_of_parameter_access(be_abi_irg_t *env, ir_graph *irg, - ent_pos_pair *value_param_list) -{ - be_abi_call_t *call = env->call; - const arch_env_t *arch_env = be_get_irg_arch_env(irg); - ent_pos_pair *entry, *new_list; - ir_type *frame_tp; - int i, n = ARR_LEN(value_param_list); - - new_list = NULL; - for (i = 0; i < n; ++i) { - int pos = value_param_list[i].pos; - be_abi_call_arg_t *arg = get_call_arg(call, 0, pos, 1); - - if (arg->in_reg) { - DBG((dbg, LEVEL_2, "\targ #%d need backing store\n", pos)); - value_param_list[i].next = new_list; - new_list = &value_param_list[i]; - } - } - if (new_list != NULL) { - /* ok, change the graph */ - ir_node *start_bl = get_irg_start_block(irg); - ir_node *first_bl = get_first_block_succ(start_bl); - ir_node *frame, *imem, *nmem, *store, *mem, *args; - optimization_state_t state; - unsigned offset; - - assert(first_bl && first_bl != start_bl); - /* we had already removed critical edges, so the following - assertion should be always true. */ - assert(get_Block_n_cfgpreds(first_bl) == 1); - - /* now create backing stores */ - frame = get_irg_frame(irg); - imem = get_irg_initial_mem(irg); - - save_optimization_state(&state); - set_optimize(0); - nmem = new_r_Proj(get_irg_start(irg), mode_M, pn_Start_M); - restore_optimization_state(&state); - - /* reroute all edges to the new memory source */ - edges_reroute(imem, nmem); - - store = NULL; - mem = imem; - args = get_irg_args(irg); - for (entry = new_list; entry != NULL; entry = entry->next) { - int i = entry->pos; - ir_type *tp = get_entity_type(entry->ent); - ir_mode *mode = get_type_mode(tp); - ir_node *addr; - - /* address for the backing store */ - addr = be_new_FrameAddr(arch_env->sp->reg_class, first_bl, frame, entry->ent); - - if (store) - mem = new_r_Proj(store, mode_M, pn_Store_M); - - /* the backing store itself */ - store = new_r_Store(first_bl, mem, addr, - new_r_Proj(args, mode, i), cons_none); } - /* the new memory Proj gets the last Proj from store */ - set_Proj_pred(nmem, store); - set_Proj_proj(nmem, pn_Store_M); - - /* move all entities to the frame type */ - frame_tp = get_irg_frame_type(irg); - offset = get_type_size_bytes(frame_tp); - - /* we will add new entities: set the layout to undefined */ - assert(get_type_state(frame_tp) == layout_fixed); - set_type_state(frame_tp, layout_undefined); - for (entry = new_list; entry != NULL; entry = entry->next) { - ir_entity *ent = entry->ent; - - /* If the entity is still on the argument type, move it to the - * frame type. - * This happens if the value_param type was build due to compound - * params. */ - if (get_entity_owner(ent) != frame_tp) { - ir_type *tp = get_entity_type(ent); - unsigned align = get_type_alignment_bytes(tp); - - offset += align - 1; - offset &= ~(align - 1); - set_entity_owner(ent, frame_tp); - /* must be automatic to set a fixed layout */ - set_entity_offset(ent, offset); - offset += get_type_size_bytes(tp); - } - } - set_type_size_bytes(frame_tp, offset); - /* fix the layout again */ - set_type_state(frame_tp, layout_fixed); } } @@ -1556,75 +1370,20 @@ static void fix_start_block(ir_graph *irg) assert(is_Proj(initial_X)); exchange(initial_X, jmp); - set_irg_initial_exec(irg, new_r_Bad(irg)); -} + set_irg_initial_exec(irg, new_r_Bad(irg, mode_X)); -/** - * Update the entity of Sels to the outer value parameters. - */ -static void update_outer_frame_sels(ir_node *irn, void *env) -{ - lower_frame_sels_env_t *ctx = (lower_frame_sels_env_t*)env; - ir_node *ptr; - ir_entity *ent; - int pos = 0; - - if (! is_Sel(irn)) - return; - ptr = get_Sel_ptr(irn); - if (! is_arg_Proj(ptr)) - return; - if (get_Proj_proj(ptr) != ctx->static_link_pos) - return; - ent = get_Sel_entity(irn); - - if (get_entity_owner(ent) == ctx->value_tp) { - /* replace by its copy from the argument type */ - pos = get_struct_member_index(ctx->value_tp, ent); - ent = get_argument_entity(ent, ctx); - set_Sel_entity(irn, ent); - - /* check, if we have not seen this entity before */ - if (get_entity_link(ent) == NULL) { - ent_pos_pair pair; - - pair.ent = ent; - pair.pos = pos; - pair.next = NULL; - ARR_APP1(ent_pos_pair, ctx->value_param_list, pair); - /* just a mark */ - set_entity_link(ent, ctx->value_param_list); - } - } -} - -/** - * Fix access to outer local variables. - */ -static void fix_outer_variable_access(be_abi_irg_t *env, - lower_frame_sels_env_t *ctx) -{ - int i; - ir_graph *irg; - (void) env; - - for (i = get_class_n_members(ctx->frame_tp) - 1; i >= 0; --i) { - ir_entity *ent = get_class_member(ctx->frame_tp, i); - - if (! is_method_entity(ent)) - continue; - - irg = get_entity_irg(ent); - if (irg == NULL) - continue; - - /* - * FIXME: find the number of the static link parameter - * for now we assume 0 here - */ - ctx->static_link_pos = 0; + /* merge start block with successor if possible */ + { + foreach_out_edge(jmp, edge) { + ir_node *succ = get_edge_src_irn(edge); + if (!is_Block(succ)) + continue; - irg_walk_graph(irg, NULL, update_outer_frame_sels, ctx); + if (get_irn_arity(succ) == 1) { + exchange(succ, start_block); + } + break; + } } } @@ -1657,34 +1416,18 @@ static void modify_irg(ir_graph *irg) ir_node *start_bl; ir_node **args; ir_node *arg_tuple; - const ir_edge_t *edge; - ir_type *arg_type, *bet_type, *tp; + ir_type *arg_type, *bet_type; lower_frame_sels_env_t ctx; - ir_entity **param_map; DBG((dbg, LEVEL_1, "introducing abi on %+F\n", irg)); old_mem = get_irg_initial_mem(irg); - irp_reserve_resources(irp, IR_RESOURCE_ENTITY_LINK); - - /* set the links of all frame entities to NULL, we use it - to detect if an entity is already linked in the value_param_list */ - tp = get_method_value_param_type(method_type); - ctx.value_tp = tp; - if (tp != NULL) { - /* clear the links of the clone type, let the - original entities point to its clones */ - for (i = get_struct_n_members(tp) - 1; i >= 0; --i) { - ir_entity *mem = get_struct_member(tp, i); - set_entity_link(mem, NULL); - } - } + irp_reserve_resources(irp, IRP_RESOURCE_ENTITY_LINK); - arg_type = compute_arg_type(env, irg, call, method_type, tp, ¶m_map); + arg_type = compute_arg_type(irg, call, method_type); /* Convert the Sel nodes in the irg to frame addr nodes: */ - ctx.value_param_list = NEW_ARR_F(ent_pos_pair, 0); ctx.frame = get_irg_frame(irg); ctx.sp_class = arch_env->sp->reg_class; ctx.link_class = arch_env->link_class; @@ -1695,14 +1438,6 @@ static void modify_irg(ir_graph *irg) default_layout_compound_type(ctx.frame_tp); } - /* we will possible add new entities to the frame: set the layout to undefined */ - assert(get_type_state(ctx.frame_tp) == layout_fixed); - set_type_state(ctx.frame_tp, layout_undefined); - - irg_walk_graph(irg, lower_frame_sels_walker, NULL, &ctx); - - /* fix the frame type layout again */ - set_type_state(ctx.frame_tp, layout_fixed); /* align stackframe to 4 byte */ frame_size = get_type_size_bytes(ctx.frame_tp); if (frame_size % 4 != 0) { @@ -1714,25 +1449,11 @@ static void modify_irg(ir_graph *irg) n_params = get_method_n_params(method_type); args = OALLOCNZ(obst, ir_node*, n_params); - /* - * for inner function we must now fix access to outer frame entities. - */ - fix_outer_variable_access(env, &ctx); + be_add_parameter_entity_stores(irg); - /* Check if a value parameter is transmitted as a register. - * This might happen if the address of an parameter is taken which is - * transmitted in registers. - * - * Note that on some architectures this case must be handled specially - * because the place of the backing store is determined by their ABI. - * - * In the default case we move the entity to the frame type and create - * a backing store into the first block. - */ - fix_address_of_parameter_access(env, irg, ctx.value_param_list); + irg_walk_graph(irg, lower_frame_sels_walker, NULL, &ctx); - DEL_ARR_F(ctx.value_param_list); - irp_free_resources(irp, IR_RESOURCE_ENTITY_LINK); + irp_free_resources(irp, IRP_RESOURCE_ENTITY_LINK); /* Fill the argument vector */ arg_tuple = get_irg_args(irg); @@ -1748,7 +1469,7 @@ static void modify_irg(ir_graph *irg) stack_layout->sp_relative = call->flags.bits.try_omit_fp; bet_type = call->cb->get_between_type(irg); stack_frame_init(stack_layout, arg_type, bet_type, - get_irg_frame_type(irg), param_map); + get_irg_frame_type(irg)); /* Count the register params and add them to the number of Projs for the RegParams node */ for (i = 0; i < n_params; ++i) { @@ -1768,7 +1489,7 @@ static void modify_irg(ir_graph *irg) const arch_register_class_t *cls = &arch_env->register_classes[i]; for (j = 0; j < cls->n_regs; ++j) { const arch_register_t *reg = &cls->regs[j]; - if (reg->type & (arch_register_type_callee_save | arch_register_type_state)) { + if ((reg->type & arch_register_type_state) || arch_register_is_callee_save(arch_env, reg)) { pmap_insert(env->regs, (void *) reg, NULL); } } @@ -1819,7 +1540,7 @@ static void modify_irg(ir_graph *irg) /* create a new initial memory proj */ assert(is_Proj(old_mem)); - arch_set_out_register_req(env->start, 0, arch_no_register_req); + arch_set_irn_register_req_out(env->start, 0, arch_no_register_req); new_mem_proj = new_r_Proj(env->start, mode_M, 0); mem = new_mem_proj; set_irg_initial_mem(irg, mem); @@ -1854,7 +1575,7 @@ static void modify_irg(ir_graph *irg) param_type = get_method_param_type(method_type, nr); if (arg->in_reg) { - repl = (ir_node*)pmap_get(env->regs, arg->reg); + repl = pmap_get(ir_node, env->regs, arg->reg); } else if (arg->on_stack) { ir_node *addr = be_new_FrameAddr(sp->reg_class, start_bl, frame_pointer, arg->stack_ent); @@ -1893,7 +1614,7 @@ static void modify_irg(ir_graph *irg) /* the arg proj is not needed anymore now and should be only used by the anchor */ assert(get_irn_n_edges(arg_tuple) == 1); kill_node(arg_tuple); - set_irg_args(irg, new_r_Bad(irg)); + set_irg_args(irg, new_r_Bad(irg, mode_T)); /* All Return nodes hang on the End node, so look for them there. */ end = get_irg_end_block(irg); @@ -1975,7 +1696,7 @@ static ir_entity *create_trampoline(be_main_env_t *be, ir_entity *method) */ static ir_entity *get_trampoline(be_main_env_t *env, ir_entity *method) { - ir_entity *result = (ir_entity*)pmap_get(env->ent_trampoline_map, method); + ir_entity *result = pmap_get(ir_entity, env->ent_trampoline_map, method); if (result == NULL) { result = create_trampoline(env, method); pmap_insert(env->ent_trampoline_map, method, result); @@ -2000,7 +1721,7 @@ static ir_entity *create_pic_symbol(be_main_env_t *be, ir_entity *entity) static ir_entity *get_pic_symbol(be_main_env_t *env, ir_entity *entity) { - ir_entity *result = (ir_entity*)pmap_get(env->ent_pic_symbol_map, entity); + ir_entity *result = pmap_get(ir_entity, env->ent_pic_symbol_map, entity); if (result == NULL) { result = create_pic_symbol(env, entity); pmap_insert(env->ent_pic_symbol_map, entity, result); @@ -2016,8 +1737,7 @@ static ir_entity *get_pic_symbol(be_main_env_t *env, ir_entity *entity) */ static int can_address_relative(ir_entity *entity) { - return get_entity_visibility(entity) != ir_visibility_external - && !(get_entity_linkage(entity) & IR_LINKAGE_MERGE); + return entity_has_definition(entity) && !(get_entity_linkage(entity) & IR_LINKAGE_MERGE); } static ir_node *get_pic_base(ir_graph *irg) @@ -2109,7 +1829,6 @@ void be_abi_introduce(ir_graph *irg) { be_abi_irg_t *env = XMALLOCZ(be_abi_irg_t); ir_node *old_frame = get_irg_frame(irg); - be_options_t *options = be_get_irg_options(irg); const arch_env_t *arch_env = be_get_irg_arch_env(irg); ir_entity *entity = get_irg_entity(irg); ir_type *method_type = get_entity_type(entity); @@ -2135,7 +1854,7 @@ void be_abi_introduce(ir_graph *irg) */ be_set_irg_abi(irg, env); - be_omit_fp = options->omit_fp; + be_omit_fp = be_options.omit_fp; env->keep_map = pmap_create(); env->call = be_abi_call_new(arch_env->sp->reg_class); @@ -2144,7 +1863,9 @@ void be_abi_introduce(ir_graph *irg) env->init_sp = dummy; env->calls = NEW_ARR_F(ir_node*, 0); - if (options->pic) { + assure_edges(irg); + + if (be_options.pic) { irg_walk_graph(irg, fix_pic_symconsts, NULL, env); } @@ -2179,8 +1900,8 @@ void be_abi_free(ir_graph *irg) if (env->call != NULL) be_abi_call_free(env->call); - free(env); assert(env->regs == NULL); + free(env); be_set_irg_abi(irg, NULL); } @@ -2225,7 +1946,7 @@ void be_set_allocatable_regs(const ir_graph *irg, } } -BE_REGISTER_MODULE_CONSTRUCTOR(be_init_abi); +BE_REGISTER_MODULE_CONSTRUCTOR(be_init_abi) void be_init_abi(void) { FIRM_DBG_REGISTER(dbg, "firm.be.abi");