X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbeabi.c;h=6123524173d0a60d251a7fe13fb644a53f819cdd;hb=adbae5c7cf3dc4262cad0bb7743c34b462f40907;hp=51a3d9c35b5b30fcb790391ca97bdcee10494c87;hpb=a68dfa0a328a5859012053ad0200a1e01465875b;p=libfirm diff --git a/ir/be/beabi.c b/ir/be/beabi.c index 51a3d9c35..612352417 100644 --- a/ir/be/beabi.c +++ b/ir/be/beabi.c @@ -23,9 +23,7 @@ * @author Sebastian Hack, Michael Beck * @version $Id$ */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include "obst.h" #include "offset.h" @@ -172,7 +170,7 @@ static be_abi_call_arg_t *get_or_set_call_arg(be_abi_call_t *call, int is_res, i * @param is_res true for call results, false for call arguments * @param pos position of the argument */ -static INLINE be_abi_call_arg_t *get_call_arg(be_abi_call_t *call, int is_res, int pos) +static inline be_abi_call_arg_t *get_call_arg(be_abi_call_t *call, int is_res, int pos) { return get_or_set_call_arg(call, is_res, pos, 0); } @@ -235,8 +233,7 @@ be_abi_call_flags_t be_abi_call_get_flags(const be_abi_call_t *call) */ static be_abi_call_t *be_abi_call_new(const arch_register_class_t *cls_addr) { - be_abi_call_t *call = xmalloc(sizeof(call[0])); - memset(call, 0, sizeof(call[0])); + be_abi_call_t *call = XMALLOCZ(be_abi_call_t); call->flags.val = 0; call->params = new_set(cmp_call_arg, 16); @@ -384,7 +381,7 @@ static void stack_layout_dump(FILE *file, be_stack_layout_t *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) +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; @@ -670,7 +667,7 @@ static ir_node *adjust_call(be_abi_irg_t *env, ir_node *irn, ir_node *curr_sp) curr_sp = new_r_Proj(irg, bl, low_call, get_irn_mode(curr_sp), pn_be_Call_sp); be_set_constr_single_reg(low_call, BE_OUT_POS(pn_be_Call_sp), sp); - arch_set_irn_register(arch_env, curr_sp, sp); + arch_set_irn_register(curr_sp, sp); be_node_set_flags(low_call, BE_OUT_POS(pn_be_Call_sp), arch_irn_flags_ignore | arch_irn_flags_modify_sp); @@ -729,7 +726,7 @@ static ir_node *adjust_call(be_abi_irg_t *env, ir_node *irn, ir_node *curr_sp) assert(arg->in_reg); be_set_constr_single_reg(low_call, BE_OUT_POS(pn), arg->reg); - arch_set_irn_register(arch_env, proj, arg->reg); + arch_set_irn_register(proj, arg->reg); } obstack_free(obst, in); exchange(irn, low_call); @@ -760,7 +757,7 @@ static ir_node *adjust_call(be_abi_irg_t *env, ir_node *irn, ir_node *curr_sp) /* memorize the register in the link field. we need afterwards to set the register class of the keep correctly. */ be_set_constr_single_reg(low_call, BE_OUT_POS(curr_res_proj), reg); - arch_set_irn_register(arch_env, proj, reg); + arch_set_irn_register(proj, reg); /* a call can produce ignore registers, in this case set the flag and register for the Proj */ if (arch_register_type_is(reg, ignore)) { @@ -775,7 +772,7 @@ static ir_node *adjust_call(be_abi_irg_t *env, ir_node *irn, ir_node *curr_sp) for(i = 0; i < n_reg_results; ++i) { ir_node *proj = res_projs[i]; - const arch_register_t *reg = arch_get_irn_register(arch_env, proj); + const arch_register_t *reg = arch_get_irn_register(proj); set_irn_link(proj, (void*) reg); obstack_ptr_grow(obst, proj); } @@ -1365,13 +1362,13 @@ static ir_node *create_barrier(be_abi_irg_t *env, ir_node *bl, ir_node **mem, pm be_set_constr_single_reg(irn, n, reg); be_set_constr_single_reg(irn, pos, reg); be_node_set_reg_class(irn, pos, reg->reg_class); - arch_set_irn_register(env->birg->main_env->arch_env, proj, reg); + arch_set_irn_register(proj, reg); /* if the proj projects a ignore register or a node which is set to ignore, propagate this property. */ - if (arch_register_type_is(reg, ignore) || arch_irn_is(env->birg->main_env->arch_env, in[n], ignore)) + if (arch_register_type_is(reg, ignore) || arch_irn_is(in[n], ignore)) flags |= arch_irn_flags_ignore; - if (arch_irn_is(env->birg->main_env->arch_env, in[n], modify_sp)) + if (arch_irn_is(in[n], modify_sp)) flags |= arch_irn_flags_modify_sp; be_node_set_flags(irn, pos, flags); @@ -1841,7 +1838,7 @@ static void modify_irg(be_abi_irg_t *env) proj = new_r_Proj(irg, reg_params_bl, env->reg_params, mode, nr); pmap_insert(env->regs, (void *) reg, proj); be_set_constr_single_reg(env->reg_params, pos, reg); - arch_set_irn_register(env->birg->main_env->arch_env, proj, reg); + arch_set_irn_register(proj, reg); /* * If the register is an ignore register, @@ -1879,7 +1876,7 @@ static void modify_irg(be_abi_irg_t *env) create_barrier(env, start_bl, &mem, env->regs, 0); env->init_sp = be_abi_reg_map_get(env->regs, sp); - arch_set_irn_register(env->birg->main_env->arch_env, env->init_sp, sp); + arch_set_irn_register(env->init_sp, sp); frame_pointer = be_abi_reg_map_get(env->regs, fp_reg); set_irg_frame(irg, frame_pointer); @@ -2131,13 +2128,13 @@ static void fix_pic_symconsts(ir_node *node, void *data) mode = get_irn_mode(pred); unknown = new_r_Unknown(irg, mode); pic_base = arch_code_generator_get_pic_base(env->birg->cg); - add = new_r_Add(irg, block, pic_base, pred, mode); - - /* make sure the walker doesn't visit this add again */ - mark_irn_visited(add); /* all ok now for locally constructed stuff */ if (can_address_relative(entity)) { + ir_node *add = new_r_Add(irg, block, pic_base, pred, mode); + + /* make sure the walker doesn't visit this add again */ + mark_irn_visited(add); set_irn_n(node, i, add); continue; } @@ -2147,7 +2144,8 @@ 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); - set_Add_right(add, pic_symconst); + add = new_r_Add(irg, 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 @@ -2162,7 +2160,7 @@ static void fix_pic_symconsts(ir_node *node, void *data) be_abi_irg_t *be_abi_introduce(be_irg_t *birg) { - be_abi_irg_t *env = xmalloc(sizeof(env[0])); + be_abi_irg_t *env = XMALLOC(be_abi_irg_t); ir_node *old_frame = get_irg_frame(birg->irg); ir_graph *irg = birg->irg; @@ -2306,7 +2304,6 @@ typedef ir_node **node_array; typedef struct fix_stack_walker_env_t { node_array sp_nodes; - const arch_env_t *arch_env; } fix_stack_walker_env_t; /** @@ -2316,7 +2313,7 @@ static void collect_stack_nodes_walker(ir_node *node, void *data) { fix_stack_walker_env_t *env = data; - if (arch_irn_is(env->arch_env, node, modify_sp)) { + if (arch_irn_is(node, modify_sp)) { assert(get_irn_mode(node) != mode_M && get_irn_mode(node) != mode_T); ARR_APP1(ir_node*, env->sp_nodes, node); } @@ -2332,7 +2329,6 @@ void be_abi_fix_stack_nodes(be_abi_irg_t *env) fix_stack_walker_env_t walker_env; walker_env.sp_nodes = NEW_ARR_F(ir_node*, 0); - walker_env.arch_env = birg->main_env->arch_env; irg_walk_graph(birg->irg, collect_stack_nodes_walker, NULL, &walker_env); @@ -2366,9 +2362,9 @@ 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(walker_env.arch_env, phi, &env->sp_req); - be_set_phi_flags(walker_env.arch_env, phi, arch_irn_flags_ignore | arch_irn_flags_modify_sp); - arch_set_irn_register(walker_env.arch_env, phi, env->arch_env->sp); + be_set_phi_reg_req(phi, &env->sp_req); + be_set_phi_flags(phi, arch_irn_flags_ignore | arch_irn_flags_modify_sp); + arch_set_irn_register(phi, env->arch_env->sp); } be_ssa_construction_destroy(&senv); @@ -2386,7 +2382,6 @@ void be_abi_fix_stack_nodes(be_abi_irg_t *env) */ static int process_stack_bias(be_abi_irg_t *env, ir_node *bl, int real_bias) { - const arch_env_t *arch_env = env->birg->main_env->arch_env; int omit_fp = env->call->flags.bits.try_omit_fp; ir_node *irn; int wanted_bias = real_bias; @@ -2399,11 +2394,11 @@ static int process_stack_bias(be_abi_irg_t *env, ir_node *bl, int real_bias) If so, set the true offset (including the bias) for that node. */ - ir_entity *ent = arch_get_frame_entity(arch_env, irn); + ir_entity *ent = arch_get_frame_entity(irn); if (ent) { int bias = omit_fp ? real_bias : 0; int offset = get_stack_entity_offset(&env->frame, ent, bias); - arch_set_frame_offset(arch_env, irn, offset); + arch_set_frame_offset(irn, offset); DBG((env->dbg, LEVEL_2, "%F has offset %d (including bias %d)\n", ent, offset, bias)); } @@ -2412,7 +2407,7 @@ static int process_stack_bias(be_abi_irg_t *env, ir_node *bl, int real_bias) * If the node modifies the stack pointer by a constant offset, * record that in the bias. */ - ofs = arch_get_sp_bias(arch_env, irn); + ofs = arch_get_sp_bias(irn); if (be_is_IncSP(irn)) { /* fill in real stack frame size */