X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbeabi.c;h=0547a0cf5558c2053c7d6769021dc394354692da;hb=9d20c61722e987065708bfb75669e92c28cab78c;hp=a0c6499233962ffda6b38883b79547120fec9f53;hpb=9bb022c5e36fbfa02b79241d8c1c7e0102cf83d5;p=libfirm diff --git a/ir/be/beabi.c b/ir/be/beabi.c index a0c649923..0547a0cf5 100644 --- a/ir/be/beabi.c +++ b/ir/be/beabi.c @@ -571,7 +571,7 @@ static ir_node *adjust_call(be_abi_irg_t *env, ir_node *irn, ir_node *curr_sp) /* Collect caller save registers */ for (i = 0, n = arch_isa_get_n_reg_class(isa); i < n; ++i) { - int j; + unsigned j; const arch_register_class_t *cls = arch_isa_get_reg_class(isa, i); for (j = 0; j < cls->n_regs; ++j) { const arch_register_t *reg = arch_register_for_index(cls, j); @@ -650,6 +650,14 @@ static ir_node *adjust_call(be_abi_irg_t *env, ir_node *irn, ir_node *curr_sp) } 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); + for(i = 0; i < n_res; ++i) { int pn; ir_node *proj = res_projs[i]; @@ -717,20 +725,26 @@ 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 (pset_count(caller_save) + n_reg_results > 0) { + if (1 || pset_count(caller_save) + n_reg_results > 0) { const arch_register_t *reg; ir_node **in, *keep; - int i, n; + int i; + int n = 0; int curr_res_proj = pn_be_Call_first_res + n_reg_results; - for (reg = pset_first(caller_save), n = 0; reg; reg = pset_next(caller_save), ++n) { + /* 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); /* 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(env->birg->main_env->arch_env, 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)) { @@ -774,14 +788,21 @@ 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(irg, bl, low_call, mode_M, pn_Call_M); + mem_proj = new_r_Proj(irg, bl, low_call, mode_M, pn_be_Call_M_regular); keep_alive(mem_proj); } /* Clean up the stack frame if we allocated it */ if (! no_alloc) { + /* the callee pops the shadow parameter */ + if(get_method_calling_convention(mt) & cc_compound_ret) { + unsigned size = get_mode_size_bytes(mode_P_data); + stack_size -= size; + be_Call_set_pop(low_call, size); + } + curr_sp = be_new_IncSP(sp, irg, bl, curr_sp, -stack_size); - add_irn_dep(curr_sp, mem_proj); + //add_irn_dep(curr_sp, mem_proj); } } @@ -1127,8 +1148,10 @@ static void process_calls_in_block(ir_node *bl, void *data) obstack_free(&env->obst, nodes); - /* Keep the last stack state in the block by tying it to Keep node */ - if(curr_sp != env->init_sp) { + /* Keep the last stack state in the block by tying it to Keep node, + * the proj from calls is already kept */ + if(curr_sp != env->init_sp + && !(is_Proj(curr_sp) && be_is_Call(get_Proj_pred(curr_sp)))) { nodes[0] = curr_sp; keep = be_new_Keep(env->isa->sp->reg_class, get_irn_irg(bl), bl, 1, nodes); @@ -1154,86 +1177,6 @@ static void process_calls(be_abi_irg_t *env) heights_free(ir_heights); } -#if 0 /* -static ir_node *setup_frame(be_abi_irg_t *env) -{ - const arch_isa_t *isa = env->birg->main_env->arch_env->isa; - const arch_register_t *sp = isa->sp; - const arch_register_t *bp = isa->bp; - be_abi_call_flags_bits_t flags = env->call->flags.bits; - ir_graph *irg = env->birg->irg; - ir_node *bl = get_irg_start_block(irg); - ir_node *no_mem = get_irg_no_mem(irg); - ir_node *old_frame = get_irg_frame(irg); - ir_node *stack = pmap_get(env->regs, (void *) sp); - ir_node *frame = pmap_get(env->regs, (void *) bp); - - int stack_nr = get_Proj_proj(stack); - - if(flags.try_omit_fp) { - stack = be_new_IncSP(sp, irg, bl, stack, no_mem, BE_STACK_FRAME_SIZE_EXPAND); - frame = stack; - } - - else { - frame = be_new_Copy(bp->reg_class, irg, bl, stack); - - be_node_set_flags(frame, -1, arch_irn_flags_dont_spill); - if(!flags.fp_free) { - be_set_constr_single_reg(frame, -1, bp); - be_node_set_flags(frame, -1, arch_irn_flags_ignore); - arch_set_irn_register(env->birg->main_env->arch_env, frame, bp); - } - - stack = be_new_IncSP(sp, irg, bl, stack, frame, BE_STACK_FRAME_SIZE_EXPAND); - } - - be_node_set_flags(env->reg_params, -(stack_nr + 1), arch_irn_flags_ignore); - env->init_sp = stack; - set_irg_frame(irg, frame); - edges_reroute(old_frame, frame, irg); - - return frame; -} - -static void clearup_frame(be_abi_irg_t *env, ir_node *ret, pmap *reg_map, struct obstack *obst) -{ - const arch_isa_t *isa = env->birg->main_env->arch_env->isa; - const arch_register_t *sp = isa->sp; - const arch_register_t *bp = isa->bp; - ir_graph *irg = env->birg->irg; - ir_node *ret_mem = get_Return_mem(ret); - ir_node *frame = get_irg_frame(irg); - ir_node *bl = get_nodes_block(ret); - ir_node *stack = get_irn_link(bl); - - pmap_entry *ent; - - if(env->call->flags.bits.try_omit_fp) { - stack = be_new_IncSP(sp, irg, bl, stack, ret_mem, -BE_STACK_FRAME_SIZE_SHRINK); - } - - else { - stack = be_new_SetSP(sp, irg, bl, stack, frame, ret_mem); - be_set_constr_single_reg(stack, -1, sp); - be_node_set_flags(stack, -1, arch_irn_flags_ignore); - } - - pmap_foreach(env->regs, ent) { - const arch_register_t *reg = ent->key; - ir_node *irn = ent->value; - - if(reg == sp) - obstack_ptr_grow(&env->obst, stack); - else if(reg == bp) - obstack_ptr_grow(&env->obst, frame); - else if(arch_register_type_is(reg, callee_save) || arch_register_type_is(reg, ignore)) - obstack_ptr_grow(obst, irn); - } -} -*/ -#endif - /** * Computes the stack argument layout type. * Changes a possibly allocated value param type by moving @@ -1441,15 +1384,21 @@ static ir_node *create_barrier(be_abi_irg_t *env, ir_node *bl, ir_node **mem, pm * @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) { - be_abi_call_t *call = env->call; +static ir_node *create_be_return(be_abi_irg_t *env, ir_node *irn, ir_node *bl, + ir_node *mem, int n_res) +{ + ir_graph *irg = env->birg->irg; + ir_entity *entity = get_irg_entity(irg); + ir_type *method_type = get_entity_type(entity); + be_abi_call_t *call = env->call; const arch_isa_t *isa = env->birg->main_env->arch_env->isa; - + dbg_info *dbgi; pmap *reg_map = pmap_create(); ir_node *keep = pmap_get(env->keep_map, bl); int in_max; ir_node *ret; int i, n; + unsigned pop; ir_node **in; ir_node *stack; const arch_register_t **regs; @@ -1526,7 +1475,17 @@ static ir_node *create_be_return(be_abi_irg_t *env, ir_node *irn, ir_node *bl, i } /* The in array for the new back end return is now ready. */ - ret = be_new_Return(irn ? get_irn_dbg_info(irn) : NULL, env->birg->irg, bl, n_res, n, in); + 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 = 0; + if(get_method_calling_convention(method_type) & cc_compound_ret) { + pop = get_mode_size_bytes(mode_P_data); + } + 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) @@ -1739,7 +1698,8 @@ static void modify_irg(be_abi_irg_t *env) pset *dont_save = pset_new_ptr(8); int n_params; - int i, j, n; + int i, n; + unsigned j; reg_node_map_t *rm; const arch_register_t *fp_reg; @@ -2003,7 +1963,7 @@ void fix_call_state_inputs(be_abi_irg_t *env) /* Collect caller save registers */ n = arch_isa_get_n_reg_class(isa); for(i = 0; i < n; ++i) { - int j; + unsigned j; const arch_register_class_t *cls = arch_isa_get_reg_class(isa, i); for(j = 0; j < cls->n_regs; ++j) { const arch_register_t *reg = arch_register_for_index(cls, j);