X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbeabi.c;h=9568bd760ba8916f4a0af2d6da7ff4f7b671d917;hb=8a907f80824671f3ff21569442566dceca8d4f5f;hp=b67a4c38d8c0e3253c702283607d7d01d5ba6e43;hpb=a38e2989a02963136e46547f762d96bca7229d94;p=libfirm diff --git a/ir/be/beabi.c b/ir/be/beabi.c index b67a4c38d..9568bd760 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" @@ -62,6 +63,7 @@ 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. */ unsigned in_reg : 1; /**< 1: this argument is transmitted in registers. */ unsigned on_stack : 1; /**< 1: this argument is transmitted on the stack. */ + unsigned callee : 1; /**< 1: someone called us. 0: We call another function */ int pos; const arch_register_t *reg; @@ -140,7 +142,7 @@ static int cmp_call_arg(const void *a, const void *b, size_t n) { const be_abi_call_arg_t *p = a, *q = b; (void) n; - return !(p->is_res == q->is_res && p->pos == q->pos); + return !(p->is_res == q->is_res && p->pos == q->pos && p->callee == q->callee); } /** @@ -149,8 +151,9 @@ static int cmp_call_arg(const void *a, const void *b, size_t n) * @param call the abi call * @param is_res true for call results, false for call arguments * @param pos position of the argument + * @param callee context type - if we are callee or caller */ -static be_abi_call_arg_t *get_call_arg(be_abi_call_t *call, int is_res, int pos) +static be_abi_call_arg_t *get_call_arg(be_abi_call_t *call, int is_res, int pos, int callee) { be_abi_call_arg_t arg; unsigned hash; @@ -158,6 +161,7 @@ static be_abi_call_arg_t *get_call_arg(be_abi_call_t *call, int is_res, int pos) memset(&arg, 0, sizeof(arg)); arg.is_res = is_res; arg.pos = pos; + arg.callee = callee; hash = is_res * 128 + pos; @@ -166,23 +170,18 @@ static be_abi_call_arg_t *get_call_arg(be_abi_call_t *call, int is_res, int pos) /** * Set an ABI call object argument. - * - * @param call the abi call - * @param is_res true for call results, false for call arguments - * @param pos position of the argument */ -static be_abi_call_arg_t *create_call_arg(be_abi_call_t *call, int is_res, int pos) +static void remember_call_arg(be_abi_call_arg_t *arg, be_abi_call_t *call, be_abi_context_t context) { - be_abi_call_arg_t arg; - unsigned hash; - - memset(&arg, 0, sizeof(arg)); - arg.is_res = is_res; - arg.pos = pos; - - hash = is_res * 128 + pos; - - return set_insert(call->params, &arg, sizeof(arg), hash); + unsigned hash = arg->is_res * 128 + arg->pos; + if (context & ABI_CONTEXT_CALLEE) { + arg->callee = 1; + set_insert(call->params, arg, sizeof(*arg), hash); + } + if (context & ABI_CONTEXT_CALLER) { + arg->callee = 0; + set_insert(call->params, arg, sizeof(*arg), hash); + } } /* Set the flags for a call. */ @@ -206,29 +205,49 @@ void be_abi_call_set_call_address_reg_class(be_abi_call_t *call, const arch_regi } -void be_abi_call_param_stack(be_abi_call_t *call, int arg_pos, ir_mode *load_mode, unsigned alignment, unsigned space_before, unsigned space_after) +void be_abi_call_param_stack(be_abi_call_t *call, int arg_pos, + ir_mode *load_mode, unsigned alignment, + unsigned space_before, unsigned space_after, + be_abi_context_t context) { - be_abi_call_arg_t *arg = create_call_arg(call, 0, arg_pos); - arg->on_stack = 1; - arg->load_mode = load_mode; - arg->alignment = alignment; - arg->space_before = space_before; - arg->space_after = space_after; + be_abi_call_arg_t arg; + memset(&arg, 0, sizeof(arg)); assert(alignment > 0 && "Alignment must be greater than 0"); + arg.on_stack = 1; + arg.load_mode = load_mode; + arg.alignment = alignment; + arg.space_before = space_before; + arg.space_after = space_after; + arg.is_res = 0; + arg.pos = arg_pos; + + remember_call_arg(&arg, call, context); } -void be_abi_call_param_reg(be_abi_call_t *call, int arg_pos, const arch_register_t *reg) +void be_abi_call_param_reg(be_abi_call_t *call, int arg_pos, const arch_register_t *reg, be_abi_context_t context) { - be_abi_call_arg_t *arg = create_call_arg(call, 0, arg_pos); - arg->in_reg = 1; - arg->reg = reg; + be_abi_call_arg_t arg; + memset(&arg, 0, sizeof(arg)); + + arg.in_reg = 1; + arg.reg = reg; + arg.is_res = 0; + arg.pos = arg_pos; + + remember_call_arg(&arg, call, context); } -void be_abi_call_res_reg(be_abi_call_t *call, int arg_pos, const arch_register_t *reg) +void be_abi_call_res_reg(be_abi_call_t *call, int arg_pos, const arch_register_t *reg, be_abi_context_t context) { - be_abi_call_arg_t *arg = create_call_arg(call, 1, arg_pos); - arg->in_reg = 1; - arg->reg = reg; + be_abi_call_arg_t arg; + memset(&arg, 0, sizeof(arg)); + + arg.in_reg = 1; + arg.reg = reg; + arg.is_res = 1; + arg.pos = arg_pos; + + remember_call_arg(&arg, call, context); } /* Get the flags of a ABI call object. */ @@ -378,16 +397,6 @@ static be_stack_layout_t *stack_frame_init(be_stack_layout_t *frame, ir_type *ar return frame; } -/** - * Returns non-zero if the call argument at given position - * is transfered on the stack. - */ -static inline int is_on_stack(be_abi_call_t *call, int pos) -{ - be_abi_call_arg_t *arg = get_call_arg(call, 0, pos); - return arg && !arg->in_reg; -} - /* ____ _ _ / ___|__ _| | |___ @@ -455,7 +464,7 @@ static ir_node *adjust_call(be_abi_irg_t *env, ir_node *irn, ir_node *curr_sp) 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); + be_abi_call_arg_t *arg = get_call_arg(call, 0, i, 0); assert(arg); if (arg->on_stack) { int arg_size = get_type_size_bytes(get_method_param_type(call_tp, i)); @@ -471,7 +480,7 @@ static ir_node *adjust_call(be_abi_irg_t *env, ir_node *irn, ir_node *curr_sp) /* 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); + be_abi_call_arg_t *arg = get_call_arg(call, 0, i, 0); if (arg && arg->in_reg) { reg_param_idxs[n_reg_params++] = i; } @@ -518,7 +527,7 @@ static ir_node *adjust_call(be_abi_irg_t *env, ir_node *irn, ir_node *curr_sp) for (i = 0; i < n_stack_params; ++i) { int p = stack_param_idx[i]; - be_abi_call_arg_t *arg = get_call_arg(call, 0, p); + be_abi_call_arg_t *arg = get_call_arg(call, 0, p, 0); ir_node *param = get_Call_param(irn, p); ir_node *addr = curr_sp; ir_node *mem = NULL; @@ -555,14 +564,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 +700,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); @@ -700,7 +709,7 @@ static ir_node *adjust_call(be_abi_irg_t *env, ir_node *irn, ir_node *curr_sp) for (i = 0; i < n_res; ++i) { int pn; ir_node *proj = res_projs[i]; - be_abi_call_arg_t *arg = get_call_arg(call, 1, i); + be_abi_call_arg_t *arg = get_call_arg(call, 1, i, 0); /* returns values on stack not supported yet */ assert(arg->in_reg); @@ -715,7 +724,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); @@ -738,7 +747,7 @@ static ir_node *adjust_call(be_abi_irg_t *env, ir_node *irn, ir_node *curr_sp) /* Set the register classes and constraints of the Call parameters. */ for (i = 0; i < n_reg_params; ++i) { int index = reg_param_idxs[i]; - be_abi_call_arg_t *arg = get_call_arg(call, 0, index); + be_abi_call_arg_t *arg = get_call_arg(call, 0, index, 0); assert(arg->reg != NULL); be_set_constr_single_reg_in(low_call, be_pos_Call_first_arg + i, @@ -748,7 +757,7 @@ static ir_node *adjust_call(be_abi_irg_t *env, ir_node *irn, ir_node *curr_sp) /* Set the register constraints of the results. */ for (i = 0; i < n_res; ++i) { ir_node *proj = res_projs[i]; - const be_abi_call_arg_t *arg = get_call_arg(call, 1, i); + const be_abi_call_arg_t *arg = get_call_arg(call, 1, i, 0); int pn = get_Proj_proj(proj); assert(arg->in_reg); @@ -781,7 +790,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 +833,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 +897,10 @@ 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 *ins[2]; unsigned stack_alignment; assert(get_Alloc_where(alloc) == stack_alloc); @@ -923,16 +935,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 +962,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. */ @@ -964,9 +978,7 @@ static ir_node *adjust_alloc(be_abi_irg_t *env, ir_node *alloc, ir_node *curr_sp /* fix projnum of alloca res */ 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 +1026,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); @@ -1157,7 +1169,6 @@ static void process_ops_in_block(ir_node *bl, void *data) break; default: panic("invalid call"); - break; } } @@ -1223,7 +1234,7 @@ static ir_type *compute_arg_type(be_abi_irg_t *env, be_abi_call_t *call, 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); - be_abi_call_arg_t *arg = get_call_arg(call, 0, curr); + be_abi_call_arg_t *arg = get_call_arg(call, 0, curr, 1); map[i] = NULL; if (arg->on_stack) { @@ -1233,8 +1244,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 +1336,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 +1347,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; @@ -1387,7 +1396,7 @@ static ir_node *create_be_return(be_abi_irg_t *env, ir_node *irn, ir_node *bl, /* Insert results for Return into the register map. */ for (i = 0; i < n_res; ++i) { ir_node *res = get_Return_res(irn, i); - be_abi_call_arg_t *arg = get_call_arg(call, 1, i); + be_abi_call_arg_t *arg = get_call_arg(call, 1, i, 1); assert(arg->in_reg && "return value must be passed in register"); pmap_insert(reg_map, (void *) arg->reg, res); } @@ -1423,7 +1432,7 @@ static ir_node *create_be_return(be_abi_irg_t *env, ir_node *irn, ir_node *bl, /* clear SP entry, since it has already been grown. */ pmap_insert(reg_map, (void *) arch_env->sp, NULL); for (i = 0; i < n_res; ++i) { - be_abi_call_arg_t *arg = get_call_arg(call, 1, i); + be_abi_call_arg_t *arg = get_call_arg(call, 1, i, 1); in[n] = be_abi_reg_map_get(reg_map, arg->reg); regs[n++] = arg->reg; @@ -1507,7 +1516,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); @@ -1583,7 +1591,7 @@ static void fix_address_of_parameter_access(be_abi_irg_t *env, ent_pos_pair *val new_list = NULL; for (i = 0; i < n; ++i) { int pos = value_param_list[i].pos; - be_abi_call_arg_t *arg = get_call_arg(call, 0, pos); + be_abi_call_arg_t *arg = get_call_arg(call, 0, pos, 1); if (arg->in_reg) { DBG((dbg, LEVEL_2, "\targ #%d need backing store\n", pos)); @@ -1594,16 +1602,11 @@ static void fix_address_of_parameter_access(be_abi_irg_t *env, ent_pos_pair *val if (new_list != NULL) { /* ok, change the graph */ ir_node *start_bl = get_irg_start_block(irg); - ir_node *first_bl = NULL; - ir_node *frame, *imem, *nmem, *store, *mem, *args, *args_bl; - const ir_edge_t *edge; + ir_node *first_bl = get_first_block_succ(start_bl); + ir_node *frame, *imem, *nmem, *store, *mem, *args; optimization_state_t state; unsigned offset; - foreach_block_succ(start_bl, edge) { - first_bl = get_edge_src_irn(edge); - break; - } assert(first_bl && first_bl != start_bl); /* we had already removed critical edges, so the following assertion should be always true. */ @@ -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 */ @@ -1624,7 +1627,6 @@ static void fix_address_of_parameter_access(be_abi_irg_t *env, ent_pos_pair *val store = NULL; mem = imem; args = get_irg_args(irg); - args_bl = get_nodes_block(args); for (entry = new_list; entry != NULL; entry = entry->next) { int i = entry->pos; ir_type *tp = get_entity_type(entry->ent); @@ -1635,11 +1637,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 +1669,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 +1710,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 +1761,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 +1772,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); } } @@ -1895,7 +1898,7 @@ static void modify_irg(be_abi_irg_t *env) /* Count the register params and add them to the number of Projs for the RegParams node */ for (i = 0; i < n_params; ++i) { - be_abi_call_arg_t *arg = get_call_arg(call, 0, i); + be_abi_call_arg_t *arg = get_call_arg(call, 0, i, 1); if (arg->in_reg && args[i]) { assert(arg->reg != sp && "cannot use stack pointer as parameter register"); assert(i == get_Proj_proj(args[i])); @@ -1947,7 +1950,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 +1961,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); @@ -2000,7 +2003,7 @@ static void modify_irg(be_abi_irg_t *env) ir_mode *mode; nr = MIN(nr, n_params); - arg = get_call_arg(call, 0, nr); + arg = get_call_arg(call, 0, nr, 1); param_type = get_method_param_type(method_type, nr); if (arg->in_reg) { @@ -2014,7 +2017,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 +2065,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 +2112,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 +2138,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 +2167,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 */ @@ -2177,7 +2178,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; @@ -2219,7 +2219,6 @@ 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 */ @@ -2244,7 +2243,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); } @@ -2259,7 +2258,6 @@ be_abi_irg_t *be_abi_introduce(be_irg_t *birg) pmap_entry *ent; ir_node *dummy; - optimization_state_t state; unsigned *limited_bitset; arch_register_req_t *sp_req; @@ -2293,12 +2291,7 @@ be_abi_irg_t *be_abi_introduce(be_irg_t *birg) sp_req->type |= arch_register_req_type_ignore; } - /* 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); + env->init_sp = dummy = new_r_Dummy(irg, env->arch_env->sp->reg_class->mode); env->calls = NEW_ARR_F(ir_node*, 0); @@ -2585,7 +2578,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; @@ -2639,10 +2633,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); } } @@ -2671,9 +2664,8 @@ int be_abi_omit_fp(const be_abi_irg_t *abi) return abi->call->flags.bits.try_omit_fp; } +BE_REGISTER_MODULE_CONSTRUCTOR(be_init_abi); void be_init_abi(void) { FIRM_DBG_REGISTER(dbg, "firm.be.abi"); } - -BE_REGISTER_MODULE_CONSTRUCTOR(be_init_abi);