X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbeabi.c;h=2de57d9de455f706d46650b7560fe508056e61d8;hb=8694468860fe14808c20e9e246fe1368c097b322;hp=87bfeb59af15f00c379f3d9f453f4b538f846b6e;hpb=74e36002f21db2c7be0d5bd1e1a2407ae5955960;p=libfirm diff --git a/ir/be/beabi.c b/ir/be/beabi.c index 87bfeb59a..2de57d9de 100644 --- a/ir/be/beabi.c +++ b/ir/be/beabi.c @@ -8,7 +8,9 @@ #ifdef HAVE_CONFIG_H # include "config.h" #endif + #include "obst.h" +#include "offset.h" #include "type.h" #include "irgopt.h" @@ -40,6 +42,9 @@ typedef struct _be_abi_call_arg_t { int pos; const arch_register_t *reg; entity *stack_ent; + unsigned alignment; + unsigned space_before; + unsigned space_after; } be_abi_call_arg_t; struct _be_abi_call_t { @@ -69,7 +74,6 @@ struct _be_stack_slot_t { struct _be_abi_irg_t { struct obstack obst; - firm_dbg_module_t *dbg; /**< The debugging module. */ be_stack_frame_t *frame; /**< The stack frame model. */ const be_irg_t *birg; /**< The back end IRG. */ const arch_isa_t *isa; /**< The isa. */ @@ -92,19 +96,24 @@ struct _be_abi_irg_t { void *cb; /**< ABI Callback self pointer. */ + pmap *keep_map; /**< mapping blocks to keep nodes. */ + pset *ignore_regs; /**< Additional registers which shall be ignored. */ + arch_irn_handler_t irn_handler; arch_irn_ops_t irn_ops; + DEBUG_ONLY(firm_dbg_module_t *dbg;) /**< The debugging module. */ }; -#define abi_offset_of(type,member) ((char *) &(((type *) 0)->member) - (char *) 0) -#define abi_get_relative(ptr, member) ((void *) ((char *) (ptr) - abi_offset_of(be_abi_irg_t, member))) -#define get_abi_from_handler(ptr) abi_get_relative(ptr, irn_handler) -#define get_abi_from_ops(ptr) abi_get_relative(ptr, irn_ops) +#define get_abi_from_handler(ptr) firm_container_of(ptr, be_abi_irg_t, irn_handler) +#define get_abi_from_ops(ptr) firm_container_of(ptr, be_abi_irg_t, irn_ops) /* Forward, since be need it in be_abi_introduce(). */ static const arch_irn_ops_if_t abi_irn_ops; static const arch_irn_handler_t abi_irn_handler; +/* Flag: if set, try to omit the frame pointer if called by the backend */ +int be_omit_fp = 1; + /* _ ____ ___ ____ _ _ _ _ / \ | __ )_ _| / ___|__ _| | | |__ __ _ ___| | _____ @@ -116,12 +125,23 @@ static const arch_irn_handler_t abi_irn_handler; for a specific call type. */ +/** + * Set compare function: compares two ABI call object arguments. + */ static int cmp_call_arg(const void *a, const void *b, size_t n) { const be_abi_call_arg_t *p = a, *q = b; return !(p->is_res == q->is_res && p->pos == q->pos); } +/** + * Get or set 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) { be_abi_call_arg_t arg; @@ -131,28 +151,40 @@ static be_abi_call_arg_t *get_or_set_call_arg(be_abi_call_t *call, int is_res, i arg.is_res = is_res; arg.pos = pos; - hash = is_res * 100 + pos; + hash = is_res * 128 + pos; return do_insert ? set_insert(call->params, &arg, sizeof(arg), hash) : set_find(call->params, &arg, sizeof(arg), hash); } +/** + * Retrieve an ABI call object argument. + * + * @param call the ABI call object + * @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) { return get_or_set_call_arg(call, is_res, pos, 0); } +/* Set the flags for a call. */ void be_abi_call_set_flags(be_abi_call_t *call, be_abi_call_flags_t flags, const be_abi_callbacks_t *cb) { call->flags = flags; call->cb = cb; } -void be_abi_call_param_stack(be_abi_call_t *call, int arg_pos) +void be_abi_call_param_stack(be_abi_call_t *call, int arg_pos, unsigned alignment, unsigned space_before, unsigned space_after) { be_abi_call_arg_t *arg = get_or_set_call_arg(call, 0, arg_pos, 1); - arg->on_stack = 1; + arg->on_stack = 1; + arg->alignment = alignment; + arg->space_before = space_before; + arg->space_after = space_after; + assert(alignment > 0 && "Alignment must be greater than 0"); } void be_abi_call_param_reg(be_abi_call_t *call, int arg_pos, const arch_register_t *reg) @@ -169,21 +201,32 @@ void be_abi_call_res_reg(be_abi_call_t *call, int arg_pos, const arch_register_t arg->reg = reg; } +/* Get the flags of a ABI call object. */ be_abi_call_flags_t be_abi_call_get_flags(const be_abi_call_t *call) { return call->flags; } -be_abi_call_t *be_abi_call_new(void) +/** + * Constructor for a new ABI call object. + * + * @return the new ABI call object + */ +static be_abi_call_t *be_abi_call_new() { - be_abi_call_t *call = malloc(sizeof(call[0])); + be_abi_call_t *call = xmalloc(sizeof(call[0])); call->flags.val = 0; call->params = new_set(cmp_call_arg, 16); call->cb = NULL; + + call->flags.bits.try_omit_fp = be_omit_fp; return call; } -void be_abi_call_free(be_abi_call_t *call) +/** + * Destructor for an ABI call object. + */ +static void be_abi_call_free(be_abi_call_t *call) { del_set(call->params); free(call); @@ -232,6 +275,9 @@ static int get_stack_entity_offset(be_stack_frame_t *frame, entity *ent, int bia return ofs; } +/** + * Retrieve the entity with given offset from a frame type. + */ static entity *search_ent_with_offset(type *t, int offset) { int i, n; @@ -293,14 +339,12 @@ static void stack_frame_dump(FILE *file, be_stack_frame_t *frame) } /** - * If irn is a Sel node computing the address of an entity + * If irn is a Sel node computes the address of an entity * on the frame type return the entity, else NULL. */ static INLINE entity *get_sel_ent(ir_node *irn) { - if(get_irn_opcode(irn) == iro_Sel - && get_Sel_ptr(irn) == get_irg_frame(get_irn_irg(irn))) { - + if(is_Sel(irn) && get_Sel_ptr(irn) == get_irg_frame(get_irn_irg(irn))) { return get_Sel_entity(irn); } @@ -323,12 +367,14 @@ static void lower_frame_sels_walker(ir_node *irn, void *data) ir_node *frame = get_irg_frame(irg); nw = be_new_FrameAddr(env->isa->sp->reg_class, irg, bl, frame, ent); - } - - if(nw != NULL) exchange(irn, nw); + } } +/** + * 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) { be_abi_call_arg_t *arg = get_call_arg(call, 0, pos); @@ -371,6 +417,7 @@ static ir_node *adjust_call(be_abi_irg_t *env, ir_node *irn, ir_node *curr_sp) ir_mode *mach_mode = sp->reg_class->mode; struct obstack *obst = &env->obst; ir_node *no_mem = get_irg_no_mem(irg); + int no_alloc = call->flags.bits.frame_is_setup_on_call; ir_node *res_proj = NULL; int curr_res_proj = pn_Call_max; @@ -394,7 +441,10 @@ 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, i); assert(arg); if(arg->on_stack) { + stack_size += arg->space_before; + stack_size = round_up2(stack_size, arg->alignment); stack_size += get_type_size_bytes(get_method_param_type(mt, i)); + stack_size += arg->space_after; obstack_int_grow(obst, i); n_pos++; } @@ -414,11 +464,15 @@ static ir_node *adjust_call(be_abi_irg_t *env, ir_node *irn, ir_node *curr_sp) /* If there are some parameters which shall be passed on the stack. */ if(n_pos > 0) { int curr_ofs = 0; - int do_seq = call->flags.bits.store_args_sequential; + int do_seq = call->flags.bits.store_args_sequential && !no_alloc; - /* Reverse list of stack parameters if call arguments are from left to right */ - if(call->flags.bits.left_to_right) { - for(i = 0; i < n_pos / 2; ++i) { + /* + * Reverse list of stack parameters if call arguments are from left to right. + * We must them reverse again in they are pushed (not stored) and the stack + * 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]; @@ -428,55 +482,64 @@ static ir_node *adjust_call(be_abi_irg_t *env, ir_node *irn, ir_node *curr_sp) /* * If the stack is decreasing and we do not want to store sequentially, + * or someone else allocated the call frame * 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) { - curr_sp = be_new_IncSP(sp, irg, bl, curr_sp, no_mem, stack_size, be_stack_dir_along); + if(stack_dir < 0 && !do_seq && !no_alloc) { + curr_sp = be_new_IncSP(sp, irg, bl, curr_sp, no_mem, stack_size, be_stack_dir_expand); } assert(mode_is_reference(mach_mode) && "machine mode must be pointer"); for(i = 0; i < n_pos; ++i) { - int p = pos[i]; - ir_node *param = get_Call_param(irn, p); - ir_node *addr = curr_sp; - ir_node *mem = NULL; - type *param_type = get_method_param_type(mt, p); - int param_size = get_type_size_bytes(param_type); - - /* Make the expression to compute the argument's offset. */ - if(curr_ofs > 0) { - addr = new_r_Const_long(irg, bl, mode_Is, curr_ofs); - addr = new_r_Add(irg, bl, curr_sp, addr, mach_mode); + int p = pos[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; + ir_node *mem = NULL; + type *param_type = get_method_param_type(mt, p); + int param_size = get_type_size_bytes(param_type) + arg->space_after; + + /* + * If we wanted to build the arguments sequentially, + * the stack pointer for the next must be incremented, + * and the memory value propagated. + */ + if (do_seq) { + curr_ofs = 0; + addr = curr_sp = be_new_IncSP(sp, irg, bl, curr_sp, curr_mem, + param_size + arg->space_before, be_stack_dir_expand); + } + else { + curr_ofs += arg->space_before; + curr_ofs = round_up2(curr_ofs, arg->alignment); + + /* Make the expression to compute the argument's offset. */ + if(curr_ofs > 0) { + addr = new_r_Const_long(irg, bl, mode_Is, curr_ofs); + addr = new_r_Add(irg, bl, curr_sp, addr, mach_mode); + } } /* Insert a store for primitive arguments. */ - if(is_atomic_type(param_type)) { + if (is_atomic_type(param_type)) { mem = new_r_Store(irg, bl, curr_mem, addr, param); mem = new_r_Proj(irg, bl, mem, mode_M, pn_Store_M); } - /* Make a memcopy for compound arguments. */ + /* Make a mem copy for compound arguments. */ else { assert(mode_is_reference(get_irn_mode(param))); mem = new_r_CopyB(irg, bl, curr_mem, addr, param, param_type); mem = new_r_Proj(irg, bl, mem, mode_M, pn_CopyB_M_regular); } - obstack_ptr_grow(obst, mem); - curr_ofs += param_size; - /* - * If we wanted to build the arguments sequentially, - * the stack pointer for the next must be incremented, - * and the memory value propagated. - */ - if(do_seq) { - curr_ofs = 0; - curr_sp = be_new_IncSP(sp, irg, bl, curr_sp, no_mem, param_size, be_stack_dir_along); + if (do_seq) curr_mem = mem; - } + else + obstack_ptr_grow(obst, mem); } in = (ir_node **) obstack_finish(obst); @@ -499,11 +562,20 @@ static ir_node *adjust_call(be_abi_irg_t *env, ir_node *irn, ir_node *curr_sp) } /* search the greatest result proj number */ + + /* TODO: what if the result is NOT used? Currently there is + * no way to detect this later, especially there is no way to + * see this in the proj numbers. + * While this is ok for the register allocator, it is bad for + * backends which need to change the be_Call further (x87 simulator + * for instance. However for this particular case the call_type is + * sufficient.). + */ foreach_out_edge(irn, edge) { const ir_edge_t *res_edge; ir_node *irn = get_edge_src_irn(edge); - if(is_Proj(irn) && get_irn_mode(irn) == mode_T) { + if(is_Proj(irn) && get_Proj_proj(irn) == pn_Call_T_result) { res_proj = irn; foreach_out_edge(irn, res_edge) { int proj; @@ -518,19 +590,22 @@ static ir_node *adjust_call(be_abi_irg_t *env, ir_node *irn, ir_node *curr_sp) /* shift the proj number to the right, since we will drop the unspeakable Proj_T from the Call. Therefore, all real argument - Proj numbers must be increased by pn_Call_max + Proj numbers must be increased by pn_be_Call_first_res */ - proj += pn_Call_max; + proj += pn_be_Call_first_res; set_Proj_proj(res, proj); obstack_ptr_grow(obst, res); 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)) + } } } } + curr_res_proj++; obstack_ptr_grow(obst, NULL); res_projs = obstack_finish(obst); @@ -540,20 +615,33 @@ static ir_node *adjust_call(be_abi_irg_t *env, ir_node *irn, ir_node *curr_sp) obstack_ptr_grow(obst, get_Call_param(irn, low_args[i])); in = obstack_finish(obst); + if(env->call->flags.bits.call_has_imm && get_irn_opcode(call_ptr) == iro_SymConst) { - low_call = be_new_Call(irg, bl, curr_mem, curr_sp, curr_sp, curr_res_proj, n_low_args, in); + 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), n_low_args, in, + get_Call_type(irn)); be_Call_set_entity(low_call, get_SymConst_entity(call_ptr)); } else - low_call = be_new_Call(irg, bl, curr_mem, curr_sp, call_ptr, curr_res_proj, n_low_args, in); + 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), n_low_args, in, + get_Call_type(irn)); + + /* + TODO: + Set the register class of the call address to the same as the stack pointer's. + That' probably buggy for some architectures. + */ + be_node_set_reg_class(low_call, be_pos_Call_ptr, sp->reg_class); /* Set the register classes and constraints of the Call parameters. */ for(i = 0; i < n_low_args; ++i) { int index = low_args[i]; be_abi_call_arg_t *arg = get_call_arg(call, 0, index); assert(arg->reg != NULL); - be_set_constr_single_reg(low_call, index, arg->reg); + + be_set_constr_single_reg(low_call, be_pos_Call_first_arg + index, arg->reg); } /* Set the register constraints of the results. */ @@ -582,11 +670,13 @@ static ir_node *adjust_call(be_abi_irg_t *env, ir_node *irn, ir_node *curr_sp) int i, n; for(reg = pset_first(caller_save), n = 0; reg; reg = pset_next(caller_save), ++n) { - ir_node *proj = new_r_Proj(irg, bl, low_call, reg->reg_class->mode, curr_res_proj++); + 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); set_irn_link(proj, (void *) reg); obstack_ptr_grow(obst, proj); + curr_res_proj++; } in = (ir_node **) obstack_finish(obst); @@ -613,8 +703,9 @@ 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); - /* Make a Proj for the stack pointer. */ - curr_sp = be_new_IncSP(sp, irg, bl, curr_sp, mem_proj, stack_size, be_stack_dir_against); + /* Clean up the stack frame if we allocated it */ + if(!no_alloc) + curr_sp = be_new_IncSP(sp, irg, bl, curr_sp, mem_proj, stack_size, be_stack_dir_shrink); } be_abi_call_free(call); @@ -631,7 +722,7 @@ static ir_node *adjust_call(be_abi_irg_t *env, ir_node *irn, ir_node *curr_sp) */ static ir_node *adjust_alloc(be_abi_irg_t *env, ir_node *alloc, ir_node *curr_sp) { - if(get_Alloc_where(alloc) == stack_alloc) { + if (get_Alloc_where(alloc) == stack_alloc) { ir_node *bl = get_nodes_block(alloc); ir_graph *irg = get_irn_irg(bl); ir_node *alloc_mem = NULL; @@ -640,10 +731,6 @@ static ir_node *adjust_alloc(be_abi_irg_t *env, ir_node *alloc, ir_node *curr_sp const ir_edge_t *edge; ir_node *new_alloc; - env->call->flags.bits.try_omit_fp = 0; - - new_alloc = be_new_AddSP(env->isa->sp, irg, bl, curr_sp, get_Alloc_size(alloc)); - foreach_out_edge(alloc, edge) { ir_node *irn = get_edge_src_irn(edge); @@ -660,7 +747,19 @@ static ir_node *adjust_alloc(be_abi_irg_t *env, ir_node *alloc, ir_node *curr_sp } } - assert(alloc_res != NULL); + /* Beware: currently Alloc nodes without a result might happen, + only escape analysis kills them and this phase runs only for object + oriented source. We kill the Alloc here. */ + if (alloc_res == NULL) { + exchange(alloc_mem, get_Alloc_mem(alloc)); + return curr_sp; + } + + /* The stack pointer will be modified in an unknown manner. + We cannot omit it. */ + env->call->flags.bits.try_omit_fp = 0; + new_alloc = be_new_AddSP(env->isa->sp, irg, bl, curr_sp, get_Alloc_size(alloc)); + exchange(alloc_res, env->isa->stack_dir < 0 ? new_alloc : curr_sp); if(alloc_mem != NULL) @@ -764,6 +863,7 @@ static void process_calls_in_block(ir_node *bl, void *data) /* If there were call nodes in the block. */ if(n > 0) { + ir_node *keep; ir_node **nodes; int i; @@ -791,7 +891,8 @@ static void process_calls_in_block(ir_node *bl, void *data) /* Keep the last stack state in the block by tying it to Keep node */ nodes[0] = curr_sp; - be_new_Keep(env->isa->sp->reg_class, get_irn_irg(bl), bl, 1, nodes); + 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); @@ -817,6 +918,7 @@ static void collect_return_walker(ir_node *irn, void *data) } } +#if 0 /* static ir_node *setup_frame(be_abi_irg_t *env) { const arch_isa_t *isa = env->birg->main_env->arch_env->isa; @@ -833,7 +935,7 @@ static ir_node *setup_frame(be_abi_irg_t *env) 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, be_stack_dir_along); + stack = be_new_IncSP(sp, irg, bl, stack, no_mem, BE_STACK_FRAME_SIZE, be_stack_dir_expand); frame = stack; } @@ -847,7 +949,7 @@ static ir_node *setup_frame(be_abi_irg_t *env) 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, be_stack_dir_along); + stack = be_new_IncSP(sp, irg, bl, stack, frame, BE_STACK_FRAME_SIZE, be_stack_dir_expand); } be_node_set_flags(env->reg_params, -(stack_nr + 1), arch_irn_flags_ignore); @@ -872,7 +974,7 @@ static void clearup_frame(be_abi_irg_t *env, ir_node *ret, pmap *reg_map, struct 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, be_stack_dir_against); + stack = be_new_IncSP(sp, irg, bl, stack, ret_mem, BE_STACK_FRAME_SIZE, be_stack_dir_shrink); } else { @@ -886,13 +988,15 @@ static void clearup_frame(be_abi_irg_t *env, ir_node *ret, pmap *reg_map, struct ir_node *irn = ent->value; if(reg == sp) - irn = stack; + obstack_ptr_grow(&env->obst, stack); else if(reg == bp) - irn = frame; - - obstack_ptr_grow(obst, irn); + 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 static ir_type *compute_arg_type(be_abi_irg_t *env, be_abi_call_t *call, ir_type *method_type) { @@ -916,7 +1020,10 @@ static ir_type *compute_arg_type(be_abi_irg_t *env, be_abi_call_t *call, ir_type if(arg->on_stack) { 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_bytes(arg->stack_ent, ofs); + ofs += arg->space_after; ofs += get_type_size_bytes(param_type); } } @@ -967,17 +1074,55 @@ static void create_register_perms(const arch_isa_t *isa, ir_graph *irg, ir_node obstack_free(&obst, NULL); } -static void create_barrier(be_abi_irg_t *env, ir_node *bl, ir_node **mem, pmap *regs) +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 = a; + const reg_node_map_t *q = b; + + 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; +} + +static reg_node_map_t *reg_map_to_arr(struct obstack *obst, pmap *reg_map) +{ + pmap_entry *ent; + int n = pmap_count(reg_map); + int i = 0; + reg_node_map_t *res = obstack_alloc(obst, n * sizeof(res[0])); + + pmap_foreach(reg_map, ent) { + res[i].reg = ent->key; + res[i].irn = ent->value; + i++; + } + + qsort(res, n, sizeof(res[0]), cmp_regs); + return res; +} + +/** + * Creates a barrier. + */ +static ir_node *create_barrier(be_abi_irg_t *env, ir_node *bl, ir_node **mem, pmap *regs, int in_req) { ir_graph *irg = env->birg->irg; - int i, j, n; + int n_regs = pmap_count(regs); + int n; ir_node *irn; ir_node **in; - pmap_entry *ent; + reg_node_map_t *rm; + rm = reg_map_to_arr(&env->obst, regs); - for(ent = pmap_first(regs), n = 0; ent; ent = pmap_next(regs), ++n) - obstack_ptr_grow(&env->obst, ent->value); + for(n = 0; n < n_regs; ++n) + obstack_ptr_grow(&env->obst, rm[n].irn); if(mem) { obstack_ptr_grow(&env->obst, *mem); @@ -985,25 +1130,152 @@ static void create_barrier(be_abi_irg_t *env, ir_node *bl, ir_node **mem, pmap * } in = (ir_node **) obstack_finish(&env->obst); - irn = be_new_Barrier(env->birg->irg, bl, n, in); + irn = be_new_Barrier(irg, bl, n, in); obstack_free(&env->obst, in); - for(ent = pmap_first(regs), n = 0; ent; ent = pmap_next(regs), ++n) { - int pos = BE_OUT_POS(n); - const arch_register_t *reg = ent->key; + 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; - ent->value = new_r_Proj(env->birg->irg, bl, irn, get_irn_mode(ent->value), n); - be_set_constr_single_reg(irn, n, reg); + proj = new_r_Proj(irg, bl, irn, get_irn_mode(rm[n].irn), n); + be_node_set_reg_class(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, ent->value, reg); - if(arch_register_type_is(reg, ignore)) - be_node_set_flags(irn, pos, arch_irn_flags_ignore); + 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); + + pmap_insert(regs, (void *) reg, proj); } if(mem) { - *mem = new_r_Proj(env->birg->irg, bl, irn, mode_M, n); + *mem = new_r_Proj(irg, bl, irn, mode_M, n); + } + + obstack_free(&env->obst, rm); + 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 + */ +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; + const arch_isa_t *isa = env->birg->main_env->arch_env->isa; + + pmap *reg_map = pmap_create(); + ir_node *keep = pmap_get(env->keep_map, bl); + int in_max; + ir_node *ret; + int i, n; + ir_node **in; + ir_node *stack; + const arch_register_t **regs; + pmap_entry *ent ; + + /* + get the valid stack node in this block. + If we had a call in that block there is a Keep constructed by process_calls() + which points to the last stack modification in that block. we'll use + it then. Else we use the stack from the start block and let + the ssa construction fix the usage. + */ + 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)); + } + + /* Insert results for Return into the register map. */ + for(i = 0; i < n_res; ++i) { + ir_node *res = get_Return_res(irn, i); + be_abi_call_arg_t *arg = get_call_arg(call, 1, i); + assert(arg->in_reg && "return value must be passed in register"); + pmap_insert(reg_map, (void *) arg->reg, res); + } + + /* Add uses of the callee save registers. */ + pmap_foreach(env->regs, ent) { + const arch_register_t *reg = ent->key; + if(arch_register_type_is(reg, callee_save) || arch_register_type_is(reg, ignore)) + pmap_insert(reg_map, ent->key, ent->value); } + + be_abi_reg_map_set(reg_map, isa->sp, stack); + + /* Make the Epilogue node and call the arch's epilogue maker. */ + create_barrier(env, 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 + */ + in_max = pmap_count(reg_map) + n_res + 2; + + in = obstack_alloc(&env->obst, in_max * sizeof(in[0])); + regs = obstack_alloc(&env->obst, in_max * sizeof(regs[0])); + + in[0] = mem; + in[1] = be_abi_reg_map_get(reg_map, isa->sp); + regs[0] = NULL; + regs[1] = isa->sp; + n = 2; + + /* clear SP entry, since it has already been grown. */ + pmap_insert(reg_map, (void *) isa->sp, NULL); + for(i = 0; i < n_res; ++i) { + ir_node *res = get_Return_res(irn, i); + be_abi_call_arg_t *arg = get_call_arg(call, 1, i); + + in[n] = be_abi_reg_map_get(reg_map, arg->reg); + regs[n++] = arg->reg; + + /* Clear the map entry to mark the register as processed. */ + be_abi_reg_map_set(reg_map, arg->reg, NULL); + } + + /* grow the rest of the stuff. */ + pmap_foreach(reg_map, ent) { + if(ent->value) { + in[n] = ent->value; + regs[n++] = ent->key; + } + } + + /* 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); + + /* 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); + + /* Free the space of the Epilog's in array and the register <-> proj map. */ + obstack_free(&env->obst, in); + pmap_destroy(reg_map); + + return ret; } /** @@ -1011,7 +1283,6 @@ static void create_barrier(be_abi_irg_t *env, ir_node *bl, ir_node **mem, pmap * */ static void modify_irg(be_abi_irg_t *env) { - firm_dbg_module_t *dbg = env->dbg; be_abi_call_t *call = env->call; const arch_isa_t *isa = env->birg->main_env->arch_env->isa; const arch_register_t *sp = arch_isa_sp(isa); @@ -1020,24 +1291,25 @@ static void modify_irg(be_abi_irg_t *env) ir_node *end = get_irg_end_block(irg); ir_node *arg_tuple = get_irg_args(irg); ir_node *no_mem = get_irg_no_mem(irg); + ir_node *mem = get_irg_initial_mem(irg); type *method_type = get_entity_type(get_irg_entity(irg)); pset *dont_save = pset_new_ptr(8); - pmap *reg_proj_map = pmap_create(); int n_params = get_method_n_params(method_type); int max_arg = 0; - int arg_offset = 0; int i, j, n; + reg_node_map_t *rm; const arch_register_t *fp_reg; ir_node *frame_pointer; + ir_node *barrier; ir_node *reg_params_bl; ir_node **args; const ir_edge_t *edge; ir_type *arg_type, *bet_type; - pmap_entry *ent; bitset_t *used_proj_nr; + DEBUG_ONLY(firm_dbg_module_t *dbg = env->dbg;) DBG((dbg, LEVEL_1, "introducing abi on %+F\n", irg)); @@ -1053,10 +1325,11 @@ static void modify_irg(be_abi_irg_t *env) int nr = get_Proj_proj(irn); max_arg = MAX(max_arg, nr); } - max_arg += 1; - args = obstack_alloc(&env->obst, max_arg * sizeof(args[0])); - memset(args, 0, max_arg * sizeof(args[0])); + used_proj_nr = bitset_alloca(1024); + max_arg = MAX(max_arg + 1, n_params); + args = obstack_alloc(&env->obst, max_arg * sizeof(args[0])); + memset(args, 0, max_arg * sizeof(args[0])); /* Fill the argument vector */ foreach_out_edge(arg_tuple, edge) { @@ -1073,7 +1346,7 @@ static void modify_irg(be_abi_irg_t *env) /* Count the register params and add them to the number of Projs for the RegParams node */ for(i = 0; i < n_params; ++i) { be_abi_call_arg_t *arg = get_call_arg(call, 0, i); - if(arg->in_reg) { + if(arg->in_reg && args[i]) { assert(arg->reg != sp && "cannot use stack pointer as parameter register"); assert(i == get_Proj_proj(args[i])); @@ -1089,7 +1362,7 @@ static void modify_irg(be_abi_irg_t *env) 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 = &cls->regs[j]; - if(arch_register_type_is(reg, callee_save)) + if(arch_register_type_is(reg, callee_save) || arch_register_type_is(reg, ignore)) pmap_insert(env->regs, (void *) reg, NULL); } } @@ -1106,38 +1379,58 @@ static void modify_irg(be_abi_irg_t *env) * Note, that if a register corresponds to an argument, the regs map contains * the old Proj from start for that argument. */ - pmap_foreach(env->regs, ent) { - arch_register_t *reg = ent->key; - ir_node *arg_proj = ent->value; + + 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_node *arg_proj = rm[i].irn; ir_mode *mode = arg_proj ? get_irn_mode(arg_proj) : reg->reg_class->mode; - long nr = arg_proj ? get_Proj_proj(arg_proj) : (long) bitset_next_clear(used_proj_nr, 0); + long nr = i; int pos = BE_OUT_POS((int) nr); + int flags = 0; + + ir_node *proj; assert(nr >= 0); bitset_set(used_proj_nr, nr); - ent->value = new_r_Proj(irg, reg_params_bl, env->reg_params, mode, 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, ent->value, 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)) - be_node_set_flags(env->reg_params, pos, arch_irn_flags_ignore); + flags |= arch_irn_flags_ignore; + + if(reg == sp) + flags |= arch_irn_flags_modify_sp; + + be_node_set_flags(env->reg_params, pos, flags); DBG((dbg, LEVEL_2, "\tregister save proj #%d -> reg %s\n", nr, reg->name)); } + obstack_free(&env->obst, rm); /* Generate the Prologue */ - fp_reg = call->cb->prologue(env->cb, env->regs); - create_barrier(env, bl, NULL, env->regs); - env->init_sp = pmap_get(env->regs, (void *) sp); - env->init_sp = be_new_IncSP(sp, irg, bl, env->init_sp, no_mem, BE_STACK_FRAME_SIZE, be_stack_dir_along); + fp_reg = call->cb->prologue(env->cb, &mem, env->regs); + + /* 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, irg, bl, env->init_sp, no_mem, BE_STACK_FRAME_SIZE, be_stack_dir_expand); + be_abi_reg_map_set(env->regs, sp, env->init_sp); + + barrier = create_barrier(env, 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); - pmap_insert(env->regs, (void *) sp, env->init_sp); - frame_pointer = pmap_get(env->regs, (void *) fp_reg); + + frame_pointer = be_abi_reg_map_get(env->regs, fp_reg); set_irg_frame(irg, frame_pointer); + pset_insert_ptr(env->ignore_regs, fp_reg); /* Now, introduce stack param nodes for all parameters passed on the stack */ for(i = 0; i < max_arg; ++i) { @@ -1174,77 +1467,23 @@ static void modify_irg(be_abi_irg_t *env) } assert(repl != NULL); - exchange(args[i], repl); + edges_reroute(args[i], repl, irg); } } /* All Return nodes hang on the End node, so look for them there. */ - for(i = 0, n = get_irn_arity(end); i < n; ++i) { - ir_node *irn = get_irn_n(end, i); - - if(get_irn_opcode(irn) == iro_Return) { - ir_node *bl = get_nodes_block(irn); - int n_res = get_Return_n_ress(irn); - pmap *reg_map = pmap_create(); - ir_node *mem = get_Return_mem(irn); - ir_node *ret; - int i, n; - ir_node **in; - - pmap_insert(reg_map, (void *) sp, pmap_get(env->regs, (void *) sp)); - - /* Insert results for Return into the register map. */ - for(i = 0; i < n_res; ++i) { - ir_node *res = get_Return_res(irn, i); - be_abi_call_arg_t *arg = get_call_arg(call, 1, i); - assert(arg->in_reg && "return value must be passed in register"); - pmap_insert(reg_map, (void *) arg->reg, res); - } - - /* Add uses of the callee save registers. */ - pmap_foreach(env->regs, ent) { - const arch_register_t *reg = ent->key; - if(arch_register_type_is(reg, callee_save) || arch_register_type_is(reg, ignore)) - pmap_insert(reg_map, ent->key, ent->value); - } + for (i = 0, n = get_Block_n_cfgpreds(end); i < n; ++i) { + ir_node *irn = get_Block_cfgpred(end, i); - /* Make the Epilogue node and call the arch's epilogue maker. */ - create_barrier(env, bl, &mem, reg_map); - call->cb->epilogue(env->cb, bl, &mem, reg_map); - - obstack_ptr_grow(&env->obst, mem); - obstack_ptr_grow(&env->obst, pmap_get(reg_map, (void *) sp)); - - /* clear SP entry, since it has already been grown. */ - pmap_insert(reg_map, (void *) sp, NULL); - for(i = 0; i < n_res; ++i) { - ir_node *res = get_Return_res(irn, i); - be_abi_call_arg_t *arg = get_call_arg(call, 1, i); - - obstack_ptr_grow(&env->obst, pmap_get(reg_map, (void *) arg->reg)); - - /* Clear the map entry to mark the register as processed. */ - pmap_insert(reg_map, (void *) arg->reg, NULL); - } - - /* grow the rest of the stuff. */ - pmap_foreach(reg_map, ent) { - if(ent->value) - obstack_ptr_grow(&env->obst, ent->value); - } - - /* The in array for the new back end return is now ready. */ - n = obstack_object_size(&env->obst) / sizeof(in[0]); - in = obstack_finish(&env->obst); - ret = be_new_Return(irg, bl, n, in); - - /* Free the space of the Epilog's in array and the register <-> proj map. */ - obstack_free(&env->obst, in); + if (is_Return(irn)) { + ir_node *ret = create_be_return(env, irn, get_nodes_block(irn), get_Return_mem(irn), get_Return_n_ress(irn)); exchange(irn, ret); - pmap_destroy(reg_map); } } + /* if we have endless loops here, n might be <= 0. Do NOT create a be_Return than, + the code is dead and will never be executed. */ + del_pset(dont_save); obstack_free(&env->obst, args); } @@ -1267,20 +1506,22 @@ be_abi_irg_t *be_abi_introduce(be_irg_t *birg) pmap_entry *ent; ir_node *dummy; + obstack_init(&env->obst); + env->isa = birg->main_env->arch_env->isa; env->method_type = get_entity_type(get_irg_entity(irg)); env->call = be_abi_call_new(); arch_isa_get_call_abi(env->isa, env->method_type, env->call); + env->ignore_regs = pset_new_ptr_default(); + env->keep_map = pmap_create(); env->dce_survivor = new_survive_dce(); env->birg = birg; - env->dbg = firm_dbg_register("firm.be.abi"); env->stack_phis = pset_new_ptr(16); env->init_sp = dummy = new_r_Unknown(irg, env->isa->sp->reg_class->mode); + FIRM_DBG_REGISTER(env->dbg, "firm.be.abi"); - env->cb = env->call->cb->init(env->call, env->isa, irg); - - obstack_init(&env->obst); + env->cb = env->call->cb->init(env->call, birg->main_env->arch_env, irg); memcpy(&env->irn_handler, &abi_irn_handler, sizeof(abi_irn_handler)); env->irn_ops.impl = &abi_irn_ops; @@ -1291,6 +1532,9 @@ be_abi_irg_t *be_abi_introduce(be_irg_t *birg) /* Process the IRG */ modify_irg(env); + /* We don't need the keep map anymore. */ + pmap_destroy(env->keep_map); + /* reroute the stack origin of the calls to the true stack origin. */ edges_reroute(dummy, env->init_sp, irg); edges_reroute(old_frame, get_irg_frame(irg), irg); @@ -1311,12 +1555,22 @@ void be_abi_free(be_abi_irg_t *env) { free_survive_dce(env->dce_survivor); del_pset(env->stack_phis); + del_pset(env->ignore_regs); pmap_destroy(env->regs); obstack_free(&env->obst, NULL); arch_env_pop_irn_handler(env->birg->main_env->arch_env); free(env); } +void be_abi_put_ignore_regs(be_abi_irg_t *abi, const arch_register_class_t *cls, bitset_t *bs) +{ + arch_register_t *reg; + + for(reg = pset_first(abi->ignore_regs); reg; reg = pset_next(abi->ignore_regs)) + if(reg->reg_class == cls) + bitset_set(bs, reg->index); +} + /* @@ -1328,24 +1582,35 @@ void be_abi_free(be_abi_irg_t *env) */ +struct fix_stack_walker_info { + nodeset *nodes; + const arch_env_t *aenv; +}; + +/** + * Walker. Collect all stack modifying nodes. + */ static void collect_stack_nodes_walker(ir_node *irn, void *data) { - pset *s = data; + struct fix_stack_walker_info *info = data; - if(be_is_AddSP(irn) || be_is_IncSP(irn) || be_is_SetSP(irn)) - pset_insert_ptr(s, irn); + if(arch_irn_is(info->aenv, irn, modify_sp)) + pset_insert_ptr(info->nodes, irn); } void be_abi_fix_stack_nodes(be_abi_irg_t *env) { dom_front_info_t *df; - pset *stack_nodes; + pset *stack_nodes = pset_new_ptr(16); + struct fix_stack_walker_info info; + + info.nodes = stack_nodes; + info.aenv = env->birg->main_env->arch_env; /* We need dominance frontiers for fix up */ df = be_compute_dominance_frontiers(env->birg->irg); - stack_nodes = pset_new_ptr(16); + irg_walk_graph(env->birg->irg, collect_stack_nodes_walker, NULL, &info); pset_insert_ptr(stack_nodes, env->init_sp); - irg_walk_graph(env->birg->irg, collect_stack_nodes_walker, NULL, stack_nodes); be_ssa_constr_set_phis(df, stack_nodes, env->stack_phis); del_pset(stack_nodes); @@ -1357,22 +1622,21 @@ void be_abi_fix_stack_nodes(be_abi_irg_t *env) } /** - * Translates a direction of an IncSP node (either be_stack_dir_against, or ...along) + * Translates a direction of an IncSP node (either be_stack_dir_shrink, or ...expand) * into -1 or 1, respectively. * @param irn The node. * @return 1, if the direction of the IncSP was along, -1 if against. */ static int get_dir(ir_node *irn) { - return 1 - 2 * (be_get_IncSP_direction(irn) == be_stack_dir_against); + return 1 - 2 * (be_get_IncSP_direction(irn) == be_stack_dir_shrink); } static int process_stack_bias(be_abi_irg_t *env, ir_node *bl, int bias) { const arch_env_t *aenv = env->birg->main_env->arch_env; + int omit_fp = env->call->flags.bits.try_omit_fp; ir_node *irn; - int start_bias = bias; - int omit_fp = env->call->flags.bits.try_omit_fp; sched_foreach(bl, irn) { @@ -1419,6 +1683,9 @@ struct bias_walk { int start_block_bias; /**< The bias at the end of the start block. */ }; +/** + * Block-Walker: fix all stack offsets + */ static void stack_bias_walker(ir_node *bl, void *data) { if(bl != get_irg_start_block(get_irn_irg(bl))) { @@ -1435,7 +1702,7 @@ void be_abi_fix_stack_bias(be_abi_irg_t *env) stack_frame_compute_initial_offset(env->frame); // stack_frame_dump(stdout, env->frame); - /* Determine the stack bias at the and of the start block. */ + /* Determine the stack bias at the end of the start block. */ bw.start_block_bias = process_stack_bias(env, get_irg_start_block(irg), 0); /* fix the bias is all other blocks */ @@ -1522,7 +1789,7 @@ static arch_irn_class_t abi_classify(const void *_self, const ir_node *irn) static arch_irn_flags_t abi_get_flags(const void *_self, const ir_node *irn) { - return arch_irn_flags_ignore; + return arch_irn_flags_ignore | arch_irn_flags_modify_sp; } static entity *abi_get_frame_entity(const void *_self, const ir_node *irn)