type *param_type = get_method_param_type(mt, p);
int param_size = get_type_size_bytes(param_type) + arg->space_after;
- curr_ofs += arg->space_before;
- curr_ofs = round_up2(curr_ofs, arg->alignment);
+ /*
+ * 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;
+ addr = curr_sp = be_new_IncSP(sp, irg, bl, curr_sp, curr_mem,
+ param_size + arg->space_before, be_stack_dir_expand);
+ }
+ else {
+ curr_ofs += arg->space_before;
+ curr_ofs = round_up2(curr_ofs, arg->alignment);
- /* Make the expression to compute the argument's offset. */
- if(curr_ofs > 0) {
- addr = new_r_Const_long(irg, bl, mode_Is, curr_ofs);
- addr = new_r_Add(irg, bl, curr_sp, addr, mach_mode);
+ /* Make the expression to compute the argument's offset. */
+ if(curr_ofs > 0) {
+ addr = new_r_Const_long(irg, bl, mode_Is, curr_ofs);
+ addr = new_r_Add(irg, bl, curr_sp, addr, mach_mode);
+ }
}
/* Insert a store for primitive arguments. */
- if(is_atomic_type(param_type)) {
+ if (is_atomic_type(param_type)) {
mem = new_r_Store(irg, bl, curr_mem, addr, param);
mem = new_r_Proj(irg, bl, mem, mode_M, pn_Store_M);
}
mem = new_r_Proj(irg, bl, mem, mode_M, pn_CopyB_M_regular);
}
- obstack_ptr_grow(obst, mem);
-
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(do_seq) {
- curr_ofs = 0;
- curr_sp = be_new_IncSP(sp, irg, bl, curr_sp, curr_mem, param_size, be_stack_dir_expand);
+ if (do_seq)
curr_mem = mem;
- }
+ else
+ obstack_ptr_grow(obst, mem);
}
in = (ir_node **) obstack_finish(obst);
return res;
}
+/**
+ * Creates a barrier.
+ */
static ir_node *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 n_regs = pmap_count(regs);
int n;
- int n_regs = pmap_count(regs);
ir_node *irn;
ir_node **in;
reg_node_map_t *rm;
obstack_free(&env->obst, in);
for(n = 0; n < n_regs; ++n) {
- int pos = BE_OUT_POS(n);
- ir_node *proj;
const arch_register_t *reg = rm[n].reg;
+ int flags = 0;
+ int pos = BE_OUT_POS(n);
+ ir_node *proj;
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 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))
- be_node_set_flags(irn, pos, arch_irn_flags_ignore);
+ flags |= arch_irn_flags_ignore;
+
+ if(arch_irn_is(env->birg->main_env->arch_env, in[n], modify_sp))
+ flags |= arch_irn_flags_modify_sp;
+
+ be_node_set_flags(irn, pos, flags);
pmap_insert(regs, (void *) reg, proj);
}
return irn;
}
+/**
+ * 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
+ */
+static ir_node *create_be_return(be_abi_irg_t *env, ir_node *irn, ir_node *bl, ir_node *mem, int n_res) {
+ be_abi_call_t *call = env->call;
+ const arch_isa_t *isa = env->birg->main_env->arch_env->isa;
+
+ pmap *reg_map = pmap_create();
+ ir_node *keep = pmap_get(env->keep_map, bl);
+ int in_max;
+ ir_node *ret;
+ int i, n;
+ ir_node **in;
+ ir_node *stack;
+ const arch_register_t **regs;
+ pmap_entry *ent ;
+
+ /*
+ get the valid stack node in this block.
+ If we had a call in that block there is a Keep constructed by process_calls()
+ which points to the last stack modification in that block. we'll use
+ it then. Else we use the stack from the start block and let
+ the ssa construction fix the usage.
+ */
+ stack = be_abi_reg_map_get(env->regs, isa->sp);
+ if (keep) {
+ ir_node *bad = new_r_Bad(env->birg->irg);
+ stack = get_irn_n(keep, 0);
+ set_nodes_block(keep, bad);
+ set_irn_n(keep, 0, bad);
+ // exchange(keep, new_r_Bad(env->birg->irg));
+ }
+
+ /* 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);
+ assert(arg->in_reg && "return value must be passed in register");
+ pmap_insert(reg_map, (void *) arg->reg, res);
+ }
+
+ /* Add uses of the callee save registers. */
+ pmap_foreach(env->regs, ent) {
+ const arch_register_t *reg = ent->key;
+ if(arch_register_type_is(reg, callee_save) || arch_register_type_is(reg, ignore))
+ pmap_insert(reg_map, ent->key, ent->value);
+ }
+
+ be_abi_reg_map_set(reg_map, isa->sp, stack);
+
+ /* Make the Epilogue node and call the arch's epilogue maker. */
+ create_barrier(env, bl, &mem, reg_map, 1);
+ call->cb->epilogue(env->cb, bl, &mem, reg_map);
+
+ /*
+ 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) + n_res + 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, isa->sp);
+ regs[0] = NULL;
+ regs[1] = isa->sp;
+ n = 2;
+
+ /* clear SP entry, since it has already been grown. */
+ pmap_insert(reg_map, (void *) isa->sp, NULL);
+ 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);
+
+ 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. */
+ be_abi_reg_map_set(reg_map, arg->reg, NULL);
+ }
+
+ /* grow the rest of the stuff. */
+ pmap_foreach(reg_map, ent) {
+ if(ent->value) {
+ in[n] = ent->value;
+ regs[n++] = ent->key;
+ }
+ }
+
+ /* The in array for the new back end return is now ready. */
+ ret = be_new_Return(irn ? get_irn_dbg_info(irn) : NULL, env->birg->irg, bl, n_res, 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);
+ pmap_destroy(reg_map);
+
+ return ret;
+}
+
/**
* Modify the irg itself and the frame type.
*/
const ir_edge_t *edge;
ir_type *arg_type, *bet_type;
- pmap_entry *ent;
bitset_t *used_proj_nr;
DEBUG_ONLY(firm_dbg_module_t *dbg = env->dbg;)
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 = i;
int pos = BE_OUT_POS((int) nr);
+ int flags = 0;
+
+ ir_node *proj;
assert(nr >= 0);
bitset_set(used_proj_nr, nr);
* The Proj for that register shall also be ignored during register allocation.
*/
if(arch_register_type_is(reg, ignore))
- be_node_set_flags(env->reg_params, pos, arch_irn_flags_ignore);
+ flags |= arch_irn_flags_ignore;
+
+ if(reg == sp)
+ flags |= arch_irn_flags_modify_sp;
+
+ be_node_set_flags(env->reg_params, pos, flags);
DBG((dbg, LEVEL_2, "\tregister save proj #%d -> reg %s\n", nr, reg->name));
}
/* Generate the Prologue */
fp_reg = call->cb->prologue(env->cb, &mem, env->regs);
+
+ /* do the stack allocation BEFORE the barrier, or spill code
+ might be added before it */
+ 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_expand);
+ be_abi_reg_map_set(env->regs, sp, env->init_sp);
+
barrier = 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_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);
set_irg_frame(irg, frame_pointer);
pset_insert_ptr(env->ignore_regs, fp_reg);
}
/* All Return nodes hang on the End node, so look for them there. */
- for(i = 0, n = get_irn_arity(end); i < n; ++i) {
- ir_node *irn = get_irn_n(end, i);
-
- if(get_irn_opcode(irn) == iro_Return) {
- ir_node *bl = get_nodes_block(irn);
- int n_res = get_Return_n_ress(irn);
- pmap *reg_map = pmap_create();
- ir_node *mem = get_Return_mem(irn);
- ir_node *keep = pmap_get(env->keep_map, bl);
- int in_max;
- ir_node *ret;
- int i, n;
- ir_node **in;
- ir_node *stack;
- const arch_register_t **regs;
-
- /*
- get the valid stack node in this block.
- If we had a call in that block there is a Keep constructed by process_calls()
- which points to the last stack modification in that block. we'll use
- it then. Else we use the stack from the start block and let
- the ssa construction fix the usage.
- */
- stack = keep ? get_irn_n(keep, 0) : be_abi_reg_map_get(env->regs, sp);
- be_abi_reg_map_set(reg_map, sp, stack);
-
- /* 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);
- assert(arg->in_reg && "return value must be passed in register");
- pmap_insert(reg_map, (void *) arg->reg, res);
- }
-
- /* Add uses of the callee save registers. */
- pmap_foreach(env->regs, ent) {
- const arch_register_t *reg = ent->key;
- if(arch_register_type_is(reg, callee_save) || arch_register_type_is(reg, ignore))
- pmap_insert(reg_map, ent->key, ent->value);
- }
-
- /* Make the Epilogue node and call the arch's epilogue maker. */
- create_barrier(env, bl, &mem, reg_map, 1);
- call->cb->epilogue(env->cb, bl, &mem, reg_map);
+ for (i = 0, n = get_Block_n_cfgpreds(end); i < n; ++i) {
+ ir_node *irn = get_Block_cfgpred(end, i);
- /*
- 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);
- 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);
-
- 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. */
- be_abi_reg_map_set(reg_map, arg->reg, NULL);
- }
-
- /* grow the rest of the stuff. */
- pmap_foreach(reg_map, ent) {
- if(ent->value) {
- in[n] = ent->value;
- regs[n++] = ent->key;
- }
- }
-
- /* The in array for the new back end return is now ready. */
- 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)
- 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);
+ if (is_Return(irn)) {
+ ir_node *ret = create_be_return(env, irn, get_nodes_block(irn), get_Return_mem(irn), get_Return_n_ress(irn));
exchange(irn, ret);
- pmap_destroy(reg_map);
}
}
+ /* if we have endless loops here, n might be <= 0. Do NOT create a be_Return than,
+ the code is dead and will never be executed. */
del_pset(dont_save);
obstack_free(&env->obst, args);
*/
+struct fix_stack_walker_info {
+ nodeset *nodes;
+ const arch_env_t *aenv;
+};
+
/**
* Walker. Collect all stack modifying nodes.
*/
static void collect_stack_nodes_walker(ir_node *irn, void *data)
{
- pset *s = data;
+ struct fix_stack_walker_info *info = data;
- if(be_is_AddSP(irn) || be_is_IncSP(irn) || be_is_SetSP(irn))
- pset_insert_ptr(s, irn);
+ if(arch_irn_is(info->aenv, irn, modify_sp))
+ pset_insert_ptr(info->nodes, irn);
}
void be_abi_fix_stack_nodes(be_abi_irg_t *env)
{
dom_front_info_t *df;
- pset *stack_nodes;
+ pset *stack_nodes = pset_new_ptr(16);
+ struct fix_stack_walker_info info;
+
+ info.nodes = stack_nodes;
+ info.aenv = env->birg->main_env->arch_env;
/* We need dominance frontiers for fix up */
df = be_compute_dominance_frontiers(env->birg->irg);
- stack_nodes = pset_new_ptr(16);
+ irg_walk_graph(env->birg->irg, collect_stack_nodes_walker, NULL, &info);
pset_insert_ptr(stack_nodes, env->init_sp);
- irg_walk_graph(env->birg->irg, collect_stack_nodes_walker, NULL, stack_nodes);
be_ssa_constr_set_phis(df, stack_nodes, env->stack_phis);
del_pset(stack_nodes);
static arch_irn_flags_t abi_get_flags(const void *_self, const ir_node *irn)
{
- return arch_irn_flags_ignore;
+ return arch_irn_flags_ignore | arch_irn_flags_modify_sp;
}
static entity *abi_get_frame_entity(const void *_self, const ir_node *irn)
projects / libfirm / blobdiff