X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbeabi.c;h=a8e030a1551d4ac0fec6128714e07489f05ab488;hb=6e3e499d6c68aee0c6a9ada6a99f16c4f6f8445b;hp=f45b0b8c0dba5f04cfb31bfb7c254a2d823df8ec;hpb=868c8b47eb3e9b006a4cd7dcdc4df2cdb32dc955;p=libfirm diff --git a/ir/be/beabi.c b/ir/be/beabi.c index f45b0b8c0..a8e030a15 100644 --- a/ir/be/beabi.c +++ b/ir/be/beabi.c @@ -119,12 +119,23 @@ static const arch_irn_handler_t abi_irn_handler; for a specific call type. */ +/** + * Set compare function: compares two ABI call object arguments. + */ static int cmp_call_arg(const void *a, const void *b, size_t n) { const be_abi_call_arg_t *p = a, *q = b; return !(p->is_res == q->is_res && p->pos == q->pos); } +/** + * Get or 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 + * @param do_insert true if the argument is set, false if it's retrieved + */ static be_abi_call_arg_t *get_or_set_call_arg(be_abi_call_t *call, int is_res, int pos, int do_insert) { be_abi_call_arg_t arg; @@ -134,18 +145,26 @@ static be_abi_call_arg_t *get_or_set_call_arg(be_abi_call_t *call, int is_res, i arg.is_res = is_res; arg.pos = pos; - hash = is_res * 100 + pos; + hash = is_res * 128 + pos; return do_insert ? set_insert(call->params, &arg, sizeof(arg), hash) : set_find(call->params, &arg, sizeof(arg), hash); } +/** + * Retrieve an ABI call object argument. + * + * @param call the ABI call object + * @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) { return get_or_set_call_arg(call, is_res, pos, 0); } +/* Set the flags for a call. */ void be_abi_call_set_flags(be_abi_call_t *call, be_abi_call_flags_t flags, const be_abi_callbacks_t *cb) { call->flags = flags; @@ -176,12 +195,18 @@ void be_abi_call_res_reg(be_abi_call_t *call, int arg_pos, const arch_register_t arg->reg = reg; } +/* Get the flags of a ABI call object. */ be_abi_call_flags_t be_abi_call_get_flags(const be_abi_call_t *call) { return call->flags; } -be_abi_call_t *be_abi_call_new(void) +/** + * Constructor for a new ABI call object. + * + * @return the new ABI call object + */ +static be_abi_call_t *be_abi_call_new(void) { be_abi_call_t *call = xmalloc(sizeof(call[0])); call->flags.val = 0; @@ -190,7 +215,10 @@ be_abi_call_t *be_abi_call_new(void) return call; } -void be_abi_call_free(be_abi_call_t *call) +/** + * Destructor for an ABI call object. + */ +static void be_abi_call_free(be_abi_call_t *call) { del_set(call->params); free(call); @@ -239,6 +267,9 @@ static int get_stack_entity_offset(be_stack_frame_t *frame, entity *ent, int bia return ofs; } +/** + * Retrieve the entity with given offset from a frame type. + */ static entity *search_ent_with_offset(type *t, int offset) { int i, n; @@ -300,14 +331,12 @@ static void stack_frame_dump(FILE *file, be_stack_frame_t *frame) } /** - * If irn is a Sel node computing the address of an entity + * If irn is a Sel node computes the address of an entity * on the frame type return the entity, else NULL. */ static INLINE entity *get_sel_ent(ir_node *irn) { - if(get_irn_opcode(irn) == iro_Sel - && get_Sel_ptr(irn) == get_irg_frame(get_irn_irg(irn))) { - + if(is_Sel(irn) && get_Sel_ptr(irn) == get_irg_frame(get_irn_irg(irn))) { return get_Sel_entity(irn); } @@ -330,12 +359,14 @@ static void lower_frame_sels_walker(ir_node *irn, void *data) ir_node *frame = get_irg_frame(irg); nw = be_new_FrameAddr(env->isa->sp->reg_class, irg, bl, frame, ent); - } - - if(nw != NULL) exchange(irn, nw); + } } +/** + * 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); @@ -444,7 +475,7 @@ static ir_node *adjust_call(be_abi_irg_t *env, ir_node *irn, ir_node *curr_sp) * moving the stack pointer along the stack's direction. */ if(stack_dir < 0 && !do_seq && !no_alloc) { - curr_sp = be_new_IncSP(sp, irg, bl, curr_sp, no_mem, stack_size, be_stack_dir_along); + curr_sp = be_new_IncSP(sp, irg, bl, curr_sp, no_mem, stack_size, be_stack_dir_expand); } assert(mode_is_reference(mach_mode) && "machine mode must be pointer"); @@ -484,13 +515,13 @@ static ir_node *adjust_call(be_abi_irg_t *env, ir_node *irn, ir_node *curr_sp) curr_ofs += param_size; /* - * If we wanted to build the arguments sequentially, - * the stack pointer for the next must be incremented, - * and the memory value propagated. - */ + * If we wanted to build the arguments sequentially, + * the stack pointer for the next must be incremented, + * and the memory value propagated. + */ if(do_seq) { curr_ofs = 0; - curr_sp = be_new_IncSP(sp, irg, bl, curr_sp, no_mem, param_size, be_stack_dir_along); + curr_sp = be_new_IncSP(sp, irg, bl, curr_sp, no_mem, param_size, be_stack_dir_expand); curr_mem = mem; } } @@ -515,11 +546,20 @@ static ir_node *adjust_call(be_abi_irg_t *env, ir_node *irn, ir_node *curr_sp) } /* search the greatest result proj number */ + + /* TODO: what if the result is NOT used? Currently there is + * no way to detect this later, especially there is no way to + * see this in the proj numbers. + * While this is ok for the register allocator, it is bad for + * backends which need to change the be_Call further (x87 simulator + * for instance. However for this particular case the call_type is + * sufficient.). + */ foreach_out_edge(irn, edge) { const ir_edge_t *res_edge; ir_node *irn = get_edge_src_irn(edge); - if(is_Proj(irn) && get_irn_mode(irn) == mode_T) { + if(is_Proj(irn) && get_Proj_proj(irn) == pn_Call_T_result) { res_proj = irn; foreach_out_edge(irn, res_edge) { int proj; @@ -534,9 +574,9 @@ static ir_node *adjust_call(be_abi_irg_t *env, ir_node *irn, ir_node *curr_sp) /* shift the proj number to the right, since we will drop the unspeakable Proj_T from the Call. Therefore, all real argument - Proj numbers must be increased by pn_Call_max + Proj numbers must be increased by pn_be_Call_first_res */ - proj += pn_Call_max; + proj += pn_be_Call_first_res; set_Proj_proj(res, proj); obstack_ptr_grow(obst, res); @@ -561,12 +601,16 @@ static ir_node *adjust_call(be_abi_irg_t *env, ir_node *irn, ir_node *curr_sp) in = obstack_finish(obst); if(env->call->flags.bits.call_has_imm && get_irn_opcode(call_ptr) == iro_SymConst) { - low_call = be_new_Call(irg, bl, curr_mem, curr_sp, curr_sp, curr_res_proj + pset_count(caller_save), n_low_args, in); + low_call = be_new_Call(get_irn_dbg_info(irn), irg, bl, curr_mem, curr_sp, curr_sp, + curr_res_proj + pset_count(caller_save), n_low_args, in, + get_Call_type(irn)); be_Call_set_entity(low_call, get_SymConst_entity(call_ptr)); } - else - low_call = be_new_Call(irg, bl, curr_mem, curr_sp, call_ptr, curr_res_proj + pset_count(caller_save), n_low_args, in); + else + low_call = be_new_Call(get_irn_dbg_info(irn), irg, bl, curr_mem, curr_sp, call_ptr, + curr_res_proj + pset_count(caller_save), n_low_args, in, + get_Call_type(irn)); /* TODO: @@ -645,7 +689,7 @@ static ir_node *adjust_call(be_abi_irg_t *env, ir_node *irn, ir_node *curr_sp) /* Clean up the stack frame if we allocated it */ if(!no_alloc) - curr_sp = be_new_IncSP(sp, irg, bl, curr_sp, mem_proj, stack_size, be_stack_dir_against); + curr_sp = be_new_IncSP(sp, irg, bl, curr_sp, mem_proj, stack_size, be_stack_dir_shrink); } be_abi_call_free(call); @@ -662,7 +706,7 @@ static ir_node *adjust_call(be_abi_irg_t *env, ir_node *irn, ir_node *curr_sp) */ static ir_node *adjust_alloc(be_abi_irg_t *env, ir_node *alloc, ir_node *curr_sp) { - if(get_Alloc_where(alloc) == stack_alloc) { + if (get_Alloc_where(alloc) == stack_alloc) { ir_node *bl = get_nodes_block(alloc); ir_graph *irg = get_irn_irg(bl); ir_node *alloc_mem = NULL; @@ -691,6 +735,9 @@ static ir_node *adjust_alloc(be_abi_irg_t *env, ir_node *alloc, ir_node *curr_sp } } + /* TODO: Beware: currently Alloc nodes without a result might happen, + only escape analysis kills them and this phase runs only for object + oriented source. So this must be fixed. */ assert(alloc_res != NULL); exchange(alloc_res, env->isa->stack_dir < 0 ? new_alloc : curr_sp); @@ -864,7 +911,7 @@ static ir_node *setup_frame(be_abi_irg_t *env) int stack_nr = get_Proj_proj(stack); if(flags.try_omit_fp) { - stack = be_new_IncSP(sp, irg, bl, stack, no_mem, BE_STACK_FRAME_SIZE, be_stack_dir_along); + stack = be_new_IncSP(sp, irg, bl, stack, no_mem, BE_STACK_FRAME_SIZE, be_stack_dir_expand); frame = stack; } @@ -878,7 +925,7 @@ static ir_node *setup_frame(be_abi_irg_t *env) arch_set_irn_register(env->birg->main_env->arch_env, frame, bp); } - stack = be_new_IncSP(sp, irg, bl, stack, frame, BE_STACK_FRAME_SIZE, be_stack_dir_along); + stack = be_new_IncSP(sp, irg, bl, stack, frame, BE_STACK_FRAME_SIZE, be_stack_dir_expand); } be_node_set_flags(env->reg_params, -(stack_nr + 1), arch_irn_flags_ignore); @@ -903,7 +950,7 @@ static void clearup_frame(be_abi_irg_t *env, ir_node *ret, pmap *reg_map, struct pmap_entry *ent; if(env->call->flags.bits.try_omit_fp) { - stack = be_new_IncSP(sp, irg, bl, stack, ret_mem, BE_STACK_FRAME_SIZE, be_stack_dir_against); + stack = be_new_IncSP(sp, irg, bl, stack, ret_mem, BE_STACK_FRAME_SIZE, be_stack_dir_shrink); } else { @@ -1037,7 +1084,7 @@ static reg_node_map_t *reg_map_to_arr(struct obstack *obst, pmap *reg_map) static void 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 i, n; + int n; int n_regs = pmap_count(regs); ir_node *irn; ir_node **in; @@ -1045,8 +1092,8 @@ static void create_barrier(be_abi_irg_t *env, ir_node *bl, ir_node **mem, pmap * rm = reg_map_to_arr(&env->obst, regs); - for(i = 0, n = 0; i < n_regs; ++i, ++n) - obstack_ptr_grow(&env->obst, rm[i].irn); + for(n = 0; n < n_regs; ++n) + obstack_ptr_grow(&env->obst, rm[n].irn); if(mem) { obstack_ptr_grow(&env->obst, *mem); @@ -1054,7 +1101,7 @@ static void create_barrier(be_abi_irg_t *env, ir_node *bl, ir_node **mem, pmap * } in = (ir_node **) obstack_finish(&env->obst); - irn = be_new_Barrier(env->birg->irg, bl, n, in); + irn = be_new_Barrier(irg, bl, n, in); obstack_free(&env->obst, in); for(n = 0; n < n_regs; ++n) { @@ -1062,7 +1109,7 @@ static void create_barrier(be_abi_irg_t *env, ir_node *bl, ir_node **mem, pmap * ir_node *proj; const arch_register_t *reg = rm[n].reg; - proj = new_r_Proj(env->birg->irg, bl, irn, get_irn_mode(rm[i].irn), n); + proj = new_r_Proj(irg, bl, irn, get_irn_mode(rm[n].irn), n); be_node_set_reg_class(irn, n, reg->reg_class); if(in_req) be_set_constr_single_reg(irn, n, reg); @@ -1076,7 +1123,7 @@ static void create_barrier(be_abi_irg_t *env, ir_node *bl, ir_node **mem, pmap * } if(mem) { - *mem = new_r_Proj(env->birg->irg, bl, irn, mode_M, n); + *mem = new_r_Proj(irg, bl, irn, mode_M, n); } obstack_free(&env->obst, rm); @@ -1099,10 +1146,8 @@ static void modify_irg(be_abi_irg_t *env) ir_node *mem = get_irg_initial_mem(irg); type *method_type = get_entity_type(get_irg_entity(irg)); pset *dont_save = pset_new_ptr(8); - pmap *reg_proj_map = pmap_create(); int n_params = get_method_n_params(method_type); int max_arg = 0; - int arg_offset = 0; int i, j, n; @@ -1131,10 +1176,11 @@ static void modify_irg(be_abi_irg_t *env) int nr = get_Proj_proj(irn); max_arg = MAX(max_arg, nr); } - max_arg = MAX(max_arg + 1, n_params); - args = obstack_alloc(&env->obst, max_arg * sizeof(args[0])); - memset(args, 0, max_arg * sizeof(args[0])); + used_proj_nr = bitset_alloca(1024); + max_arg = MAX(max_arg + 1, n_params); + args = obstack_alloc(&env->obst, max_arg * sizeof(args[0])); + memset(args, 0, max_arg * sizeof(args[0])); /* Fill the argument vector */ foreach_out_edge(arg_tuple, edge) { @@ -1217,7 +1263,7 @@ static void modify_irg(be_abi_irg_t *env) create_barrier(env, bl, &mem, env->regs, 0); env->init_sp = be_abi_reg_map_get(env->regs, sp); - env->init_sp = be_new_IncSP(sp, irg, bl, env->init_sp, no_mem, BE_STACK_FRAME_SIZE, be_stack_dir_along); + env->init_sp = be_new_IncSP(sp, irg, bl, env->init_sp, no_mem, BE_STACK_FRAME_SIZE, be_stack_dir_expand); arch_set_irn_register(env->birg->main_env->arch_env, env->init_sp, sp); be_abi_reg_map_set(env->regs, sp, env->init_sp); frame_pointer = be_abi_reg_map_get(env->regs, fp_reg); @@ -1335,7 +1381,7 @@ static void modify_irg(be_abi_irg_t *env) } /* The in array for the new back end return is now ready. */ - ret = be_new_Return(irg, bl, n, in); + ret = be_new_Return(get_irn_dbg_info(irn), irg, bl, n, in); /* Set the register classes of the return's parameter accordingly. */ for(i = 0; i < n; ++i) @@ -1349,6 +1395,7 @@ static void modify_irg(be_abi_irg_t *env) } } + del_pset(dont_save); obstack_free(&env->obst, args); } @@ -1378,9 +1425,9 @@ be_abi_irg_t *be_abi_introduce(be_irg_t *birg) env->dce_survivor = new_survive_dce(); env->birg = birg; - env->dbg = firm_dbg_register("firm.be.abi"); env->stack_phis = pset_new_ptr(16); env->init_sp = dummy = new_r_Unknown(irg, env->isa->sp->reg_class->mode); + FIRM_DBG_REGISTER(env->dbg, "firm.be.abi"); env->cb = env->call->cb->init(env->call, birg->main_env->arch_env, irg); @@ -1461,22 +1508,21 @@ void be_abi_fix_stack_nodes(be_abi_irg_t *env) } /** - * Translates a direction of an IncSP node (either be_stack_dir_against, or ...along) + * Translates a direction of an IncSP node (either be_stack_dir_shrink, or ...expand) * into -1 or 1, respectively. * @param irn The node. * @return 1, if the direction of the IncSP was along, -1 if against. */ static int get_dir(ir_node *irn) { - return 1 - 2 * (be_get_IncSP_direction(irn) == be_stack_dir_against); + return 1 - 2 * (be_get_IncSP_direction(irn) == be_stack_dir_shrink); } static int process_stack_bias(be_abi_irg_t *env, ir_node *bl, int bias) { const arch_env_t *aenv = env->birg->main_env->arch_env; + int omit_fp = env->call->flags.bits.try_omit_fp; ir_node *irn; - int start_bias = bias; - int omit_fp = env->call->flags.bits.try_omit_fp; sched_foreach(bl, irn) {