X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbeabi.c;h=9d4f3f9b2c79dbbdbe7725f321aa2b2ec48ccdc3;hb=09eee9b1bd1d75f696272f2fe37385c5f50f309d;hp=3c0125607a0d4fd123c554c405b5ab73f9f8211d;hpb=ee44e33167b44432066f2ca6c7e413daa1949280;p=libfirm diff --git a/ir/be/beabi.c b/ir/be/beabi.c index 3c0125607..9d4f3f9b2 100644 --- a/ir/be/beabi.c +++ b/ir/be/beabi.c @@ -48,11 +48,11 @@ #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" typedef struct _be_abi_call_arg_t { @@ -93,7 +93,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,8 +106,7 @@ 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. */ @@ -330,7 +329,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; } @@ -501,7 +505,7 @@ 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); @@ -544,7 +548,7 @@ 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 { @@ -558,7 +562,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); } } @@ -566,8 +570,8 @@ 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); + store = new_rd_Store(dbgi, bl, mem_input, addr, param, 0); + mem = new_r_Proj(bl, store, mode_M, pn_Store_M); } /* Make a mem copy for compound arguments. */ @@ -575,8 +579,8 @@ static ir_node *adjust_call(be_abi_irg_t *env, ir_node *irn, ir_node *curr_sp) 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(bl, copy, mode_M, pn_CopyB_M_regular); } curr_ofs += param_size; @@ -592,7 +596,7 @@ static ir_node *adjust_call(be_abi_irg_t *env, ir_node *irn, ir_node *curr_sp) /* 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_stack_params + 1, in); } else { curr_mem = get_Call_mem(irn); } @@ -680,7 +684,7 @@ 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)); + ir_node *regnode = new_r_Unknown(irg, arch_register_class_mode(cls)); obstack_ptr_grow(obst, regnode); } n_ins = n_reg_params + pset_new_size(&states); @@ -706,8 +710,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(bl, 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); @@ -731,7 +734,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(bl, low_call, mode, pn); res_projs[i] = proj; } else { set_Proj_pred(proj, low_call); @@ -795,7 +798,7 @@ static ir_node *adjust_call(be_abi_irg_t *env, ir_node *irn, ir_node *curr_sp) obstack_ptr_grow(obst, 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(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_out(low_call, curr_res_proj, reg, 0); @@ -817,7 +820,7 @@ static ir_node *adjust_call(be_abi_irg_t *env, ir_node *irn, ir_node *curr_sp) /* 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); @@ -841,13 +844,13 @@ 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(bl, 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); @@ -864,30 +867,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; } @@ -911,7 +915,7 @@ static ir_node *adjust_alloc(be_abi_irg_t *env, ir_node *alloc, ir_node *curr_sp 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); @@ -949,7 +953,7 @@ static ir_node *adjust_alloc(be_abi_irg_t *env, ir_node *alloc, ir_node *curr_sp 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, size, cnst, mode); } /* The stack pointer will be modified in an unknown manner. @@ -957,21 +961,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(block, new_alloc, mode_M, pn_be_AddSP_M); /* We need to sync the output mem of the AddSP with the input mem edge into the alloc node. */ 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); } @@ -982,7 +986,7 @@ 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), + curr_sp = new_r_Proj(block, new_alloc, get_irn_mode(curr_sp), pn_be_AddSP_sp); return curr_sp; @@ -1015,7 +1019,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 { @@ -1023,21 +1027,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(block, subsp, mode_M, pn_be_SubSP_M); + res = new_r_Proj(block, 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)); @@ -1110,7 +1114,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); } /** @@ -1119,12 +1125,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); @@ -1134,6 +1140,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; + } + } } /** @@ -1197,8 +1213,7 @@ static void process_ops_in_block(ir_node *bl, void *data) 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); } } @@ -1250,7 +1265,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(&env->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); @@ -1305,7 +1320,7 @@ 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])); + reg_node_map_t *res = OALLOCN(obst, reg_node_map_t, n); foreach_pmap(reg_map, ent) { res[i].reg = ent->key; @@ -1322,7 +1337,6 @@ static reg_node_map_t *reg_map_to_arr(struct obstack *obst, pmap *reg_map) */ 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 n_regs = pmap_count(regs); int n; ir_node *irn; @@ -1340,18 +1354,20 @@ static ir_node *create_barrier(be_abi_irg_t *env, ir_node *bl, ir_node **mem, pm } in = (ir_node **) obstack_finish(&env->obst); - irn = be_new_Barrier(irg, bl, n, in); + irn = be_new_Barrier(bl, n, in); obstack_free(&env->obst, 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; @@ -1359,7 +1375,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(bl, 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); @@ -1370,7 +1386,7 @@ 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(bl, irn, mode_M, n); } obstack_free(&env->obst, rm); @@ -1401,7 +1417,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. @@ -1444,8 +1460,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 = OALLOCN(&env->obst, ir_node*, in_max); + regs = OALLOCN(&env->obst, arch_register_t const*, in_max); in[0] = mem; in[1] = be_abi_reg_map_get(reg_map, arch_env->sp); @@ -1567,18 +1583,21 @@ static void lower_frame_sels_walker(ir_node *irn, void *data) 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; + /* replace by its copy from the argument type */ pos = get_struct_member_index(ctx->value_tp, ent); 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 (get_entity_owner(ent) == ctx->value_tp && 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; @@ -1633,13 +1652,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); @@ -1650,7 +1666,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(start_bl, get_irg_start(irg), mode_M, pn_Start_M); restore_optimization_state(&state); /* reroute all edges to the new memory source */ @@ -1667,14 +1683,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(first_bl, 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_bl, args, mode, i), 0); } /* the new memory Proj gets the last Proj from store */ set_Proj_pred(nmem, store); @@ -1732,9 +1748,9 @@ 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; } } @@ -1782,16 +1798,20 @@ static void update_outer_frame_sels(ir_node *irn, void *env) { /** * Fix access to outer local variables. */ -static void fix_outer_variable_access(be_abi_irg_t *env, lower_frame_sels_env_t *ctx) +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; + if (get_entity_peculiarity(ent) == peculiarity_description) + continue; /* * FIXME: find the number of the static link parameter @@ -1813,7 +1833,6 @@ static void modify_irg(be_abi_irg_t *env) const arch_env_t *arch_env= env->birg->main_env->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; @@ -1823,11 +1842,12 @@ static void modify_irg(be_abi_irg_t *env) int n_params; int i, n; unsigned j; + unsigned frame_size; reg_node_map_t *rm; const arch_register_t *fp_reg; ir_node *frame_pointer; - ir_node *reg_params_bl; + ir_node *start_bl; ir_node **args; ir_node *arg_tuple; const ir_edge_t *edge; @@ -1875,12 +1895,16 @@ static void modify_irg(be_abi_irg_t *env) /* 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(&env->obst, ir_node*, n_params); /* * for inner function we must now fix access to outer frame entities. @@ -1941,11 +1965,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. @@ -1967,9 +1993,9 @@ 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(start_bl, 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)); @@ -1978,10 +2004,10 @@ static void modify_irg(be_abi_irg_t *env) /* 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(start_bl, 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); @@ -1989,8 +2015,7 @@ 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); @@ -2003,7 +2028,6 @@ 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); set_irg_initial_mem(irg, mem); @@ -2026,18 +2050,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(start_bl, 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), @@ -2053,7 +2077,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); } @@ -2080,9 +2104,6 @@ static void modify_irg(be_abi_irg_t *env) 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 */ @@ -2191,8 +2212,7 @@ 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) != visibility_external_allocated; } /** patches SymConsts to work in position independent code */ @@ -2249,7 +2269,7 @@ static void fix_pic_symconsts(ir_node *node, void *data) /* 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); @@ -2262,14 +2282,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(block, load, mode, pn_Load_res); set_irn_n(node, i, load_res); } @@ -2285,6 +2305,7 @@ be_abi_irg_t *be_abi_introduce(be_irg_t *birg) 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; @@ -2301,18 +2322,20 @@ be_abi_irg_t *be_abi_introduce(be_irg_t *birg) env->dce_survivor = new_survive_dce(); env->birg = birg; - 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 = OALLOCZ(&env->obst, arch_register_req_t); + env->sp_req = sp_req; + + 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(&env->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); @@ -2433,10 +2456,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); @@ -2489,7 +2517,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); @@ -2627,7 +2655,7 @@ static void lower_outer_frame_sels(ir_node *sel, void *ctx) { 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, current_ir_graph, bl, ptr, cnst, mode); + ptr = new_rd_Add(dbgi, bl, ptr, cnst, mode); } exchange(sel, ptr); } @@ -2658,7 +2686,7 @@ void be_abi_fix_stack_bias(be_abi_irg_t *env) for (i = get_class_n_members(frame_tp) - 1; i >= 0; --i) { ir_entity *ent = get_class_member(frame_tp, i); - if (is_method_entity(ent)) { + if (is_method_entity(ent) && get_entity_peculiarity(ent) != peculiarity_description) { ir_graph *irg = get_entity_irg(ent); irg_walk_graph(irg, NULL, lower_outer_frame_sels, env);