Removed useless Alloc nodes
add omitfp parameter
static const arch_irn_ops_if_t abi_irn_ops;
static const arch_irn_handler_t abi_irn_handler;
static const arch_irn_ops_if_t abi_irn_ops;
static const arch_irn_handler_t abi_irn_handler;
+/* Flag: if set, try to omit the frame pointer if alled by the backend */
+int be_omit_fp = 0;
+
/*
_ ____ ___ ____ _ _ _ _
/ \ | __ )_ _| / ___|__ _| | | |__ __ _ ___| | _____
/*
_ ____ ___ ____ _ _ _ _
/ \ | __ )_ _| / ___|__ _| | | |__ __ _ ___| | _____
*
* @return the new ABI call object
*/
*
* @return the new ABI call object
*/
-static be_abi_call_t *be_abi_call_new(void)
+static be_abi_call_t *be_abi_call_new()
{
be_abi_call_t *call = xmalloc(sizeof(call[0]));
call->flags.val = 0;
call->params = new_set(cmp_call_arg, 16);
call->cb = NULL;
{
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->flags.bits.try_omit_fp = be_omit_fp;
const ir_edge_t *edge;
ir_node *new_alloc;
const ir_edge_t *edge;
ir_node *new_alloc;
- env->call->flags.bits.try_omit_fp = 0;
-
- new_alloc = be_new_AddSP(env->isa->sp, irg, bl, curr_sp, get_Alloc_size(alloc));
-
foreach_out_edge(alloc, edge) {
ir_node *irn = get_edge_src_irn(edge);
foreach_out_edge(alloc, edge) {
ir_node *irn = get_edge_src_irn(edge);
- /* TODO: Beware: currently Alloc nodes without a result might happen,
- only escape analysis kills them and this phase runs only for object
- oriented source. So this must be fixed. */
- assert(alloc_res != NULL);
+ /* Beware: currently Alloc nodes without a result might happen,
+ only escape analysis kills them and this phase runs only for object
+ oriented source. We kill the Alloc here. */
+ if (alloc_res == NULL) {
+ exchange(alloc_mem, get_Alloc_mem(alloc));
+ return curr_sp;
+ }
+
+ /* The stack pointer will be modified in an unknown manner.
+ We cannot omit it. */
+ 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_res, env->isa->stack_dir < 0 ? new_alloc : curr_sp);
if(alloc_mem != NULL)
exchange(alloc_res, env->isa->stack_dir < 0 ? new_alloc : curr_sp);
if(alloc_mem != NULL)
static ir_node *setup_frame(be_abi_irg_t *env)
{
const arch_isa_t *isa = env->birg->main_env->arch_env->isa;
static ir_node *setup_frame(be_abi_irg_t *env)
{
const arch_isa_t *isa = env->birg->main_env->arch_env->isa;
obstack_ptr_grow(obst, irn);
}
}
obstack_ptr_grow(obst, irn);
}
}
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)
{
-static void create_barrier(be_abi_irg_t *env, ir_node *bl, ir_node **mem, pmap *regs, int in_req)
+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;
{
ir_graph *irg = env->birg->irg;
int n;
}
obstack_free(&env->obst, rm);
}
obstack_free(&env->obst, rm);
pset *dont_save = pset_new_ptr(8);
int n_params = get_method_n_params(method_type);
int max_arg = 0;
pset *dont_save = pset_new_ptr(8);
int n_params = get_method_n_params(method_type);
int max_arg = 0;
- DEBUG_ONLY(firm_dbg_module_t *dbg = env->dbg;)
int i, j, n;
reg_node_map_t *rm;
const arch_register_t *fp_reg;
ir_node *frame_pointer;
int i, j, n;
reg_node_map_t *rm;
const arch_register_t *fp_reg;
ir_node *frame_pointer;
ir_node *reg_params_bl;
ir_node **args;
const ir_edge_t *edge;
ir_node *reg_params_bl;
ir_node **args;
const ir_edge_t *edge;
pmap_entry *ent;
bitset_t *used_proj_nr;
pmap_entry *ent;
bitset_t *used_proj_nr;
+ DEBUG_ONLY(firm_dbg_module_t *dbg = env->dbg;)
DBG((dbg, LEVEL_1, "introducing abi on %+F\n", irg));
DBG((dbg, LEVEL_1, "introducing abi on %+F\n", irg));
obstack_free(&env->obst, rm);
/* Generate the Prologue */
obstack_free(&env->obst, rm);
/* Generate the Prologue */
- fp_reg = call->cb->prologue(env->cb, &mem, env->regs);
- create_barrier(env, bl, &mem, env->regs, 0);
+ fp_reg = call->cb->prologue(env->cb, &mem, env->regs);
+ 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);
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);
frame_pointer = be_abi_reg_map_get(env->regs, fp_reg);
set_irg_frame(irg, frame_pointer);
frame_pointer = be_abi_reg_map_get(env->regs, fp_reg);
set_irg_frame(irg, frame_pointer);
+ assert(is_Proj(frame_pointer));
+ be_node_set_flags(barrier, BE_OUT_POS(get_Proj_proj(frame_pointer)), arch_irn_flags_ignore);
+
/* Now, introduce stack param nodes for all parameters passed on the stack */
for(i = 0; i < max_arg; ++i) {
ir_node *arg_proj = args[i];
/* Now, introduce stack param nodes for all parameters passed on the stack */
for(i = 0; i < max_arg; ++i) {
ir_node *arg_proj = args[i];
#include "bearch.h"
#include "beabi_t.h"
#include "bearch.h"
#include "beabi_t.h"
+/** Flag: if set, try to omit the frame pointer if alled by the backend */
+extern int be_omit_fp;
+
struct _be_abi_call_flags_bits_t {
unsigned left_to_right : 1; /**< Arguments are from left to right. */
unsigned store_args_sequential : 1; /**< Use sequential stores for arguments. */
struct _be_abi_call_flags_bits_t {
unsigned left_to_right : 1; /**< Arguments are from left to right. */
unsigned store_args_sequential : 1; /**< Use sequential stores for arguments. */
* @param reg_map A mapping mapping all callee_save/ignore/parameter registers to their defining nodes.
* @return The register which shall be used as a stack frame base.
*
* @param reg_map A mapping mapping all callee_save/ignore/parameter registers to their defining nodes.
* @return The register which shall be used as a stack frame base.
*
- * All nodes which define registers in @p reg_map must keep @p reg_map current.
+ * All nodes which define registers in @p reg_map must keep @p reg_map current.
*/
const arch_register_t *(*prologue)(void *self, ir_node **mem, pmap *reg_map);
*/
const arch_register_t *(*prologue)(void *self, ir_node **mem, pmap *reg_map);
LC_OPT_ENT_ENUM_MASK("dump", "dump irg on several occasions", &dump_var),
LC_OPT_ENT_ENUM_PTR("ra", "register allocator", &ra_var),
LC_OPT_ENT_ENUM_PTR("isa", "the instruction set architecture", &isa_var),
LC_OPT_ENT_ENUM_MASK("dump", "dump irg on several occasions", &dump_var),
LC_OPT_ENT_ENUM_PTR("ra", "register allocator", &ra_var),
LC_OPT_ENT_ENUM_PTR("isa", "the instruction set architecture", &isa_var),
+ LC_OPT_ENT_BOOL("omitfp", "omit frame pointer", &be_omit_fp),
#ifdef WITH_ILP
LC_OPT_ENT_STR ("ilp.server", "the ilp server name", be_options.ilp_server, sizeof(be_options.ilp_server)),
#ifdef WITH_ILP
LC_OPT_ENT_STR ("ilp.server", "the ilp server name", be_options.ilp_server, sizeof(be_options.ilp_server)),