X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbeabi.c;h=a71e41a20c23f2313962a92af044d445eaf68f4f;hb=0e4318adc38a54110c1b1f7f1d5edc0ee2c78170;hp=e5eb80f5b822d63f63fb1c6e8cce629efae40405;hpb=270f2356557d43d3e7ea36dacac46cd1e54a902d;p=libfirm diff --git a/ir/be/beabi.c b/ir/be/beabi.c index e5eb80f5b..a71e41a20 100644 --- a/ir/be/beabi.c +++ b/ir/be/beabi.c @@ -55,6 +55,7 @@ #include "beirg.h" #include "bessaconstr.h" #include "bemodule.h" +#include "betranshlp.h" DEBUG_ONLY(static firm_dbg_module_t *dbg;) @@ -86,8 +87,6 @@ struct be_abi_call_t { * The ABI information for the current graph. */ struct be_abi_irg_t { - survive_dce_t *dce_survivor; - be_abi_call_t *call; /**< The ABI call information. */ ir_node *init_sp; /**< The node representing the stack pointer @@ -96,11 +95,8 @@ struct be_abi_irg_t { ir_node *start; /**< The be_Start params node. */ pmap *regs; /**< A map of all callee-save and ignore regs to their Projs to the RegParams node. */ - int start_block_bias; /**< The stack bias at the end of the start block. */ - void *cb; /**< ABI Callback self pointer. */ - pmap *keep_map; /**< mapping blocks to keep nodes. */ ir_node **calls; /**< flexible array containing all be_Call nodes */ @@ -111,6 +107,43 @@ static ir_heights_t *ir_heights; /** Flag: if set, try to omit the frame pointer in all routines. */ 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); +} + +static void be_abi_reg_map_set(pmap *map, const arch_register_t* reg, + ir_node *node) +{ + 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; +} + + + /* _ ____ ___ ____ _ _ _ _ / \ | __ )_ _| / ___|__ _| | | |__ __ _ ___| | _____ @@ -281,13 +314,12 @@ 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 stack_dir the stack direction: < 0 decreasing, > 0 increasing addresses * @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, int stack_dir, + ir_type *between, ir_type *locals, ir_entity *param_map[]) { frame->arg_type = args; @@ -295,19 +327,13 @@ static be_stack_layout_t *stack_frame_init(be_stack_layout_t *frame, ir_type *ar frame->frame_type = locals; frame->initial_offset = 0; frame->initial_bias = 0; - frame->stack_dir = stack_dir; frame->order[1] = between; frame->param_map = param_map; - if (stack_dir > 0) { - frame->order[0] = args; - frame->order[2] = locals; - } else { - /* typical decreasing stack: locals have the - * lowest addresses, arguments the highest */ - frame->order[0] = locals; - frame->order[2] = args; - } + /* typical decreasing stack: locals have the + * lowest addresses, arguments the highest */ + frame->order[0] = locals; + frame->order[2] = args; return frame; } @@ -340,7 +366,6 @@ static ir_node *adjust_call(be_abi_irg_t *env, ir_node *irn, ir_node *curr_sp) ir_node *curr_mem = get_Call_mem(irn); ir_node *bl = get_nodes_block(irn); int stack_size = 0; - int stack_dir = arch_env->stack_dir; 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; @@ -363,6 +388,7 @@ static ir_node *adjust_call(be_abi_irg_t *env, ir_node *irn, ir_node *curr_sp) int *reg_param_idxs; int *stack_param_idx; int i, n, destroy_all_regs; + int throws_exception; size_t s; size_t p; dbg_info *dbgi; @@ -405,7 +431,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 (stack_dir < 0 && !do_seq && !no_alloc) { + if (!do_seq && !no_alloc) { curr_sp = be_new_IncSP(sp, bl, curr_sp, stack_size, 1); } @@ -416,12 +442,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 && stack_dir < 0)) { + /* push params in reverse direction because stack grows downwards */ + if (do_seq) { for (i = 0; i < n_stack_params >> 1; ++i) { int other = n_stack_params - i - 1; int tmp = stack_param_idx[i]; @@ -471,7 +493,8 @@ static ir_node *adjust_call(be_abi_irg_t *env, ir_node *irn, ir_node *curr_sp) /* Insert a store for primitive arguments. */ if (is_atomic_type(param_type)) { - ir_node *mem_input = do_seq ? curr_mem : new_r_NoMem(irg); + ir_node *nomem = get_irg_no_mem(irg); + ir_node *mem_input = do_seq ? curr_mem : 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 { @@ -535,7 +558,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 (destroy_all_regs || arch_register_is_caller_save(arch_env, reg)) { if (!(reg->type & arch_register_type_ignore)) { ARR_APP1(const arch_register_t*, destroyed_regs, reg); } @@ -584,17 +607,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); -#if 0 - ir_node *regnode = be_abi_reg_map_get(env->regs, reg); - ir_fprintf(stderr, "Adding %+F\n", regnode); -#endif - 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, @@ -607,6 +627,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 */ @@ -620,9 +641,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); @@ -662,7 +683,7 @@ static ir_node *adjust_call(be_abi_irg_t *env, ir_node *irn, ir_node *curr_sp) Set the register class of the call address to the backend provided class (default: stack pointer class) */ - be_node_set_reg_class_in(low_call, be_pos_Call_ptr, call->cls_addr); + be_node_set_reg_class_in(low_call, n_be_Call_ptr, call->cls_addr); DBG((dbg, LEVEL_3, "\tcreated backend call %+F\n", low_call)); @@ -672,7 +693,7 @@ static ir_node *adjust_call(be_abi_irg_t *env, ir_node *irn, ir_node *curr_sp) be_abi_call_arg_t *arg = get_call_arg(call, 0, index, 0); assert(arg->reg != NULL); - be_set_constr_single_reg_in(low_call, be_pos_Call_first_arg + i, + be_set_constr_single_reg_in(low_call, n_be_Call_first_arg + i, arg->reg, arch_register_req_type_none); } @@ -737,7 +758,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)); } } @@ -757,7 +778,7 @@ 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); } } @@ -927,11 +948,11 @@ static ir_node *adjust_free(be_abi_irg_t *env, ir_node *free, ir_node *curr_sp) if (type != firm_unknown_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; @@ -979,6 +1000,7 @@ static int cmp_call_dependency(const void *c1, const void *c2) { ir_node *n1 = *(ir_node **) c1; ir_node *n2 = *(ir_node **) c2; + unsigned h1, h2; /* Classical qsort() comparison function behavior: @@ -993,7 +1015,16 @@ static int cmp_call_dependency(const void *c1, const void *c2) return 1; /* The nodes have no depth order, but we need a total order because qsort() - * is not stable. */ + * is not stable. + * + * Additionally, we need to respect transitive dependencies. Consider a + * Call a depending on Call b and an independent Call c. + * We MUST NOT order c > a and b > c. */ + h1 = get_irn_height(ir_heights, n1); + h2 = get_irn_height(ir_heights, n2); + if (h1 < h2) return -1; + if (h1 > h2) return 1; + /* Same height, so use a random (but stable) order */ return get_irn_idx(n1) - get_irn_idx(n2); } @@ -1124,62 +1155,86 @@ 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 + * @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, ir_entity ***param_map) { - const arch_env_t *arch_env = be_get_irg_arch_env(irg); - int dir = env->call->flags.bits.left_to_right ? 1 : -1; - int inc = arch_env->stack_dir * 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)); + size_t i; ir_entity **map; - *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); + *param_map = map = OALLOCNZ(obst, ir_entity*, n_params); + res = new_type_struct(new_id_from_chars("arg_type", 8)); - 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; + /* 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; + + 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; } @@ -1214,76 +1269,14 @@ static void reg_map_to_arr(reg_node_map_t *res, pmap *reg_map) qsort(res, n, sizeof(res[0]), cmp_regs); } -/** - * Creates a barrier. - */ -static ir_node *create_barrier(ir_node *bl, ir_node **mem, pmap *regs, - int in_req) -{ - int n_regs = pmap_count(regs); - int n; - ir_node *irn; - ir_node **in; - reg_node_map_t *rm; - - in = ALLOCAN(ir_node*, n_regs+1); - rm = ALLOCAN(reg_node_map_t, n_regs); - reg_map_to_arr(rm, regs); - for (n = 0; n < n_regs; ++n) { - in[n] = rm[n].irn; - } - - if (mem) { - in[n++] = *mem; - } - - irn = be_new_Barrier(bl, n, in); - - for (n = 0; n < n_regs; ++n) { - ir_node *pred = rm[n].irn; - const arch_register_t *reg = rm[n].reg; - arch_register_req_type_t add_type = arch_register_req_type_none; - ir_node *proj; - const backend_info_t *info; - - /* stupid workaround for now... as not all nodes report register - * requirements. */ - info = be_get_info(skip_Proj(pred)); - if (info != NULL && info->out_infos != NULL) { - const arch_register_req_t *ireq = arch_get_register_req_out(pred); - if (ireq->type & arch_register_req_type_ignore) - add_type |= arch_register_req_type_ignore; - if (ireq->type & arch_register_req_type_produces_sp) - add_type |= arch_register_req_type_produces_sp; - } - - proj = new_r_Proj(irn, get_irn_mode(pred), n); - be_node_set_reg_class_in(irn, n, reg->reg_class); - if (in_req) { - be_set_constr_single_reg_in(irn, n, reg, - arch_register_req_type_none); - } - be_set_constr_single_reg_out(irn, n, reg, add_type); - arch_set_irn_register(proj, reg); - - pmap_insert(regs, (void *) reg, proj); - } - - if (mem) { - *mem = new_r_Proj(irn, mode_M, n); - } - - return irn; -} - /** * Creates a be_Return for a Return node. * - * @param @env the abi environment - * @param irn the Return node or NULL if there was none - * @param bl the block where the be_Retun should be placed - * @param mem the current memory - * @param n_res number of return results + * @param @env the abi environment + * @param irn the Return node or NULL if there was none + * @param bl the block where the be_Retun should be placed + * @param mem the current memory + * @param n_res number of return results */ static ir_node *create_be_return(be_abi_irg_t *env, ir_node *irn, ir_node *bl, ir_node *mem, int n_res) @@ -1328,16 +1321,12 @@ 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); } be_abi_reg_map_set(reg_map, arch_env->sp, stack); - /* Make the Epilogue node and call the arch's epilogue maker. */ - create_barrier(bl, &mem, reg_map, 1); - call->cb->epilogue(env->cb, bl, &mem, reg_map); - /* Maximum size of the in array for Return nodes is return args + callee save/ignore registers + memory + stack pointer @@ -1388,7 +1377,7 @@ static ir_node *create_be_return(be_abi_irg_t *env, ir_node *irn, ir_node *bl, if (regs[i] == NULL) continue; - be_node_set_reg_class_in(ret, i, regs[i]->reg_class); + be_set_constr_single_reg_in(ret, i, regs[i], arch_register_req_type_none); } /* Free the space of the Epilog's in array and the register <-> proj map. */ @@ -1397,57 +1386,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. @@ -1464,143 +1410,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, irg); - - 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); } } @@ -1611,96 +1424,30 @@ static void fix_address_of_parameter_access(be_abi_irg_t *env, ir_graph *irg, */ static void fix_start_block(ir_graph *irg) { - ir_node *initial_X = get_irg_initial_exec(irg); - ir_node *start_block = get_irg_start_block(irg); - const ir_edge_t *edge; + ir_node *initial_X = get_irg_initial_exec(irg); + ir_node *start_block = get_irg_start_block(irg); + ir_node *jmp = new_r_Jmp(start_block); assert(is_Proj(initial_X)); + exchange(initial_X, jmp); + set_irg_initial_exec(irg, new_r_Bad(irg, mode_X)); - foreach_out_edge(initial_X, edge) { - ir_node *block = get_edge_src_irn(edge); - - if (is_Anchor(block)) - continue; - if (block != start_block) { - ir_node *jmp = new_r_Jmp(start_block); - set_Block_cfgpred(block, get_edge_src_pos(edge), jmp); - set_irg_initial_exec(irg, jmp); - return; - } - } - panic("Initial exec has no follow block in %+F", irg); -} + /* merge start block with successor if possible */ + { + const ir_edge_t *edge; + foreach_out_edge(jmp, edge) { + ir_node *succ = get_edge_src_irn(edge); + if (!is_Block(succ)) + continue; -/** - * 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); + if (get_irn_arity(succ) == 1) { + exchange(succ, start_block); + } + break; } } } -/** - * 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; - - irg_walk_graph(irg, NULL, update_outer_frame_sels, ctx); - } -} - /** * Modify the irg itself and the frame type. */ @@ -1731,35 +1478,19 @@ static void modify_irg(ir_graph *irg) 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)); - /* Must fetch memory here, otherwise the start Barrier gets the wrong - * memory, which leads to loops in the DAG. */ 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, ¶m_map); /* 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; @@ -1770,14 +1501,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) { @@ -1789,25 +1512,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); @@ -1820,10 +1529,10 @@ static void modify_irg(ir_graph *irg) } } - bet_type = call->cb->get_between_type(env->cb); - stack_frame_init(stack_layout, arg_type, bet_type, - get_irg_frame_type(irg), arch_env->stack_dir, param_map); 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); /* Count the register params and add them to the number of Projs for the RegParams node */ for (i = 0; i < n_params; ++i) { @@ -1843,12 +1552,15 @@ 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); } } } + fp_reg = call->flags.bits.try_omit_fp ? arch_env->sp : arch_env->bp; + rbitset_clear(birg->allocatable_regs, fp_reg->global_index); + /* handle start block here (place a jump in the block) */ fix_start_block(irg); @@ -1856,15 +1568,15 @@ static void modify_irg(ir_graph *irg) pmap_insert(env->regs, (void *) arch_env->bp, NULL); start_bl = get_irg_start_block(irg); env->start = be_new_Start(NULL, start_bl, pmap_count(env->regs) + 1); + set_irg_start(irg, env->start); /* * make proj nodes for the callee save registers. * memorize them, since Return nodes get those as inputs. * - * Note, that if a register corresponds to an argument, the regs map contains - * the old Proj from start for that argument. + * Note, that if a register corresponds to an argument, the regs map + * contains the old Proj from start for that argument. */ - rm = ALLOCAN(reg_node_map_t, pmap_count(env->regs)); reg_map_to_arr(rm, env->regs); for (i = 0, n = pmap_count(env->regs); i < n; ++i) { @@ -1875,7 +1587,10 @@ static void modify_irg(ir_graph *irg) ir_node *proj; if (reg == sp) - add_type |= arch_register_req_type_produces_sp | arch_register_req_type_ignore; + add_type |= arch_register_req_type_produces_sp; + if (!rbitset_is_set(birg->allocatable_regs, reg->global_index)) { + add_type |= arch_register_req_type_ignore; + } assert(nr >= 0); proj = new_r_Proj(env->start, mode, nr + 1); @@ -1888,28 +1603,16 @@ 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); - /* Generate the Prologue */ - fp_reg = call->cb->prologue(env->cb, &mem, env->regs, &stack_layout->initial_bias); - - /* do the stack allocation BEFORE the barrier, or spill code - might be added before it */ - env->init_sp = be_abi_reg_map_get(env->regs, sp); - env->init_sp = be_new_IncSP(sp, start_bl, env->init_sp, BE_STACK_FRAME_SIZE_EXPAND, 0); - be_abi_reg_map_set(env->regs, sp, env->init_sp); - - create_barrier(start_bl, &mem, env->regs, 0); - env->init_sp = be_abi_reg_map_get(env->regs, sp); - arch_set_irn_register(env->init_sp, sp); + /* set new frame_pointer */ frame_pointer = be_abi_reg_map_get(env->regs, fp_reg); set_irg_frame(irg, frame_pointer); - rbitset_clear(birg->allocatable_regs, fp_reg->global_index); /* rewire old mem users to new mem */ exchange(old_mem, mem); @@ -1943,8 +1646,9 @@ static void modify_irg(ir_graph *irg) if (is_atomic_type(param_type) && get_irn_n_edges(args[i]) > 0) { ir_mode *mode = get_type_mode(param_type); ir_mode *load_mode = arg->load_mode; + ir_node *nomem = get_irg_no_mem(irg); - ir_node *load = new_r_Load(start_bl, new_r_NoMem(irg), addr, load_mode, cons_floats); + ir_node *load = new_r_Load(start_bl, nomem, addr, load_mode, cons_floats); repl = new_r_Proj(load, load_mode, pn_Load_res); if (mode != load_mode) { @@ -1973,7 +1677,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); @@ -2178,14 +1882,14 @@ static void fix_pic_symconsts(ir_node *node, void *data) /* we need an extra indirection for global data outside our current module. The loads are always safe and can therefore float and need no memory input */ - load = new_r_Load(block, new_r_NoMem(irg), add, mode, cons_floats); + load = new_r_Load(block, get_irg_no_mem(irg), add, mode, cons_floats); load_res = new_r_Proj(load, mode, pn_Load_res); set_irn_n(node, i, load_res); } } -be_abi_irg_t *be_abi_introduce(ir_graph *irg) +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); @@ -2195,11 +1899,10 @@ be_abi_irg_t *be_abi_introduce(ir_graph *irg) ir_type *method_type = get_entity_type(entity); be_irg_t *birg = be_birg_from_irg(irg); struct obstack *obst = &birg->obst; + ir_node *dummy = new_r_Dummy(irg, + arch_env->sp->reg_class->mode); unsigned r; - pmap_entry *ent; - ir_node *dummy; - /* determine allocatable registers */ assert(birg->allocatable_regs == NULL); birg->allocatable_regs = rbitset_obstack_alloc(obst, arch_env->n_registers); @@ -2218,14 +1921,15 @@ be_abi_irg_t *be_abi_introduce(ir_graph *irg) be_omit_fp = options->omit_fp; - env->dce_survivor = new_survive_dce(); env->keep_map = pmap_create(); env->call = be_abi_call_new(arch_env->sp->reg_class); arch_env_get_call_abi(arch_env, method_type, env->call); - env->init_sp = dummy = new_r_Dummy(irg, arch_env->sp->reg_class->mode); + env->init_sp = dummy; env->calls = NEW_ARR_F(ir_node*, 0); + edges_assure(irg); + if (options->pic) { irg_walk_graph(irg, fix_pic_symconsts, NULL, env); } @@ -2233,12 +1937,6 @@ be_abi_irg_t *be_abi_introduce(ir_graph *irg) /* Lower all call nodes in the IRG. */ process_calls(irg); - /* - Beware: init backend abi call object after processing calls, - otherwise some information might be not yet available. - */ - env->cb = env->call->cb->init(env->call, irg); - /* Process the IRG */ modify_irg(irg); @@ -2257,15 +1955,8 @@ be_abi_irg_t *be_abi_introduce(ir_graph *irg) exchange(dummy, env->init_sp); exchange(old_frame, get_irg_frame(irg)); - /* Make some important node pointers survive the dead node elimination. */ - survive_dce_register_irn(env->dce_survivor, &env->init_sp); - foreach_pmap(env->regs, ent) { - survive_dce_register_irn(env->dce_survivor, (ir_node **) &ent->value); - } - - env->call->cb->done(env->cb); - env->cb = NULL; - return env; + pmap_destroy(env->regs); + env->regs = NULL; } void be_abi_free(ir_graph *irg) @@ -2274,10 +1965,7 @@ void be_abi_free(ir_graph *irg) if (env->call != NULL) be_abi_call_free(env->call); - if (env->dce_survivor != NULL) - free_survive_dce(env->dce_survivor); - if (env->regs != NULL) - pmap_destroy(env->regs); + assert(env->regs == NULL); free(env); be_set_irg_abi(irg, NULL); @@ -2323,21 +2011,7 @@ void be_set_allocatable_regs(const ir_graph *irg, } } -ir_node *be_abi_get_callee_save_irn(be_abi_irg_t *abi, const arch_register_t *reg) -{ - assert(reg->type & arch_register_type_callee_save); - assert(pmap_contains(abi->regs, (void *) reg)); - return (ir_node*)pmap_get(abi->regs, (void *) reg); -} - -ir_node *be_abi_get_ignore_irn(be_abi_irg_t *abi, const arch_register_t *reg) -{ - assert(reg->type & arch_register_type_ignore); - assert(pmap_contains(abi->regs, (void *) reg)); - return (ir_node*)pmap_get(abi->regs, (void *) reg); -} - -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");