benode: Remove the parameter irg from be_new_Call().
[libfirm] / ir / be / beabi.c
index e01d364..99868f2 100644 (file)
@@ -21,7 +21,6 @@
  * @file
  * @brief       Backend ABI implementation.
  * @author      Sebastian Hack, Michael Beck
- * @version     $Id$
  */
 #include "config.h"
 
 #include "iredges_t.h"
 #include "irgmod.h"
 #include "irgwalk.h"
-#include "irprintf_t.h"
+#include "irprintf.h"
 #include "irgopt.h"
-#include "irbitset.h"
 #include "iropt_t.h"
+#include "irtools.h"
 #include "heights.h"
 #include "pdeq.h"
-#include "irtools.h"
+#include "util.h"
 #include "raw_bitset.h"
 #include "error.h"
 #include "pset_new.h"
 
 #include "be.h"
 #include "beabi.h"
+#include "beabihelper.h"
 #include "bearch.h"
 #include "benode.h"
 #include "belive_t.h"
@@ -61,8 +61,7 @@ DEBUG_ONLY(static firm_dbg_module_t *dbg;)
 
 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. */
-       unsigned in_reg   : 1;  /**< 1: this argument is transmitted in registers. */
-       unsigned on_stack : 1;  /**< 1: this argument is transmitted on the stack. */
+       unsigned in_reg   : 1;  /**< 1: this argument is transmitted 1: in registers, 0: on stack. */
        unsigned callee   : 1;  /**< 1: someone called us. 0: We call another function */
 
        int                    pos;
@@ -75,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;
 };
 
 /**
@@ -92,14 +89,8 @@ struct be_abi_irg_t {
        ir_node              *init_sp;      /**< The node representing the stack pointer
                                                 at the start of the function. */
 
-       ir_node              *start;        /**< The be_Start params node. */
        pmap                 *regs;         /**< A map of all callee-save and ignore regs to
                                                 their Projs to the RegParams node. */
-
-       int                  start_block_bias; /**< The stack bias at the end of the start block. */
-
-       void                 *cb;           /**< ABI Callback self pointer. */
-
        pmap                 *keep_map;     /**< mapping blocks to keep nodes. */
 
        ir_node              **calls;       /**< flexible array containing all be_Call nodes */
@@ -107,8 +98,42 @@ 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);
+}
+
+static void be_abi_reg_map_set(pmap *map, const arch_register_t* reg,
+                               ir_node *node)
+{
+       pmap_insert(map, reg, node);
+}
+
+/**
+ * Check if the given register is callee save, i.e. will be saved by the callee.
+ */
+static bool arch_register_is_callee_save(
+       const arch_env_t      *arch_env,
+       const arch_register_t *reg)
+{
+       if (arch_env->impl->register_saved_by)
+               return arch_env->impl->register_saved_by(reg, /*callee=*/1);
+       return false;
+}
+
+/**
+ * Check if the given register is caller save, i.e. must be saved by the caller.
+ */
+static bool arch_register_is_caller_save(
+       const arch_env_t      *arch_env,
+       const arch_register_t *reg)
+{
+       if (arch_env->impl->register_saved_by)
+               return arch_env->impl->register_saved_by(reg, /*callee=*/0);
+       return false;
+}
+
+
 
 /*
      _    ____ ___    ____      _ _ _                _
@@ -152,7 +177,7 @@ static be_abi_call_arg_t *get_call_arg(be_abi_call_t *call, int is_res, int pos,
 
        hash = is_res * 128 + pos;
 
-       return (be_abi_call_arg_t*)set_find(call->params, &arg, sizeof(arg), hash);
+       return set_find(be_abi_call_arg_t, call->params, &arg, sizeof(arg), hash);
 }
 
 /**
@@ -163,11 +188,11 @@ static void remember_call_arg(be_abi_call_arg_t *arg, be_abi_call_t *call, be_ab
        unsigned hash = arg->is_res * 128 + arg->pos;
        if (context & ABI_CONTEXT_CALLEE) {
                arg->callee = 1;
-               set_insert(call->params, arg, sizeof(*arg), hash);
+               (void)set_insert(be_abi_call_arg_t, call->params, arg, sizeof(*arg), hash);
        }
        if (context & ABI_CONTEXT_CALLER) {
                arg->callee = 0;
-               set_insert(call->params, arg, sizeof(*arg), hash);
+               (void)set_insert(be_abi_call_arg_t, call->params, arg, sizeof(*arg), hash);
        }
 }
 
@@ -185,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,
@@ -200,7 +218,6 @@ void be_abi_call_param_stack(be_abi_call_t *call, int arg_pos,
        be_abi_call_arg_t arg;
        memset(&arg, 0, sizeof(arg));
        assert(alignment > 0 && "Alignment must be greater than 0");
-       arg.on_stack     = 1;
        arg.load_mode    = load_mode;
        arg.alignment    = alignment;
        arg.space_before = space_before;
@@ -246,20 +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->flags.val  = 0;
-       call->params     = new_set(cmp_call_arg, 16);
-       call->cb         = NULL;
-       call->cls_addr   = cls_addr;
-
-       call->flags.bits.try_omit_fp = be_omit_fp;
+       call->params            = new_set(cmp_call_arg, 16);
+       call->cb                = NULL;
+       call->flags.try_omit_fp = be_options.omit_fp;
 
        return call;
 }
@@ -280,33 +292,23 @@ static void be_abi_call_free(be_abi_call_t *call)
  * @param args      the stack argument layout type
  * @param between   the between layout type
  * @param locals    the method frame type
- * @param stack_dir the stack direction: < 0 decreasing, > 0 increasing addresses
- * @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_entity *param_map[])
+                                           ir_type *between, ir_type *locals)
 {
        frame->arg_type       = args;
        frame->between_type   = between;
        frame->frame_type     = locals;
        frame->initial_offset = 0;
        frame->initial_bias   = 0;
-       frame->stack_dir      = stack_dir;
        frame->order[1]       = between;
-       frame->param_map      = param_map;
 
-       if (stack_dir > 0) {
-               frame->order[0] = args;
-               frame->order[2] = locals;
-       } else {
-               /* typical decreasing stack: locals have the
-                * lowest addresses, arguments the highest */
-               frame->order[0] = locals;
-               frame->order[2] = args;
-       }
+       /* typical decreasing stack: locals have the
+        * lowest addresses, arguments the highest */
+       frame->order[0] = locals;
+       frame->order[2] = args;
        return frame;
 }
 
@@ -339,13 +341,10 @@ static ir_node *adjust_call(be_abi_irg_t *env, ir_node *irn, ir_node *curr_sp)
        ir_node *curr_mem          = get_Call_mem(irn);
        ir_node *bl                = get_nodes_block(irn);
        int stack_size             = 0;
-       int stack_dir              = arch_env->stack_dir;
        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 no_alloc               = call->flags.bits.frame_is_setup_on_call;
        int n_res                  = get_method_n_ress(call_tp);
-       int do_seq                 = call->flags.bits.store_args_sequential && !no_alloc;
 
        ir_node *res_proj  = NULL;
        int n_reg_params   = 0;
@@ -358,10 +357,10 @@ static ir_node *adjust_call(be_abi_irg_t *env, ir_node *irn, ir_node *curr_sp)
        ir_node               **in;
        ir_node               **res_projs;
        int                     n_reg_results = 0;
-       const ir_edge_t        *edge;
        int                    *reg_param_idxs;
        int                    *stack_param_idx;
-       int                     i, n, destroy_all_regs;
+       int                     i, n;
+       int                     throws_exception;
        size_t                  s;
        size_t                  p;
        dbg_info               *dbgi;
@@ -370,12 +369,12 @@ static ir_node *adjust_call(be_abi_irg_t *env, ir_node *irn, ir_node *curr_sp)
        arch_env_get_call_abi(arch_env, call_tp, call);
 
        /* Insert code to put the stack arguments on the stack. */
-       assert(get_Call_n_params(irn) == n_params);
+       assert((size_t)get_Call_n_params(irn) == n_params);
        stack_param_idx = ALLOCAN(int, n_params);
        for (p = 0; p < n_params; ++p) {
                be_abi_call_arg_t *arg = get_call_arg(call, 0, p, 0);
                assert(arg);
-               if (arg->on_stack) {
+               if (!arg->in_reg) {
                        int arg_size = get_type_size_bytes(get_method_param_type(call_tp, p));
 
                        stack_size += round_up2(arg->space_before, arg->alignment);
@@ -404,9 +403,7 @@ static ir_node *adjust_call(be_abi_irg_t *env, ir_node *irn, ir_node *curr_sp)
         * Note: we also have to do this for stack_size == 0, because we may have
         * to adjust stack alignment for the call.
         */
-       if (stack_dir < 0 && !do_seq && !no_alloc) {
-               curr_sp = be_new_IncSP(sp, bl, curr_sp, stack_size, 1);
-       }
+       curr_sp = be_new_IncSP(sp, bl, curr_sp, stack_size, 1);
 
        dbgi = get_irn_dbg_info(irn);
        /* If there are some parameters which shall be passed on the stack. */
@@ -415,24 +412,8 @@ static ir_node *adjust_call(be_abi_irg_t *env, ir_node *irn, ir_node *curr_sp)
                ir_node **in       = ALLOCAN(ir_node*, n_stack_params+1);
                unsigned  n_in     = 0;
 
-               /*
-                * Reverse list of stack parameters if call arguments are from left to right.
-                * 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_stack_params >> 1; ++i) {
-                               int other  = n_stack_params - i - 1;
-                               int tmp    = stack_param_idx[i];
-                               stack_param_idx[i]     = stack_param_idx[other];
-                               stack_param_idx[other] = tmp;
-                       }
-               }
-
                curr_mem = get_Call_mem(irn);
-               if (! do_seq) {
-                       in[n_in++] = curr_mem;
-               }
+               in[n_in++] = curr_mem;
 
                for (i = 0; i < n_stack_params; ++i) {
                        int p                  = stack_param_idx[i];
@@ -448,29 +429,23 @@ static ir_node *adjust_call(be_abi_irg_t *env, ir_node *irn, ir_node *curr_sp)
                         * 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, bl, curr_sp,
-                                                             param_size + arg->space_before, 0);
-                               add_irn_dep(curr_sp, curr_mem);
-                       } 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) {
-                                       ir_mode *constmode = mach_mode;
-                                       if (mode_is_reference(mach_mode)) {
-                                               constmode = mode_Is;
-                                       }
-                                       addr = new_r_Const_long(irg, constmode, curr_ofs);
-                                       addr = new_r_Add(bl, curr_sp, addr, mach_mode);
+                       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) {
+                               ir_mode *constmode = mach_mode;
+                               if (mode_is_reference(mach_mode)) {
+                                       constmode = mode_Is;
                                }
+                               addr = new_r_Const_long(irg, constmode, curr_ofs);
+                               addr = new_r_Add(bl, curr_sp, addr, mach_mode);
                        }
 
                        /* Insert a store for primitive arguments. */
                        if (is_atomic_type(param_type)) {
-                               ir_node *mem_input = do_seq ? curr_mem : new_r_NoMem(irg);
+                               ir_node *nomem     = get_irg_no_mem(irg);
+                               ir_node *mem_input = nomem;
                                ir_node *store     = new_rd_Store(dbgi, bl, mem_input, addr, param, cons_none);
                                mem   = new_r_Proj(store, mode_M, pn_Store_M);
                        } else {
@@ -484,36 +459,17 @@ static ir_node *adjust_call(be_abi_irg_t *env, ir_node *irn, ir_node *curr_sp)
 
                        curr_ofs += param_size;
 
-                       if (do_seq)
-                               curr_mem = mem;
-                       else
-                               in[n_in++] = mem;
+                       in[n_in++] = mem;
                }
 
                /* We need the sync only, if we didn't build the stores sequentially. */
-               if (! do_seq) {
-                       if (n_stack_params >= 1) {
-                               curr_mem = new_r_Sync(bl, n_in, in);
-                       } else {
-                               curr_mem = get_Call_mem(irn);
-                       }
+               if (n_stack_params >= 1) {
+                       curr_mem = new_r_Sync(bl, n_in, in);
+               } else {
+                       curr_mem = get_Call_mem(irn);
                }
        }
 
-       /* check for the return_twice property */
-       destroy_all_regs = 0;
-       if (is_SymConst_addr_ent(call_ptr)) {
-               ir_entity *ent = get_SymConst_entity(call_ptr);
-
-               if (get_entity_additional_properties(ent) & mtp_property_returns_twice)
-                       destroy_all_regs = 1;
-       } else {
-               ir_type *call_tp = get_Call_type(irn);
-
-               if (get_method_additional_properties(call_tp) & mtp_property_returns_twice)
-                       destroy_all_regs = 1;
-       }
-
        /* Put caller save into the destroyed set and state registers in the states
         * set */
        for (i = 0, n = arch_env->n_register_classes; i < n; ++i) {
@@ -534,11 +490,8 @@ static ir_node *adjust_call(be_abi_irg_t *env, ir_node *irn, ir_node *curr_sp)
                                 * checking */
                                continue;
                        }
-                       if (destroy_all_regs || (reg->type & arch_register_type_caller_save)) {
-                               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);
                }
        }
 
@@ -546,19 +499,14 @@ static ir_node *adjust_call(be_abi_irg_t *env, ir_node *irn, ir_node *curr_sp)
        res_projs = ALLOCANZ(ir_node*, n_res);
 
        foreach_out_edge(irn, edge) {
-               const ir_edge_t *res_edge;
-               ir_node         *irn = get_edge_src_irn(edge);
+               ir_node *irn = get_edge_src_irn(edge);
 
                if (!is_Proj(irn) || get_Proj_proj(irn) != pn_Call_T_result)
                        continue;
 
                foreach_out_edge(irn, res_edge) {
-                       int proj;
-                       ir_node *res = get_edge_src_irn(res_edge);
-
-                       assert(is_Proj(res));
-
-                       proj = get_Proj_proj(res);
+                       ir_node *const res  = get_edge_src_irn(res_edge);
+                       long     const proj = get_Proj_proj(res);
                        assert(proj < n_res);
                        assert(res_projs[proj] == NULL);
                        res_projs[proj] = res;
@@ -583,29 +531,29 @@ static ir_node *adjust_call(be_abi_irg_t *env, ir_node *irn, ir_node *curr_sp)
        /* add state registers ins */
        for (s = 0; s < ARR_LEN(states); ++s) {
                const arch_register_t       *reg = states[s];
-               const arch_register_class_t *cls = arch_register_get_class(reg);
-#if 0
-               ir_node *regnode = be_abi_reg_map_get(env->regs, reg);
-               ir_fprintf(stderr, "Adding %+F\n", regnode);
-#endif
-               ir_node *regnode = new_r_Unknown(irg, arch_register_class_mode(cls));
+               const arch_register_class_t *cls = reg->reg_class;
+               ir_node *regnode = new_r_Unknown(irg, cls->mode);
                in[n_ins++]      = regnode;
        }
        assert(n_ins == (int) (n_reg_params + ARR_LEN(states)));
 
        /* ins collected, build the call */
-       if (env->call->flags.bits.call_has_imm && is_SymConst(call_ptr)) {
+       throws_exception = ir_throws_exception(irn);
+       if (env->call->flags.call_has_imm && is_SymConst(call_ptr)) {
                /* direct call */
-               low_call = be_new_Call(dbgi, irg, bl, curr_mem, curr_sp, curr_sp,
+               low_call = be_new_Call(dbgi, bl, curr_mem, sp->single_req, curr_sp,
+                                      sp->single_req, curr_sp,
                                       n_reg_results + pn_be_Call_first_res + ARR_LEN(destroyed_regs),
                                       n_ins, in, get_Call_type(irn));
                be_Call_set_entity(low_call, get_SymConst_entity(call_ptr));
        } else {
                /* indirect call */
-               low_call = be_new_Call(dbgi, irg, bl, curr_mem, curr_sp, call_ptr,
+               low_call = be_new_Call(dbgi, bl, curr_mem, sp->single_req, curr_sp,
+                                      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));
        }
+       ir_set_throws_exception(low_call, throws_exception);
        be_Call_set_pop(low_call, call->pop);
 
        /* put the call into the list of all calls for later processing */
@@ -619,7 +567,6 @@ static ir_node *adjust_call(be_abi_irg_t *env, ir_node *irn, ir_node *curr_sp)
 
        /* now handle results */
        for (i = 0; i < n_res; ++i) {
-               int pn;
                ir_node           *proj = res_projs[i];
                be_abi_call_arg_t *arg  = get_call_arg(call, 1, i, 0);
 
@@ -631,7 +578,7 @@ static ir_node *adjust_call(be_abi_irg_t *env, ir_node *irn, ir_node *curr_sp)
                        unspeakable Proj_T from the Call. Therefore, all real argument
                        Proj numbers must be increased by pn_be_Call_first_res
                */
-               pn = i + pn_be_Call_first_res;
+               long pn = i + pn_be_Call_first_res;
 
                if (proj == NULL) {
                        ir_type *res_type = get_method_res_type(call_tp, i);
@@ -657,12 +604,6 @@ static ir_node *adjust_call(be_abi_irg_t *env, ir_node *irn, ir_node *curr_sp)
                }
        }
 
-       /*
-               Set the register class of the call address to
-               the backend provided class (default: stack pointer class)
-       */
-       be_node_set_reg_class_in(low_call, be_pos_Call_ptr, call->cls_addr);
-
        DBG((dbg, LEVEL_3, "\tcreated backend call %+F\n", low_call));
 
        /* Set the register classes and constraints of the Call parameters. */
@@ -671,7 +612,7 @@ static ir_node *adjust_call(be_abi_irg_t *env, ir_node *irn, ir_node *curr_sp)
                be_abi_call_arg_t *arg = get_call_arg(call, 0, index, 0);
                assert(arg->reg != NULL);
 
-               be_set_constr_single_reg_in(low_call, be_pos_Call_first_arg + i,
+               be_set_constr_single_reg_in(low_call, n_be_Call_first_arg + i,
                                            arg->reg, arch_register_req_type_none);
        }
 
@@ -756,14 +697,12 @@ static ir_node *adjust_call(be_abi_irg_t *env, ir_node *irn, ir_node *curr_sp)
                }
 
                if (! mem_proj) {
-                       mem_proj = new_r_Proj(low_call, mode_M, pn_be_Call_M_regular);
+                       mem_proj = new_r_Proj(low_call, mode_M, pn_be_Call_M);
                        keep_alive(mem_proj);
                }
        }
        /* Clean up the stack frame or revert alignment fixes if we allocated it */
-       if (! no_alloc) {
-               curr_sp = be_new_IncSP(sp, bl, curr_sp, -stack_size, 0);
-       }
+       curr_sp = be_new_IncSP(sp, bl, curr_sp, -stack_size, 0);
 
        be_abi_call_free(call);
 
@@ -820,7 +759,6 @@ static ir_node *adjust_alloc(be_abi_irg_t *env, ir_node *alloc, ir_node *curr_sp
        ir_type          *type      = get_Alloc_type(alloc);
        dbg_info         *dbg;
 
-       const ir_edge_t *edge;
        ir_node *new_alloc;
        ir_node *count;
        ir_node *size;
@@ -833,7 +771,6 @@ static ir_node *adjust_alloc(be_abi_irg_t *env, ir_node *alloc, ir_node *curr_sp
        foreach_out_edge(alloc, edge) {
                ir_node *irn = get_edge_src_irn(edge);
 
-               assert(is_Proj(irn));
                switch (get_Proj_proj(irn)) {
                case pn_Alloc_M:
                        alloc_mem = irn;
@@ -858,7 +795,7 @@ static ir_node *adjust_alloc(be_abi_irg_t *env, ir_node *alloc, ir_node *curr_sp
        count = get_Alloc_count(alloc);
 
        /* we might need to multiply the count with the element size */
-       if (type != firm_unknown_type && get_type_size_bytes(type) != 1) {
+       if (!is_unknown_type(type) && get_type_size_bytes(type) != 1) {
                ir_mode   *mode  = get_irn_mode(count);
                ir_tarval *tv    = new_tarval_from_long(get_type_size_bytes(type),
                                                        mode);
@@ -870,7 +807,7 @@ static ir_node *adjust_alloc(be_abi_irg_t *env, ir_node *alloc, ir_node *curr_sp
 
        /* The stack pointer will be modified in an unknown manner.
           We cannot omit it. */
-       env->call->flags.bits.try_omit_fp = 0;
+       env->call->flags.try_omit_fp = 0;
 
        stack_alignment = 1 << arch_env->stack_alignment;
        size            = adjust_alloc_size(stack_alignment, size, block, dbg);
@@ -923,14 +860,14 @@ static ir_node *adjust_free(be_abi_irg_t *env, ir_node *free, ir_node *curr_sp)
        assert(get_Free_where(free) == stack_alloc);
 
        /* we might need to multiply the size with the element size */
-       if (type != firm_unknown_type && get_type_size_bytes(type) != 1) {
+       if (!is_unknown_type(type) && get_type_size_bytes(type) != 1) {
                ir_tarval *tv   = new_tarval_from_long(get_type_size_bytes(type), mode_Iu);
                ir_node   *cnst = new_rd_Const(dbg, irg, tv);
-               ir_node   *mul  = new_rd_Mul(dbg, block, get_Free_size(free),
+               ir_node   *mul  = new_rd_Mul(dbg, block, get_Free_count(free),
                                             cnst, mode_Iu);
                size = mul;
        } else {
-               size = get_Free_size(free);
+               size = get_Free_count(free);
        }
 
        stack_alignment = 1 << arch_env->stack_alignment;
@@ -938,7 +875,7 @@ static ir_node *adjust_free(be_abi_irg_t *env, ir_node *free, ir_node *curr_sp)
 
        /* The stack pointer will be modified in an unknown manner.
           We cannot omit it. */
-       env->call->flags.bits.try_omit_fp = 0;
+       env->call->flags.try_omit_fp = 0;
        subsp = be_new_SubSP(arch_env->sp, block, curr_sp, size);
        set_irn_dbg_info(subsp, dbg);
 
@@ -1008,7 +945,6 @@ static int cmp_call_dependency(const void *c1, const void *c2)
 
 /**
  * Walker: links all Call/Alloc/Free nodes to the Block they are contained.
- * Clears the irg_is_leaf flag if a Call is detected.
  */
 static void link_ops_in_block_walker(ir_node *irn, void *data)
 {
@@ -1021,9 +957,6 @@ static void link_ops_in_block_walker(ir_node *irn, void *data)
                ir_node *bl       = get_nodes_block(irn);
                void *save        = get_irn_link(bl);
 
-               if (code == iro_Call)
-                       env->call->flags.bits.irg_is_leaf = 0;
-
                set_irn_link(irn, save);
                set_irn_link(bl, irn);
        }
@@ -1034,7 +967,7 @@ static void link_ops_in_block_walker(ir_node *irn, void *data)
                unsigned long  value = get_tarval_long(tv);
                /* use ebp, so the climbframe algo works... */
                if (value > 0) {
-                       env->call->flags.bits.try_omit_fp = 0;
+                       env->call->flags.try_omit_fp = 0;
                }
        }
 }
@@ -1081,10 +1014,6 @@ static void process_ops_in_block(ir_node *bl, void *data)
                        DBG((dbg, LEVEL_3, "\tprocessing call %+F\n", irn));
                        switch (get_irn_opcode(irn)) {
                        case iro_Call:
-                               if (! be_omit_fp) {
-                                       /* The stack pointer will be modified due to a call. */
-                                       env->call->flags.bits.try_omit_fp = 0;
-                               }
                                curr_sp = adjust_call(env, irn, curr_sp);
                                break;
                        case iro_Alloc:
@@ -1116,11 +1045,8 @@ static void process_ops_in_block(ir_node *bl, void *data)
 /**
  * Adjust all call nodes in the graph to the ABI conventions.
  */
-static void process_calls(ir_graph *irg)
+static void process_calls(ir_graph *const irg, be_abi_irg_t *const abi)
 {
-       be_abi_irg_t *abi = be_get_irg_abi(irg);
-
-       abi->call->flags.bits.irg_is_leaf = 1;
        irg_walk_graph(irg, firm_clear_link, link_ops_in_block_walker, abi);
 
        ir_heights = heights_new(irg);
@@ -1133,91 +1059,103 @@ static void process_calls(ir_graph *irg)
  * Changes a possibly allocated value param type by moving
  * entities to the stack layout type.
  *
- * @param env           the ABI environment
  * @param call          the current call ABI
  * @param method_type   the method type
- * @param val_param_tp  the value parameter type, will be destroyed
- * @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, ir_graph *irg,
-                                 be_abi_call_t *call,
-                                                                ir_type *method_type, ir_type *val_param_tp,
-                                                                ir_entity ***param_map)
+static ir_type *compute_arg_type(ir_graph *irg, be_abi_call_t *call,
+                                                                ir_type *method_type)
 {
-       const arch_env_t *arch_env = be_get_irg_arch_env(irg);
-       int dir  = env->call->flags.bits.left_to_right ? 1 : -1;
-       int inc  = arch_env->stack_dir * dir;
-       int n    = get_method_n_params(method_type);
-       int curr = inc > 0 ? 0 : n - 1;
        struct obstack *obst = be_get_be_obst(irg);
-       int ofs  = 0;
+       ir_type   *frame_type      = get_irg_frame_type(irg);
+       size_t     n_params        = get_method_n_params(method_type);
+       size_t     n_frame_members = get_compound_n_members(frame_type);
+       ir_entity *va_start_entity = NULL;
+       size_t   f;
+       int      ofs  = 0;
 
-       char buf[128];
        ir_type *res;
-       int i;
-       ident *id = get_entity_ident(get_irg_entity(irg));
-       ir_entity **map;
-
-       *param_map = map = OALLOCN(obst, ir_entity*, n);
-       res = new_type_struct(id_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, 1);
-
-               map[i] = NULL;
-               if (arg->on_stack) {
-                       if (val_param_tp != NULL) {
-                               /* the entity was already created, create a copy in the param type */
-                               ir_entity *val_ent = get_method_value_param_ent(method_type, i);
-                               arg->stack_ent = copy_entity_own(val_ent, res);
-                               set_entity_link(val_ent, arg->stack_ent);
-                               set_entity_link(arg->stack_ent, NULL);
-                       } else {
-                               /* create a new entity */
-                               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(arg->stack_ent, ofs);
-                       ofs += arg->space_after;
-                       ofs += get_type_size_bytes(param_type);
-                       map[i] = arg->stack_ent;
+       size_t i;
+       ir_entity **map = OALLOCNZ(obst, ir_entity*, n_params);
+       res = new_type_struct(new_id_from_chars("arg_type", 8));
+
+       /* collect existing entities for value_param_types */
+       for (f = n_frame_members; f > 0; ) {
+               ir_entity *entity = get_compound_member(frame_type, --f);
+               size_t     num;
+
+               set_entity_link(entity, NULL);
+               if (!is_parameter_entity(entity))
+                       continue;
+               num = get_entity_parameter_number(entity);
+               if (num == IR_VA_START_PARAMETER_NUMBER) {
+                       /* move entity to new arg_type */
+                       set_entity_owner(entity, res);
+                       va_start_entity = entity;
+                       continue;
                }
+               assert(num < n_params);
+               if (map[num] != NULL)
+                       panic("multiple entities for parameter %u in %+F found", f, irg);
+
+               if (num != n_params && get_call_arg(call, 0, num, 1)->in_reg) {
+                       /* don't move this entity */
+                       continue;
+               }
+
+               map[num] = entity;
+               /* move entity to new arg_type */
+               set_entity_owner(entity, res);
+       }
+
+       for (i = 0; i < n_params; ++i) {
+               be_abi_call_arg_t *arg        = get_call_arg(call, 0, i, 1);
+               ir_type           *param_type = get_method_param_type(method_type, i);
+               ir_entity         *entity;
+
+               if (arg->in_reg)
+                       continue;
+               entity = map[i];
+               if (entity == NULL) {
+                       /* create a new entity */
+                       entity = new_parameter_entity(res, i, param_type);
+               }
+               ofs += arg->space_before;
+               ofs = round_up2(ofs, arg->alignment);
+               set_entity_offset(entity, ofs);
+               ofs += arg->space_after;
+               ofs += get_type_size_bytes(param_type);
+               arg->stack_ent = entity;
+       }
+       if (va_start_entity != NULL) {
+               set_entity_offset(va_start_entity, ofs);
        }
        set_type_size_bytes(res, ofs);
        set_type_state(res, layout_fixed);
+
        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);
@@ -1227,24 +1165,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  = (ir_node*)pmap_get(env->keep_map, bl);
+       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;
@@ -1264,6 +1196,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);
@@ -1275,15 +1208,12 @@ 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_callee_save | arch_register_type_ignore))
+               if (arch_register_is_callee_save(arch_env, reg))
                        pmap_insert(reg_map, ent->key, ent->value);
        }
 
        be_abi_reg_map_set(reg_map, arch_env->sp, stack);
 
-       /* Make the Epilogue node and call the arch's epilogue maker. */
-       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
@@ -1293,7 +1223,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;
@@ -1320,15 +1250,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);
-       arch_irn_add_flags(ret, arch_irn_flags_epilog);
+       dbg_info *const dbgi = get_irn_dbg_info(irn);
+       ir_node  *const ret  = be_new_Return(dbgi, bl, n_res, call->pop, n, in);
 
        /* Set the register classes of the return's parameter accordingly. */
        for (i = 0; i < n; ++i) {
@@ -1344,57 +1267,11 @@ static ir_node *create_be_return(be_abi_irg_t *env, ir_node *irn, ir_node *bl,
        return ret;
 }
 
-typedef struct ent_pos_pair ent_pos_pair;
-struct ent_pos_pair {
-       ir_entity    *ent;   /**< a value param entity */
-       int          pos;    /**< its parameter number */
-       ent_pos_pair *next;  /**< for linking */
-};
-
 typedef struct lower_frame_sels_env_t {
-       ent_pos_pair *value_param_list;          /**< the list of all value param entities */
        ir_node      *frame;                     /**< the current frame */
        const arch_register_class_t *sp_class;   /**< register class of the stack pointer */
-       const arch_register_class_t *link_class; /**< register class of the link pointer */
-       ir_type      *value_tp;                  /**< the value type if any */
-       ir_type      *frame_tp;                  /**< the frame type */
-       int          static_link_pos;            /**< argument number of the hidden static link */
 } lower_frame_sels_env_t;
 
-/**
- * Return an entity from the backend for an value param entity.
- *
- * @param ent  an value param type entity
- * @param ctx  context
- */
-static ir_entity *get_argument_entity(ir_entity *ent, lower_frame_sels_env_t *ctx)
-{
-       ir_entity *argument_ent = (ir_entity*)get_entity_link(ent);
-
-       if (argument_ent == NULL) {
-               /* we have NO argument entity yet: This is bad, as we will
-               * need one for backing store.
-               * Create one here.
-               */
-               ir_type *frame_tp = ctx->frame_tp;
-               unsigned offset   = get_type_size_bytes(frame_tp);
-               ir_type  *tp      = get_entity_type(ent);
-               unsigned align    = get_type_alignment_bytes(tp);
-
-               offset += align - 1;
-               offset &= ~(align - 1);
-
-               argument_ent = copy_entity_own(ent, frame_tp);
-
-               /* must be automatic to set a fixed layout */
-               set_entity_offset(argument_ent, offset);
-               offset += get_type_size_bytes(tp);
-
-               set_type_size_bytes(frame_tp, offset);
-               set_entity_link(ent, argument_ent);
-       }
-       return argument_ent;
-}
 /**
  * Walker: Replaces Sels of frame type and
  * value param type entities by FrameAddress.
@@ -1411,146 +1288,13 @@ static void lower_frame_sels_walker(ir_node *irn, void *data)
                        ir_entity    *ent = get_Sel_entity(irn);
                        ir_node      *bl  = get_nodes_block(irn);
                        ir_node      *nw;
-                       int          pos = 0;
-                       int          is_value_param = 0;
-
-                       if (get_entity_owner(ent) == ctx->value_tp) {
-                               is_value_param = 1;
-
-                               /* replace by its copy from the argument type */
-                               pos = get_struct_member_index(ctx->value_tp, ent);
-                               ent = get_argument_entity(ent, ctx);
-                       }
 
                        nw = be_new_FrameAddr(ctx->sp_class, bl, ctx->frame, ent);
                        exchange(irn, nw);
-
-                       /* check, if it's a param Sel and if have not seen this entity before */
-                       if (is_value_param && get_entity_link(ent) == NULL) {
-                               ent_pos_pair pair;
-
-                               pair.ent  = ent;
-                               pair.pos  = pos;
-                               pair.next = NULL;
-                               ARR_APP1(ent_pos_pair, ctx->value_param_list, pair);
-                               /* just a mark */
-                               set_entity_link(ent, ctx->value_param_list);
-                       }
                }
        }
 }
 
-/**
- * Check if a value parameter is transmitted as a register.
- * This might happen if the address of an parameter is taken which is
- * transmitted in registers.
- *
- * Note that on some architectures this case must be handled specially
- * because the place of the backing store is determined by their ABI.
- *
- * 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, ir_graph *irg,
-                                            ent_pos_pair *value_param_list)
-{
-       be_abi_call_t    *call     = env->call;
-       const arch_env_t *arch_env = be_get_irg_arch_env(irg);
-       ent_pos_pair  *entry, *new_list;
-       ir_type       *frame_tp;
-       int           i, n = ARR_LEN(value_param_list);
-
-       new_list = NULL;
-       for (i = 0; i < n; ++i) {
-               int               pos  = value_param_list[i].pos;
-               be_abi_call_arg_t *arg = get_call_arg(call, 0, pos, 1);
-
-               if (arg->in_reg) {
-                       DBG((dbg, LEVEL_2, "\targ #%d need backing store\n", pos));
-                       value_param_list[i].next = new_list;
-                       new_list = &value_param_list[i];
-               }
-       }
-       if (new_list != NULL) {
-               /* ok, change the graph */
-               ir_node *start_bl = get_irg_start_block(irg);
-               ir_node *first_bl = get_first_block_succ(start_bl);
-               ir_node *frame, *imem, *nmem, *store, *mem, *args;
-               optimization_state_t state;
-               unsigned offset;
-
-               assert(first_bl && first_bl != start_bl);
-               /* we had already removed critical edges, so the following
-                  assertion should be always true. */
-               assert(get_Block_n_cfgpreds(first_bl) == 1);
-
-               /* now create backing stores */
-               frame = get_irg_frame(irg);
-               imem = get_irg_initial_mem(irg);
-
-               save_optimization_state(&state);
-               set_optimize(0);
-               nmem = new_r_Proj(get_irg_start(irg), mode_M, pn_Start_M);
-               restore_optimization_state(&state);
-
-               /* reroute all edges to the new memory source */
-               edges_reroute(imem, nmem, irg);
-
-               store   = NULL;
-               mem     = imem;
-               args    = get_irg_args(irg);
-               for (entry = new_list; entry != NULL; entry = entry->next) {
-                       int     i     = entry->pos;
-                       ir_type *tp   = get_entity_type(entry->ent);
-                       ir_mode *mode = get_type_mode(tp);
-                       ir_node *addr;
-
-                       /* address for the backing store */
-                       addr = be_new_FrameAddr(arch_env->sp->reg_class, first_bl, frame, entry->ent);
-
-                       if (store)
-                               mem = new_r_Proj(store, mode_M, pn_Store_M);
-
-                       /* the backing store itself */
-                       store = new_r_Store(first_bl, mem, addr,
-                                           new_r_Proj(args, mode, i), cons_none);
-               }
-               /* the new memory Proj gets the last Proj from store */
-               set_Proj_pred(nmem, store);
-               set_Proj_proj(nmem, pn_Store_M);
-
-               /* move all entities to the frame type */
-               frame_tp = get_irg_frame_type(irg);
-               offset   = get_type_size_bytes(frame_tp);
-
-               /* we will add new entities: set the layout to undefined */
-               assert(get_type_state(frame_tp) == layout_fixed);
-               set_type_state(frame_tp, layout_undefined);
-               for (entry = new_list; entry != NULL; entry = entry->next) {
-                       ir_entity *ent = entry->ent;
-
-                       /* If the entity is still on the argument type, move it to the
-                        * frame type.
-                        * This happens if the value_param type was build due to compound
-                        * params. */
-                       if (get_entity_owner(ent) != frame_tp) {
-                               ir_type  *tp   = get_entity_type(ent);
-                               unsigned align = get_type_alignment_bytes(tp);
-
-                               offset += align - 1;
-                               offset &= ~(align - 1);
-                               set_entity_owner(ent, frame_tp);
-                               /* must be automatic to set a fixed layout */
-                               set_entity_offset(ent, offset);
-                               offset += get_type_size_bytes(tp);
-                       }
-               }
-               set_type_size_bytes(frame_tp, offset);
-               /* fix the layout again */
-               set_type_state(frame_tp, layout_fixed);
-       }
-}
-
 /**
  * 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
@@ -1564,84 +1308,28 @@ static void fix_start_block(ir_graph *irg)
 
        assert(is_Proj(initial_X));
        exchange(initial_X, jmp);
-       set_irg_initial_exec(irg, new_r_Bad(irg));
-}
-
-/**
- * Update the entity of Sels to the outer value parameters.
- */
-static void update_outer_frame_sels(ir_node *irn, void *env)
-{
-       lower_frame_sels_env_t *ctx = (lower_frame_sels_env_t*)env;
-       ir_node                *ptr;
-       ir_entity              *ent;
-       int                    pos = 0;
-
-       if (! is_Sel(irn))
-               return;
-       ptr = get_Sel_ptr(irn);
-       if (! is_arg_Proj(ptr))
-               return;
-       if (get_Proj_proj(ptr) != ctx->static_link_pos)
-               return;
-       ent   = get_Sel_entity(irn);
-
-       if (get_entity_owner(ent) == ctx->value_tp) {
-               /* replace by its copy from the argument type */
-               pos = get_struct_member_index(ctx->value_tp, ent);
-               ent = get_argument_entity(ent, ctx);
-               set_Sel_entity(irn, ent);
-
-               /* check, if we have not seen this entity before */
-               if (get_entity_link(ent) == NULL) {
-                       ent_pos_pair pair;
-
-                       pair.ent  = ent;
-                       pair.pos  = pos;
-                       pair.next = NULL;
-                       ARR_APP1(ent_pos_pair, ctx->value_param_list, pair);
-                       /* just a mark */
-                       set_entity_link(ent, ctx->value_param_list);
-               }
-       }
-}
+       set_irg_initial_exec(irg, new_r_Bad(irg, mode_X));
 
-/**
- * Fix access to outer local variables.
- */
-static void fix_outer_variable_access(be_abi_irg_t *env,
-                                      lower_frame_sels_env_t *ctx)
-{
-       int      i;
-       ir_graph *irg;
-       (void) env;
-
-       for (i = get_class_n_members(ctx->frame_tp) - 1; i >= 0; --i) {
-               ir_entity *ent = get_class_member(ctx->frame_tp, i);
-
-               if (! is_method_entity(ent))
-                       continue;
-
-               irg = get_entity_irg(ent);
-               if (irg == NULL)
-                       continue;
-
-               /*
-                * FIXME: find the number of the static link parameter
-                * for now we assume 0 here
-                */
-               ctx->static_link_pos = 0;
+       /* merge start block with successor if possible */
+       {
+               foreach_out_edge(jmp, edge) {
+                       ir_node *succ = get_edge_src_irn(edge);
+                       if (!is_Block(succ))
+                               continue;
 
-               irg_walk_graph(irg, NULL, update_outer_frame_sels, ctx);
+                       if (get_irn_arity(succ) == 1) {
+                               exchange(succ, start_block);
+                       }
+                       break;
+               }
        }
 }
 
 /**
  * Modify the irg itself and the frame type.
  */
-static void modify_irg(ir_graph *irg)
+static void modify_irg(ir_graph *const irg, be_abi_irg_t *const env)
 {
-       be_abi_irg_t          *env          = be_get_irg_abi(irg);
        be_abi_call_t         *call         = env->call;
        const arch_env_t      *arch_env     = be_get_irg_arch_env(irg);
        const arch_register_t *sp           = arch_env->sp;
@@ -1657,90 +1345,48 @@ static void modify_irg(ir_graph *irg)
        int n_params;
        int i, n;
        unsigned j;
-       unsigned frame_size;
 
-       reg_node_map_t *rm;
        const arch_register_t *fp_reg;
        ir_node *frame_pointer;
        ir_node *start_bl;
        ir_node **args;
        ir_node *arg_tuple;
-       const ir_edge_t *edge;
-       ir_type *arg_type, *bet_type, *tp;
+       ir_type *arg_type, *bet_type;
        lower_frame_sels_env_t ctx;
-       ir_entity **param_map;
 
        DBG((dbg, LEVEL_1, "introducing abi on %+F\n", irg));
 
        old_mem = get_irg_initial_mem(irg);
 
-       irp_reserve_resources(irp, IR_RESOURCE_ENTITY_LINK);
-
-       /* set the links of all frame entities to NULL, we use it
-          to detect if an entity is already linked in the value_param_list */
-       tp = get_method_value_param_type(method_type);
-       ctx.value_tp = tp;
-       if (tp != NULL) {
-               /* clear the links of the clone type, let the
-                  original entities point to its clones */
-               for (i = get_struct_n_members(tp) - 1; i >= 0; --i) {
-                       ir_entity *mem  = get_struct_member(tp, i);
-                       set_entity_link(mem, NULL);
-               }
-       }
+       irp_reserve_resources(irp, IRP_RESOURCE_ENTITY_LINK);
 
-       arg_type = compute_arg_type(env, irg, call, method_type, tp, &param_map);
+       arg_type = compute_arg_type(irg, call, method_type);
 
        /* Convert the Sel nodes in the irg to frame addr nodes: */
-       ctx.value_param_list = NEW_ARR_F(ent_pos_pair, 0);
-       ctx.frame            = get_irg_frame(irg);
-       ctx.sp_class         = arch_env->sp->reg_class;
-       ctx.link_class       = arch_env->link_class;
-       ctx.frame_tp         = get_irg_frame_type(irg);
+       ctx.frame    = get_irg_frame(irg);
+       ctx.sp_class = arch_env->sp->reg_class;
 
+       ir_type *const frame_tp = get_irg_frame_type(irg);
        /* layout the stackframe now */
-       if (get_type_state(ctx.frame_tp) == layout_undefined) {
-               default_layout_compound_type(ctx.frame_tp);
+       if (get_type_state(frame_tp) == layout_undefined) {
+               default_layout_compound_type(frame_tp);
        }
 
-       /* we will possible add new entities to the frame: set the layout to undefined */
-       assert(get_type_state(ctx.frame_tp) == layout_fixed);
-       set_type_state(ctx.frame_tp, layout_undefined);
-
-       irg_walk_graph(irg, lower_frame_sels_walker, NULL, &ctx);
-
-       /* fix the frame type layout again */
-       set_type_state(ctx.frame_tp, layout_fixed);
-       /* align stackframe to 4 byte */
-       frame_size = get_type_size_bytes(ctx.frame_tp);
-       if (frame_size % 4 != 0) {
-               set_type_size_bytes(ctx.frame_tp, frame_size + 4 - (frame_size % 4));
-       }
+       /* align stackframe */
+       unsigned const alignment  = 1U << arch_env->stack_alignment;
+       unsigned const frame_size = round_up2(get_type_size_bytes(frame_tp), alignment);
+       set_type_size_bytes(frame_tp, frame_size);
 
        env->regs  = pmap_create();
 
        n_params = get_method_n_params(method_type);
        args     = OALLOCNZ(obst, ir_node*, n_params);
 
-       /*
-        * for inner function we must now fix access to outer frame entities.
-        */
-       fix_outer_variable_access(env, &ctx);
+       be_add_parameter_entity_stores(irg);
 
-       /* Check if a value parameter is transmitted as a register.
-        * This might happen if the address of an parameter is taken which is
-        * transmitted in registers.
-        *
-        * Note that on some architectures this case must be handled specially
-        * because the place of the backing store is determined by their ABI.
-        *
-        * In the default case we move the entity to the frame type and create
-        * a backing store into the first block.
-        */
-       fix_address_of_parameter_access(env, irg, ctx.value_param_list);
+       irg_walk_graph(irg, lower_frame_sels_walker, NULL, &ctx);
 
-       DEL_ARR_F(ctx.value_param_list);
-       irp_free_resources(irp, IR_RESOURCE_ENTITY_LINK);
+       irp_free_resources(irp, IRP_RESOURCE_ENTITY_LINK);
 
        /* Fill the argument vector */
        arg_tuple = get_irg_args(irg);
@@ -1753,10 +1399,10 @@ static void modify_irg(ir_graph *irg)
                }
        }
 
-       bet_type = call->cb->get_between_type(env->cb);
+       stack_layout->sp_relative = call->flags.try_omit_fp;
+       bet_type = call->cb->get_between_type(irg);
        stack_frame_init(stack_layout, arg_type, bet_type,
-                        get_irg_frame_type(irg), arch_env->stack_dir, param_map);
-       stack_layout->sp_relative = call->flags.bits.try_omit_fp;
+                        get_irg_frame_type(irg));
 
        /* Count the register params and add them to the number of Projs for the RegParams node */
        for (i = 0; i < n_params; ++i) {
@@ -1776,46 +1422,50 @@ static void modify_irg(ir_graph *irg)
                const arch_register_class_t *cls = &arch_env->register_classes[i];
                for (j = 0; j < cls->n_regs; ++j) {
                        const arch_register_t *reg = &cls->regs[j];
-                       if (reg->type & (arch_register_type_callee_save | arch_register_type_state)) {
+                       if ((reg->type & arch_register_type_state) || arch_register_is_callee_save(arch_env, reg)) {
                                pmap_insert(env->regs, (void *) reg, NULL);
                        }
                }
        }
 
+       fp_reg = call->flags.try_omit_fp ? arch_env->sp : arch_env->bp;
+       rbitset_clear(birg->allocatable_regs, fp_reg->global_index);
+
        /* handle start block here (place a jump in the block) */
        fix_start_block(irg);
 
        pmap_insert(env->regs, (void *) sp, NULL);
        pmap_insert(env->regs, (void *) arch_env->bp, NULL);
        start_bl   = get_irg_start_block(irg);
-       env->start = be_new_Start(NULL, start_bl, pmap_count(env->regs) + 1);
-       arch_irn_add_flags(env->start, arch_irn_flags_prolog);
-       set_irg_start(irg, env->start);
+       ir_node *const start = be_new_Start(NULL, start_bl, pmap_count(env->regs) + 1);
+       set_irg_start(irg, start);
 
        /*
         * make proj nodes for the callee save registers.
         * memorize them, since Return nodes get those as inputs.
         *
-        * Note, that if a register corresponds to an argument, the regs map contains
-        * the old Proj from start for that argument.
+        * 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;
                ir_node                  *proj;
 
                if (reg == sp)
-                       add_type |= arch_register_req_type_produces_sp | arch_register_req_type_ignore;
+                       add_type |= arch_register_req_type_produces_sp;
+               if (!rbitset_is_set(birg->allocatable_regs, reg->global_index)) {
+                       add_type |= arch_register_req_type_ignore;
+               }
 
                assert(nr >= 0);
-               proj = new_r_Proj(env->start, mode, nr + 1);
+               proj = new_r_Proj(start, mode, nr + 1);
                pmap_insert(env->regs, (void *) reg, proj);
-               be_set_constr_single_reg_out(env->start, nr + 1, reg, add_type);
+               be_set_constr_single_reg_out(start, nr + 1, reg, add_type);
                arch_set_irn_register(proj, reg);
 
                DBG((dbg, LEVEL_2, "\tregister save proj #%d -> reg %s\n", nr, reg->name));
@@ -1823,25 +1473,16 @@ static void modify_irg(ir_graph *irg)
 
        /* create a new initial memory proj */
        assert(is_Proj(old_mem));
-       arch_set_out_register_req(env->start, 0, arch_no_register_req);
-       new_mem_proj = new_r_Proj(env->start, mode_M, 0);
+       arch_set_irn_register_req_out(start, 0, arch_no_register_req);
+       new_mem_proj = new_r_Proj(start, mode_M, 0);
        mem = new_mem_proj;
        set_irg_initial_mem(irg, mem);
 
-       /* Generate the Prologue */
-       fp_reg = call->cb->prologue(env->cb, &mem, env->regs, &stack_layout->initial_bias);
-
-       env->init_sp = be_abi_reg_map_get(env->regs, sp);
-       env->init_sp = be_new_IncSP(sp, start_bl, env->init_sp, BE_STACK_FRAME_SIZE_EXPAND, 0);
-       arch_irn_add_flags(env->init_sp, arch_irn_flags_prolog);
-       be_abi_reg_map_set(env->regs, sp, env->init_sp);
-
        env->init_sp = be_abi_reg_map_get(env->regs, sp);
-       arch_set_irn_register(env->init_sp, sp);
 
+       /* set new frame_pointer */
        frame_pointer = be_abi_reg_map_get(env->regs, fp_reg);
        set_irg_frame(irg, frame_pointer);
-       rbitset_clear(birg->allocatable_regs, fp_reg->global_index);
 
        /* rewire old mem users to new mem */
        exchange(old_mem, mem);
@@ -1867,16 +1508,17 @@ static void modify_irg(ir_graph *irg)
                        param_type = get_method_param_type(method_type, nr);
 
                        if (arg->in_reg) {
-                               repl = (ir_node*)pmap_get(env->regs, arg->reg);
-                       } else if (arg->on_stack) {
+                               repl = pmap_get(ir_node, env->regs, arg->reg);
+                       } else {
                                ir_node *addr = be_new_FrameAddr(sp->reg_class, start_bl, frame_pointer, arg->stack_ent);
 
                                /* For atomic parameters which are actually used, we create a Load node. */
                                if (is_atomic_type(param_type) && get_irn_n_edges(args[i]) > 0) {
                                        ir_mode *mode      = get_type_mode(param_type);
                                        ir_mode *load_mode = arg->load_mode;
+                                       ir_node *nomem     = get_irg_no_mem(irg);
 
-                                       ir_node *load = new_r_Load(start_bl, new_r_NoMem(irg), addr, load_mode, cons_floats);
+                                       ir_node *load = new_r_Load(start_bl, nomem, addr, load_mode, cons_floats);
                                        repl = new_r_Proj(load, load_mode, pn_Load_res);
 
                                        if (mode != load_mode) {
@@ -1905,7 +1547,7 @@ static void modify_irg(ir_graph *irg)
        /* the arg proj is not needed anymore now and should be only used by the anchor */
        assert(get_irn_n_edges(arg_tuple) == 1);
        kill_node(arg_tuple);
-       set_irg_args(irg, new_r_Bad(irg));
+       set_irg_args(irg, new_r_Bad(irg, mode_T));
 
        /* All Return nodes hang on the End node, so look for them there. */
        end = get_irg_end_block(irg);
@@ -1913,9 +1555,7 @@ static void modify_irg(ir_graph *irg)
                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);
                }
        }
@@ -1925,9 +1565,8 @@ static void modify_irg(ir_graph *irg)
 }
 
 /** Fix the state inputs of calls that still hang on unknowns */
-static void fix_call_state_inputs(ir_graph *irg)
+static void fix_call_state_inputs(ir_graph *const irg, be_abi_irg_t *const env)
 {
-       be_abi_irg_t     *env      = be_get_irg_abi(irg);
        const arch_env_t *arch_env = be_get_irg_arch_env(irg);
        int i, n, n_states;
        arch_register_t **stateregs = NEW_ARR_F(arch_register_t*, 0);
@@ -1987,7 +1626,7 @@ static ir_entity *create_trampoline(be_main_env_t *be, ir_entity *method)
  */
 static ir_entity *get_trampoline(be_main_env_t *env, ir_entity *method)
 {
-       ir_entity *result = (ir_entity*)pmap_get(env->ent_trampoline_map, method);
+       ir_entity *result = pmap_get(ir_entity, env->ent_trampoline_map, method);
        if (result == NULL) {
                result = create_trampoline(env, method);
                pmap_insert(env->ent_trampoline_map, method, result);
@@ -2012,7 +1651,7 @@ static ir_entity *create_pic_symbol(be_main_env_t *be, ir_entity *entity)
 
 static ir_entity *get_pic_symbol(be_main_env_t *env, ir_entity *entity)
 {
-       ir_entity *result = (ir_entity*)pmap_get(env->ent_pic_symbol_map, entity);
+       ir_entity *result = pmap_get(ir_entity, env->ent_pic_symbol_map, entity);
        if (result == NULL) {
                result = create_pic_symbol(env, entity);
                pmap_insert(env->ent_pic_symbol_map, entity, result);
@@ -2028,8 +1667,7 @@ static ir_entity *get_pic_symbol(be_main_env_t *env, ir_entity *entity)
  */
 static int can_address_relative(ir_entity *entity)
 {
-       return get_entity_visibility(entity) != ir_visibility_external
-               && !(get_entity_linkage(entity) & IR_LINKAGE_MERGE);
+       return entity_has_definition(entity) && !(get_entity_linkage(entity) & IR_LINKAGE_MERGE);
 }
 
 static ir_node *get_pic_base(ir_graph *irg)
@@ -2110,27 +1748,25 @@ static void fix_pic_symconsts(ir_node *node, void *data)
                /* we need an extra indirection for global data outside our current
                   module. The loads are always safe and can therefore float
                   and need no memory input */
-               load     = new_r_Load(block, new_r_NoMem(irg), add, mode, cons_floats);
+               load     = new_r_Load(block, get_irg_no_mem(irg), add, mode, cons_floats);
                load_res = new_r_Proj(load, mode, pn_Load_res);
 
                set_irn_n(node, i, load_res);
        }
 }
 
-be_abi_irg_t *be_abi_introduce(ir_graph *irg)
+void be_abi_introduce(ir_graph *irg)
 {
-       be_abi_irg_t     *env         = XMALLOCZ(be_abi_irg_t);
        ir_node          *old_frame   = get_irg_frame(irg);
-       be_options_t     *options     = be_get_irg_options(irg);
        const arch_env_t *arch_env    = be_get_irg_arch_env(irg);
        ir_entity        *entity      = get_irg_entity(irg);
        ir_type          *method_type = get_entity_type(entity);
        be_irg_t         *birg        = be_birg_from_irg(irg);
        struct obstack   *obst        = &birg->obst;
+       ir_node          *dummy       = new_r_Dummy(irg,
+                                                   arch_env->sp->reg_class->mode);
        unsigned          r;
 
-       ir_node *dummy;
-
        /* determine allocatable registers */
        assert(birg->allocatable_regs == NULL);
        birg->allocatable_regs = rbitset_obstack_alloc(obst, arch_env->n_registers);
@@ -2141,90 +1777,44 @@ be_abi_irg_t *be_abi_introduce(ir_graph *irg)
                }
        }
 
-       /* break here if backend provides a custom API.
-        * Note: we shouldn't have to setup any be_abi_irg_t* stuff at all,
-        * but need more cleanup to make this work
-        */
-       be_set_irg_abi(irg, env);
+       /* Break here if backend provides a custom API. */
 
-       be_omit_fp      = options->omit_fp;
+       be_abi_irg_t env;
+       env.keep_map     = pmap_create();
+       env.call         = be_abi_call_new();
+       arch_env_get_call_abi(arch_env, method_type, env.call);
 
-       env->keep_map     = pmap_create();
-       env->call         = be_abi_call_new(arch_env->sp->reg_class);
-       arch_env_get_call_abi(arch_env, method_type, env->call);
+       env.init_sp = dummy;
+       env.calls   = NEW_ARR_F(ir_node*, 0);
 
-       env->init_sp = dummy = new_r_Dummy(irg, arch_env->sp->reg_class->mode);
-       env->calls   = NEW_ARR_F(ir_node*, 0);
+       assure_edges(irg);
 
-       if (options->pic) {
-               irg_walk_graph(irg, fix_pic_symconsts, NULL, env);
+       if (be_options.pic) {
+               irg_walk_graph(irg, fix_pic_symconsts, NULL, NULL);
        }
 
        /* Lower all call nodes in the IRG. */
-       process_calls(irg);
-
-       /*
-               Beware: init backend abi call object after processing calls,
-               otherwise some information might be not yet available.
-       */
-       env->cb = env->call->cb->init(env->call, irg);
+       process_calls(irg, &env);
 
        /* Process the IRG */
-       modify_irg(irg);
+       modify_irg(irg, &env);
 
        /* fix call inputs for state registers */
-       fix_call_state_inputs(irg);
+       fix_call_state_inputs(irg, &env);
+
+       be_abi_call_free(env.call);
 
        /* We don't need the keep map anymore. */
-       pmap_destroy(env->keep_map);
-       env->keep_map = NULL;
+       pmap_destroy(env.keep_map);
 
        /* calls array is not needed anymore */
-       DEL_ARR_F(env->calls);
-       env->calls = NULL;
+       DEL_ARR_F(env.calls);
 
        /* reroute the stack origin of the calls to the true stack origin. */
-       exchange(dummy, env->init_sp);
+       exchange(dummy, env.init_sp);
        exchange(old_frame, get_irg_frame(irg));
 
-       env->call->cb->done(env->cb);
-       env->cb = NULL;
-       return env;
-}
-
-void be_abi_free(ir_graph *irg)
-{
-       be_abi_irg_t *env = be_get_irg_abi(irg);
-
-       if (env->call != NULL)
-               be_abi_call_free(env->call);
-       if (env->regs != NULL)
-               pmap_destroy(env->regs);
-       free(env);
-
-       be_set_irg_abi(irg, NULL);
-}
-
-/**
- * called after nodes have been transformed so some node references can be
- * replaced with new nodes
- */
-void be_abi_transform_fixup(ir_graph *irg)
-{
-       be_abi_irg_t *abi = be_get_irg_abi(irg);
-       pmap         *new_regs;
-       pmap_entry   *entry;
-       if (abi == NULL || abi->regs == NULL)
-               return;
-
-       new_regs = pmap_create();
-       foreach_pmap(abi->regs, entry) {
-               ir_node *value       = (ir_node*)entry->value;
-               ir_node *transformed = be_transform_node(value);
-               pmap_insert(new_regs, entry->key, transformed);
-       }
-       pmap_destroy(abi->regs);
-       abi->regs = new_regs;
+       pmap_destroy(env.regs);
 }
 
 void be_put_allocatable_regs(const ir_graph *irg,
@@ -2267,21 +1857,7 @@ void be_set_allocatable_regs(const ir_graph *irg,
        }
 }
 
-ir_node *be_abi_get_callee_save_irn(be_abi_irg_t *abi, const arch_register_t *reg)
-{
-       assert(reg->type & arch_register_type_callee_save);
-       assert(pmap_contains(abi->regs, (void *) reg));
-       return (ir_node*)pmap_get(abi->regs, (void *) reg);
-}
-
-ir_node *be_abi_get_ignore_irn(be_abi_irg_t *abi, const arch_register_t *reg)
-{
-       assert(reg->type & arch_register_type_ignore);
-       assert(pmap_contains(abi->regs, (void *) reg));
-       return (ir_node*)pmap_get(abi->regs, (void *) reg);
-}
-
-BE_REGISTER_MODULE_CONSTRUCTOR(be_init_abi);
+BE_REGISTER_MODULE_CONSTRUCTOR(be_init_abi)
 void be_init_abi(void)
 {
        FIRM_DBG_REGISTER(dbg, "firm.be.abi");