#include "benode_t.h"
#include "belive_t.h"
#include "besched_t.h"
+#include "beirg.h"
typedef struct _be_abi_call_arg_t {
unsigned is_res : 1; /**< 1: the call argument is a return value. 0: it's a call parameter. */
int pos;
const arch_register_t *reg;
- entity *stack_ent;
+ ir_entity *stack_ent;
unsigned alignment;
unsigned space_before;
unsigned space_after;
} be_abi_call_arg_t;
struct _be_abi_call_t {
- be_abi_call_flags_t flags;
- const be_abi_callbacks_t *cb;
- ir_type *between_type;
- set *params;
+ be_abi_call_flags_t flags;
+ const be_abi_callbacks_t *cb;
+ ir_type *between_type;
+ set *params;
+ const arch_register_class_t *cls_addr;
};
-#define N_FRAME_TYPES 3
-
-/**
- * This type describes the stack layout.
- * The stack is divided into 3 parts:
- * - arg_type: A struct type describing the stack arguments and it's order.
- * - between_type: A struct type describing the stack layout between arguments
- * and frame type
- * - frame_type: A class type descibing the frame layout
- */
-typedef struct _be_stack_layout_t {
- ir_type *arg_type; /**< A type describing the stack argument layout. */
- ir_type *between_type; /**< A type describing the "between" layout. */
- ir_type *frame_type; /**< The frame type. */
-
- ir_type *order[N_FRAME_TYPES]; /**< arg, between and frame types ordered. */
-
- int initial_offset;
- int stack_dir; /**< -1 for decreasing, 1 for increasing. */
-} be_stack_layout_t;
-
struct _be_abi_irg_t {
struct obstack obst;
be_stack_layout_t *frame; /**< The stack frame model. */
- const be_irg_t *birg; /**< The back end IRG. */
+ be_irg_t *birg; /**< The back end IRG. */
const arch_isa_t *isa; /**< The isa. */
survive_dce_t *dce_survivor;
ir_node *init_sp; /**< The node representing the stack pointer
at the start of the function. */
+ ir_node *start_barrier; /**< The barrier of the start block */
+
ir_node *reg_params; /**< The reg params node. */
pmap *regs; /**< A map of all callee-save and ignore regs to
their Projs to the RegParams node. */
static heights_t *ir_heights;
/* Flag: if set, try to omit the frame pointer if called by the backend */
-int be_omit_fp = 1;
+static int be_omit_fp = 1;
/*
_ ____ ___ ____ _ _ _ _
/* 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;
- call->cb = cb;
+ call->flags = flags;
+ call->cb = cb;
+}
+
+
+/* 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, unsigned alignment, unsigned space_before, unsigned space_after)
{
be_abi_call_arg_t *arg = get_or_set_call_arg(call, 0, arg_pos, 1);
static be_abi_call_t *be_abi_call_new(void)
{
be_abi_call_t *call = xmalloc(sizeof(call[0]));
+
call->flags.val = 0;
call->params = new_set(cmp_call_arg, 16);
call->cb = NULL;
+ call->cls_addr = NULL;
call->flags.bits.try_omit_fp = be_omit_fp;
+
return call;
}
and the spills.
*/
-static int get_stack_entity_offset(be_stack_layout_t *frame, entity *ent, int bias)
+static int get_stack_entity_offset(be_stack_layout_t *frame, ir_entity *ent, int bias)
{
ir_type *t = get_entity_owner(ent);
- int ofs = get_entity_offset_bytes(ent);
+ int ofs = get_entity_offset(ent);
int i, index;
/**
* Retrieve the entity with given offset from a frame type.
*/
-static entity *search_ent_with_offset(ir_type *t, int offset)
+static ir_entity *search_ent_with_offset(ir_type *t, int offset)
{
int i, n;
for(i = 0, n = get_compound_n_members(t); i < n; ++i) {
- entity *ent = get_compound_member(t, i);
- if(get_entity_offset_bytes(ent) == offset)
+ ir_entity *ent = get_compound_member(t, i);
+ if(get_entity_offset(ent) == offset)
return ent;
}
static int stack_frame_compute_initial_offset(be_stack_layout_t *frame)
{
- ir_type *base = frame->stack_dir < 0 ? frame->between_type : frame->frame_type;
- entity *ent = search_ent_with_offset(base, 0);
- frame->initial_offset = 0;
- frame->initial_offset = get_stack_entity_offset(frame, ent, 0);
+ ir_type *base = frame->stack_dir < 0 ? frame->between_type : frame->frame_type;
+ ir_entity *ent = search_ent_with_offset(base, 0);
+
+ frame->initial_offset = ent ? get_stack_entity_offset(frame, ent, 0) : 0;
+
return frame->initial_offset;
}
* @param between the between layout type
* @param locals the method frame type
* @param stack_dir the stack direction
+ * @param param_map an array mapping method argument positions to the stack argument type
*
* @return the initialized stack layout
*/
static be_stack_layout_t *stack_frame_init(be_stack_layout_t *frame, ir_type *args,
- ir_type *between, ir_type *locals, int stack_dir)
+ ir_type *between, ir_type *locals, int stack_dir,
+ ir_entity *param_map[])
{
frame->arg_type = args;
frame->between_type = between;
frame->initial_offset = 0;
frame->stack_dir = stack_dir;
frame->order[1] = between;
+ frame->param_map = param_map;
if(stack_dir > 0) {
frame->order[0] = args;
return frame;
}
+#if 0
/** Dumps the stack layout to file. */
static void stack_layout_dump(FILE *file, be_stack_layout_t *frame)
{
ir_fprintf(file, "type %d: %F size: %d\n", j, t, get_type_size_bytes(t));
for (i = 0, n = get_compound_n_members(t); i < n; ++i) {
- entity *ent = get_compound_member(t, i);
+ ir_entity *ent = get_compound_member(t, i);
ir_fprintf(file, "\t%F int ofs: %d glob ofs: %d\n", ent, get_entity_offset_bytes(ent), get_stack_entity_offset(frame, ent, 0));
}
}
}
+#endif
/**
* Returns non-zero if the call argument at given position
* @param curr_sp The stack pointer node to use.
* @return The stack pointer after the call.
*/
-static ir_node *adjust_call(be_abi_irg_t *env, ir_node *irn, ir_node *curr_sp)
+static ir_node *adjust_call(be_abi_irg_t *env, ir_node *irn, ir_node *curr_sp, ir_node *alloca_copy)
{
ir_graph *irg = env->birg->irg;
const arch_isa_t *isa = env->birg->main_env->arch_env->isa;
const arch_register_t *sp = arch_isa_sp(isa);
ir_mode *mach_mode = sp->reg_class->mode;
struct obstack *obst = &env->obst;
- ir_node *no_mem = get_irg_no_mem(irg);
int no_alloc = call->flags.bits.frame_is_setup_on_call;
ir_node *res_proj = NULL;
for(i = 0; i < n_params; ++i) {
be_abi_call_arg_t *arg = get_call_arg(call, 0, i);
assert(arg);
- if(arg->on_stack) {
- stack_size += arg->space_before;
- stack_size = round_up2(stack_size, arg->alignment);
- stack_size += get_type_size_bytes(get_method_param_type(mt, i));
- stack_size += arg->space_after;
+ if (arg->on_stack) {
+ int arg_size = get_type_size_bytes(get_method_param_type(mt, i));
+
+ stack_size += round_up2(arg->space_before, arg->alignment);
+ stack_size += round_up2(arg_size, arg->alignment);
+ stack_size += round_up2(arg->space_after, arg->alignment);
obstack_int_grow(obst, i);
n_pos++;
}
/*
* Reverse list of stack parameters if call arguments are from left to right.
- * We must them reverse again in they are pushed (not stored) and the stack
+ * We must them reverse again if they are pushed (not stored) and the stack
* direction is downwards.
*/
if (call->flags.bits.left_to_right ^ (do_seq && stack_dir < 0)) {
- for(i = 0; i < n_pos >> 1; ++i) {
+ for (i = 0; i < n_pos >> 1; ++i) {
int other = n_pos - i - 1;
int tmp = pos[i];
pos[i] = pos[other];
* 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);
+ curr_sp = be_new_IncSP(sp, irg, bl, curr_sp, stack_size);
+ if(alloca_copy) {
+ add_irn_dep(curr_sp, alloca_copy);
+ alloca_copy = NULL;
+ }
+ }
+
+ if(!do_seq) {
+ obstack_ptr_grow(obst, get_Call_mem(irn));
+ curr_mem = new_NoMem();
+ } else {
+ curr_mem = get_Call_mem(irn);
}
assert(mode_is_reference(mach_mode) && "machine mode must be pointer");
*/
if (do_seq) {
curr_ofs = 0;
- addr = curr_sp = be_new_IncSP(sp, irg, bl, curr_sp, curr_mem,
- param_size + arg->space_before);
+ addr = curr_sp = be_new_IncSP(sp, irg, bl, curr_sp, param_size + arg->space_before);
+ if(alloca_copy) {
+ add_irn_dep(curr_sp, alloca_copy);
+ alloca_copy = NULL;
+ }
+ add_irn_dep(curr_sp, curr_mem);
}
else {
curr_ofs += arg->space_before;
/* Insert a store for primitive arguments. */
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);
+ ir_node *store;
+ store = new_r_Store(irg, bl, curr_mem, addr, param);
+ mem = new_r_Proj(irg, bl, store, mode_M, pn_Store_M);
}
/* Make a mem copy for compound arguments. */
else {
+ ir_node *copy;
+
assert(mode_is_reference(get_irn_mode(param)));
- mem = new_r_CopyB(irg, bl, curr_mem, addr, param, param_type);
- mem = new_r_Proj(irg, bl, mem, mode_M, pn_CopyB_M_regular);
+ copy = new_r_CopyB(irg, bl, curr_mem, addr, param, param_type);
+ mem = new_r_Proj(irg, bl, copy, mode_M, pn_CopyB_M_regular);
}
curr_ofs += param_size;
in = (ir_node **) obstack_finish(obst);
/* We need the sync only, if we didn't build the stores sequentially. */
- if(!do_seq)
- curr_mem = new_r_Sync(irg, bl, n_pos, in);
+ if(!do_seq) {
+ if(n_pos >= 1) {
+ curr_mem = new_r_Sync(irg, bl, n_pos + 1, in);
+ } else {
+ curr_mem = get_Call_mem(irn);
+ }
+ }
obstack_free(obst, in);
}
get_Call_type(irn));
/*
- TODO:
- Set the register class of the call address to the same as the stack pointer's.
- That' probably buggy for some architectures.
+ Set the register class of the call address to the same as the stack pointer's
+ if it's not set by the backend in the abi callback.
*/
- be_node_set_reg_class(low_call, be_pos_Call_ptr, sp->reg_class);
+ be_node_set_reg_class(low_call, be_pos_Call_ptr, call->cls_addr ? call->cls_addr : sp->reg_class);
+
+ /* Set input requirement for stack pointer. */
+ be_node_set_reg_class(low_call, be_pos_Call_sp, arch_get_irn_reg_class(isa->main_env->arch_env, curr_sp, -1));
DBG((env->dbg, LEVEL_3, "\tcreated backend call %+F\n", low_call));
}
/* Set the register constraints of the results. */
- for(i = 0; res_projs[i]; ++i) {
- ir_node *irn = res_projs[i];
- int proj = get_Proj_proj(irn);
+ for (i = 0; res_projs[i]; ++i) {
+ ir_node *irn = res_projs[i];
+ int proj = get_Proj_proj(irn);
/* Correct Proj number since it has been adjusted! (see above) */
const be_abi_call_arg_t *arg = get_call_arg(call, 1, proj - pn_Call_max);
exchange(irn, low_call);
/* redirect the result projs to the lowered call instead of the Proj_T */
- for(i = 0; res_projs[i]; ++i)
+ for (i = 0; res_projs[i]; ++i)
set_Proj_pred(res_projs[i], low_call);
/* Make additional projs for the caller save registers
and the Keep node which keeps them alive. */
- if(pset_count(caller_save) > 0) {
+ if (pset_count(caller_save) > 0) {
const arch_register_t *reg;
- ir_node **in, *keep;
- int i, n;
+ ir_node **in, *keep;
+ int i, n;
- for(reg = pset_first(caller_save), n = 0; reg; reg = pset_next(caller_save), ++n) {
+ for (reg = pset_first(caller_save), n = 0; reg; reg = pset_next(caller_save), ++n) {
ir_node *proj = new_r_Proj(irg, bl, low_call, reg->reg_class->mode, curr_res_proj);
/* 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);
+
+ /* a call can produce ignore registers, in this case set the flag and register for the Proj */
+ if (arch_register_type_is(reg, ignore)) {
+ arch_set_irn_register(env->birg->main_env->arch_env, proj, reg);
+ be_node_set_flags(low_call, BE_OUT_POS(curr_res_proj), arch_irn_flags_ignore);
+ }
+
set_irn_link(proj, (void *) reg);
obstack_ptr_grow(obst, proj);
curr_res_proj++;
}
+ /* create the Keep for the caller save registers */
in = (ir_node **) obstack_finish(obst);
keep = be_new_Keep(NULL, irg, bl, n, in);
- for(i = 0; i < n; ++i) {
+ for (i = 0; i < n; ++i) {
const arch_register_t *reg = get_irn_link(in[i]);
be_node_set_reg_class(keep, i, reg->reg_class);
}
}
}
- if(!mem_proj)
+ if(!mem_proj) {
mem_proj = new_r_Proj(irg, bl, low_call, mode_M, pn_Call_M);
+ keep_alive(mem_proj);
+ }
/* 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);
+ if(!no_alloc) {
+ curr_sp = be_new_IncSP(sp, irg, bl, curr_sp, -stack_size);
+ add_irn_dep(curr_sp, mem_proj);
+ if(alloca_copy) {
+ add_irn_dep(curr_sp, alloca_copy);
+ alloca_copy = NULL;
+ }
+ }
}
be_abi_call_free(call);
* Adjust an alloca.
* The alloca is transformed into a back end alloca node and connected to the stack nodes.
*/
-static ir_node *adjust_alloc(be_abi_irg_t *env, ir_node *alloc, ir_node *curr_sp)
+static ir_node *adjust_alloc(be_abi_irg_t *env, ir_node *alloc, ir_node *curr_sp, ir_node **result_copy)
{
if (get_Alloc_where(alloc) == stack_alloc) {
ir_node *bl = get_nodes_block(alloc);
ir_node *new_alloc;
ir_node *addr;
ir_node *copy;
+ ir_node *ins[2];
foreach_out_edge(alloc, edge) {
ir_node *irn = get_edge_src_irn(edge);
env->call->flags.bits.try_omit_fp = 0;
new_alloc = be_new_AddSP(env->isa->sp, irg, bl, curr_sp, get_Alloc_size(alloc));
- exchange(alloc, new_alloc);
+ if(alloc_mem != NULL) {
+ ir_node *addsp_mem;
+ ir_node *sync;
- if(alloc_mem != NULL)
- set_Proj_proj(alloc_mem, pn_be_AddSP_M);
+ addsp_mem = new_r_Proj(irg, bl, new_alloc, mode_M, pn_be_AddSP_M);
+
+ // We need to sync the output mem of the AddSP with the input mem
+ // edge into the alloc node
+ ins[0] = get_Alloc_mem(alloc);
+ ins[1] = addsp_mem;
+ sync = new_r_Sync(irg, bl, 2, ins);
+
+ exchange(alloc_mem, sync);
+ }
+
+ exchange(alloc, new_alloc);
/* fix projnum of alloca res */
set_Proj_proj(alloc_res, pn_be_AddSP_res);
addr = env->isa->stack_dir < 0 ? alloc_res : curr_sp;
- /* copy the address away, since it could be used after further stack pointer modifictions. */
+ /* copy the address away, since it could be used after further stack pointer modifications. */
/* Let it point curr_sp just for the moment, I'll reroute it in a second. */
- copy = be_new_Copy(env->isa->sp->reg_class, irg, bl, curr_sp);
+ *result_copy = copy = be_new_Copy(env->isa->sp->reg_class, irg, bl, curr_sp);
/* Let all users of the Alloc() result now point to the copy. */
edges_reroute(alloc_res, copy, irg);
curr_sp = alloc_res;
}
+ return curr_sp;
+} /* adjust_alloc */
+
+/**
+ * Adjust a Free.
+ * The Free is transformed into a back end free node and connected to the stack nodes.
+ */
+static ir_node *adjust_free(be_abi_irg_t *env, ir_node *free, ir_node *curr_sp)
+{
+ if (get_Free_where(free) == stack_alloc) {
+ ir_node *bl = get_nodes_block(free);
+ ir_graph *irg = get_irn_irg(bl);
+ ir_node *addsp, *mem, *res;
+
+ /* The stack pointer will be modified in an unknown manner.
+ We cannot omit it. */
+ env->call->flags.bits.try_omit_fp = 0;
+ addsp = be_new_SubSP(env->isa->sp, irg, bl, curr_sp, get_Free_size(free));
+ mem = new_r_Proj(irg, bl, addsp, mode_M, pn_be_SubSP_M);
+ res = new_r_Proj(irg, bl, addsp, mode_P_data, pn_be_SubSP_res);
+
+ exchange(free, mem);
+ curr_sp = res;
+ }
return curr_sp;
-}
+} /* adjust_free */
/* the following function is replaced by the usage of the heights module */
#if 0
}
/**
- * Walker: links all Call nodes to the Block they are contained.
+ * Walker: links all Call/alloc/Free nodes to the Block they are contained.
*/
static void link_calls_in_block_walker(ir_node *irn, void *data)
{
- if(is_Call(irn) || (get_irn_opcode(irn) == iro_Alloc && get_Alloc_where(irn) == stack_alloc)) {
+ opcode code = get_irn_opcode(irn);
+
+ if (code == iro_Call ||
+ (code == iro_Alloc && get_Alloc_where(irn) == stack_alloc) ||
+ (code == iro_Free && get_Free_where(irn) == stack_alloc)) {
be_abi_irg_t *env = data;
ir_node *bl = get_nodes_block(irn);
void *save = get_irn_link(bl);
- if (is_Call(irn))
+ if (code == iro_Call)
env->call->flags.bits.irg_is_leaf = 0;
set_irn_link(irn, save);
if(n > 0) {
ir_node *keep;
ir_node **nodes;
+ ir_node *copy = NULL;
int i;
nodes = obstack_finish(&env->obst);
DBG((env->dbg, LEVEL_3, "\tprocessing call %+F\n", irn));
switch(get_irn_opcode(irn)) {
case iro_Call:
- curr_sp = adjust_call(env, irn, curr_sp);
+ curr_sp = adjust_call(env, irn, curr_sp, copy);
break;
case iro_Alloc:
- curr_sp = adjust_alloc(env, irn, curr_sp);
+ curr_sp = adjust_alloc(env, irn, curr_sp, ©);
+ break;
+ case iro_Free:
+ curr_sp = adjust_free(env, irn, curr_sp);
break;
default:
break;
}
set_irn_link(bl, curr_sp);
-}
+} /* process_calls_in_block */
/**
* Adjust all call nodes in the graph to the ABI conventions.
heights_free(ir_heights);
}
-static void collect_return_walker(ir_node *irn, void *data)
-{
- if(get_irn_opcode(irn) == iro_Return) {
- struct obstack *obst = data;
- obstack_ptr_grow(obst, irn);
- }
-}
-
#if 0 /*
static ir_node *setup_frame(be_abi_irg_t *env)
{
* @param env the ABI environment
* @param call the current call ABI
* @param method_type the method type
+ * @param param_map an array mapping method arguments to the stack layout type
*
* @return the stack argument layout type
*/
-static ir_type *compute_arg_type(be_abi_irg_t *env, be_abi_call_t *call, ir_type *method_type)
+static ir_type *compute_arg_type(be_abi_irg_t *env, be_abi_call_t *call, ir_type *method_type, ir_entity ***param_map)
{
int dir = env->call->flags.bits.left_to_right ? 1 : -1;
int inc = env->birg->main_env->arch_env->isa->stack_dir * dir;
int i;
ir_type *val_param_tp = get_method_value_param_type(method_type);
ident *id = get_entity_ident(get_irg_entity(env->birg->irg));
+ ir_entity **map;
+ *param_map = map = obstack_alloc(&env->obst, n * sizeof(ir_entity *));
res = new_type_struct(mangle_u(id, new_id_from_chars("arg_type", 8)));
for (i = 0; i < n; ++i, curr += inc) {
ir_type *param_type = get_method_param_type(method_type, curr);
be_abi_call_arg_t *arg = get_call_arg(call, 0, curr);
+ map[i] = NULL;
if (arg->on_stack) {
if (val_param_tp) {
/* the entity was already created, move it to the param type */
}
ofs += arg->space_before;
ofs = round_up2(ofs, arg->alignment);
- set_entity_offset_bytes(arg->stack_ent, ofs);
+ set_entity_offset(arg->stack_ent, ofs);
ofs += arg->space_after;
ofs += get_type_size_bytes(param_type);
+ map[i] = arg->stack_ent;
}
}
set_type_size_bytes(res, ofs);
return res;
}
+#if 0
static void create_register_perms(const arch_isa_t *isa, ir_graph *irg, ir_node *bl, pmap *regs)
{
int i, j, n;
obstack_free(&obst, NULL);
}
+#endif
typedef struct {
const arch_register_t *reg;
typedef struct lower_frame_sels_env_t {
be_abi_irg_t *env;
- entity *value_param_list; /**< the list of all value param antities */
+ ir_entity *value_param_list; /**< the list of all value param entities */
} lower_frame_sels_env_t;
/**
if (ptr == frame || ptr == param_base) {
be_abi_irg_t *env = ctx->env;
- entity *ent = get_Sel_entity(irn);
+ ir_entity *ent = get_Sel_entity(irn);
ir_node *bl = get_nodes_block(irn);
ir_node *nw;
nw = be_new_FrameAddr(env->isa->sp->reg_class, irg, bl, frame, ent);
exchange(irn, nw);
- if (ptr == param_base) {
+ /* check, if it's a param sel and if have not seen this entity immediatly before */
+ if (ptr == param_base && ctx->value_param_list != ent) {
set_entity_link(ent, ctx->value_param_list);
ctx->value_param_list = ent;
}
* In the default case we move the entity to the frame type and create
* a backing store into the first block.
*/
-static void fix_address_of_parameter_access(be_abi_irg_t *env, entity *value_param_list) {
+static void fix_address_of_parameter_access(be_abi_irg_t *env, ir_entity *value_param_list) {
be_abi_call_t *call = env->call;
ir_graph *irg = env->birg->irg;
- entity *ent, *next_ent, *new_list;
+ ir_entity *ent, *next_ent, *new_list;
ir_type *frame_tp;
DEBUG_ONLY(firm_dbg_module_t *dbg = env->dbg;)
add_class_member(frame_tp, ent);
/* must be automatic to set a fixed layout */
set_entity_allocation(ent, allocation_automatic);
- set_entity_offset_bytes(ent, offset);
+ set_entity_offset(ent, offset);
offset += get_type_size_bytes(tp);
}
set_type_size_bytes(frame_tp, offset);
}
}
+/**
+ * The start block has no jump, instead it has an initial exec Proj.
+ * The backend wants to handle all blocks the same way, so we replace
+ * the out cfg edge with a real jump.
+ */
+static void fix_start_block(ir_node *block, void *env) {
+ int *done = env;
+ int i;
+ ir_node *start_block;
+ ir_graph *irg;
+
+ /* we processed the start block, return */
+ if (*done)
+ return;
+
+ irg = get_irn_irg(block);
+ start_block = get_irg_start_block(irg);
+
+ for (i = get_Block_n_cfgpreds(block) - 1; i >= 0; --i) {
+ ir_node *pred = get_Block_cfgpred(block, i);
+ ir_node *pred_block = get_nodes_block(pred);
+
+ /* ok, we are in the block, having start as cfg predecessor */
+ if (pred_block == start_block) {
+ ir_node *jump = new_r_Jmp(irg, pred_block);
+ set_Block_cfgpred(block, i, jump);
+ *done = 1;
+ }
+ }
+}
+
/**
* Modify the irg itself and the frame type.
*/
ir_graph *irg = env->birg->irg;
ir_node *bl = get_irg_start_block(irg);
ir_node *end = get_irg_end_block(irg);
- ir_node *no_mem = get_irg_no_mem(irg);
ir_node *mem = get_irg_initial_mem(irg);
ir_type *method_type = get_entity_type(get_irg_entity(irg));
pset *dont_save = pset_new_ptr(8);
int n_params;
- int i, j, n;
+ int i, j, n, temp;
reg_node_map_t *rm;
const arch_register_t *fp_reg;
const ir_edge_t *edge;
ir_type *arg_type, *bet_type;
lower_frame_sels_env_t ctx;
+ ir_entity **param_map;
bitset_t *used_proj_nr;
DEBUG_ONLY(firm_dbg_module_t *dbg = env->dbg;)
DBG((dbg, LEVEL_2, "\treading arg: %d -> %+F\n", nr, irn));
}
- arg_type = compute_arg_type(env, call, method_type);
+ arg_type = compute_arg_type(env, call, method_type, ¶m_map);
bet_type = call->cb->get_between_type(env->cb);
- stack_frame_init(env->frame, arg_type, bet_type, get_irg_frame_type(irg), isa->stack_dir);
+ stack_frame_init(env->frame, arg_type, bet_type, get_irg_frame_type(irg), isa->stack_dir, param_map);
/* Count the register params and add them to the number of Projs for the RegParams node */
for(i = 0; i < n_params; ++i) {
pmap_insert(env->regs, (void *) isa->bp, NULL);
reg_params_bl = get_irg_start_block(irg);
env->reg_params = be_new_RegParams(irg, reg_params_bl, pmap_count(env->regs));
+ add_irn_dep(env->reg_params, get_irg_start(irg));
/*
* make proj nodes for the callee save registers.
/* 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_EXPAND);
+ env->init_sp = be_new_IncSP(sp, irg, bl, env->init_sp, BE_STACK_FRAME_SIZE_EXPAND);
be_abi_reg_map_set(env->regs, sp, env->init_sp);
- barrier = create_barrier(env, bl, &mem, env->regs, 0);
+ env->start_barrier = barrier = create_barrier(env, 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);
del_pset(dont_save);
obstack_free(&env->obst, args);
-}
-/**
- * Walker: puts all Alloc(stack_alloc) on a obstack
- */
-static void collect_alloca_walker(ir_node *irn, void *data)
-{
- be_abi_irg_t *env = data;
- if(get_irn_opcode(irn) == iro_Alloc && get_Alloc_where(irn) == stack_alloc)
- obstack_ptr_grow(&env->obst, irn);
+ /* handle start block here (place a jump in the block) */
+ temp = 0;
+ irg_block_walk_graph(irg, fix_start_block, NULL, &temp);
}
be_abi_irg_t *be_abi_introduce(be_irg_t *birg)
ir_node *dummy;
optimization_state_t state;
+ be_omit_fp = birg->main_env->options->omit_fp;
+
obstack_init(&env->obst);
env->isa = birg->main_env->arch_env->isa;
arch_env_push_irn_handler(env->birg->main_env->arch_env, &env->irn_handler);
env->call->cb->done(env->cb);
+ env->cb = NULL;
return env;
}
bitset_set(bs, reg->index);
}
+/* Returns the stack layout from a abi environment. */
+const be_stack_layout_t *be_abi_get_stack_layout(const be_abi_irg_t *abi) {
+ return abi->frame;
+}
/*
void be_abi_fix_stack_nodes(be_abi_irg_t *env, be_lv_t *lv)
{
- dom_front_info_t *df;
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);
+ be_assure_dom_front(env->birg);
+
irg_walk_graph(env->birg->irg, collect_stack_nodes_walker, NULL, &info);
pset_insert_ptr(stack_nodes, env->init_sp);
- be_ssa_constr_set_phis(df, lv, stack_nodes, env->stack_phis);
+ be_ssa_constr_set_phis(env->birg->dom_front, lv, stack_nodes, env->stack_phis);
del_pset(stack_nodes);
-
- /* free these dominance frontiers */
- be_free_dominance_frontiers(df);
}
static int process_stack_bias(be_abi_irg_t *env, ir_node *bl, int bias)
If so, set the true offset (including the bias) for that
node.
*/
- entity *ent = arch_get_frame_entity(arch_env, irn);
+ ir_entity *ent = arch_get_frame_entity(arch_env, irn);
if(ent) {
int offset = get_stack_entity_offset(env->frame, ent, bias);
arch_set_frame_offset(arch_env, irn, offset);
return pmap_get(abi->regs, (void *) reg);
}
+ir_node *be_abi_get_ignore_irn(be_abi_irg_t *abi, const arch_register_t *reg)
+{
+ assert(arch_register_type_is(reg, ignore));
+ assert(pmap_contains(abi->regs, (void *) reg));
+ return pmap_get(abi->regs, (void *) reg);
+}
+
+ir_node *be_abi_get_start_barrier(be_abi_irg_t *abi)
+{
+ return abi->start_barrier;
+}
+
/*
_____ _____ _ _ _ _ _ _
|_ _| __ \| \ | | | | | | | | |
return arch_irn_flags_ignore | arch_irn_flags_modify_sp;
}
-static entity *abi_get_frame_entity(const void *_self, const ir_node *irn)
+static ir_entity *abi_get_frame_entity(const void *_self, const ir_node *irn)
{
return NULL;
}
-static void abi_set_frame_entity(const void *_self, ir_node *irn, entity *ent)
+static void abi_set_frame_entity(const void *_self, ir_node *irn, ir_entity *ent)
{
}
static const arch_irn_handler_t abi_irn_handler = {
abi_get_irn_ops
};
+
+/**
+ * Returns non-zero if the ABI has omitted the frame pointer in
+ * the current graph.
+ */
+int be_abi_omit_fp(const be_abi_irg_t *abi) {
+ return abi->call->flags.bits.try_omit_fp;
+}
projects / libfirm / blobdiff