X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbeabi.c;h=99868f26ebca4f221c94bec88a3ed0d677378cfd;hb=3cda7b99b8d1bbddc0937e5529e4b3fdc0b2919d;hp=bc07732771eeba0ab31bd82334eb5004b756ac5a;hpb=eddb3fe633c8777a566e7685750ca25c50196f88;p=libfirm diff --git a/ir/be/beabi.c b/ir/be/beabi.c index bc0773277..99868f26e 100644 --- a/ir/be/beabi.c +++ b/ir/be/beabi.c @@ -34,7 +34,7 @@ #include "iredges_t.h" #include "irgmod.h" #include "irgwalk.h" -#include "irprintf_t.h" +#include "irprintf.h" #include "irgopt.h" #include "iropt_t.h" #include "irtools.h" @@ -47,6 +47,7 @@ #include "be.h" #include "beabi.h" +#include "beabihelper.h" #include "bearch.h" #include "benode.h" #include "belive_t.h" @@ -60,8 +61,7 @@ DEBUG_ONLY(static firm_dbg_module_t *dbg;) typedef struct be_abi_call_arg_t { unsigned is_res : 1; /**< 1: the call argument is a return value. 0: it's a call parameter. */ - unsigned in_reg : 1; /**< 1: this argument is transmitted in registers. */ - unsigned on_stack : 1; /**< 1: this argument is transmitted on the stack. */ + unsigned in_reg : 1; /**< 1: this argument is transmitted 1: in registers, 0: on stack. */ unsigned callee : 1; /**< 1: someone called us. 0: We call another function */ int pos; @@ -74,12 +74,10 @@ typedef struct be_abi_call_arg_t { } be_abi_call_arg_t; struct be_abi_call_t { - 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; /**< register class of the call address */ + 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; + set *params; }; /** @@ -100,9 +98,6 @@ struct be_abi_irg_t { 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 pmap_get(ir_node, map, reg); @@ -115,7 +110,7 @@ static void be_abi_reg_map_set(pmap *map, const arch_register_t* reg, } /** - * Check if the given register is callee save, ie. will be saved by the callee. + * Check if the given register is callee save, i.e. will be saved by the callee. */ static bool arch_register_is_callee_save( const arch_env_t *arch_env, @@ -127,7 +122,7 @@ static bool arch_register_is_callee_save( } /** - * Check if the given register is caller save, ie. must be saved by the caller. + * Check if the given register is caller save, i.e. must be saved by the caller. */ static bool arch_register_is_caller_save( const arch_env_t *arch_env, @@ -215,13 +210,6 @@ void be_abi_call_set_pop(be_abi_call_t *call, int pop) call->pop = pop; } -/* Set register class for call address */ -void be_abi_call_set_call_address_reg_class(be_abi_call_t *call, const arch_register_class_t *cls) -{ - call->cls_addr = cls; -} - - 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, @@ -230,7 +218,6 @@ void be_abi_call_param_stack(be_abi_call_t *call, int arg_pos, be_abi_call_arg_t arg; memset(&arg, 0, sizeof(arg)); assert(alignment > 0 && "Alignment must be greater than 0"); - arg.on_stack = 1; arg.load_mode = load_mode; arg.alignment = alignment; arg.space_before = space_before; @@ -276,20 +263,15 @@ 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) +static be_abi_call_t *be_abi_call_new(void) { be_abi_call_t *call = XMALLOCZ(be_abi_call_t); - call->flags.val = 0; - call->params = new_set(cmp_call_arg, 16); - call->cb = NULL; - call->cls_addr = cls_addr; - - call->flags.bits.try_omit_fp = be_omit_fp; + call->params = new_set(cmp_call_arg, 16); + call->cb = NULL; + call->flags.try_omit_fp = be_options.omit_fp; return call; } @@ -360,7 +342,7 @@ static ir_node *adjust_call(be_abi_irg_t *env, ir_node *irn, ir_node *curr_sp) ir_node *bl = get_nodes_block(irn); int stack_size = 0; const arch_register_t *sp = arch_env->sp; - be_abi_call_t *call = be_abi_call_new(sp->reg_class); + be_abi_call_t *call = be_abi_call_new(); ir_mode *mach_mode = sp->reg_class->mode; int n_res = get_method_n_ress(call_tp); @@ -392,7 +374,7 @@ static ir_node *adjust_call(be_abi_irg_t *env, ir_node *irn, ir_node *curr_sp) for (p = 0; p < n_params; ++p) { be_abi_call_arg_t *arg = get_call_arg(call, 0, p, 0); assert(arg); - if (arg->on_stack) { + if (!arg->in_reg) { int arg_size = get_type_size_bytes(get_method_param_type(call_tp, p)); stack_size += round_up2(arg->space_before, arg->alignment); @@ -508,11 +490,8 @@ static ir_node *adjust_call(be_abi_irg_t *env, ir_node *irn, ir_node *curr_sp) * checking */ continue; } - 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); - } - } + if (arch_register_is_caller_save(arch_env, reg)) + ARR_APP1(const arch_register_t*, destroyed_regs, reg); } } @@ -526,12 +505,8 @@ static ir_node *adjust_call(be_abi_irg_t *env, ir_node *irn, ir_node *curr_sp) continue; foreach_out_edge(irn, res_edge) { - int proj; - ir_node *res = get_edge_src_irn(res_edge); - - assert(is_Proj(res)); - - proj = get_Proj_proj(res); + ir_node *const res = get_edge_src_irn(res_edge); + long const proj = get_Proj_proj(res); assert(proj < n_res); assert(res_projs[proj] == NULL); res_projs[proj] = res; @@ -564,17 +539,17 @@ static ir_node *adjust_call(be_abi_irg_t *env, ir_node *irn, ir_node *curr_sp) /* ins collected, build the call */ throws_exception = ir_throws_exception(irn); - if (env->call->flags.bits.call_has_imm && is_SymConst(call_ptr)) { + if (env->call->flags.call_has_imm && is_SymConst(call_ptr)) { /* direct call */ - low_call = be_new_Call(dbgi, irg, bl, curr_mem, sp->single_req, curr_sp, + low_call = be_new_Call(dbgi, bl, curr_mem, sp->single_req, curr_sp, sp->single_req, curr_sp, n_reg_results + pn_be_Call_first_res + ARR_LEN(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(dbgi, irg, bl, curr_mem, sp->single_req, curr_sp, - call->cls_addr->class_req, call_ptr, + low_call = be_new_Call(dbgi, bl, curr_mem, sp->single_req, curr_sp, + sp->reg_class->class_req, call_ptr, n_reg_results + pn_be_Call_first_res + ARR_LEN(destroyed_regs), n_ins, in, get_Call_type(irn)); } @@ -796,7 +771,6 @@ static ir_node *adjust_alloc(be_abi_irg_t *env, ir_node *alloc, ir_node *curr_sp foreach_out_edge(alloc, edge) { ir_node *irn = get_edge_src_irn(edge); - assert(is_Proj(irn)); switch (get_Proj_proj(irn)) { case pn_Alloc_M: alloc_mem = irn; @@ -833,7 +807,7 @@ static ir_node *adjust_alloc(be_abi_irg_t *env, ir_node *alloc, ir_node *curr_sp /* The stack pointer will be modified in an unknown manner. We cannot omit it. */ - env->call->flags.bits.try_omit_fp = 0; + env->call->flags.try_omit_fp = 0; stack_alignment = 1 << arch_env->stack_alignment; size = adjust_alloc_size(stack_alignment, size, block, dbg); @@ -901,7 +875,7 @@ static ir_node *adjust_free(be_abi_irg_t *env, ir_node *free, ir_node *curr_sp) /* The stack pointer will be modified in an unknown manner. We cannot omit it. */ - env->call->flags.bits.try_omit_fp = 0; + env->call->flags.try_omit_fp = 0; subsp = be_new_SubSP(arch_env->sp, block, curr_sp, size); set_irn_dbg_info(subsp, dbg); @@ -993,7 +967,7 @@ static void link_ops_in_block_walker(ir_node *irn, void *data) unsigned long value = get_tarval_long(tv); /* use ebp, so the climbframe algo works... */ if (value > 0) { - env->call->flags.bits.try_omit_fp = 0; + env->call->flags.try_omit_fp = 0; } } } @@ -1040,10 +1014,6 @@ static void process_ops_in_block(ir_node *bl, void *data) DBG((dbg, LEVEL_3, "\tprocessing call %+F\n", irn)); switch (get_irn_opcode(irn)) { case iro_Call: - if (! be_omit_fp) { - /* The stack pointer will be modified due to a call. */ - env->call->flags.bits.try_omit_fp = 0; - } curr_sp = adjust_call(env, irn, curr_sp); break; case iro_Alloc: @@ -1129,7 +1099,7 @@ static ir_type *compute_arg_type(ir_graph *irg, be_abi_call_t *call, 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) { + if (num != n_params && get_call_arg(call, 0, num, 1)->in_reg) { /* don't move this entity */ continue; } @@ -1144,9 +1114,8 @@ static ir_type *compute_arg_type(ir_graph *irg, be_abi_call_t *call, ir_type *param_type = get_method_param_type(method_type, i); ir_entity *entity; - if (!arg->on_stack) { + if (arg->in_reg) continue; - } entity = map[i]; if (entity == NULL) { /* create a new entity */ @@ -1168,32 +1137,25 @@ static ir_type *compute_arg_type(ir_graph *irg, be_abi_call_t *call, return res; } -typedef struct { - const arch_register_t *reg; - ir_node *irn; -} reg_node_map_t; - static int cmp_regs(const void *a, const void *b) { - const reg_node_map_t *p = (const reg_node_map_t*)a; - const reg_node_map_t *q = (const reg_node_map_t*)b; + arch_register_t const *const p = *(arch_register_t const**)a; + arch_register_t const *const q = *(arch_register_t const**)b; - if (p->reg->reg_class == q->reg->reg_class) - return p->reg->index - q->reg->index; + if (p->reg_class == q->reg_class) + return p->index - q->index; else - return p->reg->reg_class < q->reg->reg_class ? -1 : +1; + return p->reg_class < q->reg_class ? -1 : +1; } -static void reg_map_to_arr(reg_node_map_t *res, pmap *reg_map) +static void reg_map_to_arr(arch_register_t const **const res, pmap *const reg_map) { pmap_entry *ent; size_t n = pmap_count(reg_map); size_t i = 0; foreach_pmap(reg_map, ent) { - res[i].reg = (const arch_register_t*)ent->key; - res[i].irn = (ir_node*)ent->value; - i++; + res[i++] = (arch_register_t const*)ent->key; } qsort(res, n, sizeof(res[0]), cmp_regs); @@ -1203,24 +1165,18 @@ static void reg_map_to_arr(reg_node_map_t *res, pmap *reg_map) * 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 irn the Return node */ -static ir_node *create_be_return(be_abi_irg_t *env, ir_node *irn, ir_node *bl, - ir_node *mem, int n_res) +static ir_node *create_be_return(be_abi_irg_t *const env, ir_node *const irn) { + ir_node *const bl = get_nodes_block(irn); be_abi_call_t *call = env->call; ir_graph *irg = get_Block_irg(bl); const arch_env_t *arch_env = be_get_irg_arch_env(irg); - dbg_info *dbgi; pmap *reg_map = pmap_create(); ir_node *keep = pmap_get(ir_node, env->keep_map, bl); size_t in_max; - ir_node *ret; int i, n; - unsigned pop; ir_node **in; ir_node *stack; const arch_register_t **regs; @@ -1240,6 +1196,7 @@ static ir_node *create_be_return(be_abi_irg_t *env, ir_node *irn, ir_node *bl, remove_End_keepalive(get_irg_end(irg), keep); } + int const n_res = get_Return_n_ress(irn); /* Insert results for Return into the register map. */ for (i = 0; i < n_res; ++i) { ir_node *res = get_Return_res(irn, i); @@ -1251,7 +1208,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_ignore) || arch_register_is_callee_save(arch_env, reg)) + if (arch_register_is_callee_save(arch_env, reg)) pmap_insert(reg_map, ent->key, ent->value); } @@ -1266,7 +1223,7 @@ static ir_node *create_be_return(be_abi_irg_t *env, ir_node *irn, ir_node *bl, in = ALLOCAN(ir_node*, in_max); regs = ALLOCAN(arch_register_t const*, in_max); - in[0] = mem; + in[0] = get_Return_mem(irn); in[1] = be_abi_reg_map_get(reg_map, arch_env->sp); regs[0] = NULL; regs[1] = arch_env->sp; @@ -1293,14 +1250,8 @@ static ir_node *create_be_return(be_abi_irg_t *env, ir_node *irn, ir_node *bl, } /* The in array for the new back end return is now ready. */ - if (irn != NULL) { - dbgi = get_irn_dbg_info(irn); - } else { - dbgi = NULL; - } - /* we have to pop the shadow parameter in in case of struct returns */ - pop = call->pop; - ret = be_new_Return(dbgi, irg, bl, n_res, pop, n, in); + dbg_info *const dbgi = get_irn_dbg_info(irn); + ir_node *const ret = be_new_Return(dbgi, bl, n_res, call->pop, n, in); /* Set the register classes of the return's parameter accordingly. */ for (i = 0; i < n; ++i) { @@ -1319,8 +1270,6 @@ static ir_node *create_be_return(be_abi_irg_t *env, ir_node *irn, ir_node *bl, typedef struct lower_frame_sels_env_t { ir_node *frame; /**< the current frame */ const arch_register_class_t *sp_class; /**< register class of the stack pointer */ - ir_type *frame_tp; /**< the frame type */ - int static_link_pos; /**< argument number of the hidden static link */ } lower_frame_sels_env_t; /** @@ -1396,9 +1345,7 @@ static void modify_irg(ir_graph *const irg, be_abi_irg_t *const env) int n_params; int i, n; unsigned j; - unsigned frame_size; - reg_node_map_t *rm; const arch_register_t *fp_reg; ir_node *frame_pointer; ir_node *start_bl; @@ -1418,18 +1365,17 @@ static void modify_irg(ir_graph *const irg, be_abi_irg_t *const env) /* Convert the Sel nodes in the irg to frame addr nodes: */ ctx.frame = get_irg_frame(irg); ctx.sp_class = arch_env->sp->reg_class; - ctx.frame_tp = get_irg_frame_type(irg); + ir_type *const frame_tp = get_irg_frame_type(irg); /* layout the stackframe now */ - if (get_type_state(ctx.frame_tp) == layout_undefined) { - default_layout_compound_type(ctx.frame_tp); + if (get_type_state(frame_tp) == layout_undefined) { + default_layout_compound_type(frame_tp); } - /* align stackframe to 4 byte */ - frame_size = get_type_size_bytes(ctx.frame_tp); - if (frame_size % 4 != 0) { - set_type_size_bytes(ctx.frame_tp, frame_size + 4 - (frame_size % 4)); - } + /* align stackframe */ + unsigned const alignment = 1U << arch_env->stack_alignment; + unsigned const frame_size = round_up2(get_type_size_bytes(frame_tp), alignment); + set_type_size_bytes(frame_tp, frame_size); env->regs = pmap_create(); @@ -1453,7 +1399,7 @@ static void modify_irg(ir_graph *const irg, be_abi_irg_t *const env) } } - stack_layout->sp_relative = call->flags.bits.try_omit_fp; + stack_layout->sp_relative = call->flags.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)); @@ -1482,7 +1428,7 @@ static void modify_irg(ir_graph *const irg, be_abi_irg_t *const env) } } - fp_reg = call->flags.bits.try_omit_fp ? arch_env->sp : arch_env->bp; + fp_reg = call->flags.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) */ @@ -1501,10 +1447,10 @@ static void modify_irg(ir_graph *const irg, be_abi_irg_t *const env) * 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); + arch_register_t const **const regs = ALLOCAN(arch_register_t const*, pmap_count(env->regs)); + reg_map_to_arr(regs, env->regs); for (i = 0, n = pmap_count(env->regs); i < n; ++i) { - const arch_register_t *reg = rm[i].reg; + const arch_register_t *reg = regs[i]; ir_mode *mode = reg->reg_class->mode; long nr = i; arch_register_req_type_t add_type = arch_register_req_type_none; @@ -1563,7 +1509,7 @@ static void modify_irg(ir_graph *const irg, be_abi_irg_t *const env) if (arg->in_reg) { repl = pmap_get(ir_node, env->regs, arg->reg); - } else if (arg->on_stack) { + } else { ir_node *addr = be_new_FrameAddr(sp->reg_class, start_bl, frame_pointer, arg->stack_ent); /* For atomic parameters which are actually used, we create a Load node. */ @@ -1609,9 +1555,7 @@ static void modify_irg(ir_graph *const irg, be_abi_irg_t *const env) ir_node *irn = get_Block_cfgpred(end, i); if (is_Return(irn)) { - ir_node *blk = get_nodes_block(irn); - ir_node *mem = get_Return_mem(irn); - ir_node *ret = create_be_return(env, irn, blk, mem, get_Return_n_ress(irn)); + ir_node *const ret = create_be_return(env, irn); exchange(irn, ret); } } @@ -1835,11 +1779,9 @@ void be_abi_introduce(ir_graph *irg) /* Break here if backend provides a custom API. */ - be_omit_fp = be_options.omit_fp; - be_abi_irg_t env; env.keep_map = pmap_create(); - env.call = be_abi_call_new(arch_env->sp->reg_class); + env.call = be_abi_call_new(); arch_env_get_call_abi(arch_env, method_type, env.call); env.init_sp = dummy;