X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbeabi.c;h=2e7aad197f00066c237006129a7a89d0080f5e98;hb=44fdfafcf4d8940cbdc92266b091f18c62832d3a;hp=420bb08f00d7575d1ed29040203025cddbef9788;hpb=641c8d10420714f80eb08b87a12355fdf96a7cf2;p=libfirm diff --git a/ir/be/beabi.c b/ir/be/beabi.c index 420bb08f0..2e7aad197 100644 --- a/ir/be/beabi.c +++ b/ir/be/beabi.c @@ -23,9 +23,7 @@ * @author Sebastian Hack, Michael Beck * @version $Id$ */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include "obst.h" #include "offset.h" @@ -46,6 +44,7 @@ #include "irtools.h" #include "raw_bitset.h" #include "error.h" +#include "pset_new.h" #include "be.h" #include "beabi.h" @@ -71,14 +70,17 @@ typedef struct _be_abi_call_arg_t { } be_abi_call_arg_t; struct _be_abi_call_t { - be_abi_call_flags_t flags; - int pop; + be_abi_call_flags_t flags; /**< Flags describing the ABI behavior on calls */ + int pop; /**< number of bytes the stack frame is shrinked by the callee on return. */ const be_abi_callbacks_t *cb; ir_type *between_type; set *params; - const arch_register_class_t *cls_addr; + const arch_register_class_t *cls_addr; /**< register class of the call address */ }; +/** + * The ABI information for the current birg. + */ struct _be_abi_irg_t { struct obstack obst; be_irg_t *birg; /**< The back end IRG. */ @@ -142,14 +144,13 @@ static int cmp_call_arg(const void *a, const void *b, size_t n) } /** - * Get or set an ABI call object argument. + * Get an ABI call object argument. * * @param call the abi call * @param is_res true for call results, false for call arguments * @param pos position of the argument - * @param do_insert true if the argument is set, false if it's retrieved */ -static be_abi_call_arg_t *get_or_set_call_arg(be_abi_call_t *call, int is_res, int pos, int do_insert) +static be_abi_call_arg_t *get_call_arg(be_abi_call_t *call, int is_res, int pos) { be_abi_call_arg_t arg; unsigned hash; @@ -160,21 +161,28 @@ static be_abi_call_arg_t *get_or_set_call_arg(be_abi_call_t *call, int is_res, i hash = is_res * 128 + pos; - return do_insert - ? set_insert(call->params, &arg, sizeof(arg), hash) - : set_find(call->params, &arg, sizeof(arg), hash); + return set_find(call->params, &arg, sizeof(arg), hash); } /** - * Retrieve an ABI call object argument. + * Set an ABI call object argument. * - * @param call the ABI call object + * @param call the abi call * @param is_res true for call results, false for call arguments * @param pos position of the argument */ -static INLINE be_abi_call_arg_t *get_call_arg(be_abi_call_t *call, int is_res, int pos) +static be_abi_call_arg_t *create_call_arg(be_abi_call_t *call, int is_res, int pos) { - return get_or_set_call_arg(call, is_res, pos, 0); + be_abi_call_arg_t arg; + unsigned hash; + + memset(&arg, 0, sizeof(arg)); + arg.is_res = is_res; + arg.pos = pos; + + hash = is_res * 128 + pos; + + return set_insert(call->params, &arg, sizeof(arg), hash); } /* Set the flags for a call. */ @@ -184,6 +192,7 @@ void be_abi_call_set_flags(be_abi_call_t *call, be_abi_call_flags_t flags, const call->cb = cb; } +/* Sets the number of bytes the stackframe is shrinked by the callee on return */ void be_abi_call_set_pop(be_abi_call_t *call, int pop) { assert(pop >= 0); @@ -199,7 +208,7 @@ void be_abi_call_set_call_address_reg_class(be_abi_call_t *call, const arch_regi void be_abi_call_param_stack(be_abi_call_t *call, int arg_pos, ir_mode *load_mode, unsigned alignment, unsigned space_before, unsigned space_after) { - be_abi_call_arg_t *arg = get_or_set_call_arg(call, 0, arg_pos, 1); + be_abi_call_arg_t *arg = create_call_arg(call, 0, arg_pos); arg->on_stack = 1; arg->load_mode = load_mode; arg->alignment = alignment; @@ -210,14 +219,14 @@ void be_abi_call_param_stack(be_abi_call_t *call, int arg_pos, ir_mode *load_mod void be_abi_call_param_reg(be_abi_call_t *call, int arg_pos, const arch_register_t *reg) { - be_abi_call_arg_t *arg = get_or_set_call_arg(call, 0, arg_pos, 1); + be_abi_call_arg_t *arg = create_call_arg(call, 0, arg_pos); arg->in_reg = 1; arg->reg = reg; } void be_abi_call_res_reg(be_abi_call_t *call, int arg_pos, const arch_register_t *reg) { - be_abi_call_arg_t *arg = get_or_set_call_arg(call, 1, arg_pos, 1); + be_abi_call_arg_t *arg = create_call_arg(call, 1, arg_pos); arg->in_reg = 1; arg->reg = reg; } @@ -231,6 +240,8 @@ be_abi_call_flags_t be_abi_call_get_flags(const be_abi_call_t *call) /** * Constructor for a new ABI call object. * + * @param cls_addr register class of the call address + * * @return the new ABI call object */ static be_abi_call_t *be_abi_call_new(const arch_register_class_t *cls_addr) @@ -305,7 +316,7 @@ static ir_entity *search_ent_with_offset(ir_type *t, int offset) { int i, n; - for(i = 0, n = get_compound_n_members(t); i < n; ++i) { + for (i = 0, n = get_compound_n_members(t); i < n; ++i) { ir_entity *ent = get_compound_member(t, i); if (get_entity_offset(ent) == offset) return ent; @@ -349,7 +360,7 @@ static be_stack_layout_t *stack_frame_init(be_stack_layout_t *frame, ir_type *ar frame->order[1] = between; frame->param_map = param_map; - if(stack_dir > 0) { + if (stack_dir > 0) { frame->order[0] = args; frame->order[2] = locals; } @@ -383,7 +394,7 @@ static void stack_layout_dump(FILE *file, be_stack_layout_t *frame) * Returns non-zero if the call argument at given position * is transfered on the stack. */ -static INLINE int is_on_stack(be_abi_call_t *call, int pos) +static inline int is_on_stack(be_abi_call_t *call, int pos) { be_abi_call_arg_t *arg = get_call_arg(call, 0, pos); return arg && !arg->in_reg; @@ -417,9 +428,6 @@ static ir_node *adjust_call(be_abi_irg_t *env, ir_node *irn, ir_node *curr_sp) int n_params = get_method_n_params(call_tp); ir_node *curr_mem = get_Call_mem(irn); ir_node *bl = get_nodes_block(irn); - pset *results = pset_new_ptr(8); - pset *caller_save = pset_new_ptr(8); - pset *states = pset_new_ptr(2); int stack_size = 0; int stack_dir = arch_env_stack_dir(arch_env); const arch_register_t *sp = arch_env_sp(arch_env); @@ -435,15 +443,21 @@ static ir_node *adjust_call(be_abi_irg_t *env, ir_node *irn, ir_node *curr_sp) int n_stack_params = 0; int n_ins; - ir_node *low_call; - ir_node **in; - ir_node **res_projs; - int n_reg_results = 0; - const arch_register_t *reg; - const ir_edge_t *edge; - int *reg_param_idxs; - int *stack_param_idx; - int i, n; + pset_new_t destroyed_regs, states; + pset_new_iterator_t iter; + ir_node *low_call; + ir_node **in; + ir_node **res_projs; + int n_reg_results = 0; + const arch_register_t *reg; + const ir_edge_t *edge; + int *reg_param_idxs; + int *stack_param_idx; + int i, n, destroy_all_regs; + dbg_info *dbgi; + + pset_new_init(&destroyed_regs); + pset_new_init(&states); /* Let the isa fill out the abi description for that call node. */ arch_env_get_call_abi(arch_env, call_tp, call); @@ -488,6 +502,7 @@ static ir_node *adjust_call(be_abi_irg_t *env, ir_node *irn, ir_node *curr_sp) curr_sp = be_new_IncSP(sp, irg, bl, curr_sp, stack_size, 1); } + dbgi = get_irn_dbg_info(irn); /* If there are some parameters which shall be passed on the stack. */ if (n_stack_params > 0) { int curr_ofs = 0; @@ -537,10 +552,10 @@ static ir_node *adjust_call(be_abi_irg_t *env, ir_node *irn, ir_node *curr_sp) /* Make the expression to compute the argument's offset. */ if (curr_ofs > 0) { ir_mode *constmode = mach_mode; - if(mode_is_reference(mach_mode)) { + if (mode_is_reference(mach_mode)) { constmode = mode_Is; } - addr = new_r_Const_long(irg, bl, constmode, curr_ofs); + addr = new_r_Const_long(irg, constmode, curr_ofs); addr = new_r_Add(irg, bl, curr_sp, addr, mach_mode); } } @@ -549,7 +564,7 @@ static ir_node *adjust_call(be_abi_irg_t *env, ir_node *irn, ir_node *curr_sp) if (is_atomic_type(param_type)) { ir_node *store; ir_node *mem_input = do_seq ? curr_mem : new_NoMem(); - store = new_r_Store(irg, bl, mem_input, addr, param); + store = new_rd_Store(dbgi, irg, bl, mem_input, addr, param, 0); mem = new_r_Proj(irg, bl, store, mode_M, pn_Store_M); } @@ -558,7 +573,7 @@ static ir_node *adjust_call(be_abi_irg_t *env, ir_node *irn, ir_node *curr_sp) ir_node *copy; assert(mode_is_reference(get_irn_mode(param))); - copy = new_r_CopyB(irg, bl, curr_mem, addr, param, param_type); + copy = new_rd_CopyB(dbgi, irg, bl, curr_mem, addr, param, param_type); mem = new_r_Proj(irg, bl, copy, mode_M, pn_CopyB_M_regular); } @@ -583,32 +598,52 @@ static ir_node *adjust_call(be_abi_irg_t *env, ir_node *irn, ir_node *curr_sp) obstack_free(obst, in); } - /* Collect caller save registers */ + /* 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_get_n_reg_class(arch_env); i < n; ++i) { unsigned j; const arch_register_class_t *cls = arch_env_get_reg_class(arch_env, i); for (j = 0; j < cls->n_regs; ++j) { const arch_register_t *reg = arch_register_for_index(cls, j); - if (arch_register_type_is(reg, caller_save)) { - pset_insert_ptr(caller_save, (void *) reg); + + if (destroy_all_regs || arch_register_type_is(reg, caller_save)) { + if (! arch_register_type_is(reg, ignore)) + pset_new_insert(&destroyed_regs, (void *) reg); } if (arch_register_type_is(reg, state)) { - pset_insert_ptr(caller_save, (void*) reg); - pset_insert_ptr(states, (void*) reg); + pset_new_insert(&destroyed_regs, (void*) reg); + pset_new_insert(&states, (void*) reg); } } } - /* search the greatest result proj number */ + if (destroy_all_regs) { + /* even if destroyed all is specified, neither SP nor FP are destroyed (else bad things will happen) */ + pset_new_remove(&destroyed_regs, arch_env->sp); + pset_new_remove(&destroyed_regs, arch_env->bp); + } - res_projs = alloca(n_res * sizeof(res_projs[0])); - memset(res_projs, 0, n_res * sizeof(res_projs[0])); + /* search the largest result proj number */ + 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); - if(!is_Proj(irn) || get_Proj_proj(irn) != pn_Call_T_result) + if (!is_Proj(irn) || get_Proj_proj(irn) != pn_Call_T_result) continue; foreach_out_edge(irn, res_edge) { @@ -635,7 +670,9 @@ static ir_node *adjust_call(be_abi_irg_t *env, ir_node *irn, ir_node *curr_sp) for (i = 0; i < n_reg_params; ++i) { obstack_ptr_grow(obst, get_Call_param(irn, reg_param_idxs[i])); } - foreach_pset(states, reg) { + + /* add state registers ins */ + foreach_pset_new(&states, reg, iter) { const arch_register_class_t *cls = arch_register_get_class(reg); #if 0 ir_node *regnode = be_abi_reg_map_get(env->regs, reg); @@ -644,36 +681,37 @@ static ir_node *adjust_call(be_abi_irg_t *env, ir_node *irn, ir_node *curr_sp) ir_node *regnode = new_rd_Unknown(irg, arch_register_class_mode(cls)); obstack_ptr_grow(obst, regnode); } - n_ins = n_reg_params + pset_count(states); + n_ins = n_reg_params + pset_new_size(&states); in = obstack_finish(obst); + /* ins collected, build the call */ if (env->call->flags.bits.call_has_imm && is_SymConst(call_ptr)) { /* direct call */ - low_call = be_new_Call(get_irn_dbg_info(irn), irg, bl, curr_mem, - curr_sp, curr_sp, - n_reg_results + pn_be_Call_first_res + pset_count(caller_save), + low_call = be_new_Call(dbgi, irg, bl, curr_mem, curr_sp, curr_sp, + n_reg_results + pn_be_Call_first_res + pset_new_size(&destroyed_regs), n_ins, in, get_Call_type(irn)); be_Call_set_entity(low_call, get_SymConst_entity(call_ptr)); } else { /* indirect call */ - low_call = be_new_Call(get_irn_dbg_info(irn), irg, bl, curr_mem, - curr_sp, call_ptr, - n_reg_results + pn_be_Call_first_res + pset_count(caller_save), + low_call = be_new_Call(dbgi, irg, bl, curr_mem, curr_sp, call_ptr, + n_reg_results + pn_be_Call_first_res + pset_new_size(&destroyed_regs), n_ins, in, get_Call_type(irn)); } be_Call_set_pop(low_call, call->pop); + + /* put the call into the list of all calls for later processing */ ARR_APP1(ir_node *, env->calls, low_call); /* create new stack pointer */ curr_sp = new_r_Proj(irg, bl, low_call, get_irn_mode(curr_sp), pn_be_Call_sp); - be_set_constr_single_reg(low_call, BE_OUT_POS(pn_be_Call_sp), sp); - arch_set_irn_register(arch_env, curr_sp, sp); - be_node_set_flags(low_call, BE_OUT_POS(pn_be_Call_sp), - arch_irn_flags_ignore | arch_irn_flags_modify_sp); + be_set_constr_single_reg_out(low_call, pn_be_Call_sp, sp, + arch_register_req_type_ignore | arch_register_req_type_produces_sp); + arch_set_irn_register(curr_sp, sp); - for(i = 0; i < n_res; ++i) { + /* 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); @@ -688,7 +726,7 @@ static ir_node *adjust_call(be_abi_irg_t *env, ir_node *irn, ir_node *curr_sp) */ pn = i + pn_be_Call_first_res; - if(proj == NULL) { + if (proj == NULL) { ir_type *res_type = get_method_res_type(call_tp, i); ir_mode *mode = get_type_mode(res_type); proj = new_r_Proj(irg, bl, low_call, mode, pn); @@ -699,7 +737,7 @@ static ir_node *adjust_call(be_abi_irg_t *env, ir_node *irn, ir_node *curr_sp) } if (arg->in_reg) { - pset_remove_ptr(caller_save, arg->reg); + pset_new_remove(&destroyed_regs, arg->reg); } } @@ -707,7 +745,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(low_call, be_pos_Call_ptr, call->cls_addr); + be_node_set_reg_class_in(low_call, be_pos_Call_ptr, call->cls_addr); DBG((env->dbg, LEVEL_3, "\tcreated backend call %+F\n", low_call)); @@ -717,7 +755,8 @@ 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); assert(arg->reg != NULL); - be_set_constr_single_reg(low_call, be_pos_Call_first_arg + i, arg->reg); + be_set_constr_single_reg_in(low_call, be_pos_Call_first_arg + i, + arg->reg, 0); } /* Set the register constraints of the results. */ @@ -727,8 +766,8 @@ static ir_node *adjust_call(be_abi_irg_t *env, ir_node *irn, ir_node *curr_sp) int pn = get_Proj_proj(proj); assert(arg->in_reg); - be_set_constr_single_reg(low_call, BE_OUT_POS(pn), arg->reg); - arch_set_irn_register(arch_env, proj, arg->reg); + be_set_constr_single_reg_out(low_call, pn, arg->reg, 0); + arch_set_irn_register(proj, arg->reg); } obstack_free(obst, in); exchange(irn, low_call); @@ -740,41 +779,35 @@ static ir_node *adjust_call(be_abi_irg_t *env, ir_node *irn, ir_node *curr_sp) /* Make additional projs for the caller save registers and the Keep node which keeps them alive. */ - if (1 || pset_count(caller_save) + n_reg_results > 0) { + { const arch_register_t *reg; ir_node **in, *keep; int i; int n = 0; - int curr_res_proj - = pn_be_Call_first_res + n_reg_results; + int curr_res_proj = pn_be_Call_first_res + n_reg_results; + pset_new_iterator_t iter; /* also keep the stack pointer */ ++n; set_irn_link(curr_sp, (void*) sp); obstack_ptr_grow(obst, curr_sp); - for (reg = pset_first(caller_save); reg; reg = pset_next(caller_save), ++n) { - ir_node *proj = new_r_Proj(irg, bl, low_call, reg->reg_class->mode, - curr_res_proj); + foreach_pset_new(&destroyed_regs, reg, iter) { + ir_node *proj = new_r_Proj(irg, bl, low_call, reg->reg_class->mode, curr_res_proj); /* memorize the register in the link field. we need afterwards to set the register class of the keep correctly. */ - be_set_constr_single_reg(low_call, BE_OUT_POS(curr_res_proj), reg); - arch_set_irn_register(arch_env, proj, reg); - - /* a call can produce ignore registers, in this case set the flag and register for the Proj */ - if (arch_register_type_is(reg, ignore)) { - be_node_set_flags(low_call, BE_OUT_POS(curr_res_proj), - arch_irn_flags_ignore); - } + be_set_constr_single_reg_out(low_call, curr_res_proj, reg, 0); + arch_set_irn_register(proj, reg); set_irn_link(proj, (void*) reg); obstack_ptr_grow(obst, proj); - curr_res_proj++; + ++curr_res_proj; + ++n; } - for(i = 0; i < n_reg_results; ++i) { + for (i = 0; i < n_reg_results; ++i) { ir_node *proj = res_projs[i]; - const arch_register_t *reg = arch_get_irn_register(arch_env, proj); + const arch_register_t *reg = arch_get_irn_register(proj); set_irn_link(proj, (void*) reg); obstack_ptr_grow(obst, proj); } @@ -785,7 +818,7 @@ static ir_node *adjust_call(be_abi_irg_t *env, ir_node *irn, ir_node *curr_sp) keep = be_new_Keep(NULL, irg, bl, n, in); for (i = 0; i < n; ++i) { const arch_register_t *reg = get_irn_link(in[i]); - be_node_set_reg_class(keep, i, reg->reg_class); + be_node_set_reg_class_in(keep, i, reg->reg_class); } obstack_free(obst, in); } @@ -799,7 +832,7 @@ static ir_node *adjust_call(be_abi_irg_t *env, ir_node *irn, ir_node *curr_sp) foreach_out_edge(low_call, edge) { ir_node *irn = get_edge_src_irn(edge); - if(is_Proj(irn) && get_Proj_proj(irn) == pn_Call_M) { + if (is_Proj(irn) && get_Proj_proj(irn) == pn_Call_M) { mem_proj = irn; break; } @@ -817,9 +850,9 @@ static ir_node *adjust_call(be_abi_irg_t *env, ir_node *irn, ir_node *curr_sp) be_abi_call_free(call); obstack_free(obst, stack_param_idx); - del_pset(results); - del_pset(states); - del_pset(caller_save); + + pset_new_destroy(&states); + pset_new_destroy(&destroyed_regs); return curr_sp; } @@ -847,11 +880,11 @@ static ir_node *adjust_alloc_size(unsigned stack_alignment, ir_node *size, mode = get_irn_mode(size); tv = new_tarval_from_long(stack_alignment-1, mode); - mask = new_r_Const(irg, block, mode, tv); + mask = new_r_Const(irg, tv); size = new_rd_Add(dbg, irg, block, size, mask, mode); tv = new_tarval_from_long(-(long)stack_alignment, mode); - mask = new_r_Const(irg, block, mode, tv); + mask = new_r_Const(irg, tv); size = new_rd_And(dbg, irg, block, size, mask, mode); } return size; @@ -905,18 +938,16 @@ static ir_node *adjust_alloc(be_abi_irg_t *env, ir_node *alloc, ir_node *curr_sp return curr_sp; } - dbg = get_irn_dbg_info(alloc); + dbg = get_irn_dbg_info(alloc); + size = get_Alloc_size(alloc); /* we might need to multiply the size with the element size */ if (type != firm_unknown_type && get_type_size_bytes(type) != 1) { + ir_mode *mode = get_irn_mode(size); tarval *tv = new_tarval_from_long(get_type_size_bytes(type), - mode_Iu); - ir_node *cnst = new_rd_Const(dbg, irg, block, mode_Iu, tv); - ir_node *mul = new_rd_Mul(dbg, irg, block, get_Alloc_size(alloc), - cnst, mode_Iu); - size = mul; - } else { - size = get_Alloc_size(alloc); + mode); + ir_node *cnst = new_rd_Const(dbg, irg, tv); + size = new_rd_Mul(dbg, irg, block, size, cnst, mode); } /* The stack pointer will be modified in an unknown manner. @@ -928,7 +959,7 @@ static ir_node *adjust_alloc(be_abi_irg_t *env, ir_node *alloc, ir_node *curr_sp new_alloc = be_new_AddSP(env->arch_env->sp, irg, block, curr_sp, size); set_irn_dbg_info(new_alloc, dbg); - if(alloc_mem != NULL) { + if (alloc_mem != NULL) { ir_node *addsp_mem; ir_node *sync; @@ -981,7 +1012,7 @@ static ir_node *adjust_free(be_abi_irg_t *env, ir_node *free, ir_node *curr_sp) /* we might need to multiply the size with the element size */ if (type != firm_unknown_type && get_type_size_bytes(type) != 1) { tarval *tv = new_tarval_from_long(get_type_size_bytes(type), mode_Iu); - ir_node *cnst = new_rd_Const(dbg, irg, block, mode_Iu, tv); + ir_node *cnst = new_rd_Const(dbg, irg, tv); ir_node *mul = new_rd_Mul(dbg, irg, block, get_Free_size(free), cnst, mode_Iu); size = mul; @@ -1036,7 +1067,7 @@ static int check_dependence(ir_node *curr, ir_node *tgt, ir_node *bl) /* Phi functions stop the recursion inside a basic block */ if (! is_Phi(curr)) { - for(i = 0, n = get_irn_arity(curr); i < n; ++i) { + for (i = 0, n = get_irn_arity(curr); i < n; ++i) { if (check_dependence(get_irn_n(curr, i), tgt, bl)) return 1; } @@ -1171,7 +1202,7 @@ static void process_ops_in_block(ir_node *bl, void *data) } set_irn_link(bl, curr_sp); -} /* process_calls_in_block */ +} /* process_ops_in_block */ /** * Adjust all call nodes in the graph to the ABI conventions. @@ -1216,7 +1247,7 @@ static ir_type *compute_arg_type(be_abi_irg_t *env, be_abi_call_t *call, ir_type ir_entity **map; *param_map = map = obstack_alloc(&env->obst, n * sizeof(ir_entity *)); - res = new_type_struct(mangle_u(id, new_id_from_chars("arg_type", 8))); + 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); @@ -1249,50 +1280,6 @@ static ir_type *compute_arg_type(be_abi_irg_t *env, be_abi_call_t *call, ir_type return res; } -#if 0 -static void create_register_perms(const arch_isa_t *isa, ir_graph *irg, ir_node *bl, pmap *regs) -{ - int i, j, n; - struct obstack obst; - - obstack_init(&obst); - - /* Create a Perm after the RegParams node to delimit it. */ - for (i = 0, n = arch_isa_get_n_reg_class(isa); i < n; ++i) { - const arch_register_class_t *cls = arch_isa_get_reg_class(isa, i); - ir_node *perm; - ir_node **in; - int n_regs; - - for (n_regs = 0, j = 0; j < cls->n_regs; ++j) { - const arch_register_t *reg = &cls->regs[j]; - ir_node *irn = pmap_get(regs, (void *) reg); - - if(irn && !arch_register_type_is(reg, ignore)) { - n_regs++; - obstack_ptr_grow(&obst, irn); - set_irn_link(irn, (void *) reg); - } - } - - obstack_ptr_grow(&obst, NULL); - in = obstack_finish(&obst); - if (n_regs > 0) { - perm = be_new_Perm(cls, irg, bl, n_regs, in); - for (j = 0; j < n_regs; ++j) { - ir_node *arg = in[j]; - arch_register_t *reg = get_irn_link(arg); - pmap_insert(regs, reg, arg); - be_set_constr_single_reg(perm, BE_OUT_POS(j), reg); - } - } - obstack_free(&obst, in); - } - - obstack_free(&obst, NULL); -} -#endif - typedef struct { const arch_register_t *reg; ir_node *irn; @@ -1303,7 +1290,7 @@ static int cmp_regs(const void *a, const void *b) const reg_node_map_t *p = a; const reg_node_map_t *q = b; - if(p->reg->reg_class == q->reg->reg_class) + if (p->reg->reg_class == q->reg->reg_class) return p->reg->index - q->reg->index; else return p->reg->reg_class - q->reg->reg_class; @@ -1352,28 +1339,28 @@ static ir_node *create_barrier(be_abi_irg_t *env, ir_node *bl, ir_node **mem, pm irn = be_new_Barrier(irg, bl, n, in); obstack_free(&env->obst, in); - for(n = 0; n < n_regs; ++n) { - const arch_register_t *reg = rm[n].reg; - int flags = 0; - int pos = BE_OUT_POS(n); - ir_node *proj; + for (n = 0; n < n_regs; ++n) { + ir_node *pred = rm[n].irn; + const arch_register_t *reg = rm[n].reg; + arch_register_type_t add_type = 0; + ir_node *proj; + + /* stupid workaround for now... as not all nodes report register + * requirements. */ + if (!is_Phi(pred)) { + 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(irg, bl, irn, get_irn_mode(rm[n].irn), n); - be_node_set_reg_class(irn, n, reg->reg_class); + proj = new_r_Proj(irg, bl, 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(irn, n, reg); - be_set_constr_single_reg(irn, pos, reg); - be_node_set_reg_class(irn, pos, reg->reg_class); - arch_set_irn_register(env->birg->main_env->arch_env, proj, reg); - - /* if the proj projects a ignore register or a node which is set to ignore, propagate this property. */ - if (arch_register_type_is(reg, ignore) || arch_irn_is(env->birg->main_env->arch_env, in[n], ignore)) - flags |= arch_irn_flags_ignore; - - if (arch_irn_is(env->birg->main_env->arch_env, in[n], modify_sp)) - flags |= arch_irn_flags_modify_sp; - - be_node_set_flags(irn, pos, flags); + be_set_constr_single_reg_in(irn, n, reg, 0); + be_set_constr_single_reg_out(irn, n, reg, add_type); + arch_set_irn_register(proj, reg); pmap_insert(regs, (void *) reg, proj); } @@ -1437,7 +1424,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 = ent->key; - if(arch_register_type_is(reg, callee_save) || arch_register_type_is(reg, ignore)) + if (arch_register_type_is(reg, callee_save) || arch_register_type_is(reg, ignore)) pmap_insert(reg_map, ent->key, ent->value); } @@ -1493,9 +1480,12 @@ static ir_node *create_be_return(be_abi_irg_t *env, ir_node *irn, ir_node *bl, ret = be_new_Return(dbgi, env->birg->irg, bl, n_res, pop, n, in); /* Set the register classes of the return's parameter accordingly. */ - for (i = 0; i < n; ++i) - if (regs[i]) - be_node_set_reg_class(ret, i, regs[i]->reg_class); + for (i = 0; i < n; ++i) { + if (regs[i] == NULL) + continue; + + be_node_set_reg_class_in(ret, i, regs[i]->reg_class); + } /* Free the space of the Epilog's in array and the register <-> proj map. */ obstack_free(&env->obst, in); @@ -1535,8 +1525,8 @@ static void lower_frame_sels_walker(ir_node *irn, void *data) { /* check, if it's a param sel and if have not seen this entity before */ if (ptr == param_base && - ent != ctx->value_param_tail && - get_entity_link(ent) == NULL) { + ent != ctx->value_param_tail && + get_entity_link(ent) == NULL) { set_entity_link(ent, ctx->value_param_list); ctx->value_param_list = ent; if (ctx->value_param_tail == NULL) ctx->value_param_tail = ent; @@ -1626,7 +1616,7 @@ static void fix_address_of_parameter_access(be_abi_irg_t *env, ir_entity *value_ /* the backing store itself */ store = new_r_Store(irg, first_bl, mem, addr, - new_r_Proj(irg, args_bl, args, mode, i)); + new_r_Proj(irg, args_bl, args, mode, i), 0); } /* the new memory Proj gets the last Proj from store */ set_Proj_pred(nmem, store); @@ -1658,38 +1648,32 @@ static void fix_address_of_parameter_access(be_abi_irg_t *env, ir_entity *value_ } } -#if 1 /** * The start block has no jump, instead it has an initial exec Proj. * The backend wants to handle all blocks the same way, so we replace * the out cfg edge with a real jump. */ -static void fix_start_block(ir_node *block, void *env) { - int *done = env; - int i; - ir_node *start_block; - 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; - /* we processed the start block, return */ - if (*done) - return; + assert(is_Proj(initial_X)); - irg = get_irn_irg(block); - start_block = get_irg_start_block(irg); + foreach_out_edge(initial_X, edge) { + ir_node *block = get_edge_src_irn(edge); - for (i = get_Block_n_cfgpreds(block) - 1; i >= 0; --i) { - ir_node *pred = get_Block_cfgpred(block, i); - ir_node *pred_block = get_nodes_block(pred); + if (is_Anchor(block)) + continue; + if (block != start_block) { + ir_node *jmp = new_r_Jmp(irg, start_block); - /* ok, we are in the block, having start as cfg predecessor */ - if (pred_block == start_block) { - ir_node *jump = new_r_Jmp(irg, pred_block); - set_Block_cfgpred(block, i, jump); - *done = 1; + set_Block_cfgpred(block, get_edge_src_pos(edge), jmp); + return; } } + panic("Initial exec has no follow block"); } -#endif /** * Modify the irg itself and the frame type. @@ -1732,6 +1716,7 @@ static void modify_irg(be_abi_irg_t *env) * 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); @@ -1769,6 +1754,7 @@ static void modify_irg(be_abi_irg_t *env) * a backing store into the first block. */ fix_address_of_parameter_access(env, ctx.value_param_list); + irp_free_resources(irp, IR_RESOURCE_ENTITY_LINK); /* Fill the argument vector */ arg_tuple = get_irg_args(irg); @@ -1827,32 +1813,21 @@ static void modify_irg(be_abi_irg_t *env) rm = reg_map_to_arr(&env->obst, env->regs); for (i = 0, n = pmap_count(env->regs); i < n; ++i) { - arch_register_t *reg = (void *) rm[i].reg; - ir_mode *mode = reg->reg_class->mode; - long nr = i; - int pos = BE_OUT_POS((int) nr); - int flags = 0; + arch_register_t *reg = (void *) rm[i].reg; + ir_mode *mode = reg->reg_class->mode; + long nr = i; + arch_register_req_type_t add_type = 0; + ir_node *proj; - ir_node *proj; + if (reg == sp) + add_type |= arch_register_req_type_produces_sp | arch_register_req_type_ignore; assert(nr >= 0); bitset_set(used_proj_nr, nr); proj = new_r_Proj(irg, reg_params_bl, env->reg_params, mode, nr); pmap_insert(env->regs, (void *) reg, proj); - be_set_constr_single_reg(env->reg_params, pos, reg); - arch_set_irn_register(env->birg->main_env->arch_env, proj, reg); - - /* - * If the register is an ignore register, - * The Proj for that register shall also be ignored during register allocation. - */ - if (arch_register_type_is(reg, ignore)) - flags |= arch_irn_flags_ignore; - - if (reg == sp) - flags |= arch_irn_flags_modify_sp; - - be_node_set_flags(env->reg_params, pos, flags); + be_set_constr_single_reg_out(env->reg_params, nr, reg, add_type); + arch_set_irn_register(proj, reg); DBG((dbg, LEVEL_2, "\tregister save proj #%d -> reg %s\n", nr, reg->name)); } @@ -1866,7 +1841,7 @@ static void modify_irg(be_abi_irg_t *env) mem = new_mem_proj; /* Generate the Prologue */ - fp_reg = call->cb->prologue(env->cb, &mem, env->regs, &env->frame.initial_bias); + fp_reg = call->cb->prologue(env->cb, &mem, env->regs, &env->frame.initial_bias); /* do the stack allocation BEFORE the barrier, or spill code might be added before it */ @@ -1878,7 +1853,7 @@ static void modify_irg(be_abi_irg_t *env) create_barrier(env, start_bl, &mem, env->regs, 0); env->init_sp = be_abi_reg_map_get(env->regs, sp); - arch_set_irn_register(env->birg->main_env->arch_env, env->init_sp, sp); + arch_set_irn_register(env->init_sp, sp); frame_pointer = be_abi_reg_map_get(env->regs, fp_reg); set_irg_frame(irg, frame_pointer); @@ -1911,12 +1886,11 @@ static void modify_irg(be_abi_irg_t *env) ir_node *addr = be_new_FrameAddr(sp->reg_class, irg, reg_params_bl, frame_pointer, arg->stack_ent); /* For atomic parameters which are actually used, we create a Load node. */ - if(is_atomic_type(param_type) && get_irn_n_edges(args[i]) > 0) { + 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 *load = new_r_Load(irg, reg_params_bl, new_NoMem(), addr, load_mode); - set_irn_pinned(load, op_pin_state_floats); + ir_node *load = new_r_Load(irg, reg_params_bl, new_NoMem(), addr, load_mode, cons_floats); repl = new_r_Proj(irg, reg_params_bl, load, load_mode, pn_Load_res); if (mode != load_mode) { @@ -1945,7 +1919,7 @@ static void modify_irg(be_abi_irg_t *env) /* 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_rd_Bad(irg)); + set_irg_args(irg, new_r_Bad(irg)); /* All Return nodes hang on the End node, so look for them there. */ end = get_irg_end_block(irg); @@ -1965,8 +1939,7 @@ static void modify_irg(be_abi_irg_t *env) obstack_free(&env->obst, args); /* handle start block here (place a jump in the block) */ - i = 0; - irg_block_walk_graph(irg, fix_start_block, NULL, &i); + fix_start_block(irg); } /** Fix the state inputs of calls that still hang on unknowns */ @@ -2018,7 +1991,7 @@ static ir_entity *create_trampoline(be_main_env_t *be, ir_entity *method) { ir_type *type = get_entity_type(method); ident *old_id = get_entity_ld_ident(method); - ident *id = mangle3("L", old_id, "$stub"); + ident *id = id_mangle3("L", old_id, "$stub"); ir_type *parent = be->pic_trampolines_type; ir_entity *ent = new_entity(parent, old_id, type); set_entity_ld_ident(ent, id); @@ -2045,7 +2018,7 @@ static ir_entity *get_trampoline(be_main_env_t *env, ir_entity *method) static ir_entity *create_pic_symbol(be_main_env_t *be, ir_entity *entity) { ident *old_id = get_entity_ld_ident(entity); - ident *id = mangle3("L", old_id, "$non_lazy_ptr"); + ident *id = id_mangle3("L", old_id, "$non_lazy_ptr"); ir_type *e_type = get_entity_type(entity); ir_type *type = new_type_pointer(id, e_type, mode_P_data); ir_type *parent = be->pic_symbols_type; @@ -2111,7 +2084,7 @@ static void fix_pic_symconsts(ir_node *node, void *data) /* calls can jump to relative addresses, so we can directly jump to the (relatively) known call address or the trampoline */ - if (is_Call(node) && i == 1) { + if (i == 1 && is_Call(node)) { ir_entity *trampoline; ir_node *trampoline_const; @@ -2152,9 +2125,8 @@ 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(irg, block, new_NoMem(), add, mode); + load = new_r_Load(irg, block, new_NoMem(), add, mode, cons_floats); load_res = new_r_Proj(irg, block, load, mode, pn_Load_res); - set_irn_pinned(load, op_pin_state_floats); set_irn_n(node, i, load_res); } @@ -2191,6 +2163,9 @@ be_abi_irg_t *be_abi_introduce(be_irg_t *birg) limited_bitset = rbitset_obstack_alloc(&env->obst, env->sp_req.cls->n_regs); rbitset_set(limited_bitset, arch_register_get_index(env->arch_env->sp)); env->sp_req.limited = limited_bitset; + if (env->arch_env->sp->type & arch_register_type_ignore) { + env->sp_req.type |= arch_register_req_type_ignore; + } env->sp_cls_req.type = arch_register_req_type_normal; env->sp_cls_req.cls = arch_register_get_class(env->arch_env->sp); @@ -2201,6 +2176,7 @@ be_abi_irg_t *be_abi_introduce(be_irg_t *birg) set_optimize(0); env->init_sp = dummy = new_r_Unknown(irg, env->arch_env->sp->reg_class->mode); restore_optimization_state(&state); + FIRM_DBG_REGISTER(env->dbg, "firm.be.abi"); env->calls = NEW_ARR_F(ir_node*, 0); @@ -2261,8 +2237,8 @@ void be_abi_put_ignore_regs(be_abi_irg_t *abi, const arch_register_class_t *cls, { arch_register_t *reg; - for(reg = pset_first(abi->ignore_regs); reg; reg = pset_next(abi->ignore_regs)) - if(reg->reg_class == cls) + for (reg = pset_first(abi->ignore_regs); reg; reg = pset_next(abi->ignore_regs)) + if (reg->reg_class == cls) bitset_set(bs, reg->index); } @@ -2306,7 +2282,6 @@ typedef ir_node **node_array; typedef struct fix_stack_walker_env_t { node_array sp_nodes; - const arch_env_t *arch_env; } fix_stack_walker_env_t; /** @@ -2314,12 +2289,17 @@ typedef struct fix_stack_walker_env_t { */ static void collect_stack_nodes_walker(ir_node *node, void *data) { - fix_stack_walker_env_t *env = data; + fix_stack_walker_env_t *env = data; + const arch_register_req_t *req; - if (arch_irn_is(env->arch_env, node, modify_sp)) { - assert(get_irn_mode(node) != mode_M && get_irn_mode(node) != mode_T); - ARR_APP1(ir_node*, env->sp_nodes, node); - } + if (get_irn_mode(node) == mode_T) + return; + + req = arch_get_register_req_out(node); + if (! (req->type & arch_register_req_type_produces_sp)) + return; + + ARR_APP1(ir_node*, env->sp_nodes, node); } void be_abi_fix_stack_nodes(be_abi_irg_t *env) @@ -2332,7 +2312,6 @@ void be_abi_fix_stack_nodes(be_abi_irg_t *env) fix_stack_walker_env_t walker_env; walker_env.sp_nodes = NEW_ARR_F(ir_node*, 0); - walker_env.arch_env = birg->main_env->arch_env; irg_walk_graph(birg->irg, collect_stack_nodes_walker, NULL, &walker_env); @@ -2350,11 +2329,11 @@ void be_abi_fix_stack_nodes(be_abi_irg_t *env) be_ssa_construction_add_copies(&senv, walker_env.sp_nodes, ARR_LEN(walker_env.sp_nodes)); be_ssa_construction_fix_users_array(&senv, walker_env.sp_nodes, - ARR_LEN(walker_env.sp_nodes)); + ARR_LEN(walker_env.sp_nodes)); - if(lv != NULL) { + if (lv != NULL) { len = ARR_LEN(walker_env.sp_nodes); - for(i = 0; i < len; ++i) { + for (i = 0; i < len; ++i) { be_liveness_update(lv, walker_env.sp_nodes[i]); } be_ssa_construction_update_liveness_phis(&senv, lv); @@ -2364,11 +2343,10 @@ void be_abi_fix_stack_nodes(be_abi_irg_t *env) /* set register requirements for stack phis */ len = ARR_LEN(phis); - for(i = 0; i < len; ++i) { + for (i = 0; i < len; ++i) { ir_node *phi = phis[i]; - be_set_phi_reg_req(walker_env.arch_env, phi, &env->sp_req); - be_set_phi_flags(walker_env.arch_env, phi, arch_irn_flags_ignore | arch_irn_flags_modify_sp); - arch_set_irn_register(walker_env.arch_env, phi, env->arch_env->sp); + be_set_phi_reg_req(phi, &env->sp_req, arch_register_req_type_produces_sp); + arch_set_irn_register(phi, env->arch_env->sp); } be_ssa_construction_destroy(&senv); @@ -2386,7 +2364,6 @@ void be_abi_fix_stack_nodes(be_abi_irg_t *env) */ static int process_stack_bias(be_abi_irg_t *env, ir_node *bl, int real_bias) { - const arch_env_t *arch_env = env->birg->main_env->arch_env; int omit_fp = env->call->flags.bits.try_omit_fp; ir_node *irn; int wanted_bias = real_bias; @@ -2399,7 +2376,7 @@ static int process_stack_bias(be_abi_irg_t *env, ir_node *bl, int real_bias) If so, set the true offset (including the bias) for that node. */ - ir_entity *ent = arch_get_frame_entity(arch_env, irn); + ir_entity *ent = arch_get_frame_entity(irn); if (ent) { int bias = omit_fp ? real_bias : 0; int offset = get_stack_entity_offset(&env->frame, ent, bias); @@ -2412,7 +2389,7 @@ static int process_stack_bias(be_abi_irg_t *env, ir_node *bl, int real_bias) * If the node modifies the stack pointer by a constant offset, * record that in the bias. */ - ofs = arch_get_sp_bias(arch_env, irn); + ofs = arch_get_sp_bias(irn); if (be_is_IncSP(irn)) { /* fill in real stack frame size */