#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
+
#include "obst.h"
+#include "offset.h"
#include "type.h"
#include "irgopt.h"
int pos;
const arch_register_t *reg;
entity *stack_ent;
+ unsigned alignment;
+ unsigned space_before;
+ unsigned space_after;
} be_abi_call_arg_t;
struct _be_abi_call_t {
arch_irn_ops_t irn_ops;
};
-#define abi_offset_of(type,member) ((char *) &(((type *) 0)->member) - (char *) 0)
-#define abi_get_relative(ptr, member) ((void *) ((char *) (ptr) - abi_offset_of(be_abi_irg_t, member)))
-#define get_abi_from_handler(ptr) abi_get_relative(ptr, irn_handler)
-#define get_abi_from_ops(ptr) abi_get_relative(ptr, irn_ops)
+#define get_abi_from_handler(ptr) firm_container_of(ptr, be_abi_irg_t, irn_handler)
+#define get_abi_from_ops(ptr) firm_container_of(ptr, be_abi_irg_t, irn_ops)
/* Forward, since be need it in be_abi_introduce(). */
static const arch_irn_ops_if_t abi_irn_ops;
call->cb = cb;
}
-void be_abi_call_param_stack(be_abi_call_t *call, int arg_pos)
+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);
- arg->on_stack = 1;
+ arg->on_stack = 1;
+ arg->alignment = alignment;
+ arg->space_before = space_before;
+ arg->space_after = space_after;
+ assert(alignment > 0 && "Alignment must be greater than 0");
}
void be_abi_call_param_reg(be_abi_call_t *call, int arg_pos, const arch_register_t *reg)
be_abi_call_t *be_abi_call_new(void)
{
- be_abi_call_t *call = malloc(sizeof(call[0]));
+ be_abi_call_t *call = xmalloc(sizeof(call[0]));
call->flags.val = 0;
call->params = new_set(cmp_call_arg, 16);
call->cb = NULL;
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;
int curr_res_proj = pn_Call_max;
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;
obstack_int_grow(obst, i);
n_pos++;
}
/* If there are some parameters which shall be passed on the stack. */
if(n_pos > 0) {
int curr_ofs = 0;
- int do_seq = call->flags.bits.store_args_sequential;
+ int do_seq = call->flags.bits.store_args_sequential && !no_alloc;
/* Reverse list of stack parameters if call arguments are from left to right */
if(call->flags.bits.left_to_right) {
/*
* If the stack is decreasing and we do not want to store sequentially,
+ * or someone else allocated the call frame
* we allocate as much space on the stack all parameters need, by
* moving the stack pointer along the stack's direction.
*/
- if(stack_dir < 0 && !do_seq) {
+ 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);
}
assert(mode_is_reference(mach_mode) && "machine mode must be pointer");
for(i = 0; i < n_pos; ++i) {
- int p = pos[i];
- ir_node *param = get_Call_param(irn, p);
- ir_node *addr = curr_sp;
- ir_node *mem = NULL;
- type *param_type = get_method_param_type(mt, p);
- int param_size = get_type_size_bytes(param_type);
+ int p = pos[i];
+ be_abi_call_arg_t *arg = get_call_arg(call, 0, p);
+ ir_node *param = get_Call_param(irn, p);
+ ir_node *addr = curr_sp;
+ ir_node *mem = NULL;
+ 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);
/* Make the expression to compute the argument's offset. */
if(curr_ofs > 0) {
mem = new_r_Proj(irg, bl, mem, mode_M, pn_Store_M);
}
- /* Make a memcopy for compound arguments. */
+ /* Make a mem copy for compound arguments. */
else {
assert(mode_is_reference(get_irn_mode(param)));
mem = new_r_CopyB(irg, bl, curr_mem, addr, param, param_type);
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);
+ /*
+ TODO:
+ Set the register class of the call address to the same as the stack pointer's.
+ That' probably buggy for some architectures.
+ */
+ be_node_set_reg_class(low_call, be_pos_Call_ptr, sp->reg_class);
+
/* Set the register classes and constraints of the Call parameters. */
for(i = 0; i < n_low_args; ++i) {
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);
+ be_set_constr_single_reg(low_call, be_pos_Call_first_arg + index, arg->reg);
}
/* Set the register constraints of the results. */
if(!mem_proj)
mem_proj = new_r_Proj(irg, bl, low_call, mode_M, pn_Call_M);
- /* Make a Proj for the stack pointer. */
- curr_sp = be_new_IncSP(sp, irg, bl, curr_sp, mem_proj, stack_size, be_stack_dir_against);
+ /* 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);
}
be_abi_call_free(call);
if(arg->on_stack) {
snprintf(buf, sizeof(buf), "param_%d", i);
arg->stack_ent = new_entity(res, new_id_from_str(buf), param_type);
+ ofs += arg->space_before;
+ ofs = round_up2(ofs, arg->alignment);
set_entity_offset_bytes(arg->stack_ent, ofs);
+ ofs += arg->space_after;
ofs += get_type_size_bytes(param_type);
}
}
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;
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);
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(env->birg->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);
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);
be_abi_reg_map_set(env->regs, sp, env->init_sp);
- frame_pointer = be_abi_reg_map_get(env->regs, sp);
+ frame_pointer = be_abi_reg_map_get(env->regs, fp_reg);
set_irg_frame(irg, frame_pointer);
/* Now, introduce stack param nodes for all parameters passed on the stack */
}
}
+ del_pset(dont_save);
obstack_free(&env->obst, args);
}
env->stack_phis = pset_new_ptr(16);
env->init_sp = dummy = new_r_Unknown(irg, env->isa->sp->reg_class->mode);
- env->cb = env->call->cb->init(env->call, env->isa, irg);
+ env->cb = env->call->cb->init(env->call, birg->main_env->arch_env, irg);
obstack_init(&env->obst);
projects / libfirm / blobdiff