X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbeabi.c;h=2bf684a81ddc55dd73ccdf71a1dbee2128763ad8;hb=df2faee01a5832057bb3ca0ba5f67e979c916e19;hp=2ceca4687f814a29b418ca4d3e20d46656d7fd06;hpb=fd1af773b3020a04dad477fa8e53ea474a89edb6;p=libfirm diff --git a/ir/be/beabi.c b/ir/be/beabi.c index 2ceca4687..2bf684a81 100644 --- a/ir/be/beabi.c +++ b/ir/be/beabi.c @@ -34,7 +34,7 @@ #include "iredges_t.h" #include "irgmod.h" #include "irgwalk.h" -#include "irprintf_t.h" +#include "irprintf.h" #include "irgopt.h" #include "iropt_t.h" #include "irtools.h" @@ -47,6 +47,7 @@ #include "be.h" #include "beabi.h" +#include "beabihelper.h" #include "bearch.h" #include "benode.h" #include "belive_t.h" @@ -73,12 +74,10 @@ typedef struct be_abi_call_arg_t { } be_abi_call_arg_t; struct be_abi_call_t { - be_abi_call_flags_t flags; /**< Flags describing the ABI behavior on calls */ - int pop; /**< number of bytes the stack frame is shrinked by the callee on return. */ - const be_abi_callbacks_t *cb; - ir_type *between_type; - set *params; - const arch_register_class_t *cls_addr; /**< register class of the call address */ + be_abi_call_flags_t flags; /**< Flags describing the ABI behavior on calls */ + int pop; /**< number of bytes the stack frame is shrinked by the callee on return. */ + const be_abi_callbacks_t *cb; + set *params; }; /** @@ -99,9 +98,6 @@ struct be_abi_irg_t { static ir_heights_t *ir_heights; -/** Flag: if set, try to omit the frame pointer in all routines. */ -static int be_omit_fp = 1; - static ir_node *be_abi_reg_map_get(pmap *map, const arch_register_t *reg) { return pmap_get(ir_node, map, reg); @@ -214,13 +210,6 @@ void be_abi_call_set_pop(be_abi_call_t *call, int pop) call->pop = pop; } -/* Set register class for call address */ -void be_abi_call_set_call_address_reg_class(be_abi_call_t *call, const arch_register_class_t *cls) -{ - call->cls_addr = cls; -} - - 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, @@ -274,18 +263,15 @@ be_abi_call_flags_t be_abi_call_get_flags(const be_abi_call_t *call) /** * Constructor for a new ABI call object. * - * @param cls_addr register class of the call address - * * @return the new ABI call object */ -static be_abi_call_t *be_abi_call_new(const arch_register_class_t *cls_addr) +static be_abi_call_t *be_abi_call_new(void) { be_abi_call_t *call = XMALLOCZ(be_abi_call_t); call->params = new_set(cmp_call_arg, 16); call->cb = NULL; - call->cls_addr = cls_addr; - call->flags.try_omit_fp = be_omit_fp; + call->flags.try_omit_fp = be_options.omit_fp; return call; } @@ -356,7 +342,7 @@ static ir_node *adjust_call(be_abi_irg_t *env, ir_node *irn, ir_node *curr_sp) ir_node *bl = get_nodes_block(irn); int stack_size = 0; const arch_register_t *sp = arch_env->sp; - be_abi_call_t *call = be_abi_call_new(sp->reg_class); + be_abi_call_t *call = be_abi_call_new(); ir_mode *mach_mode = sp->reg_class->mode; int n_res = get_method_n_ress(call_tp); @@ -504,11 +490,8 @@ static ir_node *adjust_call(be_abi_irg_t *env, ir_node *irn, ir_node *curr_sp) * checking */ continue; } - if (arch_register_is_caller_save(arch_env, reg)) { - if (!(reg->type & arch_register_type_ignore)) { - ARR_APP1(const arch_register_t*, destroyed_regs, reg); - } - } + if (arch_register_is_caller_save(arch_env, reg)) + ARR_APP1(const arch_register_t*, destroyed_regs, reg); } } @@ -570,7 +553,7 @@ static ir_node *adjust_call(be_abi_irg_t *env, ir_node *irn, ir_node *curr_sp) } else { /* indirect call */ low_call = be_new_Call(dbgi, irg, bl, curr_mem, sp->single_req, curr_sp, - call->cls_addr->class_req, call_ptr, + sp->reg_class->class_req, call_ptr, n_reg_results + pn_be_Call_first_res + ARR_LEN(destroyed_regs), n_ins, in, get_Call_type(irn)); } @@ -1159,32 +1142,25 @@ static ir_type *compute_arg_type(ir_graph *irg, be_abi_call_t *call, return res; } -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 = (const reg_node_map_t*)a; - const reg_node_map_t *q = (const reg_node_map_t*)b; + arch_register_t const *const p = *(arch_register_t const**)a; + arch_register_t const *const q = *(arch_register_t const**)b; - if (p->reg->reg_class == q->reg->reg_class) - return p->reg->index - q->reg->index; + if (p->reg_class == q->reg_class) + return p->index - q->index; else - return p->reg->reg_class < q->reg->reg_class ? -1 : +1; + return p->reg_class < q->reg_class ? -1 : +1; } -static void reg_map_to_arr(reg_node_map_t *res, pmap *reg_map) +static void reg_map_to_arr(arch_register_t const **const res, pmap *const reg_map) { pmap_entry *ent; size_t n = pmap_count(reg_map); size_t i = 0; foreach_pmap(reg_map, ent) { - res[i].reg = (const arch_register_t*)ent->key; - res[i].irn = (ir_node*)ent->value; - i++; + res[i++] = (arch_register_t const*)ent->key; } qsort(res, n, sizeof(res[0]), cmp_regs); @@ -1194,24 +1170,18 @@ static void reg_map_to_arr(reg_node_map_t *res, pmap *reg_map) * Creates a be_Return for a Return node. * * @param @env the abi environment - * @param irn the Return node or NULL if there was none - * @param bl the block where the be_Retun should be placed - * @param mem the current memory - * @param n_res number of return results + * @param irn the Return node */ -static ir_node *create_be_return(be_abi_irg_t *env, ir_node *irn, ir_node *bl, - ir_node *mem, int n_res) +static ir_node *create_be_return(be_abi_irg_t *const env, ir_node *const irn) { + ir_node *const bl = get_nodes_block(irn); be_abi_call_t *call = env->call; ir_graph *irg = get_Block_irg(bl); const arch_env_t *arch_env = be_get_irg_arch_env(irg); - dbg_info *dbgi; pmap *reg_map = pmap_create(); ir_node *keep = pmap_get(ir_node, env->keep_map, bl); size_t in_max; - ir_node *ret; int i, n; - unsigned pop; ir_node **in; ir_node *stack; const arch_register_t **regs; @@ -1231,6 +1201,7 @@ static ir_node *create_be_return(be_abi_irg_t *env, ir_node *irn, ir_node *bl, remove_End_keepalive(get_irg_end(irg), keep); } + int const n_res = get_Return_n_ress(irn); /* Insert results for Return into the register map. */ for (i = 0; i < n_res; ++i) { ir_node *res = get_Return_res(irn, i); @@ -1242,7 +1213,7 @@ static ir_node *create_be_return(be_abi_irg_t *env, ir_node *irn, ir_node *bl, /* Add uses of the callee save registers. */ foreach_pmap(env->regs, ent) { const arch_register_t *reg = (const arch_register_t*)ent->key; - if ((reg->type & arch_register_type_ignore) || arch_register_is_callee_save(arch_env, reg)) + if (arch_register_is_callee_save(arch_env, reg)) pmap_insert(reg_map, ent->key, ent->value); } @@ -1257,7 +1228,7 @@ static ir_node *create_be_return(be_abi_irg_t *env, ir_node *irn, ir_node *bl, in = ALLOCAN(ir_node*, in_max); regs = ALLOCAN(arch_register_t const*, in_max); - in[0] = mem; + in[0] = get_Return_mem(irn); in[1] = be_abi_reg_map_get(reg_map, arch_env->sp); regs[0] = NULL; regs[1] = arch_env->sp; @@ -1284,14 +1255,8 @@ static ir_node *create_be_return(be_abi_irg_t *env, ir_node *irn, ir_node *bl, } /* The in array for the new back end return is now ready. */ - if (irn != NULL) { - dbgi = get_irn_dbg_info(irn); - } else { - dbgi = NULL; - } - /* we have to pop the shadow parameter in in case of struct returns */ - pop = call->pop; - ret = be_new_Return(dbgi, irg, bl, n_res, pop, n, in); + dbg_info *const dbgi = get_irn_dbg_info(irn); + ir_node *const ret = be_new_Return(dbgi, irg, bl, n_res, call->pop, n, in); /* Set the register classes of the return's parameter accordingly. */ for (i = 0; i < n; ++i) { @@ -1386,7 +1351,6 @@ static void modify_irg(ir_graph *const irg, be_abi_irg_t *const env) int i, n; unsigned j; - reg_node_map_t *rm; const arch_register_t *fp_reg; ir_node *frame_pointer; ir_node *start_bl; @@ -1488,10 +1452,10 @@ static void modify_irg(ir_graph *const irg, be_abi_irg_t *const env) * Note, that if a register corresponds to an argument, the regs map * contains the old Proj from start for that argument. */ - rm = ALLOCAN(reg_node_map_t, pmap_count(env->regs)); - reg_map_to_arr(rm, env->regs); + arch_register_t const **const regs = ALLOCAN(arch_register_t const*, pmap_count(env->regs)); + reg_map_to_arr(regs, env->regs); for (i = 0, n = pmap_count(env->regs); i < n; ++i) { - const arch_register_t *reg = rm[i].reg; + const arch_register_t *reg = regs[i]; ir_mode *mode = reg->reg_class->mode; long nr = i; arch_register_req_type_t add_type = arch_register_req_type_none; @@ -1596,9 +1560,7 @@ static void modify_irg(ir_graph *const irg, be_abi_irg_t *const env) ir_node *irn = get_Block_cfgpred(end, i); if (is_Return(irn)) { - ir_node *blk = get_nodes_block(irn); - ir_node *mem = get_Return_mem(irn); - ir_node *ret = create_be_return(env, irn, blk, mem, get_Return_n_ress(irn)); + ir_node *const ret = create_be_return(env, irn); exchange(irn, ret); } } @@ -1822,11 +1784,9 @@ void be_abi_introduce(ir_graph *irg) /* Break here if backend provides a custom API. */ - be_omit_fp = be_options.omit_fp; - be_abi_irg_t env; env.keep_map = pmap_create(); - env.call = be_abi_call_new(arch_env->sp->reg_class); + env.call = be_abi_call_new(); arch_env_get_call_abi(arch_env, method_type, env.call); env.init_sp = dummy;