X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbeabi.c;h=d27d18a6f1f19a871793a167b08cfcf91f8398c3;hb=e7ba741cdd9599ce05d7989bff60a1c6137ee0b5;hp=0f62ac708fc2e493b6cf82171c83d48040422ee9;hpb=205396c4f4f5abe7abd6dc2350c8c398a7623afc;p=libfirm diff --git a/ir/be/beabi.c b/ir/be/beabi.c index 0f62ac708..d27d18a6f 100644 --- a/ir/be/beabi.c +++ b/ir/be/beabi.c @@ -1,9 +1,27 @@ -/** - * ABI lowering. +/* + * Copyright (C) 1995-2007 University of Karlsruhe. All right reserved. + * + * This file is part of libFirm. + * + * This file may be distributed and/or modified under the terms of the + * GNU General Public License version 2 as published by the Free Software + * Foundation and appearing in the file LICENSE.GPL included in the + * packaging of this file. + * + * Licensees holding valid libFirm Professional Edition licenses may use + * this file in accordance with the libFirm Commercial License. + * Agreement provided with the Software. * - * @author Sebastian Hack - * @date 7.3.2005 - * @cvsid $Id$ + * This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE + * WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR + * PURPOSE. + */ + +/** + * @file + * @brief Backend ABI implementation. + * @author Sebastian Hack, Michael Beck + * @version $Id$ */ #ifdef HAVE_CONFIG_H # include "config.h" @@ -12,7 +30,6 @@ #include "obst.h" #include "offset.h" -#include "type.h" #include "irgopt.h" #include "irgraph_t.h" @@ -28,6 +45,7 @@ #include "pdeq.h" #include "irtools.h" #include "raw_bitset.h" +#include "error.h" #include "be.h" #include "beabi.h" @@ -46,9 +64,9 @@ typedef struct _be_abi_call_arg_t { int pos; const arch_register_t *reg; ir_entity *stack_ent; - unsigned alignment; - unsigned space_before; - unsigned space_after; + unsigned alignment; /**< stack alignment */ + unsigned space_before; /**< allocate space before */ + unsigned space_after; /**< allocate space after */ } be_abi_call_arg_t; struct _be_abi_call_t { @@ -70,15 +88,15 @@ struct _be_abi_irg_t { ir_type *method_type; /**< The type of the method of the IRG. */ ir_node *init_sp; /**< The node representing the stack pointer - at the start of the function. */ + at the start of the function. */ ir_node *start_barrier; /**< The barrier of the start block */ ir_node *reg_params; /**< The reg params node. */ pmap *regs; /**< A map of all callee-save and ignore regs to - their Projs to the RegParams node. */ + their Projs to the RegParams node. */ - int start_block_bias; /**< The stack bias at the end of the start block. */ + int start_block_bias; /**< The stack bias at the end of the start block. */ void *cb; /**< ABI Callback self pointer. */ @@ -115,6 +133,7 @@ static int be_omit_fp = 1; static int cmp_call_arg(const void *a, const void *b, size_t n) { const be_abi_call_arg_t *p = a, *q = b; + (void) n; return !(p->is_res == q->is_res && p->pos == q->pos); } @@ -372,7 +391,8 @@ static INLINE int is_on_stack(be_abi_call_t *call, int pos) */ /** - * Transform a call node. + * Transform a call node into a be_Call node. + * * @param env The ABI environment for the current irg. * @param irn The call node. * @param curr_sp The stack pointer node to use. @@ -380,38 +400,38 @@ static INLINE int is_on_stack(be_abi_call_t *call, int pos) */ static ir_node *adjust_call(be_abi_irg_t *env, ir_node *irn, ir_node *curr_sp, ir_node *alloca_copy) { - ir_graph *irg = env->birg->irg; + ir_graph *irg = env->birg->irg; const arch_env_t *arch_env = env->birg->main_env->arch_env; - const arch_isa_t *isa = arch_env->isa; - ir_type *mt = get_Call_type(irn); - ir_node *call_ptr = get_Call_ptr(irn); - int n_params = get_method_n_params(mt); - 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_isa_stack_dir(isa); - const arch_register_t *sp = arch_isa_sp(isa); - be_abi_call_t *call = be_abi_call_new(sp->reg_class); - ir_mode *mach_mode = sp->reg_class->mode; - struct obstack *obst = &env->obst; - int no_alloc = call->flags.bits.frame_is_setup_on_call; - - ir_node *res_proj = NULL; - int curr_res_proj = pn_Call_max; - int n_low_args = 0; - int n_pos = 0; - int count; + const arch_isa_t *isa = arch_env->isa; + ir_type *mt = get_Call_type(irn); + ir_node *call_ptr = get_Call_ptr(irn); + int n_params = get_method_n_params(mt); + 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_isa_stack_dir(isa); + const arch_register_t *sp = arch_isa_sp(isa); + be_abi_call_t *call = be_abi_call_new(sp->reg_class); + ir_mode *mach_mode = sp->reg_class->mode; + struct obstack *obst = &env->obst; + int no_alloc = call->flags.bits.frame_is_setup_on_call; + + ir_node *res_proj = NULL; + int curr_res_proj = pn_Call_max; + int n_reg_params = 0; + int n_stack_params = 0; + int n_ins; ir_node *low_call; ir_node **in; ir_node **res_projs; const arch_register_t *reg; const ir_edge_t *edge; - int *low_args; - int *pos; + int *reg_param_idxs; + int *stack_param_idx; int i, n; /* Let the isa fill out the abi description for that call node. */ @@ -419,7 +439,7 @@ static ir_node *adjust_call(be_abi_irg_t *env, ir_node *irn, ir_node *curr_sp, i /* Insert code to put the stack arguments on the stack. */ assert(get_Call_n_params(irn) == n_params); - for(i = 0; i < n_params; ++i) { + for (i = 0; i < n_params; ++i) { be_abi_call_arg_t *arg = get_call_arg(call, 0, i); assert(arg); if (arg->on_stack) { @@ -429,23 +449,23 @@ static ir_node *adjust_call(be_abi_irg_t *env, ir_node *irn, ir_node *curr_sp, i stack_size += round_up2(arg_size, arg->alignment); stack_size += round_up2(arg->space_after, arg->alignment); obstack_int_grow(obst, i); - n_pos++; + ++n_stack_params; } } - pos = obstack_finish(obst); + stack_param_idx = obstack_finish(obst); /* Collect all arguments which are passed in registers. */ - for(i = 0, n = get_Call_n_params(irn); i < n; ++i) { + for (i = 0; i < n_params; ++i) { be_abi_call_arg_t *arg = get_call_arg(call, 0, i); - if(arg && arg->in_reg) { + if (arg && arg->in_reg) { obstack_int_grow(obst, i); - n_low_args++; + ++n_reg_params; } } - low_args = obstack_finish(obst); + reg_param_idxs = obstack_finish(obst); /* If there are some parameters which shall be passed on the stack. */ - if(n_pos > 0) { + if (n_stack_params > 0) { int curr_ofs = 0; int do_seq = call->flags.bits.store_args_sequential && !no_alloc; @@ -455,11 +475,11 @@ static ir_node *adjust_call(be_abi_irg_t *env, ir_node *irn, ir_node *curr_sp, i * direction is downwards. */ if (call->flags.bits.left_to_right ^ (do_seq && stack_dir < 0)) { - for (i = 0; i < n_pos >> 1; ++i) { - int other = n_pos - i - 1; - int tmp = pos[i]; - pos[i] = pos[other]; - pos[other] = tmp; + for (i = 0; i < n_stack_params >> 1; ++i) { + int other = n_stack_params - i - 1; + int tmp = stack_param_idx[i]; + stack_param_idx[i] = stack_param_idx[other]; + stack_param_idx[other] = tmp; } } @@ -469,23 +489,23 @@ static ir_node *adjust_call(be_abi_irg_t *env, ir_node *irn, ir_node *curr_sp, i * we allocate as much space on the stack all parameters need, by * moving the stack pointer along the stack's direction. */ - if(stack_dir < 0 && !do_seq && !no_alloc) { + if (stack_dir < 0 && !do_seq && !no_alloc) { curr_sp = be_new_IncSP(sp, irg, bl, curr_sp, stack_size); - if(alloca_copy) { + if (alloca_copy) { add_irn_dep(curr_sp, alloca_copy); alloca_copy = NULL; } } - if(!do_seq) { + if (! do_seq) { obstack_ptr_grow(obst, get_Call_mem(irn)); curr_mem = new_NoMem(); } else { curr_mem = get_Call_mem(irn); } - for(i = 0; i < n_pos; ++i) { - int p = pos[i]; + for (i = 0; i < n_stack_params; ++i) { + int p = stack_param_idx[i]; be_abi_call_arg_t *arg = get_call_arg(call, 0, p); ir_node *param = get_Call_param(irn, p); ir_node *addr = curr_sp; @@ -501,7 +521,7 @@ static ir_node *adjust_call(be_abi_irg_t *env, ir_node *irn, ir_node *curr_sp, i if (do_seq) { curr_ofs = 0; addr = curr_sp = be_new_IncSP(sp, irg, bl, curr_sp, param_size + arg->space_before); - if(alloca_copy) { + if (alloca_copy) { add_irn_dep(curr_sp, alloca_copy); alloca_copy = NULL; } @@ -512,7 +532,7 @@ static ir_node *adjust_call(be_abi_irg_t *env, ir_node *irn, ir_node *curr_sp, i curr_ofs = round_up2(curr_ofs, arg->alignment); /* Make the expression to compute the argument's offset. */ - if(curr_ofs > 0) { + if (curr_ofs > 0) { ir_mode *constmode = mach_mode; if(mode_is_reference(mach_mode)) { constmode = mode_Is; @@ -549,9 +569,9 @@ static ir_node *adjust_call(be_abi_irg_t *env, ir_node *irn, ir_node *curr_sp, i in = (ir_node **) obstack_finish(obst); /* We need the sync only, if we didn't build the stores sequentially. */ - if(!do_seq) { - if(n_pos >= 1) { - curr_mem = new_r_Sync(irg, bl, n_pos + 1, in); + if (! do_seq) { + if (n_stack_params >= 1) { + curr_mem = new_r_Sync(irg, bl, n_stack_params + 1, in); } else { curr_mem = get_Call_mem(irn); } @@ -560,15 +580,15 @@ static ir_node *adjust_call(be_abi_irg_t *env, ir_node *irn, ir_node *curr_sp, i } /* Collect caller save registers */ - for(i = 0, n = arch_isa_get_n_reg_class(isa); i < n; ++i) { + for (i = 0, n = arch_isa_get_n_reg_class(isa); i < n; ++i) { int j; const arch_register_class_t *cls = arch_isa_get_reg_class(isa, i); - for(j = 0; j < cls->n_regs; ++j) { + 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)) { + if (arch_register_type_is(reg, caller_save)) { pset_insert_ptr(caller_save, (void *) reg); } - if(arch_register_type_is(reg, state)) { + if (arch_register_type_is(reg, state)) { pset_insert_ptr(caller_save, (void*) reg); pset_insert_ptr(states, (void*) reg); } @@ -589,7 +609,7 @@ static ir_node *adjust_call(be_abi_irg_t *env, ir_node *irn, ir_node *curr_sp, i 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) { res_proj = irn; foreach_out_edge(irn, res_edge) { int proj; @@ -599,7 +619,7 @@ static ir_node *adjust_call(be_abi_irg_t *env, ir_node *irn, ir_node *curr_sp, i assert(is_Proj(res)); proj = get_Proj_proj(res); - arg = get_call_arg(call, 1, proj); + arg = get_call_arg(call, 1, proj); /* shift the proj number to the right, since we will drop the @@ -610,9 +630,9 @@ static ir_node *adjust_call(be_abi_irg_t *env, ir_node *irn, ir_node *curr_sp, i set_Proj_proj(res, proj); obstack_ptr_grow(obst, res); - if(proj > curr_res_proj) + if (proj > curr_res_proj) curr_res_proj = proj; - if(arg->in_reg) { + if (arg->in_reg) { pset_remove_ptr(caller_save, arg->reg); //pmap_insert(arg_regs, arg->reg, INT_TO_PTR(proj + 1)) } @@ -625,8 +645,8 @@ static ir_node *adjust_call(be_abi_irg_t *env, ir_node *irn, ir_node *curr_sp, i res_projs = obstack_finish(obst); /* make the back end call node and set its register requirements. */ - for(i = 0; i < n_low_args; ++i) { - obstack_ptr_grow(obst, get_Call_param(irn, low_args[i])); + for (i = 0; i < n_reg_params; ++i) { + obstack_ptr_grow(obst, get_Call_param(irn, reg_param_idxs[i])); } foreach_pset(states, reg) { const arch_register_class_t *cls = arch_register_get_class(reg); @@ -637,23 +657,25 @@ static ir_node *adjust_call(be_abi_irg_t *env, ir_node *irn, ir_node *curr_sp, i ir_node *regnode = new_rd_Unknown(irg, arch_register_class_mode(cls)); obstack_ptr_grow(obst, regnode); } - count = n_low_args + pset_count(states); + n_ins = n_reg_params + pset_count(states); in = obstack_finish(obst); - if(env->call->flags.bits.call_has_imm && get_irn_opcode(call_ptr) == iro_SymConst) { + 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, - curr_res_proj + pset_count(caller_save), count, + curr_res_proj + pset_count(caller_save), 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, curr_res_proj + pset_count(caller_save), - count, in, get_Call_type(irn)); + n_ins, in, get_Call_type(irn)); } - ARR_APP1(ir_node*, env->calls, low_call); + ARR_APP1(ir_node *, env->calls, low_call); /* Set the register class of the call address to @@ -664,12 +686,12 @@ static ir_node *adjust_call(be_abi_irg_t *env, ir_node *irn, ir_node *curr_sp, i DBG((env->dbg, LEVEL_3, "\tcreated backend call %+F\n", low_call)); /* Set the register classes and constraints of the Call parameters. */ - for(i = 0; i < n_low_args; ++i) { - int index = low_args[i]; + for (i = 0; i < n_reg_params; ++i) { + int index = reg_param_idxs[i]; 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 + index, arg->reg); + be_set_constr_single_reg(low_call, be_pos_Call_first_arg + i, arg->reg); } /* Set the register constraints of the results. */ @@ -701,7 +723,7 @@ static ir_node *adjust_call(be_abi_irg_t *env, ir_node *irn, ir_node *curr_sp, i set_Proj_pred(res_projs[i], low_call); /* set the now unnecessary projT to bad */ - if(res_proj != NULL) { + if (res_proj != NULL) { be_kill_node(res_proj); } @@ -740,7 +762,7 @@ static ir_node *adjust_call(be_abi_irg_t *env, ir_node *irn, ir_node *curr_sp, i } /* Clean up the stack. */ - if(stack_size > 0) { + if (stack_size > 0) { ir_node *mem_proj = NULL; foreach_out_edge(low_call, edge) { @@ -751,16 +773,16 @@ static ir_node *adjust_call(be_abi_irg_t *env, ir_node *irn, ir_node *curr_sp, i } } - if(!mem_proj) { + if (! mem_proj) { mem_proj = new_r_Proj(irg, bl, low_call, mode_M, pn_Call_M); keep_alive(mem_proj); } /* Clean up the stack frame if we allocated it */ - if(!no_alloc) { + if (! no_alloc) { curr_sp = be_new_IncSP(sp, irg, bl, curr_sp, -stack_size); add_irn_dep(curr_sp, mem_proj); - if(alloca_copy) { + if (alloca_copy) { add_irn_dep(curr_sp, alloca_copy); alloca_copy = NULL; } @@ -768,7 +790,7 @@ static ir_node *adjust_call(be_abi_irg_t *env, ir_node *irn, ir_node *curr_sp, i } be_abi_call_free(call); - obstack_free(obst, pos); + obstack_free(obst, stack_param_idx); del_pset(results); del_pset(states); del_pset(caller_save); @@ -776,6 +798,31 @@ static ir_node *adjust_call(be_abi_irg_t *env, ir_node *irn, ir_node *curr_sp, i return curr_sp; } +/** + * Adjust the size of a node representing a stack alloc or free for the minimum stack alignment. + * + * @param alignment the minimum stack alignment + * @param size the node containing the non-aligned size + * @param irg the irg where new nodes are allocated on + * @param irg the block where new nodes are allocated on + * @param dbg debug info for new nodes + * + * @return a node representing the aligned size + */ +static ir_node *adjust_alloc_size(unsigned stack_alignment, ir_node *size, ir_graph *irg, ir_node *block, dbg_info *dbg) { + if (stack_alignment > 1) { + ir_mode *mode = get_irn_mode(size); + tarval *tv = new_tarval_from_long(stack_alignment-1, mode); + ir_node *mask = new_r_Const(irg, block, mode, 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); + size = new_rd_And(dbg, irg, block, size, mask, mode); + } + return size; +} /** * Adjust an alloca. * The alloca is transformed into a back end alloca node and connected to the stack nodes. @@ -787,13 +834,11 @@ static ir_node *adjust_alloc(be_abi_irg_t *env, ir_node *alloc, ir_node *curr_sp ir_node *alloc_mem; ir_node *alloc_res; ir_type *type; + dbg_info *dbg; const ir_edge_t *edge; - ir_node *new_alloc; - ir_node *size; - ir_node *addr; - ir_node *copy; - ir_node *ins[2]; + ir_node *new_alloc, *size, *addr, *copy, *ins[2]; + unsigned stack_alignment; if (get_Alloc_where(alloc) != stack_alloc) { assert(0); @@ -830,11 +875,13 @@ 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); + /* we might need to multiply the size with the element size */ if(type != get_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(NULL, irg, block, mode_Iu, tv); - ir_node *mul = new_rd_Mul(NULL, irg, block, get_Alloc_size(alloc), + 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 { @@ -844,7 +891,13 @@ 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; + + /* FIXME: size must be here round up for the stack alignment, but + this must be transmitted from the backend. */ + stack_alignment = 4; + size = adjust_alloc_size(stack_alignment, size, irg, block, dbg); new_alloc = be_new_AddSP(env->isa->sp, irg, block, curr_sp, size); + set_irn_dbg_info(new_alloc, dbg); if(alloc_mem != NULL) { ir_node *addsp_mem; @@ -852,8 +905,8 @@ static ir_node *adjust_alloc(be_abi_irg_t *env, ir_node *alloc, ir_node *curr_sp addsp_mem = new_r_Proj(irg, block, new_alloc, mode_M, pn_be_AddSP_M); - // We need to sync the output mem of the AddSP with the input mem - // edge into the alloc node + /* We need to sync the output mem of the AddSP with the input mem + edge into the alloc node. */ ins[0] = get_Alloc_mem(alloc); ins[1] = addsp_mem; sync = new_r_Sync(irg, block, 2, ins); @@ -895,6 +948,8 @@ static ir_node *adjust_free(be_abi_irg_t *env, ir_node *free, ir_node *curr_sp) ir_type *type; ir_node *in[2]; ir_mode *sp_mode; + unsigned stack_alignment; + dbg_info *dbg; if (get_Free_where(free) != stack_alloc) { assert(0); @@ -905,22 +960,29 @@ static ir_node *adjust_free(be_abi_irg_t *env, ir_node *free, ir_node *curr_sp) irg = get_irn_irg(block); type = get_Free_type(free); sp_mode = env->isa->sp->reg_class->mode; + dbg = get_irn_dbg_info(free); /* we might need to multiply the size with the element size */ if(type != get_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(NULL, irg, block, mode_Iu, tv); - ir_node *mul = new_rd_Mul(NULL, irg, block, get_Free_size(free), + ir_node *cnst = new_rd_Const(dbg, irg, block, mode_Iu, tv); + ir_node *mul = new_rd_Mul(dbg, irg, block, get_Free_size(free), cnst, mode_Iu); size = mul; } else { size = get_Free_size(free); } + /* FIXME: size must be here round up for the stack alignment, but + this must be transmitted from the backend. */ + stack_alignment = 4; + size = adjust_alloc_size(stack_alignment, size, irg, block, dbg); + /* The stack pointer will be modified in an unknown manner. We cannot omit it. */ env->call->flags.bits.try_omit_fp = 0; subsp = be_new_SubSP(env->isa->sp, irg, block, curr_sp, size); + set_irn_dbg_info(subsp, dbg); mem = new_r_Proj(irg, block, subsp, mode_M, pn_be_SubSP_M); res = new_r_Proj(irg, block, subsp, sp_mode, pn_be_SubSP_res); @@ -984,7 +1046,7 @@ static int dependent_on(ir_node *n1, ir_node *n2) return heights_reachable_in_block(ir_heights, n1, n2); } -static int cmp_call_dependecy(const void *c1, const void *c2) +static int cmp_call_dependency(const void *c1, const void *c2) { ir_node *n1 = *(ir_node **) c1; ir_node *n2 = *(ir_node **) c2; @@ -1053,7 +1115,7 @@ static void process_calls_in_block(ir_node *bl, void *data) nodes = obstack_finish(&env->obst); /* order the call nodes according to data dependency */ - qsort(nodes, n, sizeof(nodes[0]), cmp_call_dependecy); + qsort(nodes, n, sizeof(nodes[0]), cmp_call_dependency); for(i = n - 1; i >= 0; --i) { ir_node *irn = nodes[i]; @@ -1070,6 +1132,7 @@ static void process_calls_in_block(ir_node *bl, void *data) curr_sp = adjust_free(env, irn, curr_sp); break; default: + panic("invalid call"); break; } } @@ -1077,9 +1140,12 @@ 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 */ - nodes[0] = curr_sp; - keep = be_new_Keep(env->isa->sp->reg_class, get_irn_irg(bl), bl, 1, nodes); - pmap_insert(env->keep_map, bl, keep); + if(curr_sp != env->init_sp) { + nodes[0] = curr_sp; + keep = be_new_Keep(env->isa->sp->reg_class, get_irn_irg(bl), + bl, 1, nodes); + pmap_insert(env->keep_map, bl, keep); + } } set_irn_link(bl, curr_sp); @@ -1410,11 +1476,9 @@ static ir_node *create_be_return(be_abi_irg_t *env, ir_node *irn, ir_node *bl, i */ stack = be_abi_reg_map_get(env->regs, isa->sp); if (keep) { - ir_node *bad = new_r_Bad(env->birg->irg); stack = get_irn_n(keep, 0); - set_nodes_block(keep, bad); - set_irn_n(keep, 0, bad); - // exchange(keep, new_r_Bad(env->birg->irg)); + be_kill_node(keep); + remove_End_keepalive(get_irg_end(env->birg->irg), keep); } /* Insert results for Return into the register map. */ @@ -1491,14 +1555,15 @@ static ir_node *create_be_return(be_abi_irg_t *env, ir_node *irn, ir_node *bl, i typedef struct lower_frame_sels_env_t { be_abi_irg_t *env; ir_entity *value_param_list; /**< the list of all value param entities */ + ir_entity *value_param_tail; /**< the tail of the list of all value param entities */ } lower_frame_sels_env_t; /** * Walker: Replaces Sels of frame type and * value param type entities by FrameAddress. + * Links all used entities. */ -static void lower_frame_sels_walker(ir_node *irn, void *data) -{ +static void lower_frame_sels_walker(ir_node *irn, void *data) { lower_frame_sels_env_t *ctx = data; if (is_Sel(irn)) { @@ -1516,10 +1581,13 @@ static void lower_frame_sels_walker(ir_node *irn, void *data) nw = be_new_FrameAddr(env->isa->sp->reg_class, irg, bl, frame, ent); exchange(irn, nw); - /* check, if it's a param sel and if have not seen this entity immediatly before */ - if (ptr == param_base && ctx->value_param_list != ent) { + /* 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) { set_entity_link(ent, ctx->value_param_list); ctx->value_param_list = ent; + if (ctx->value_param_tail == NULL) ctx->value_param_tail = ent; } } } @@ -1692,7 +1760,7 @@ static void modify_irg(be_abi_irg_t *env) ir_node *arg_tuple; ir_node *value_param_base; const ir_edge_t *edge; - ir_type *arg_type, *bet_type; + ir_type *arg_type, *bet_type, *tp; lower_frame_sels_env_t ctx; ir_entity **param_map; @@ -1701,9 +1769,18 @@ static void modify_irg(be_abi_irg_t *env) DBG((dbg, LEVEL_1, "introducing abi on %+F\n", irg)); + /* 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); + if (tp != NULL) { + for (i = get_struct_n_members(tp) - 1; i >= 0; --i) + set_entity_link(get_struct_member(tp, i), NULL); + } + /* Convert the Sel nodes in the irg to frame load/store/addr nodes. */ ctx.env = env; ctx.value_param_list = NULL; + ctx.value_param_tail = NULL; irg_walk_graph(irg, lower_frame_sels_walker, NULL, &ctx); /* value_param_base anchor is not needed anymore now */ @@ -1856,13 +1933,14 @@ static void modify_irg(be_abi_irg_t *env) if(arg_proj != NULL) { be_abi_call_arg_t *arg; ir_type *param_type; - int nr = get_Proj_proj(arg_proj); + int nr = get_Proj_proj(arg_proj); + ir_mode *mode; nr = MIN(nr, n_params); arg = get_call_arg(call, 0, nr); param_type = get_method_param_type(method_type, nr); - if(arg->in_reg) { + if (arg->in_reg) { repl = pmap_get(env->regs, (void *) arg->reg); } @@ -1875,14 +1953,21 @@ static void modify_irg(be_abi_irg_t *env) } /* The stack parameter is not primitive (it is a struct or array), - we thus will create a node representing the parameter's address - on the stack. */ + we thus will create a node representing the parameter's address + on the stack. */ else { repl = be_new_FrameAddr(sp->reg_class, irg, reg_params_bl, frame_pointer, arg->stack_ent); } } assert(repl != NULL); + + /* Beware: the mode of the register parameters is always the mode of the register class + which may be wrong. Add Conv's then. */ + mode = get_irn_mode(args[i]); + if (mode != get_irn_mode(repl)) { + repl = new_r_Conv(irg, get_irn_n(repl, -1), repl, mode); + } exchange(args[i], repl); } } @@ -2034,6 +2119,7 @@ be_abi_irg_t *be_abi_introduce(be_irg_t *birg) void be_abi_free(be_abi_irg_t *env) { + be_abi_call_free(env->call); free_survive_dce(env->dce_survivor); del_pset(env->ignore_regs); pmap_destroy(env->regs); @@ -2147,6 +2233,7 @@ static int process_stack_bias(be_abi_irg_t *env, ir_node *bl, int bias) ir_node *irn; sched_foreach(bl, irn) { + int ofs; /* Check, if the node relates to an entity on the stack frame. @@ -2160,12 +2247,12 @@ static int process_stack_bias(be_abi_irg_t *env, ir_node *bl, int bias) DBG((env->dbg, LEVEL_2, "%F has offset %d (including bias %d)\n", ent, offset, bias)); } - /* - If the node modifies the stack pointer by a constant offset, - record that in the bias. - */ - if(arch_irn_is(arch_env, irn, modify_sp)) { - int ofs = arch_get_sp_bias(arch_env, irn); + if(omit_fp || be_is_IncSP(irn)) { + /* + * If the node modifies the stack pointer by a constant offset, + * record that in the bias. + */ + ofs = arch_get_sp_bias(arch_env, irn); if(be_is_IncSP(irn)) { if(ofs == BE_STACK_FRAME_SIZE_EXPAND) {