X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbeabi.c;h=e631e02e34e48f79744c9fa846a4af74fb04db5f;hb=94e9283b212f0f10b460248de945576a0bb61703;hp=2bb75989b75f4446f89680d19acd089e3bd017f8;hpb=9a6232862313e1e255e8039f2d2144cde9f671ad;p=libfirm diff --git a/ir/be/beabi.c b/ir/be/beabi.c index 2bb75989b..e631e02e3 100644 --- a/ir/be/beabi.c +++ b/ir/be/beabi.c @@ -39,6 +39,7 @@ #include "irprintf_t.h" #include "irgopt.h" #include "irbitset.h" +#include "iropt_t.h" #include "height.h" #include "pdeq.h" #include "irtools.h" @@ -48,12 +49,15 @@ #include "be.h" #include "beabi.h" -#include "bearch_t.h" -#include "benode_t.h" +#include "bearch.h" +#include "benode.h" #include "belive_t.h" -#include "besched_t.h" -#include "beirg_t.h" +#include "besched.h" +#include "beirg.h" #include "bessaconstr.h" +#include "bemodule.h" + +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. */ @@ -82,8 +86,8 @@ struct _be_abi_call_t { * The ABI information for the current birg. */ struct _be_abi_irg_t { - struct obstack obst; be_irg_t *birg; /**< The back end IRG. */ + ir_graph *irg; const arch_env_t *arch_env; survive_dce_t *dce_survivor; @@ -93,7 +97,7 @@ struct _be_abi_irg_t { ir_node *init_sp; /**< The node representing the stack pointer at the start of the function. */ - ir_node *reg_params; /**< The reg params node. */ + ir_node *start; /**< The be_Start params node. */ pmap *regs; /**< A map of all callee-save and ignore regs to their Projs to the RegParams node. */ @@ -106,12 +110,9 @@ struct _be_abi_irg_t { ir_node **calls; /**< flexible array containing all be_Call nodes */ - arch_register_req_t sp_req; - arch_register_req_t sp_cls_req; + arch_register_req_t *sp_req; be_stack_layout_t frame; /**< The stack frame model. */ - - DEBUG_ONLY(firm_dbg_module_t *dbg;) /**< The debugging module. */ }; static heights_t *ir_heights; @@ -330,7 +331,12 @@ static int stack_frame_compute_initial_offset(be_stack_layout_t *frame) ir_type *base = frame->stack_dir < 0 ? frame->between_type : frame->frame_type; ir_entity *ent = search_ent_with_offset(base, 0); - frame->initial_offset = ent ? get_stack_entity_offset(frame, ent, 0) : 0; + if (ent == NULL) { + frame->initial_offset + = frame->stack_dir < 0 ? get_type_size_bytes(frame->frame_type) : get_type_size_bytes(frame->between_type); + } else { + frame->initial_offset = get_stack_entity_offset(frame, ent, 0); + } return frame->initial_offset; } @@ -342,7 +348,7 @@ static int stack_frame_compute_initial_offset(be_stack_layout_t *frame) * @param args the stack argument layout type * @param between the between layout type * @param locals the method frame type - * @param stack_dir the stack direction + * @param stack_dir the stack direction: < 0 decreasing, > 0 increasing addresses * @param param_map an array mapping method argument positions to the stack argument type * * @return the initialized stack layout @@ -365,31 +371,14 @@ static be_stack_layout_t *stack_frame_init(be_stack_layout_t *frame, ir_type *ar frame->order[2] = locals; } else { + /* typical decreasing stack: locals have the + * lowest addresses, arguments the highest */ frame->order[0] = locals; frame->order[2] = args; } return frame; } -#if 0 -/** Dumps the stack layout to file. */ -static void stack_layout_dump(FILE *file, be_stack_layout_t *frame) -{ - int i, j, n; - - ir_fprintf(file, "initial offset: %d\n", frame->initial_offset); - for (j = 0; j < N_FRAME_TYPES; ++j) { - ir_type *t = frame->order[j]; - - ir_fprintf(file, "type %d: %F size: %d\n", j, t, get_type_size_bytes(t)); - for (i = 0, n = get_compound_n_members(t); i < n; ++i) { - ir_entity *ent = get_compound_member(t, i); - ir_fprintf(file, "\t%F int ofs: %d glob ofs: %d\n", ent, get_entity_offset_bytes(ent), get_stack_entity_offset(frame, ent, 0)); - } - } -} -#endif - /** * Returns non-zero if the call argument at given position * is transfered on the stack. @@ -429,11 +418,11 @@ static ir_node *adjust_call(be_abi_irg_t *env, ir_node *irn, ir_node *curr_sp) ir_node *curr_mem = get_Call_mem(irn); ir_node *bl = get_nodes_block(irn); int stack_size = 0; - int stack_dir = arch_env_stack_dir(arch_env); - const arch_register_t *sp = arch_env_sp(arch_env); + int stack_dir = arch_env->stack_dir; + const arch_register_t *sp = arch_env->sp; 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; + struct obstack *obst = be_get_birg_obst(irg); int no_alloc = call->flags.bits.frame_is_setup_on_call; int n_res = get_method_n_ress(call_tp); int do_seq = call->flags.bits.store_args_sequential && !no_alloc; @@ -464,6 +453,8 @@ static ir_node *adjust_call(be_abi_irg_t *env, ir_node *irn, ir_node *curr_sp) /* Insert code to put the stack arguments on the stack. */ assert(get_Call_n_params(irn) == n_params); + assert(obstack_object_size(obst) == 0); + stack_param_idx = ALLOCAN(int, n_params); for (i = 0; i < n_params; ++i) { be_abi_call_arg_t *arg = get_call_arg(call, 0, i); assert(arg); @@ -473,21 +464,19 @@ static ir_node *adjust_call(be_abi_irg_t *env, ir_node *irn, ir_node *curr_sp) stack_size += round_up2(arg->space_before, arg->alignment); stack_size += round_up2(arg_size, arg->alignment); stack_size += round_up2(arg->space_after, arg->alignment); - obstack_int_grow(obst, i); - ++n_stack_params; + + stack_param_idx[n_stack_params++] = i; } } - stack_param_idx = obstack_finish(obst); /* Collect all arguments which are passed in registers. */ + reg_param_idxs = ALLOCAN(int, n_params); for (i = 0; i < n_params; ++i) { be_abi_call_arg_t *arg = get_call_arg(call, 0, i); if (arg && arg->in_reg) { - obstack_int_grow(obst, i); - ++n_reg_params; + reg_param_idxs[n_reg_params++] = i; } } - reg_param_idxs = obstack_finish(obst); /* * If the stack is decreasing and we do not want to store sequentially, @@ -499,13 +488,15 @@ static ir_node *adjust_call(be_abi_irg_t *env, ir_node *irn, ir_node *curr_sp) * to adjust stack alignment for the call. */ if (stack_dir < 0 && !do_seq && !no_alloc) { - curr_sp = be_new_IncSP(sp, irg, bl, curr_sp, stack_size, 1); + curr_sp = be_new_IncSP(sp, 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; + int curr_ofs = 0; + ir_node **in = ALLOCAN(ir_node*, n_stack_params+1); + unsigned n_in = 0; /* * Reverse list of stack parameters if call arguments are from left to right. @@ -523,7 +514,7 @@ static ir_node *adjust_call(be_abi_irg_t *env, ir_node *irn, ir_node *curr_sp) curr_mem = get_Call_mem(irn); if (! do_seq) { - obstack_ptr_grow(obst, curr_mem); + in[n_in++] = curr_mem; } for (i = 0; i < n_stack_params; ++i) { @@ -542,10 +533,10 @@ static ir_node *adjust_call(be_abi_irg_t *env, ir_node *irn, ir_node *curr_sp) */ if (do_seq) { curr_ofs = 0; - addr = curr_sp = be_new_IncSP(sp, irg, bl, curr_sp, param_size + arg->space_before, 0); + addr = curr_sp = be_new_IncSP(sp, bl, curr_sp, + param_size + arg->space_before, 0); add_irn_dep(curr_sp, curr_mem); - } - else { + } else { curr_ofs += arg->space_before; curr_ofs = round_up2(curr_ofs, arg->alignment); @@ -556,7 +547,7 @@ static ir_node *adjust_call(be_abi_irg_t *env, ir_node *irn, ir_node *curr_sp) constmode = mode_Is; } addr = new_r_Const_long(irg, constmode, curr_ofs); - addr = new_r_Add(irg, bl, curr_sp, addr, mach_mode); + addr = new_r_Add(bl, curr_sp, addr, mach_mode); } } @@ -564,17 +555,15 @@ 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_rd_Store(dbgi, irg, bl, mem_input, addr, param, 0); - mem = new_r_Proj(irg, bl, store, mode_M, pn_Store_M); - } - - /* Make a mem copy for compound arguments. */ - else { + store = new_rd_Store(dbgi, bl, mem_input, addr, param, 0); + mem = new_r_Proj(store, mode_M, pn_Store_M); + } else { + /* Make a mem copy for compound arguments. */ ir_node *copy; assert(mode_is_reference(get_irn_mode(param))); - 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); + copy = new_rd_CopyB(dbgi, bl, curr_mem, addr, param, param_type); + mem = new_r_Proj(copy, mode_M, pn_CopyB_M_regular); } curr_ofs += param_size; @@ -582,20 +571,17 @@ static ir_node *adjust_call(be_abi_irg_t *env, ir_node *irn, ir_node *curr_sp) if (do_seq) curr_mem = mem; else - obstack_ptr_grow(obst, mem); + in[n_in++] = mem; } - in = (ir_node **) obstack_finish(obst); - /* We need the sync only, if we didn't build the stores sequentially. */ if (! do_seq) { if (n_stack_params >= 1) { - curr_mem = new_r_Sync(irg, bl, n_stack_params + 1, in); + curr_mem = new_r_Sync(bl, n_in, in); } else { curr_mem = get_Call_mem(irn); } } - obstack_free(obst, in); } /* check for the return_twice property */ @@ -666,9 +652,13 @@ static ir_node *adjust_call(be_abi_irg_t *env, ir_node *irn, ir_node *curr_sp) */ n_reg_results = n_res; + assert(obstack_object_size(obst) == 0); + n_ins = 0; + in = ALLOCAN(ir_node*, n_reg_params + pset_new_size(&states)); + /* make the back end call node and set its register requirements. */ for (i = 0; i < n_reg_params; ++i) { - obstack_ptr_grow(obst, get_Call_param(irn, reg_param_idxs[i])); + in[n_ins++] = get_Call_param(irn, reg_param_idxs[i]); } /* add state registers ins */ @@ -678,12 +668,10 @@ static ir_node *adjust_call(be_abi_irg_t *env, ir_node *irn, ir_node *curr_sp) ir_node *regnode = be_abi_reg_map_get(env->regs, reg); ir_fprintf(stderr, "Adding %+F\n", regnode); #endif - ir_node *regnode = new_rd_Unknown(irg, arch_register_class_mode(cls)); - obstack_ptr_grow(obst, regnode); + ir_node *regnode = new_r_Unknown(irg, arch_register_class_mode(cls)); + in[n_ins++] = regnode; } - n_ins = n_reg_params + pset_new_size(&states); - - in = obstack_finish(obst); + assert(n_ins == (int) (n_reg_params + pset_new_size(&states))); /* ins collected, build the call */ if (env->call->flags.bits.call_has_imm && is_SymConst(call_ptr)) { @@ -704,8 +692,7 @@ 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); + curr_sp = new_r_Proj(low_call, get_irn_mode(curr_sp), pn_be_Call_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); @@ -729,7 +716,7 @@ static ir_node *adjust_call(be_abi_irg_t *env, ir_node *irn, ir_node *curr_sp) 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); + proj = new_r_Proj(low_call, mode, pn); res_projs[i] = proj; } else { set_Proj_pred(proj, low_call); @@ -747,7 +734,7 @@ static ir_node *adjust_call(be_abi_irg_t *env, ir_node *irn, ir_node *curr_sp) */ 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)); + DBG((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_reg_params; ++i) { @@ -769,7 +756,6 @@ static ir_node *adjust_call(be_abi_irg_t *env, ir_node *irn, ir_node *curr_sp) 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); /* kill the ProjT node */ @@ -786,41 +772,41 @@ static ir_node *adjust_call(be_abi_irg_t *env, ir_node *irn, ir_node *curr_sp) int n = 0; int curr_res_proj = pn_be_Call_first_res + n_reg_results; pset_new_iterator_t iter; + int n_ins; + + n_ins = (int)pset_new_size(&destroyed_regs) + n_reg_results + 1; + in = ALLOCAN(ir_node *, n_ins); /* also keep the stack pointer */ - ++n; set_irn_link(curr_sp, (void*) sp); - obstack_ptr_grow(obst, curr_sp); + in[n++] = curr_sp; foreach_pset_new(&destroyed_regs, reg, iter) { - ir_node *proj = new_r_Proj(irg, bl, low_call, reg->reg_class->mode, curr_res_proj); + ir_node *proj = new_r_Proj(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_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); + in[n++] = proj; ++curr_res_proj; - ++n; } for (i = 0; i < n_reg_results; ++i) { ir_node *proj = res_projs[i]; const arch_register_t *reg = arch_get_irn_register(proj); set_irn_link(proj, (void*) reg); - obstack_ptr_grow(obst, proj); + in[n++] = proj; } - n += n_reg_results; + assert(n <= n_ins); /* create the Keep for the caller save registers */ - in = (ir_node **) obstack_finish(obst); - keep = be_new_Keep(NULL, irg, bl, n, in); + keep = be_new_Keep(bl, n, in); for (i = 0; i < n; ++i) { const arch_register_t *reg = get_irn_link(in[i]); be_node_set_reg_class_in(keep, i, reg->reg_class); } - obstack_free(obst, in); } /* Clean up the stack. */ @@ -839,17 +825,16 @@ 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_be_Call_M_regular); + mem_proj = new_r_Proj(low_call, mode_M, pn_be_Call_M_regular); keep_alive(mem_proj); } } /* Clean up the stack frame or revert alignment fixes if we allocated it */ if (! no_alloc) { - curr_sp = be_new_IncSP(sp, irg, bl, curr_sp, -stack_size, 0); + curr_sp = be_new_IncSP(sp, bl, curr_sp, -stack_size, 0); } be_abi_call_free(call); - obstack_free(obst, stack_param_idx); pset_new_destroy(&states); pset_new_destroy(&destroyed_regs); @@ -862,30 +847,31 @@ static ir_node *adjust_call(be_abi_irg_t *env, ir_node *irn, ir_node *curr_sp) * * @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 block 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) + ir_node *block, dbg_info *dbg) { if (stack_alignment > 1) { - ir_mode *mode; - tarval *tv; - ir_node *mask; + ir_mode *mode; + tarval *tv; + ir_node *mask; + ir_graph *irg; assert(is_po2(stack_alignment)); mode = get_irn_mode(size); tv = new_tarval_from_long(stack_alignment-1, mode); + irg = get_Block_irg(block); mask = new_r_Const(irg, tv); - size = new_rd_Add(dbg, irg, block, size, mask, mode); + size = new_rd_Add(dbg, block, size, mask, mode); tv = new_tarval_from_long(-(long)stack_alignment, mode); mask = new_r_Const(irg, tv); - size = new_rd_And(dbg, irg, block, size, mask, mode); + size = new_rd_And(dbg, block, size, mask, mode); } return size; } @@ -903,13 +889,17 @@ static ir_node *adjust_alloc(be_abi_irg_t *env, ir_node *alloc, ir_node *curr_sp dbg_info *dbg; const ir_edge_t *edge; - ir_node *new_alloc, *size, *addr, *ins[2]; + ir_node *new_alloc; + ir_node *count; + ir_node *size; + ir_node *addr; + ir_node *ins[2]; unsigned stack_alignment; assert(get_Alloc_where(alloc) == stack_alloc); block = get_nodes_block(alloc); - irg = get_irn_irg(block); + irg = get_Block_irg(block); alloc_mem = NULL; alloc_res = NULL; type = get_Alloc_type(alloc); @@ -938,16 +928,18 @@ 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); - size = get_Alloc_size(alloc); + dbg = get_irn_dbg_info(alloc); + count = get_Alloc_count(alloc); - /* we might need to multiply the size with the element size */ + /* we might need to multiply the count with the element size */ if (type != firm_unknown_type && get_type_size_bytes(type) != 1) { - ir_mode *mode = get_irn_mode(size); + ir_mode *mode = get_irn_mode(count); tarval *tv = new_tarval_from_long(get_type_size_bytes(type), mode); ir_node *cnst = new_rd_Const(dbg, irg, tv); - size = new_rd_Mul(dbg, irg, block, size, cnst, mode); + size = new_rd_Mul(dbg, block, count, cnst, mode); + } else { + size = count; } /* The stack pointer will be modified in an unknown manner. @@ -955,21 +947,21 @@ static ir_node *adjust_alloc(be_abi_irg_t *env, ir_node *alloc, ir_node *curr_sp env->call->flags.bits.try_omit_fp = 0; stack_alignment = 1 << env->arch_env->stack_alignment; - size = adjust_alloc_size(stack_alignment, size, irg, block, dbg); - new_alloc = be_new_AddSP(env->arch_env->sp, irg, block, curr_sp, size); + size = adjust_alloc_size(stack_alignment, size, block, dbg); + new_alloc = be_new_AddSP(env->arch_env->sp, block, curr_sp, size); set_irn_dbg_info(new_alloc, dbg); if (alloc_mem != NULL) { ir_node *addsp_mem; ir_node *sync; - addsp_mem = new_r_Proj(irg, block, new_alloc, mode_M, pn_be_AddSP_M); + addsp_mem = new_r_Proj(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. */ ins[0] = get_Alloc_mem(alloc); ins[1] = addsp_mem; - sync = new_r_Sync(irg, block, 2, ins); + sync = new_r_Sync(block, 2, ins); exchange(alloc_mem, sync); } @@ -980,11 +972,10 @@ static ir_node *adjust_alloc(be_abi_irg_t *env, ir_node *alloc, ir_node *curr_sp set_Proj_proj(alloc_res, pn_be_AddSP_res); addr = alloc_res; - curr_sp = new_r_Proj(irg, block, new_alloc, get_irn_mode(curr_sp), - pn_be_AddSP_sp); + curr_sp = new_r_Proj(new_alloc, get_irn_mode(curr_sp), pn_be_AddSP_sp); return curr_sp; -} /* adjust_alloc */ +} /** * Adjust a Free. @@ -1013,7 +1004,7 @@ static ir_node *adjust_free(be_abi_irg_t *env, ir_node *free, ir_node *curr_sp) 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, tv); - ir_node *mul = new_rd_Mul(dbg, irg, block, get_Free_size(free), + ir_node *mul = new_rd_Mul(dbg, block, get_Free_size(free), cnst, mode_Iu); size = mul; } else { @@ -1021,21 +1012,21 @@ static ir_node *adjust_free(be_abi_irg_t *env, ir_node *free, ir_node *curr_sp) } stack_alignment = 1 << env->arch_env->stack_alignment; - size = adjust_alloc_size(stack_alignment, size, irg, block, dbg); + size = adjust_alloc_size(stack_alignment, size, 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->arch_env->sp, irg, block, curr_sp, size); + subsp = be_new_SubSP(env->arch_env->sp, 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_sp); + mem = new_r_Proj(subsp, mode_M, pn_be_SubSP_M); + res = new_r_Proj(subsp, sp_mode, pn_be_SubSP_sp); /* we need to sync the memory */ in[0] = get_Free_mem(free); in[1] = mem; - sync = new_r_Sync(irg, block, 2, in); + sync = new_r_Sync(block, 2, in); /* and make the AddSP dependent on the former memory */ add_irn_dep(subsp, get_Free_mem(free)); @@ -1045,37 +1036,7 @@ static ir_node *adjust_free(be_abi_irg_t *env, ir_node *free, ir_node *curr_sp) curr_sp = res; return curr_sp; -} /* adjust_free */ - -/* the following function is replaced by the usage of the heights module */ -#if 0 -/** - * Walker for dependent_on(). - * This function searches a node tgt recursively from a given node - * but is restricted to the given block. - * @return 1 if tgt was reachable from curr, 0 if not. - */ -static int check_dependence(ir_node *curr, ir_node *tgt, ir_node *bl) -{ - int n, i; - - if (get_nodes_block(curr) != bl) - return 0; - - if (curr == tgt) - return 1; - - /* Phi functions stop the recursion inside a basic block */ - if (! is_Phi(curr)) { - for (i = 0, n = get_irn_arity(curr); i < n; ++i) { - if (check_dependence(get_irn_n(curr, i), tgt, bl)) - return 1; - } - } - - return 0; } -#endif /* if 0 */ /** * Check if a node is somehow data dependent on another one. @@ -1108,7 +1069,9 @@ static int cmp_call_dependency(const void *c1, const void *c2) if (dependent_on(n2, n1)) return 1; - return 0; + /* The nodes have no depth order, but we need a total order because qsort() + * is not stable. */ + return get_irn_idx(n1) - get_irn_idx(n2); } /** @@ -1117,12 +1080,12 @@ static int cmp_call_dependency(const void *c1, const void *c2) */ static void link_ops_in_block_walker(ir_node *irn, void *data) { - ir_opcode code = get_irn_opcode(irn); + be_abi_irg_t *env = data; + ir_opcode code = get_irn_opcode(irn); if (code == iro_Call || (code == iro_Alloc && get_Alloc_where(irn) == stack_alloc) || (code == iro_Free && get_Free_where(irn) == stack_alloc)) { - be_abi_irg_t *env = data; ir_node *bl = get_nodes_block(irn); void *save = get_irn_link(bl); @@ -1132,6 +1095,16 @@ static void link_ops_in_block_walker(ir_node *irn, void *data) set_irn_link(irn, save); set_irn_link(bl, irn); } + + if (code == iro_Builtin && get_Builtin_kind(irn) == ir_bk_return_address) { + ir_node *param = get_Builtin_param(irn, 0); + tarval *tv = get_Const_tarval(param); + 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; + } + } } /** @@ -1143,29 +1116,35 @@ static void link_ops_in_block_walker(ir_node *irn, void *data) */ static void process_ops_in_block(ir_node *bl, void *data) { - be_abi_irg_t *env = data; - ir_node *curr_sp = env->init_sp; - ir_node *irn; - int n; + be_abi_irg_t *env = data; + ir_node *curr_sp = env->init_sp; + ir_node *irn; + ir_node **nodes; + int n; + int n_nodes; - for (irn = get_irn_link(bl), n = 0; irn; irn = get_irn_link(irn), ++n) - obstack_ptr_grow(&env->obst, irn); + n_nodes = 0; + for (irn = get_irn_link(bl); irn != NULL; irn = get_irn_link(irn)) { + ++n_nodes; + } + + nodes = ALLOCAN(ir_node*, n_nodes); + for (irn = get_irn_link(bl), n = 0; irn; irn = get_irn_link(irn), ++n) { + nodes[n] = irn; + } /* If there were call nodes in the block. */ if (n > 0) { ir_node *keep; - ir_node **nodes; int i; - nodes = obstack_finish(&env->obst); - /* order the call nodes according to data dependency */ - qsort(nodes, n, sizeof(nodes[0]), cmp_call_dependency); + qsort(nodes, n_nodes, sizeof(nodes[0]), cmp_call_dependency); - for (i = n - 1; i >= 0; --i) { + for (i = n_nodes - 1; i >= 0; --i) { ir_node *irn = nodes[i]; - DBG((env->dbg, LEVEL_3, "\tprocessing call %+F\n", irn)); + DBG((dbg, LEVEL_3, "\tprocessing call %+F\n", irn)); switch (get_irn_opcode(irn)) { case iro_Call: if (! be_omit_fp) { @@ -1188,21 +1167,18 @@ static void process_ops_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, * 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->arch_env->sp->reg_class, - get_irn_irg(bl), bl, 1, nodes); + keep = be_new_Keep(bl, 1, nodes); pmap_insert(env->keep_map, bl, keep); } } set_irn_link(bl, curr_sp); -} /* process_ops_in_block */ +} /** * Adjust all call nodes in the graph to the ABI conventions. @@ -1240,6 +1216,7 @@ static ir_type *compute_arg_type(be_abi_irg_t *env, be_abi_call_t *call, int inc = env->birg->main_env->arch_env->stack_dir * dir; int n = get_method_n_params(method_type); int curr = inc > 0 ? 0 : n - 1; + struct obstack *obst = be_get_birg_obst(env->irg); int ofs = 0; char buf[128]; @@ -1248,7 +1225,7 @@ static ir_type *compute_arg_type(be_abi_irg_t *env, be_abi_call_t *call, ident *id = get_entity_ident(get_irg_entity(env->birg->irg)); ir_entity **map; - *param_map = map = obstack_alloc(&env->obst, n * sizeof(ir_entity *)); + *param_map = map = OALLOCN(obst, ir_entity*, n); 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); @@ -1262,8 +1239,6 @@ static ir_type *compute_arg_type(be_abi_irg_t *env, be_abi_call_t *call, arg->stack_ent = copy_entity_own(val_ent, res); set_entity_link(val_ent, arg->stack_ent); set_entity_link(arg->stack_ent, NULL); - /* must be automatic to set a fixed layout */ - set_entity_allocation(arg->stack_ent, allocation_automatic); } else { /* create a new entity */ snprintf(buf, sizeof(buf), "param_%d", i); @@ -1298,12 +1273,11 @@ static int cmp_regs(const void *a, const void *b) return p->reg->reg_class - q->reg->reg_class; } -static reg_node_map_t *reg_map_to_arr(struct obstack *obst, pmap *reg_map) +static void reg_map_to_arr(reg_node_map_t *res, 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])); foreach_pmap(reg_map, ent) { res[i].reg = ent->key; @@ -1312,44 +1286,44 @@ static reg_node_map_t *reg_map_to_arr(struct obstack *obst, pmap *reg_map) } 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) +static ir_node *create_barrier(ir_node *bl, ir_node **mem, pmap *regs, + int in_req) { - ir_graph *irg = env->birg->irg; - int n_regs = pmap_count(regs); - int n; - ir_node *irn; - ir_node **in; + int n_regs = pmap_count(regs); + int n; + ir_node *irn; + ir_node **in; reg_node_map_t *rm; - rm = reg_map_to_arr(&env->obst, regs); - - for (n = 0; n < n_regs; ++n) - obstack_ptr_grow(&env->obst, rm[n].irn); + in = ALLOCAN(ir_node*, n_regs+1); + rm = ALLOCAN(reg_node_map_t, n_regs); + reg_map_to_arr(rm, regs); + for (n = 0; n < n_regs; ++n) { + in[n] = rm[n].irn; + } if (mem) { - obstack_ptr_grow(&env->obst, *mem); - n++; + in[n++] = *mem; } - in = (ir_node **) obstack_finish(&env->obst); - irn = be_new_Barrier(irg, bl, n, in); - obstack_free(&env->obst, in); + irn = be_new_Barrier(bl, n, in); 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; + ir_node *pred = rm[n].irn; + const arch_register_t *reg = rm[n].reg; + arch_register_type_t add_type = 0; + ir_node *proj; + const backend_info_t *info; /* stupid workaround for now... as not all nodes report register * requirements. */ - if (!is_Phi(pred)) { + info = be_get_info(skip_Proj(pred)); + if (info != NULL && info->out_infos != NULL) { 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; @@ -1357,7 +1331,7 @@ static ir_node *create_barrier(be_abi_irg_t *env, ir_node *bl, ir_node **mem, pm add_type |= arch_register_req_type_produces_sp; } - proj = new_r_Proj(irg, bl, irn, get_irn_mode(pred), n); + proj = new_r_Proj(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_in(irn, n, reg, 0); @@ -1368,10 +1342,9 @@ static ir_node *create_barrier(be_abi_irg_t *env, ir_node *bl, ir_node **mem, pm } if (mem) { - *mem = new_r_Proj(irg, bl, irn, mode_M, n); + *mem = new_r_Proj(irn, mode_M, n); } - obstack_free(&env->obst, rm); return irn; } @@ -1399,7 +1372,7 @@ static ir_node *create_be_return(be_abi_irg_t *env, ir_node *irn, ir_node *bl, ir_node **in; ir_node *stack; const arch_register_t **regs; - pmap_entry *ent ; + pmap_entry *ent; /* get the valid stack node in this block. @@ -1433,7 +1406,7 @@ static ir_node *create_be_return(be_abi_irg_t *env, ir_node *irn, ir_node *bl, be_abi_reg_map_set(reg_map, arch_env->sp, stack); /* Make the Epilogue node and call the arch's epilogue maker. */ - create_barrier(env, bl, &mem, reg_map, 1); + create_barrier(bl, &mem, reg_map, 1); call->cb->epilogue(env->cb, bl, &mem, reg_map); /* @@ -1442,8 +1415,8 @@ static ir_node *create_be_return(be_abi_irg_t *env, ir_node *irn, ir_node *bl, */ 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 = ALLOCAN(ir_node*, in_max); + regs = ALLOCAN(arch_register_t const*, in_max); in[0] = mem; in[1] = be_abi_reg_map_get(reg_map, arch_env->sp); @@ -1490,7 +1463,6 @@ static ir_node *create_be_return(be_abi_irg_t *env, ir_node *irn, ir_node *bl, } /* 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; @@ -1504,13 +1476,49 @@ struct ent_pos_pair { }; typedef struct lower_frame_sels_env_t { - ent_pos_pair *value_param_list; /**< the list of all value param entities */ - ir_node *frame; /**< the current frame */ - ir_node *param_base; /**< the current value parameter base */ - const arch_register_class_t *sp_class; /**< register class of the stack pointer */ - ir_type *value_tp; /**< the value type if any */ + ent_pos_pair *value_param_list; /**< the list of all value param entities */ + ir_node *frame; /**< the current frame */ + const arch_register_class_t *sp_class; /**< register class of the stack pointer */ + const arch_register_class_t *link_class; /**< register class of the link pointer */ + ir_type *value_tp; /**< the value type if any */ + ir_type *frame_tp; /**< the frame type */ + int static_link_pos; /**< argument number of the hidden static link */ } lower_frame_sels_env_t; +/** + * Return an entity from the backend for an value param entity. + * + * @param ent an value param type entity + * @param ctx context + */ +static ir_entity *get_argument_entity(ir_entity *ent, lower_frame_sels_env_t *ctx) +{ + ir_entity *argument_ent = get_entity_link(ent); + + if (argument_ent == NULL) { + /* we have NO argument entity yet: This is bad, as we will + * need one for backing store. + * Create one here. + */ + ir_type *frame_tp = ctx->frame_tp; + unsigned offset = get_type_size_bytes(frame_tp); + ir_type *tp = get_entity_type(ent); + unsigned align = get_type_alignment_bytes(tp); + + offset += align - 1; + offset &= ~(align - 1); + + argument_ent = copy_entity_own(ent, frame_tp); + + /* must be automatic to set a fixed layout */ + set_entity_offset(argument_ent, offset); + offset += get_type_size_bytes(tp); + + set_type_size_bytes(frame_tp, offset); + set_entity_link(ent, argument_ent); + } + return argument_ent; +} /** * Walker: Replaces Sels of frame type and * value param type entities by FrameAddress. @@ -1523,25 +1531,26 @@ static void lower_frame_sels_walker(ir_node *irn, void *data) if (is_Sel(irn)) { ir_node *ptr = get_Sel_ptr(irn); - if (ptr == ctx->frame || ptr == ctx->param_base) { + if (ptr == ctx->frame) { ir_entity *ent = get_Sel_entity(irn); ir_node *bl = get_nodes_block(irn); ir_node *nw; int pos = 0; + int is_value_param = 0; + + if (get_entity_owner(ent) == ctx->value_tp) { + is_value_param = 1; - if (ptr == ctx->param_base) { /* replace by its copy from the argument type */ - assert(get_entity_owner(ent) == ctx->value_tp); pos = get_struct_member_index(ctx->value_tp, ent); - ent = get_entity_link(ent); - assert(ent != NULL); + ent = get_argument_entity(ent, ctx); } - nw = be_new_FrameAddr(ctx->sp_class, current_ir_graph, bl, ctx->frame, ent); + nw = be_new_FrameAddr(ctx->sp_class, bl, ctx->frame, ent); exchange(irn, nw); - /* check, if it's a param sel and if have not seen this entity before */ - if (ptr == ctx->param_base && get_entity_link(ent) == NULL) { + /* check, if it's a param Sel and if have not seen this entity before */ + if (is_value_param && get_entity_link(ent) == NULL) { ent_pos_pair pair; pair.ent = ent; @@ -1573,7 +1582,6 @@ static void fix_address_of_parameter_access(be_abi_irg_t *env, ent_pos_pair *val ent_pos_pair *entry, *new_list; ir_type *frame_tp; int i, n = ARR_LEN(value_param_list); - DEBUG_ONLY(firm_dbg_module_t *dbg = env->dbg;) new_list = NULL; for (i = 0; i < n; ++i) { @@ -1596,13 +1604,10 @@ static void fix_address_of_parameter_access(be_abi_irg_t *env, ent_pos_pair *val unsigned offset; foreach_block_succ(start_bl, edge) { - ir_node *succ = get_edge_src_irn(edge); - if (start_bl != succ) { - first_bl = succ; - break; - } + first_bl = get_edge_src_irn(edge); + break; } - assert(first_bl); + assert(first_bl && first_bl != start_bl); /* we had already removed critical edges, so the following assertion should be always true. */ assert(get_Block_n_cfgpreds(first_bl) == 1); @@ -1613,7 +1618,7 @@ static void fix_address_of_parameter_access(be_abi_irg_t *env, ent_pos_pair *val save_optimization_state(&state); set_optimize(0); - nmem = new_r_Proj(irg, first_bl, get_irg_start(irg), mode_M, pn_Start_M); + nmem = new_r_Proj(get_irg_start(irg), mode_M, pn_Start_M); restore_optimization_state(&state); /* reroute all edges to the new memory source */ @@ -1630,14 +1635,14 @@ static void fix_address_of_parameter_access(be_abi_irg_t *env, ent_pos_pair *val ir_node *addr; /* address for the backing store */ - addr = be_new_FrameAddr(env->arch_env->sp->reg_class, irg, first_bl, frame, entry->ent); + addr = be_new_FrameAddr(env->arch_env->sp->reg_class, first_bl, frame, entry->ent); if (store) - mem = new_r_Proj(irg, first_bl, store, mode_M, pn_Store_M); + mem = new_r_Proj(store, mode_M, pn_Store_M); /* the backing store itself */ - store = new_r_Store(irg, first_bl, mem, addr, - new_r_Proj(irg, args_bl, args, mode, i), 0); + store = new_r_Store(first_bl, mem, addr, + new_r_Proj(args, mode, i), 0); } /* the new memory Proj gets the last Proj from store */ set_Proj_pred(nmem, store); @@ -1652,17 +1657,22 @@ static void fix_address_of_parameter_access(be_abi_irg_t *env, ent_pos_pair *val set_type_state(frame_tp, layout_undefined); for (entry = new_list; entry != NULL; entry = entry->next) { ir_entity *ent = entry->ent; - ir_type *tp = get_entity_type(ent); - unsigned align = get_type_alignment_bytes(tp); - - offset += align - 1; - offset &= ~(align - 1); - set_entity_owner(ent, frame_tp); - add_class_member(frame_tp, ent); - /* must be automatic to set a fixed layout */ - set_entity_allocation(ent, allocation_automatic); - set_entity_offset(ent, offset); - offset += get_type_size_bytes(tp); + + /* If the entity is still on the argument type, move it to the frame type. + This happens if the value_param type was build due to compound + params. */ + if (get_entity_owner(ent) != frame_tp) { + ir_type *tp = get_entity_type(ent); + unsigned align = get_type_alignment_bytes(tp); + + offset += align - 1; + offset &= ~(align - 1); + set_entity_owner(ent, frame_tp); + add_class_member(frame_tp, ent); + /* must be automatic to set a fixed layout */ + set_entity_offset(ent, offset); + offset += get_type_size_bytes(tp); + } } set_type_size_bytes(frame_tp, offset); /* fix the layout again */ @@ -1689,13 +1699,82 @@ static void fix_start_block(ir_graph *irg) if (is_Anchor(block)) continue; if (block != start_block) { - ir_node *jmp = new_r_Jmp(irg, start_block); - + ir_node *jmp = new_r_Jmp(start_block); set_Block_cfgpred(block, get_edge_src_pos(edge), jmp); + set_irg_initial_exec(irg, jmp); return; } } - panic("Initial exec has no follow block"); + panic("Initial exec has no follow block in %+F", irg); +} + +/** + * Update the entity of Sels to the outer value parameters. + */ +static void update_outer_frame_sels(ir_node *irn, void *env) +{ + lower_frame_sels_env_t *ctx = env; + ir_node *ptr; + ir_entity *ent; + int pos = 0; + + if (! is_Sel(irn)) + return; + ptr = get_Sel_ptr(irn); + if (! is_arg_Proj(ptr)) + return; + if (get_Proj_proj(ptr) != ctx->static_link_pos) + return; + ent = get_Sel_entity(irn); + + if (get_entity_owner(ent) == ctx->value_tp) { + /* replace by its copy from the argument type */ + pos = get_struct_member_index(ctx->value_tp, ent); + ent = get_argument_entity(ent, ctx); + set_Sel_entity(irn, ent); + + /* check, if we have not seen this entity before */ + if (get_entity_link(ent) == NULL) { + ent_pos_pair pair; + + pair.ent = ent; + pair.pos = pos; + pair.next = NULL; + ARR_APP1(ent_pos_pair, ctx->value_param_list, pair); + /* just a mark */ + set_entity_link(ent, ctx->value_param_list); + } + } +} + +/** + * Fix access to outer local variables. + */ +static void fix_outer_variable_access(be_abi_irg_t *env, + lower_frame_sels_env_t *ctx) +{ + int i; + ir_graph *irg; + (void) env; + + for (i = get_class_n_members(ctx->frame_tp) - 1; i >= 0; --i) { + ir_entity *ent = get_class_member(ctx->frame_tp, i); + + if (! is_method_entity(ent)) + continue; + + irg = get_entity_irg(ent); + if (irg == NULL) + continue; + + /* + * FIXME: find the number of the static link parameter + * for now we assume 0 here + */ + ctx->static_link_pos = 0; + + irg_walk_graph(irg, NULL, update_outer_frame_sels, ctx); + } } /** @@ -1705,33 +1784,31 @@ static void modify_irg(be_abi_irg_t *env) { be_abi_call_t *call = env->call; const arch_env_t *arch_env= env->birg->main_env->arch_env; - const arch_register_t *sp = arch_env_sp(arch_env); + const arch_register_t *sp = arch_env->sp; ir_graph *irg = env->birg->irg; - ir_node *start_bl; ir_node *end; ir_node *old_mem; ir_node *new_mem_proj; ir_node *mem; ir_type *method_type = get_entity_type(get_irg_entity(irg)); + struct obstack *obst = be_get_birg_obst(irg); 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 *reg_params_bl; + ir_node *start_bl; ir_node **args; ir_node *arg_tuple; - ir_node *value_param_base; const ir_edge_t *edge; ir_type *arg_type, *bet_type, *tp; lower_frame_sels_env_t ctx; ir_entity **param_map; - DEBUG_ONLY(firm_dbg_module_t *dbg = env->dbg;) - DBG((dbg, LEVEL_1, "introducing abi on %+F\n", irg)); /* Must fetch memory here, otherwise the start Barrier gets the wrong @@ -1755,23 +1832,41 @@ static void modify_irg(be_abi_irg_t *env) arg_type = compute_arg_type(env, call, method_type, tp, ¶m_map); - /* Convert the Sel nodes in the irg to frame load/store/addr nodes. */ + /* Convert the Sel nodes in the irg to frame addr nodes: */ ctx.value_param_list = NEW_ARR_F(ent_pos_pair, 0); ctx.frame = get_irg_frame(irg); - ctx.param_base = get_irg_value_param_base(irg); ctx.sp_class = env->arch_env->sp->reg_class; + ctx.link_class = env->arch_env->link_class; + ctx.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); + } + + /* we will possible add new entities to the frame: set the layout to undefined */ + assert(get_type_state(ctx.frame_tp) == layout_fixed); + set_type_state(ctx.frame_tp, layout_undefined); + irg_walk_graph(irg, lower_frame_sels_walker, NULL, &ctx); - /* value_param_base anchor is not needed anymore now */ - value_param_base = get_irg_value_param_base(irg); - kill_node(value_param_base); - set_irg_value_param_base(irg, new_r_Bad(irg)); + /* fix the frame type layout again */ + set_type_state(ctx.frame_tp, layout_fixed); + /* 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)); + } env->regs = pmap_create(); n_params = get_method_n_params(method_type); - args = obstack_alloc(&env->obst, n_params * sizeof(args[0])); - memset(args, 0, n_params * sizeof(args[0])); + args = OALLOCNZ(obst, ir_node*, n_params); + + /* + * for inner function we must now fix access to outer frame entities. + */ + fix_outer_variable_access(env, &ctx); /* Check if a value parameter is transmitted as a register. * This might happen if the address of an parameter is taken which is @@ -1784,6 +1879,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); + DEL_ARR_F(ctx.value_param_list); irp_free_resources(irp, IR_RESOURCE_ENTITY_LINK); @@ -1826,11 +1922,13 @@ static void modify_irg(be_abi_irg_t *env) } } + /* handle start block here (place a jump in the block) */ + fix_start_block(irg); + pmap_insert(env->regs, (void *) sp, NULL); pmap_insert(env->regs, (void *) arch_env->bp, NULL); - reg_params_bl = get_irg_start_block(irg); - env->reg_params = be_new_RegParams(irg, reg_params_bl, pmap_count(env->regs)); - add_irn_dep(env->reg_params, get_irg_start(irg)); + start_bl = get_irg_start_block(irg); + env->start = be_new_Start(NULL, start_bl, pmap_count(env->regs) + 1); /* * make proj nodes for the callee save registers. @@ -1840,7 +1938,8 @@ static void modify_irg(be_abi_irg_t *env) * the old Proj from start for that argument. */ - rm = reg_map_to_arr(&env->obst, env->regs); + rm = ALLOCAN(reg_node_map_t, pmap_count(env->regs)); + reg_map_to_arr(rm, 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; @@ -1852,21 +1951,20 @@ static void modify_irg(be_abi_irg_t *env) add_type |= arch_register_req_type_produces_sp | arch_register_req_type_ignore; assert(nr >= 0); - proj = new_r_Proj(irg, reg_params_bl, env->reg_params, mode, nr); + proj = new_r_Proj(env->start, mode, nr + 1); pmap_insert(env->regs, (void *) reg, proj); - be_set_constr_single_reg_out(env->reg_params, nr, reg, add_type); + be_set_constr_single_reg_out(env->start, nr + 1, reg, add_type); arch_set_irn_register(proj, reg); DBG((dbg, LEVEL_2, "\tregister save proj #%d -> reg %s\n", nr, reg->name)); } - obstack_free(&env->obst, rm); /* create a new initial memory proj */ assert(is_Proj(old_mem)); - new_mem_proj = new_r_Proj(irg, get_nodes_block(old_mem), - new_r_Unknown(irg, mode_T), mode_M, - get_Proj_proj(old_mem)); + arch_set_out_register_req(env->start, 0, arch_no_register_req); + new_mem_proj = new_r_Proj(env->start, mode_M, 0); mem = new_mem_proj; + set_irg_initial_mem(irg, mem); /* Generate the Prologue */ fp_reg = call->cb->prologue(env->cb, &mem, env->regs, &env->frame.initial_bias); @@ -1874,11 +1972,10 @@ static void modify_irg(be_abi_irg_t *env) /* 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); - start_bl = get_irg_start_block(irg); - env->init_sp = be_new_IncSP(sp, irg, start_bl, env->init_sp, BE_STACK_FRAME_SIZE_EXPAND, 0); + env->init_sp = be_new_IncSP(sp, start_bl, env->init_sp, BE_STACK_FRAME_SIZE_EXPAND, 0); be_abi_reg_map_set(env->regs, sp, env->init_sp); - create_barrier(env, start_bl, &mem, env->regs, 0); + create_barrier(start_bl, &mem, env->regs, 0); env->init_sp = be_abi_reg_map_get(env->regs, sp); arch_set_irn_register(env->init_sp, sp); @@ -1888,9 +1985,11 @@ static void modify_irg(be_abi_irg_t *env) pset_insert_ptr(env->ignore_regs, fp_reg); /* rewire old mem users to new mem */ - set_Proj_pred(new_mem_proj, get_Proj_pred(old_mem)); exchange(old_mem, mem); + /* keep the mem (for functions with an endless loop = no return) */ + keep_alive(mem); + set_irg_initial_mem(irg, mem); /* Now, introduce stack param nodes for all parameters passed on the stack */ @@ -1911,18 +2010,18 @@ static void modify_irg(be_abi_irg_t *env) if (arg->in_reg) { repl = pmap_get(env->regs, (void *) arg->reg); } else if (arg->on_stack) { - ir_node *addr = be_new_FrameAddr(sp->reg_class, irg, reg_params_bl, frame_pointer, arg->stack_ent); + 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. */ 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, cons_floats); - repl = new_r_Proj(irg, reg_params_bl, load, load_mode, pn_Load_res); + ir_node *load = new_r_Load(start_bl, new_NoMem(), addr, load_mode, cons_floats); + repl = new_r_Proj(load, load_mode, pn_Load_res); if (mode != load_mode) { - repl = new_r_Conv(irg, reg_params_bl, repl, mode); + repl = new_r_Conv(start_bl, repl, mode); } } else { /* The stack parameter is not primitive (it is a struct or array), @@ -1938,7 +2037,7 @@ static void modify_irg(be_abi_irg_t *env) 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); + repl = new_r_Conv(get_nodes_block(repl), repl, mode); } exchange(args[i], repl); } @@ -1961,18 +2060,13 @@ static void modify_irg(be_abi_irg_t *env) exchange(irn, ret); } } + /* if we have endless loops here, n might be <= 0. Do NOT create a be_Return then, the code is dead and will never be executed. */ - - obstack_free(&env->obst, args); - - /* handle start block here (place a jump in the block) */ - fix_start_block(irg); } /** Fix the state inputs of calls that still hang on unknowns */ -static -void fix_call_state_inputs(be_abi_irg_t *env) +static void fix_call_state_inputs(be_abi_irg_t *env) { const arch_env_t *arch_env = env->arch_env; int i, n, n_states; @@ -2019,12 +2113,11 @@ 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 = id_mangle3("L", old_id, "$stub"); + ident *id = id_mangle3("", 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); - set_entity_visibility(ent, visibility_local); - set_entity_variability(ent, variability_uninitialized); + set_entity_visibility(ent, ir_visibility_private); return ent; } @@ -2046,14 +2139,13 @@ 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 = id_mangle3("L", old_id, "$non_lazy_ptr"); + ident *id = id_mangle3("", 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 *type = new_type_pointer(e_type); ir_type *parent = be->pic_symbols_type; ir_entity *ent = new_entity(parent, old_id, type); set_entity_ld_ident(ent, id); - set_entity_visibility(ent, visibility_local); - set_entity_variability(ent, variability_uninitialized); + set_entity_visibility(ent, ir_visibility_private); return ent; } @@ -2076,8 +2168,8 @@ static ir_entity *get_pic_symbol(be_main_env_t *env, ir_entity *entity) */ static int can_address_relative(ir_entity *entity) { - return get_entity_variability(entity) == variability_initialized - || get_entity_visibility(entity) == visibility_local; + return get_entity_visibility(entity) != ir_visibility_external + && !(get_entity_linkage(entity) & IR_LINKAGE_MERGE); } /** patches SymConsts to work in position independent code */ @@ -2087,7 +2179,6 @@ static void fix_pic_symconsts(ir_node *node, void *data) ir_node *pic_base; ir_node *add; ir_node *block; - ir_node *unknown; ir_mode *mode; ir_node *load; ir_node *load_res; @@ -2129,12 +2220,11 @@ static void fix_pic_symconsts(ir_node *node, void *data) /* everything else is accessed relative to EIP */ mode = get_irn_mode(pred); - unknown = new_r_Unknown(irg, mode); pic_base = arch_code_generator_get_pic_base(env->birg->cg); /* all ok now for locally constructed stuff */ if (can_address_relative(entity)) { - ir_node *add = new_r_Add(irg, block, pic_base, pred, mode); + ir_node *add = new_r_Add(block, pic_base, pred, mode); /* make sure the walker doesn't visit this add again */ mark_irn_visited(add); @@ -2147,14 +2237,14 @@ static void fix_pic_symconsts(ir_node *node, void *data) pic_symbol = get_pic_symbol(be, entity); pic_symconst = new_rd_SymConst_addr_ent(dbgi, irg, mode_P_code, pic_symbol, NULL); - add = new_r_Add(irg, block, pic_base, pic_symconst, mode); + add = new_r_Add(block, pic_base, pic_symconst, mode); mark_irn_visited(add); /* 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, cons_floats); - load_res = new_r_Proj(irg, block, load, mode, pn_Load_res); + load = new_r_Load(block, new_NoMem(), add, mode, cons_floats); + load_res = new_r_Proj(load, mode, pn_Load_res); set_irn_n(node, i, load_res); } @@ -2165,16 +2255,17 @@ be_abi_irg_t *be_abi_introduce(be_irg_t *birg) be_abi_irg_t *env = XMALLOC(be_abi_irg_t); ir_node *old_frame = get_irg_frame(birg->irg); ir_graph *irg = birg->irg; + struct obstack *obst = be_get_birg_obst(irg); pmap_entry *ent; ir_node *dummy; - optimization_state_t state; unsigned *limited_bitset; + arch_register_req_t *sp_req; be_omit_fp = birg->main_env->options->omit_fp; be_omit_leaf_fp = birg->main_env->options->omit_leaf_fp; - obstack_init(&env->obst); + obstack_init(obst); env->arch_env = birg->main_env->arch_env; env->method_type = get_entity_type(get_irg_entity(irg)); @@ -2185,27 +2276,23 @@ be_abi_irg_t *be_abi_introduce(be_irg_t *birg) env->keep_map = pmap_create(); env->dce_survivor = new_survive_dce(); env->birg = birg; + env->irg = irg; + + sp_req = OALLOCZ(obst, arch_register_req_t); + env->sp_req = sp_req; - env->sp_req.type = arch_register_req_type_limited; - env->sp_req.cls = arch_register_get_class(env->arch_env->sp); - limited_bitset = rbitset_obstack_alloc(&env->obst, env->sp_req.cls->n_regs); + sp_req->type = arch_register_req_type_limited + | arch_register_req_type_produces_sp; + sp_req->cls = arch_register_get_class(env->arch_env->sp); + + limited_bitset = rbitset_obstack_alloc(obst, sp_req->cls->n_regs); rbitset_set(limited_bitset, arch_register_get_index(env->arch_env->sp)); - env->sp_req.limited = limited_bitset; + sp_req->limited = limited_bitset; if (env->arch_env->sp->type & arch_register_type_ignore) { - env->sp_req.type |= arch_register_req_type_ignore; + 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); - - /* Beware: later we replace this node by the real one, ensure it is not CSE'd - to another Unknown or the stack pointer gets used */ - save_optimization_state(&state); - 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->init_sp = dummy = new_r_Dummy(irg, env->arch_env->sp->reg_class->mode); env->calls = NEW_ARR_F(ir_node*, 0); @@ -2257,7 +2344,6 @@ void be_abi_free(be_abi_irg_t *env) free_survive_dce(env->dce_survivor); del_pset(env->ignore_regs); pmap_destroy(env->regs); - obstack_free(&env->obst, NULL); free(env); } @@ -2318,10 +2404,15 @@ typedef struct fix_stack_walker_env_t { */ static void collect_stack_nodes_walker(ir_node *node, void *data) { + ir_node *insn = node; fix_stack_walker_env_t *env = data; const arch_register_req_t *req; - if (get_irn_mode(node) == mode_T) + if (is_Proj(node)) { + insn = get_Proj_pred(node); + } + + if (arch_irn_get_n_outs(insn) == 0) return; req = arch_get_register_req_out(node); @@ -2374,7 +2465,7 @@ void be_abi_fix_stack_nodes(be_abi_irg_t *env) len = ARR_LEN(phis); for (i = 0; i < len; ++i) { ir_node *phi = phis[i]; - be_set_phi_reg_req(phi, &env->sp_req, arch_register_req_type_produces_sp); + be_set_phi_reg_req(phi, env->sp_req); arch_set_irn_register(phi, env->arch_env->sp); } be_ssa_construction_destroy(&senv); @@ -2406,11 +2497,11 @@ static int process_stack_bias(be_abi_irg_t *env, ir_node *bl, int real_bias) node. */ ir_entity *ent = arch_get_frame_entity(irn); - if (ent) { + if (ent != NULL) { int bias = omit_fp ? real_bias : 0; int offset = get_stack_entity_offset(&env->frame, ent, bias); arch_set_frame_offset(irn, offset); - DBG((env->dbg, LEVEL_2, "%F has offset %d (including bias %d)\n", + DBG((dbg, LEVEL_2, "%F has offset %d (including bias %d)\n", ent, offset, bias)); } @@ -2484,9 +2575,46 @@ static void stack_bias_walker(ir_node *bl, void *data) } } +/** + * Walker: finally lower all Sels of outer frame or parameter + * entities. + */ +static void lower_outer_frame_sels(ir_node *sel, void *ctx) +{ + be_abi_irg_t *env = ctx; + ir_node *ptr; + ir_entity *ent; + ir_type *owner; + + if (! is_Sel(sel)) + return; + + ent = get_Sel_entity(sel); + owner = get_entity_owner(ent); + ptr = get_Sel_ptr(sel); + + if (owner == env->frame.frame_type || owner == env->frame.arg_type) { + /* found access to outer frame or arguments */ + int offset = get_stack_entity_offset(&env->frame, ent, 0); + + if (offset != 0) { + ir_node *bl = get_nodes_block(sel); + dbg_info *dbgi = get_irn_dbg_info(sel); + ir_mode *mode = get_irn_mode(sel); + ir_mode *mode_UInt = get_reference_mode_unsigned_eq(mode); + ir_node *cnst = new_r_Const_long(current_ir_graph, mode_UInt, offset); + + ptr = new_rd_Add(dbgi, bl, ptr, cnst, mode); + } + exchange(sel, ptr); + } +} + void be_abi_fix_stack_bias(be_abi_irg_t *env) { - ir_graph *irg = env->birg->irg; + ir_graph *irg = env->birg->irg; + ir_type *frame_tp; + int i; struct bias_walk bw; stack_frame_compute_initial_offset(&env->frame); @@ -2500,6 +2628,18 @@ void be_abi_fix_stack_bias(be_abi_irg_t *env) bw.env = env; bw.start_block = get_irg_start_block(irg); irg_block_walk_graph(irg, stack_bias_walker, NULL, &bw); + + /* fix now inner functions: these still have Sel node to outer + frame and parameter entities */ + frame_tp = get_irg_frame_type(irg); + for (i = get_class_n_members(frame_tp) - 1; i >= 0; --i) { + ir_entity *ent = get_class_member(frame_tp, i); + ir_graph *irg = get_entity_irg(ent); + + if (irg != NULL) { + irg_walk_graph(irg, NULL, lower_outer_frame_sels, env); + } + } } ir_node *be_abi_get_callee_save_irn(be_abi_irg_t *abi, const arch_register_t *reg) @@ -2524,3 +2664,10 @@ int be_abi_omit_fp(const be_abi_irg_t *abi) { return abi->call->flags.bits.try_omit_fp; } + +void be_init_abi(void) +{ + FIRM_DBG_REGISTER(dbg, "firm.be.abi"); +} + +BE_REGISTER_MODULE_CONSTRUCTOR(be_init_abi);