X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbeabi.c;h=5f88bd2dce0737e8bd3c15799b04c042ebeda1eb;hb=335c4762b4ac75793f3614d01c197a5289b4a946;hp=0db1cb1f2bfb26cdde39d693141d06068f515587;hpb=5a5fbeed57d26da0e79335fec458809d8b8c19fc;p=libfirm diff --git a/ir/be/beabi.c b/ir/be/beabi.c index 0db1cb1f2..5f88bd2dc 100644 --- a/ir/be/beabi.c +++ b/ir/be/beabi.c @@ -526,8 +526,10 @@ static ir_node *adjust_call(be_abi_irg_t *env, ir_node *irn, ir_node *curr_sp) if(proj > curr_res_proj) curr_res_proj = proj; - if(arg->in_reg) + if(arg->in_reg) { pset_remove_ptr(caller_save, arg->reg); + //pmap_insert(arg_regs, arg->reg, INT_TO_PTR(proj + 1)) + } } } } @@ -553,7 +555,16 @@ static ir_node *adjust_call(be_abi_irg_t *env, ir_node *irn, ir_node *curr_sp) int index = low_args[i]; be_abi_call_arg_t *arg = get_call_arg(call, 0, index); assert(arg->reg != NULL); - be_set_constr_single_reg(low_call, index, arg->reg); + +#if 0 + if(pmap_contains(arg_regs, (void *) arg->reg)) { + int out_proj_num = PTR_TO_INT(be_abi_reg_map_get(arg_regs, arg->reg)) - 1; + be_node_set_must_be_same(low_call, out_proj_num, low_args[i]); + } + + else +#endif + be_set_constr_single_reg(low_call, index, arg->reg); } /* Set the register constraints of the results. */ @@ -735,8 +746,11 @@ static int cmp_call_dependecy(const void *c1, const void *c2) static void link_calls_in_block_walker(ir_node *irn, void *data) { if(is_Call(irn)) { - ir_node *bl = get_nodes_block(irn); - void *save = get_irn_link(bl); + be_abi_irg_t *env = data; + ir_node *bl = get_nodes_block(irn); + void *save = get_irn_link(bl); + + env->call->flags.bits.irg_is_leaf = 0; set_irn_link(irn, save); set_irn_link(bl, irn); @@ -801,7 +815,8 @@ static void process_calls(be_abi_irg_t *env) { ir_graph *irg = env->birg->irg; - irg_walk_graph(irg, firm_clear_link, link_calls_in_block_walker, NULL); + env->call->flags.bits.irg_is_leaf = 1; + irg_walk_graph(irg, firm_clear_link, link_calls_in_block_walker, env); irg_block_walk_graph(irg, NULL, process_calls_in_block, env); } @@ -882,11 +897,11 @@ static void clearup_frame(be_abi_irg_t *env, ir_node *ret, pmap *reg_map, struct ir_node *irn = ent->value; if(reg == sp) - irn = stack; + obstack_ptr_grow(&env->obst, stack); else if(reg == bp) - irn = frame; - - obstack_ptr_grow(obst, irn); + obstack_ptr_grow(&env->obst, frame); + else if(arch_register_type_is(reg, callee_save) || arch_register_type_is(reg, ignore)) + obstack_ptr_grow(obst, irn); } } @@ -963,17 +978,52 @@ static void create_register_perms(const arch_isa_t *isa, ir_graph *irg, ir_node obstack_free(&obst, NULL); } -static void create_barrier(be_abi_irg_t *env, ir_node *bl, ir_node **mem, pmap *regs) +typedef struct { + const arch_register_t *reg; + ir_node *irn; +} reg_node_map_t; + +static int cmp_regs(const void *a, const void *b) +{ + const reg_node_map_t *p = a; + const reg_node_map_t *q = b; + + if(p->reg->reg_class == q->reg->reg_class) + return p->reg->index - q->reg->index; + else + return p->reg->reg_class - q->reg->reg_class; +} + +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])); + + pmap_foreach(reg_map, ent) { + res[i].reg = ent->key; + res[i].irn = ent->value; + i++; + } + + qsort(res, n, sizeof(res[0]), cmp_regs); + return res; +} + +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, j, n; + int i, n; + int n_regs = pmap_count(regs); ir_node *irn; ir_node **in; - pmap_entry *ent; + reg_node_map_t *rm; + rm = reg_map_to_arr(&env->obst, regs); - for(ent = pmap_first(regs), n = 0; ent; ent = pmap_next(regs), ++n) - obstack_ptr_grow(&env->obst, ent->value); + for(i = 0, n = 0; i < n_regs; ++i, ++n) + obstack_ptr_grow(&env->obst, rm[i].irn); if(mem) { obstack_ptr_grow(&env->obst, *mem); @@ -984,22 +1034,29 @@ static void create_barrier(be_abi_irg_t *env, ir_node *bl, ir_node **mem, pmap * irn = be_new_Barrier(env->birg->irg, bl, n, in); obstack_free(&env->obst, in); - for(ent = pmap_first(regs), n = 0; ent; ent = pmap_next(regs), ++n) { + for(n = 0; n < n_regs; ++n) { int pos = BE_OUT_POS(n); - const arch_register_t *reg = ent->key; + ir_node *proj; + const arch_register_t *reg = rm[n].reg; - ent->value = new_r_Proj(env->birg->irg, bl, irn, get_irn_mode(ent->value), n); - be_set_constr_single_reg(irn, n, reg); + proj = new_r_Proj(env->birg->irg, bl, irn, get_irn_mode(rm[i].irn), n); + be_node_set_reg_class(irn, n, reg->reg_class); + if(in_req) + 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, ent->value, reg); + arch_set_irn_register(env->birg->main_env->arch_env, proj, reg); if(arch_register_type_is(reg, ignore)) be_node_set_flags(irn, pos, arch_irn_flags_ignore); + + pmap_insert(regs, (void *) reg, proj); } if(mem) { *mem = new_r_Proj(env->birg->irg, bl, irn, mode_M, n); } + + obstack_free(&env->obst, rm); } /** @@ -1016,6 +1073,7 @@ static void modify_irg(be_abi_irg_t *env) ir_node *end = get_irg_end_block(irg); ir_node *arg_tuple = get_irg_args(irg); ir_node *no_mem = get_irg_no_mem(irg); + 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(); @@ -1025,6 +1083,7 @@ static void modify_irg(be_abi_irg_t *env) int i, j, n; + reg_node_map_t *rm; const arch_register_t *fp_reg; ir_node *frame_pointer; ir_node *reg_params_bl; @@ -1049,7 +1108,7 @@ static void modify_irg(be_abi_irg_t *env) int nr = get_Proj_proj(irn); max_arg = MAX(max_arg, nr); } - max_arg += 1; + 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); @@ -1069,7 +1128,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); - if(arg->in_reg) { + if(arg->in_reg && args[i]) { assert(arg->reg != sp && "cannot use stack pointer as parameter register"); assert(i == get_Proj_proj(args[i])); @@ -1085,7 +1144,7 @@ static void modify_irg(be_abi_irg_t *env) const arch_register_class_t *cls = arch_isa_get_reg_class(isa, i); for(j = 0; j < cls->n_regs; ++j) { const arch_register_t *reg = &cls->regs[j]; - if(arch_register_type_is(reg, callee_save)) + if(arch_register_type_is(reg, callee_save) || arch_register_type_is(reg, ignore)) pmap_insert(env->regs, (void *) reg, NULL); } } @@ -1102,18 +1161,22 @@ static void modify_irg(be_abi_irg_t *env) * Note, that if a register corresponds to an argument, the regs map contains * the old Proj from start for that argument. */ - pmap_foreach(env->regs, ent) { - arch_register_t *reg = ent->key; - ir_node *arg_proj = ent->value; + + rm = reg_map_to_arr(&env->obst, env->regs); + for(i = 0, n = pmap_count(env->regs); i < n; ++i) { + arch_register_t *reg = (void *) rm[i].reg; + ir_node *arg_proj = rm[i].irn; + ir_node *proj; ir_mode *mode = arg_proj ? get_irn_mode(arg_proj) : reg->reg_class->mode; - long nr = arg_proj ? get_Proj_proj(arg_proj) : (long) bitset_next_clear(used_proj_nr, 0); + long nr = i; int pos = BE_OUT_POS((int) nr); assert(nr >= 0); bitset_set(used_proj_nr, nr); - ent->value = new_r_Proj(irg, reg_params_bl, env->reg_params, mode, nr); + 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, ent->value, reg); + arch_set_irn_register(env->birg->main_env->arch_env, proj, reg); /* * If the register is an ignore register, @@ -1124,15 +1187,17 @@ static void modify_irg(be_abi_irg_t *env) DBG((dbg, LEVEL_2, "\tregister save proj #%d -> reg %s\n", nr, reg->name)); } + obstack_free(&env->obst, rm); /* Generate the Prologue */ - fp_reg = call->cb->prologue(env->cb, env->regs); - create_barrier(env, bl, NULL, env->regs); - env->init_sp = pmap_get(env->regs, (void *) sp); + fp_reg = call->cb->prologue(env->cb, &mem, env->regs); + 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); arch_set_irn_register(env->birg->main_env->arch_env, env->init_sp, sp); - pmap_insert(env->regs, (void *) sp, env->init_sp); - frame_pointer = pmap_get(env->regs, (void *) fp_reg); + be_abi_reg_map_set(env->regs, sp, env->init_sp); + frame_pointer = be_abi_reg_map_get(env->regs, sp); set_irg_frame(irg, frame_pointer); /* Now, introduce stack param nodes for all parameters passed on the stack */ @@ -1170,7 +1235,7 @@ static void modify_irg(be_abi_irg_t *env) } assert(repl != NULL); - exchange(args[i], repl); + edges_reroute(args[i], repl, irg); } } @@ -1183,9 +1248,11 @@ static void modify_irg(be_abi_irg_t *env) int n_res = get_Return_n_ress(irn); pmap *reg_map = pmap_create(); ir_node *mem = get_Return_mem(irn); + int in_max; ir_node *ret; int i, n; ir_node **in; + const arch_register_t **regs; pmap_insert(reg_map, (void *) sp, pmap_get(env->regs, (void *) sp)); @@ -1205,11 +1272,23 @@ static void modify_irg(be_abi_irg_t *env) } /* Make the Epilogue node and call the arch's epilogue maker. */ - create_barrier(env, bl, &mem, reg_map); + create_barrier(env, bl, &mem, reg_map, 1); call->cb->epilogue(env->cb, bl, &mem, reg_map); - obstack_ptr_grow(&env->obst, mem); - obstack_ptr_grow(&env->obst, pmap_get(reg_map, (void *) sp)); + /* + Maximum size of the in array for Return nodes is + return args + callee save/ignore registers + memory + stack pointer + */ + in_max = pmap_count(reg_map) + get_Return_n_ress(irn) + 2; + + in = obstack_alloc(&env->obst, in_max * sizeof(in[0])); + regs = obstack_alloc(&env->obst, in_max * sizeof(regs[0])); + + in[0] = mem; + in[1] = be_abi_reg_map_get(reg_map, sp); + regs[0] = NULL; + regs[1] = sp; + n = 2; /* clear SP entry, since it has already been grown. */ pmap_insert(reg_map, (void *) sp, NULL); @@ -1217,23 +1296,29 @@ static void modify_irg(be_abi_irg_t *env) ir_node *res = get_Return_res(irn, i); be_abi_call_arg_t *arg = get_call_arg(call, 1, i); - obstack_ptr_grow(&env->obst, pmap_get(reg_map, (void *) arg->reg)); + in[n] = be_abi_reg_map_get(reg_map, arg->reg); + regs[n++] = arg->reg; /* Clear the map entry to mark the register as processed. */ - pmap_insert(reg_map, (void *) arg->reg, NULL); + be_abi_reg_map_set(reg_map, arg->reg, NULL); } /* grow the rest of the stuff. */ pmap_foreach(reg_map, ent) { - if(ent->value) - obstack_ptr_grow(&env->obst, ent->value); + if(ent->value) { + in[n] = ent->value; + regs[n++] = ent->key; + } } /* The in array for the new back end return is now ready. */ - n = obstack_object_size(&env->obst) / sizeof(in[0]); - in = obstack_finish(&env->obst); ret = be_new_Return(irg, bl, n, in); + /* Set the register classes of the return's parameter accordingly. */ + for(i = 0; i < n; ++i) + if(regs[i]) + be_node_set_reg_class(ret, i, regs[i]->reg_class); + /* Free the space of the Epilog's in array and the register <-> proj map. */ obstack_free(&env->obst, in); exchange(irn, ret);