X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbeabi.c;h=e631e02e34e48f79744c9fa846a4af74fb04db5f;hb=94e9283b212f0f10b460248de945576a0bb61703;hp=0c887e21246fcb25e5897ad55f50a45585e839b4;hpb=c59d37f47fdab6d74f1da6738b2d3f3373a378b9;p=libfirm diff --git a/ir/be/beabi.c b/ir/be/beabi.c index 0c887e212..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" @@ -555,14 +556,14 @@ static ir_node *adjust_call(be_abi_irg_t *env, ir_node *irn, ir_node *curr_sp) ir_node *store; ir_node *mem_input = do_seq ? curr_mem : new_NoMem(); store = new_rd_Store(dbgi, bl, mem_input, addr, param, 0); - mem = new_r_Proj(bl, store, mode_M, pn_Store_M); + 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, bl, curr_mem, addr, param, param_type); - mem = new_r_Proj(bl, copy, mode_M, pn_CopyB_M_regular); + mem = new_r_Proj(copy, mode_M, pn_CopyB_M_regular); } curr_ofs += param_size; @@ -691,7 +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(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); @@ -715,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(bl, low_call, mode, pn); + proj = new_r_Proj(low_call, mode, pn); res_projs[i] = proj; } else { set_Proj_pred(proj, low_call); @@ -781,7 +782,7 @@ static ir_node *adjust_call(be_abi_irg_t *env, ir_node *irn, ir_node *curr_sp) in[n++] = curr_sp; foreach_pset_new(&destroyed_regs, reg, iter) { - ir_node *proj = new_r_Proj(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); @@ -824,7 +825,7 @@ 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(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); } } @@ -888,7 +889,11 @@ 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); @@ -923,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, 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. @@ -948,7 +955,7 @@ static ir_node *adjust_alloc(be_abi_irg_t *env, ir_node *alloc, ir_node *curr_sp ir_node *addsp_mem; ir_node *sync; - addsp_mem = new_r_Proj(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. */ @@ -965,8 +972,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(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; } @@ -1014,8 +1020,8 @@ static ir_node *adjust_free(be_abi_irg_t *env, ir_node *free, ir_node *curr_sp) subsp = be_new_SubSP(env->arch_env->sp, block, curr_sp, size); set_irn_dbg_info(subsp, dbg); - mem = new_r_Proj(block, subsp, mode_M, pn_be_SubSP_M); - res = new_r_Proj(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); @@ -1233,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); @@ -1327,7 +1331,7 @@ static ir_node *create_barrier(ir_node *bl, ir_node **mem, pmap *regs, add_type |= arch_register_req_type_produces_sp; } - proj = new_r_Proj(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); @@ -1338,7 +1342,7 @@ static ir_node *create_barrier(ir_node *bl, ir_node **mem, pmap *regs, } if (mem) { - *mem = new_r_Proj(bl, irn, mode_M, n); + *mem = new_r_Proj(irn, mode_M, n); } return irn; @@ -1507,7 +1511,6 @@ static ir_entity *get_argument_entity(ir_entity *ent, lower_frame_sels_env_t *ct argument_ent = copy_entity_own(ent, frame_tp); /* must be automatic to set a fixed layout */ - set_entity_allocation(argument_ent, allocation_automatic); set_entity_offset(argument_ent, offset); offset += get_type_size_bytes(tp); @@ -1615,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(start_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 */ @@ -1635,11 +1638,11 @@ static void fix_address_of_parameter_access(be_abi_irg_t *env, ent_pos_pair *val addr = be_new_FrameAddr(env->arch_env->sp->reg_class, first_bl, frame, entry->ent); if (store) - mem = new_r_Proj(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(first_bl, mem, addr, - new_r_Proj(args_bl, args, mode, i), 0); + new_r_Proj(args, mode, i), 0); } /* the new memory Proj gets the last Proj from store */ set_Proj_pred(nmem, store); @@ -1667,7 +1670,6 @@ static void fix_address_of_parameter_access(be_abi_irg_t *env, ent_pos_pair *val 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); } @@ -1709,7 +1711,8 @@ static void fix_start_block(ir_graph *irg) /** * Update the entity of Sels to the outer value parameters. */ -static void update_outer_frame_sels(ir_node *irn, void *env) { +static void update_outer_frame_sels(ir_node *irn, void *env) +{ lower_frame_sels_env_t *ctx = env; ir_node *ptr; ir_entity *ent; @@ -1759,7 +1762,9 @@ static void fix_outer_variable_access(be_abi_irg_t *env, if (! is_method_entity(ent)) continue; - if (get_entity_peculiarity(ent) == peculiarity_description) + + irg = get_entity_irg(ent); + if (irg == NULL) continue; /* @@ -1768,7 +1773,6 @@ static void fix_outer_variable_access(be_abi_irg_t *env, */ ctx->static_link_pos = 0; - irg = get_entity_irg(ent); irg_walk_graph(irg, NULL, update_outer_frame_sels, ctx); } } @@ -1947,7 +1951,7 @@ 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(start_bl, env->start, mode, nr + 1); + proj = new_r_Proj(env->start, mode, nr + 1); pmap_insert(env->regs, (void *) reg, proj); be_set_constr_single_reg_out(env->start, nr + 1, reg, add_type); arch_set_irn_register(proj, reg); @@ -1958,7 +1962,7 @@ static void modify_irg(be_abi_irg_t *env) /* create a new initial memory proj */ assert(is_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); + new_mem_proj = new_r_Proj(env->start, mode_M, 0); mem = new_mem_proj; set_irg_initial_mem(irg, mem); @@ -2014,7 +2018,7 @@ static void modify_irg(be_abi_irg_t *env) ir_mode *load_mode = arg->load_mode; 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); + repl = new_r_Proj(load, load_mode, pn_Load_res); if (mode != load_mode) { repl = new_r_Conv(start_bl, repl, mode); @@ -2062,8 +2066,7 @@ static void modify_irg(be_abi_irg_t *env) } /** 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; @@ -2110,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; } @@ -2137,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(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; } @@ -2167,7 +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_visibility(entity) != visibility_external_allocated; + return get_entity_visibility(entity) != ir_visibility_external + && !(get_entity_linkage(entity) & IR_LINKAGE_MERGE); } /** patches SymConsts to work in position independent code */ @@ -2242,7 +2244,7 @@ static void fix_pic_symconsts(ir_node *node, void *data) module. The loads are always safe and can therefore float and need no memory input */ load = new_r_Load(block, new_NoMem(), add, mode, cons_floats); - load_res = new_r_Proj(block, load, mode, pn_Load_res); + load_res = new_r_Proj(load, mode, pn_Load_res); set_irn_n(node, i, load_res); } @@ -2577,7 +2579,8 @@ 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) { +static void lower_outer_frame_sels(ir_node *sel, void *ctx) +{ be_abi_irg_t *env = ctx; ir_node *ptr; ir_entity *ent; @@ -2631,10 +2634,9 @@ void be_abi_fix_stack_bias(be_abi_irg_t *env) 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 (is_method_entity(ent) && get_entity_peculiarity(ent) != peculiarity_description) { - ir_graph *irg = get_entity_irg(ent); - + if (irg != NULL) { irg_walk_graph(irg, NULL, lower_outer_frame_sels, env); } }