fix backend nodes not copying flags correctly
[libfirm] / ir / be / beabi.c
index 752c3fa..8b80946 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1995-2008 University of Karlsruhe.  All right reserved.
+ * Copyright (C) 1995-2011 University of Karlsruhe.  All right reserved.
  *
  * This file is part of libFirm.
  *
@@ -61,7 +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 on_stack : 1;  /**< 1: this argument is transmitted on the stack. */
        unsigned callee   : 1;  /**< 1: someone called us. 0: We call another function */
 
        int                    pos;
@@ -102,7 +102,6 @@ struct be_abi_irg_t {
        void                 *cb;           /**< ABI Callback self pointer. */
 
        pmap                 *keep_map;     /**< mapping blocks to keep nodes. */
-       pset                 *ignore_regs;  /**< Additional registers which shall be ignored. */
 
        ir_node              **calls;       /**< flexible array containing all be_Call nodes */
 };
@@ -112,9 +111,6 @@ static ir_heights_t *ir_heights;
 /** Flag: if set, try to omit the frame pointer in all routines. */
 static int be_omit_fp = 1;
 
-/** Flag: if set, try to omit the frame pointer in leaf routines only. */
-static int be_omit_leaf_fp = 1;
-
 /*
      _    ____ ___    ____      _ _ _                _
     / \  | __ )_ _|  / ___|__ _| | | |__   __ _  ___| | _____
@@ -131,7 +127,8 @@ static int be_omit_leaf_fp = 1;
  */
 static int cmp_call_arg(const void *a, const void *b, size_t n)
 {
-       const be_abi_call_arg_t *p = a, *q = b;
+       const be_abi_call_arg_t *p = (const be_abi_call_arg_t*)a;
+       const be_abi_call_arg_t *q = (const be_abi_call_arg_t*)b;
        (void) n;
        return !(p->is_res == q->is_res && p->pos == q->pos && p->callee == q->callee);
 }
@@ -142,7 +139,7 @@ static int cmp_call_arg(const void *a, const void *b, size_t n)
  * @param call      the abi call
  * @param is_res    true for call results, false for call arguments
  * @param pos       position of the argument
- * @param callee       context type - if we are callee or caller
+ * @param callee    context type - if we are callee or caller
  */
 static be_abi_call_arg_t *get_call_arg(be_abi_call_t *call, int is_res, int pos, int callee)
 {
@@ -156,7 +153,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 set_find(call->params, &arg, sizeof(arg), hash);
+       return (be_abi_call_arg_t*)set_find(call->params, &arg, sizeof(arg), hash);
 }
 
 /**
@@ -263,7 +260,7 @@ static be_abi_call_t *be_abi_call_new(const arch_register_class_t *cls_addr)
        call->cb         = NULL;
        call->cls_addr   = cls_addr;
 
-       call->flags.bits.try_omit_fp = be_omit_fp | be_omit_leaf_fp;
+       call->flags.bits.try_omit_fp = be_omit_fp;
 
        return call;
 }
@@ -339,7 +336,7 @@ static ir_node *adjust_call(be_abi_irg_t *env, ir_node *irn, ir_node *curr_sp)
        const arch_env_t *arch_env = be_get_irg_arch_env(irg);
        ir_type *call_tp           = get_Call_type(irn);
        ir_node *call_ptr          = get_Call_ptr(irn);
-       int n_params               = get_method_n_params(call_tp);
+       size_t   n_params          = get_method_n_params(call_tp);
        ir_node *curr_mem          = get_Call_mem(irn);
        ir_node *bl                = get_nodes_block(irn);
        int stack_size             = 0;
@@ -366,6 +363,8 @@ static ir_node *adjust_call(be_abi_irg_t *env, ir_node *irn, ir_node *curr_sp)
        int                    *reg_param_idxs;
        int                    *stack_param_idx;
        int                     i, n, destroy_all_regs;
+       size_t                  s;
+       size_t                  p;
        dbg_info               *dbgi;
 
        /* Let the isa fill out the abi description for that call node. */
@@ -374,26 +373,26 @@ static ir_node *adjust_call(be_abi_irg_t *env, ir_node *irn, ir_node *curr_sp)
        /* Insert code to put the stack arguments on the stack. */
        assert(get_Call_n_params(irn) == n_params);
        stack_param_idx = ALLOCAN(int, n_params);
-       for (i = 0; i < n_params; ++i) {
-               be_abi_call_arg_t *arg = get_call_arg(call, 0, i, 0);
+       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) {
-                       int arg_size = get_type_size_bytes(get_method_param_type(call_tp, i));
+                       int arg_size = get_type_size_bytes(get_method_param_type(call_tp, p));
 
                        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);
 
-                       stack_param_idx[n_stack_params++] = i;
+                       stack_param_idx[n_stack_params++] = p;
                }
        }
 
        /* Collect all arguments which are passed in registers. */
        reg_param_idxs = ALLOCAN(int, n_params);
-       for (i = 0; i < n_params; ++i) {
-               be_abi_call_arg_t *arg = get_call_arg(call, 0, i, 0);
+       for (p = 0; p < n_params; ++p) {
+               be_abi_call_arg_t *arg = get_call_arg(call, 0, p, 0);
                if (arg && arg->in_reg) {
-                       reg_param_idxs[n_reg_params++] = i;
+                       reg_param_idxs[n_reg_params++] = p;
                }
        }
 
@@ -472,9 +471,8 @@ static ir_node *adjust_call(be_abi_irg_t *env, ir_node *irn, ir_node *curr_sp)
 
                        /* Insert a store for primitive arguments. */
                        if (is_atomic_type(param_type)) {
-                               ir_node *store;
-                               ir_node *mem_input = do_seq ? curr_mem : new_NoMem();
-                               store = new_rd_Store(dbgi, bl, mem_input, addr, param, 0);
+                               ir_node *mem_input = do_seq ? curr_mem : new_r_NoMem(irg);
+                               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 {
                                /* Make a mem copy for compound arguments. */
@@ -519,9 +517,9 @@ static ir_node *adjust_call(be_abi_irg_t *env, ir_node *irn, ir_node *curr_sp)
 
        /* Put caller save into the destroyed set and state registers in the states
         * set */
-       for (i = 0, n = arch_env_get_n_reg_class(arch_env); i < n; ++i) {
+       for (i = 0, n = arch_env->n_register_classes; i < n; ++i) {
                unsigned j;
-               const arch_register_class_t *cls = arch_env_get_reg_class(arch_env, i);
+               const arch_register_class_t *cls = &arch_env->register_classes[i];
                for (j = 0; j < cls->n_regs; ++j) {
                        const arch_register_t *reg = arch_register_for_index(cls, j);
 
@@ -530,15 +528,15 @@ static ir_node *adjust_call(be_abi_irg_t *env, ir_node *irn, ir_node *curr_sp)
                        if (reg == arch_env->sp || reg == arch_env->bp)
                                continue;
 
-                       if (arch_register_type_is(reg, state)) {
+                       if (reg->type & arch_register_type_state) {
                                ARR_APP1(const arch_register_t*, destroyed_regs, reg);
                                ARR_APP1(const arch_register_t*, states, reg);
                                /* we're already in the destroyed set so no need for further
                                 * checking */
                                continue;
                        }
-                       if (destroy_all_regs || arch_register_type_is(reg, caller_save)) {
-                               if (! arch_register_type_is(reg, ignore)) {
+                       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);
                                }
                        }
@@ -584,8 +582,8 @@ static ir_node *adjust_call(be_abi_irg_t *env, ir_node *irn, ir_node *curr_sp)
        }
 
        /* add state registers ins */
-       for (i = 0; i < ARR_LEN(states); ++i) {
-               const arch_register_t       *reg = states[i];
+       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);
@@ -648,8 +646,8 @@ static ir_node *adjust_call(be_abi_irg_t *env, ir_node *irn, ir_node *curr_sp)
 
                if (arg->in_reg) {
                        /* remove register from destroyed regs */
-                       int j;
-                       int n = ARR_LEN(destroyed_regs);
+                       size_t j;
+                       size_t n = ARR_LEN(destroyed_regs);
                        for (j = 0; j < n; ++j) {
                                if (destroyed_regs[j] == arg->reg) {
                                        destroyed_regs[j] = destroyed_regs[n-1];
@@ -675,7 +673,7 @@ static ir_node *adjust_call(be_abi_irg_t *env, ir_node *irn, ir_node *curr_sp)
                assert(arg->reg != NULL);
 
                be_set_constr_single_reg_in(low_call, be_pos_Call_first_arg + i,
-                                           arg->reg, 0);
+                                           arg->reg, arch_register_req_type_none);
        }
 
        /* Set the register constraints of the results. */
@@ -685,7 +683,8 @@ static ir_node *adjust_call(be_abi_irg_t *env, ir_node *irn, ir_node *curr_sp)
                int                      pn   = get_Proj_proj(proj);
 
                assert(arg->in_reg);
-               be_set_constr_single_reg_out(low_call, pn, arg->reg, 0);
+               be_set_constr_single_reg_out(low_call, pn, arg->reg,
+                                            arch_register_req_type_none);
                arch_set_irn_register(proj, arg->reg);
        }
        exchange(irn, low_call);
@@ -700,6 +699,7 @@ static ir_node *adjust_call(be_abi_irg_t *env, ir_node *irn, ir_node *curr_sp)
        {
                ir_node               **in, *keep;
                int                   i;
+               size_t                d;
                int                   n = 0;
                int                   curr_res_proj = pn_be_Call_first_res + n_reg_results;
                int                   n_ins;
@@ -711,12 +711,13 @@ static ir_node *adjust_call(be_abi_irg_t *env, ir_node *irn, ir_node *curr_sp)
                set_irn_link(curr_sp, (void*) sp);
                in[n++] = curr_sp;
 
-               for (i = 0; i < ARR_LEN(destroyed_regs); ++i) {
-                       const arch_register_t *reg = destroyed_regs[i];
+               for (d = 0; d < ARR_LEN(destroyed_regs); ++d) {
+                       const arch_register_t *reg = destroyed_regs[d];
                        ir_node *proj = new_r_Proj(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_out(low_call, curr_res_proj, reg, 0);
+                       be_set_constr_single_reg_out(low_call, curr_res_proj, reg,
+                                                    arch_register_req_type_none);
                        arch_set_irn_register(proj, reg);
 
                        set_irn_link(proj, (void*) reg);
@@ -735,7 +736,7 @@ static ir_node *adjust_call(be_abi_irg_t *env, ir_node *irn, ir_node *curr_sp)
                /* create the Keep for the caller save registers */
                keep = be_new_Keep(bl, n, in);
                for (i = 0; i < n; ++i) {
-                       const arch_register_t *reg = get_irn_link(in[i]);
+                       const arch_register_t *reg = (const arch_register_t*)get_irn_link(in[i]);
                        be_node_set_reg_class_in(keep, i, reg->reg_class);
                }
        }
@@ -787,10 +788,10 @@ static ir_node *adjust_alloc_size(unsigned stack_alignment, ir_node *size,
                                   ir_node *block, dbg_info *dbg)
 {
        if (stack_alignment > 1) {
-               ir_mode  *mode;
-               tarval   *tv;
-               ir_node  *mask;
-               ir_graph *irg;
+               ir_mode   *mode;
+               ir_tarval *tv;
+               ir_node   *mask;
+               ir_graph  *irg;
 
                assert(is_po2(stack_alignment));
 
@@ -859,11 +860,11 @@ static ir_node *adjust_alloc(be_abi_irg_t *env, ir_node *alloc, ir_node *curr_sp
 
        /* we might need to multiply the count with the element size */
        if (type != firm_unknown_type && get_type_size_bytes(type) != 1) {
-               ir_mode *mode = get_irn_mode(count);
-               tarval *tv    = new_tarval_from_long(get_type_size_bytes(type),
-                                                    mode);
-               ir_node *cnst = new_rd_Const(dbg, irg, tv);
-               size          = new_rd_Mul(dbg, block, count, cnst, mode);
+               ir_mode   *mode  = get_irn_mode(count);
+               ir_tarval *tv    = new_tarval_from_long(get_type_size_bytes(type),
+                                                       mode);
+               ir_node   *cnst = new_rd_Const(dbg, irg, tv);
+               size            = new_rd_Mul(dbg, block, count, cnst, mode);
        } else {
                size = count;
        }
@@ -924,10 +925,10 @@ static ir_node *adjust_free(be_abi_irg_t *env, ir_node *free, ir_node *curr_sp)
 
        /* we might need to multiply the size with the element size */
        if (type != firm_unknown_type && get_type_size_bytes(type) != 1) {
-               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),
-                                         cnst, mode_Iu);
+               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),
+                                            cnst, mode_Iu);
                size = mul;
        } else {
                size = get_Free_size(free);
@@ -978,6 +979,7 @@ static int cmp_call_dependency(const void *c1, const void *c2)
 {
        ir_node *n1 = *(ir_node **) c1;
        ir_node *n2 = *(ir_node **) c2;
+       unsigned h1, h2;
 
        /*
                Classical qsort() comparison function behavior:
@@ -992,7 +994,16 @@ static int cmp_call_dependency(const void *c1, const void *c2)
                return 1;
 
        /* The nodes have no depth order, but we need a total order because qsort()
-        * is not stable. */
+        * is not stable.
+        *
+        * Additionally, we need to respect transitive dependencies. Consider a
+        * Call a depending on Call b and an independent Call c.
+        * We MUST NOT order c > a and b > c. */
+       h1 = get_irn_height(ir_heights, n1);
+       h2 = get_irn_height(ir_heights, n2);
+       if (h1 < h2) return -1;
+       if (h1 > h2) return  1;
+       /* Same height, so use a random (but stable) order */
        return get_irn_idx(n1) - get_irn_idx(n2);
 }
 
@@ -1002,8 +1013,8 @@ static int cmp_call_dependency(const void *c1, const void *c2)
  */
 static void link_ops_in_block_walker(ir_node *irn, void *data)
 {
-       be_abi_irg_t *env  = data;
-       ir_opcode     code = get_irn_opcode(irn);
+       be_abi_irg_t *env  = (be_abi_irg_t*)data;
+       unsigned      code = get_irn_opcode(irn);
 
        if (code == iro_Call ||
           (code == iro_Alloc && get_Alloc_where(irn) == stack_alloc) ||
@@ -1020,7 +1031,7 @@ static void link_ops_in_block_walker(ir_node *irn, void *data)
 
        if (code == iro_Builtin && get_Builtin_kind(irn) == ir_bk_return_address) {
                ir_node       *param = get_Builtin_param(irn, 0);
-               tarval        *tv    = get_Const_tarval(param);
+               ir_tarval     *tv    = get_Const_tarval(param);
                unsigned long  value = get_tarval_long(tv);
                /* use ebp, so the climbframe algo works... */
                if (value > 0) {
@@ -1033,12 +1044,12 @@ static void link_ops_in_block_walker(ir_node *irn, void *data)
  * Block-walker:
  * Process all Call/Alloc/Free nodes inside a basic block.
  * Note that the link field of the block must contain a linked list of all
- * Call nodes inside the Block. We first order this list according to data dependency
- * and that connect the calls together.
+ * nodes inside the Block. We first order this list according to data dependency
+ * and that connect the nodes together.
  */
 static void process_ops_in_block(ir_node *bl, void *data)
 {
-       be_abi_irg_t   *env     = data;
+       be_abi_irg_t   *env     = (be_abi_irg_t*)data;
        ir_node        *curr_sp = env->init_sp;
        ir_node        *irn;
        ir_node       **nodes;
@@ -1046,12 +1057,14 @@ static void process_ops_in_block(ir_node *bl, void *data)
        int             n_nodes;
 
        n_nodes = 0;
-       for (irn = get_irn_link(bl); irn != NULL; irn = get_irn_link(irn)) {
+       for (irn = (ir_node*)get_irn_link(bl); irn != NULL;
+            irn = (ir_node*)get_irn_link(irn)) {
                ++n_nodes;
        }
 
        nodes = ALLOCAN(ir_node*, n_nodes);
-       for (irn = get_irn_link(bl), n = 0; irn; irn = get_irn_link(irn), ++n) {
+       for (irn = (ir_node*)get_irn_link(bl), n = 0; irn != NULL;
+            irn = (ir_node*)get_irn_link(irn), ++n) {
                nodes[n] = irn;
        }
 
@@ -1187,24 +1200,24 @@ typedef struct {
 
 static int cmp_regs(const void *a, const void *b)
 {
-       const reg_node_map_t *p = a;
-       const reg_node_map_t *q = 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;
 
        if (p->reg->reg_class == q->reg->reg_class)
                return p->reg->index - q->reg->index;
        else
-               return p->reg->reg_class - q->reg->reg_class;
+               return p->reg->reg_class < q->reg->reg_class ? -1 : +1;
 }
 
 static void reg_map_to_arr(reg_node_map_t *res, pmap *reg_map)
 {
        pmap_entry *ent;
-       int n = pmap_count(reg_map);
-       int i = 0;
+       size_t n = pmap_count(reg_map);
+       size_t i = 0;
 
        foreach_pmap(reg_map, ent) {
-               res[i].reg = ent->key;
-               res[i].irn = ent->value;
+               res[i].reg = (const arch_register_t*)ent->key;
+               res[i].irn = (ir_node*)ent->value;
                i++;
        }
 
@@ -1237,11 +1250,11 @@ static ir_node *create_barrier(ir_node *bl, ir_node **mem, pmap *regs,
        irn = be_new_Barrier(bl, n, in);
 
        for (n = 0; n < n_regs; ++n) {
-               ir_node               *pred     = rm[n].irn;
-               const arch_register_t *reg      = rm[n].reg;
-               arch_register_type_t   add_type = 0;
-               ir_node               *proj;
-               const backend_info_t  *info;
+               ir_node                  *pred     = rm[n].irn;
+               const arch_register_t    *reg      = rm[n].reg;
+               arch_register_req_type_t  add_type = arch_register_req_type_none;
+               ir_node                  *proj;
+               const backend_info_t     *info;
 
                /* stupid workaround for now... as not all nodes report register
                 * requirements. */
@@ -1256,8 +1269,10 @@ static ir_node *create_barrier(ir_node *bl, ir_node **mem, pmap *regs,
 
                proj = new_r_Proj(irn, get_irn_mode(pred), n);
                be_node_set_reg_class_in(irn, n, reg->reg_class);
-               if (in_req)
-                       be_set_constr_single_reg_in(irn, n, reg, 0);
+               if (in_req) {
+                       be_set_constr_single_reg_in(irn, n, reg,
+                                                   arch_register_req_type_none);
+               }
                be_set_constr_single_reg_out(irn, n, reg, add_type);
                arch_set_irn_register(proj, reg);
 
@@ -1288,8 +1303,8 @@ static ir_node *create_be_return(be_abi_irg_t *env, ir_node *irn, ir_node *bl,
        const arch_env_t *arch_env = be_get_irg_arch_env(irg);
        dbg_info *dbgi;
        pmap *reg_map  = pmap_create();
-       ir_node *keep  = pmap_get(env->keep_map, bl);
-       int in_max;
+       ir_node *keep  = (ir_node*)pmap_get(env->keep_map, bl);
+       size_t in_max;
        ir_node *ret;
        int i, n;
        unsigned pop;
@@ -1322,8 +1337,8 @@ 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 = ent->key;
-               if (arch_register_type_is(reg, callee_save) || arch_register_type_is(reg, ignore))
+               const arch_register_t *reg = (const arch_register_t*)ent->key;
+               if (reg->type & (arch_register_type_callee_save | arch_register_type_ignore))
                        pmap_insert(reg_map, ent->key, ent->value);
        }
 
@@ -1363,8 +1378,8 @@ static ir_node *create_be_return(be_abi_irg_t *env, ir_node *irn, ir_node *bl,
        /* grow the rest of the stuff. */
        foreach_pmap(reg_map, ent) {
                if (ent->value) {
-                       in[n]     = ent->value;
-                       regs[n++] = ent->key;
+                       in[n]     = (ir_node*)ent->value;
+                       regs[n++] = (const arch_register_t*)ent->key;
                }
        }
 
@@ -1417,7 +1432,7 @@ typedef struct lower_frame_sels_env_t {
  */
 static ir_entity *get_argument_entity(ir_entity *ent, lower_frame_sels_env_t *ctx)
 {
-       ir_entity *argument_ent = get_entity_link(ent);
+       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
@@ -1450,7 +1465,7 @@ static ir_entity *get_argument_entity(ir_entity *ent, lower_frame_sels_env_t *ct
  */
 static void lower_frame_sels_walker(ir_node *irn, void *data)
 {
-       lower_frame_sels_env_t *ctx = data;
+       lower_frame_sels_env_t *ctx = (lower_frame_sels_env_t*)data;
 
        if (is_Sel(irn)) {
                ir_node *ptr = get_Sel_ptr(irn);
@@ -1561,7 +1576,7 @@ static void fix_address_of_parameter_access(be_abi_irg_t *env, ir_graph *irg,
 
                        /* the backing store itself */
                        store = new_r_Store(first_bl, mem, addr,
-                                           new_r_Proj(args, mode, i), 0);
+                                           new_r_Proj(args, mode, i), cons_none);
                }
                /* the new memory Proj gets the last Proj from store */
                set_Proj_pred(nmem, store);
@@ -1606,25 +1621,13 @@ static void fix_address_of_parameter_access(be_abi_irg_t *env, ir_graph *irg,
  */
 static void fix_start_block(ir_graph *irg)
 {
-       ir_node         *initial_X   = get_irg_initial_exec(irg);
-       ir_node         *start_block = get_irg_start_block(irg);
-       const ir_edge_t *edge;
+       ir_node *initial_X   = get_irg_initial_exec(irg);
+       ir_node *start_block = get_irg_start_block(irg);
+       ir_node *jmp         = new_r_Jmp(start_block);
 
        assert(is_Proj(initial_X));
-
-       foreach_out_edge(initial_X, edge) {
-               ir_node *block = get_edge_src_irn(edge);
-
-               if (is_Anchor(block))
-                       continue;
-               if (block != start_block) {
-                       ir_node *jmp = new_r_Jmp(start_block);
-                       set_Block_cfgpred(block, get_edge_src_pos(edge), jmp);
-                       set_irg_initial_exec(irg, jmp);
-                       return;
-               }
-       }
-       panic("Initial exec has no follow block in %+F", irg);
+       exchange(initial_X, jmp);
+       set_irg_initial_exec(irg, new_r_Bad(irg));
 }
 
 /**
@@ -1632,7 +1635,7 @@ static void fix_start_block(ir_graph *irg)
  */
 static void update_outer_frame_sels(ir_node *irn, void *env)
 {
-       lower_frame_sels_env_t *ctx = env;
+       lower_frame_sels_env_t *ctx = (lower_frame_sels_env_t*)env;
        ir_node                *ptr;
        ir_entity              *ent;
        int                    pos = 0;
@@ -1706,6 +1709,7 @@ static void modify_irg(ir_graph *irg)
        const arch_env_t      *arch_env     = be_get_irg_arch_env(irg);
        const arch_register_t *sp           = arch_env->sp;
        ir_type               *method_type  = get_entity_type(get_irg_entity(irg));
+       be_irg_t              *birg         = be_birg_from_irg(irg);
        struct obstack        *obst         = be_get_be_obst(irg);
        be_stack_layout_t     *stack_layout = be_get_irg_stack_layout(irg);
        ir_node *end;
@@ -1833,12 +1837,11 @@ static void modify_irg(ir_graph *irg)
        }
 
        /* Collect all callee-save registers */
-       for (i = 0, n = arch_env_get_n_reg_class(arch_env); i < n; ++i) {
-               const arch_register_class_t *cls = arch_env_get_reg_class(arch_env, i);
+       for (i = 0, n = arch_env->n_register_classes; i < n; ++i) {
+               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 (arch_register_type_is(reg, callee_save) ||
-                                       arch_register_type_is(reg, state)) {
+                       if (reg->type & (arch_register_type_callee_save | arch_register_type_state)) {
                                pmap_insert(env->regs, (void *) reg, NULL);
                        }
                }
@@ -1851,6 +1854,7 @@ static void modify_irg(ir_graph *irg)
        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);
+       set_irg_start(irg, env->start);
 
        /*
         * make proj nodes for the callee save registers.
@@ -1863,10 +1867,10 @@ static void modify_irg(ir_graph *irg)
        rm = ALLOCAN(reg_node_map_t, pmap_count(env->regs));
        reg_map_to_arr(rm, env->regs);
        for (i = 0, n = pmap_count(env->regs); i < n; ++i) {
-               arch_register_t          *reg      = (void *) rm[i].reg;
+               const arch_register_t    *reg      = rm[i].reg;
                ir_mode                  *mode     = reg->reg_class->mode;
                long                      nr       = i;
-               arch_register_req_type_t  add_type = 0;
+               arch_register_req_type_t  add_type = arch_register_req_type_none;
                ir_node                  *proj;
 
                if (reg == sp)
@@ -1904,7 +1908,7 @@ static void modify_irg(ir_graph *irg)
 
        frame_pointer = be_abi_reg_map_get(env->regs, fp_reg);
        set_irg_frame(irg, frame_pointer);
-       pset_insert_ptr(env->ignore_regs, fp_reg);
+       rbitset_clear(birg->allocatable_regs, fp_reg->global_index);
 
        /* rewire old mem users to new mem */
        exchange(old_mem, mem);
@@ -1930,7 +1934,7 @@ static void modify_irg(ir_graph *irg)
                        param_type = get_method_param_type(method_type, nr);
 
                        if (arg->in_reg) {
-                               repl = pmap_get(env->regs, (void *) arg->reg);
+                               repl = (ir_node*)pmap_get(env->regs, arg->reg);
                        } else if (arg->on_stack) {
                                ir_node *addr = be_new_FrameAddr(sp->reg_class, start_bl, frame_pointer, arg->stack_ent);
 
@@ -1939,7 +1943,7 @@ static void modify_irg(ir_graph *irg)
                                        ir_mode *mode      = get_type_mode(param_type);
                                        ir_mode *load_mode = arg->load_mode;
 
-                                       ir_node *load = new_r_Load(start_bl, new_NoMem(), addr, load_mode, cons_floats);
+                                       ir_node *load = new_r_Load(start_bl, new_r_NoMem(irg), addr, load_mode, cons_floats);
                                        repl = new_r_Proj(load, load_mode, pn_Load_res);
 
                                        if (mode != load_mode) {
@@ -1996,13 +2000,13 @@ static void fix_call_state_inputs(ir_graph *irg)
        arch_register_t **stateregs = NEW_ARR_F(arch_register_t*, 0);
 
        /* Collect caller save registers */
-       n = arch_env_get_n_reg_class(arch_env);
+       n = arch_env->n_register_classes;
        for (i = 0; i < n; ++i) {
                unsigned j;
-               const arch_register_class_t *cls = arch_env_get_reg_class(arch_env, i);
+               const arch_register_class_t *cls = &arch_env->register_classes[i];
                for (j = 0; j < cls->n_regs; ++j) {
                        const arch_register_t *reg = arch_register_for_index(cls, j);
-                       if (arch_register_type_is(reg, state)) {
+                       if (reg->type & arch_register_type_state) {
                                ARR_APP1(arch_register_t*, stateregs, (arch_register_t *)reg);
                        }
                }
@@ -2050,7 +2054,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 = pmap_get(env->ent_trampoline_map, method);
+       ir_entity *result = (ir_entity*)pmap_get(env->ent_trampoline_map, method);
        if (result == NULL) {
                result = create_trampoline(env, method);
                pmap_insert(env->ent_trampoline_map, method, result);
@@ -2075,7 +2079,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 = pmap_get(env->ent_pic_symbol_map, entity);
+       ir_entity *result = (ir_entity*)pmap_get(env->ent_pic_symbol_map, entity);
        if (result == NULL) {
                result = create_pic_symbol(env, entity);
                pmap_insert(env->ent_pic_symbol_map, entity, result);
@@ -2143,7 +2147,7 @@ static void fix_pic_symconsts(ir_node *node, void *data)
                        dbgi             = get_irn_dbg_info(pred);
                        trampoline       = get_trampoline(be, entity);
                        trampoline_const = new_rd_SymConst_addr_ent(dbgi, irg, mode_P_code,
-                                                                   trampoline, NULL);
+                                                                   trampoline);
                        set_irn_n(node, i, trampoline_const);
                        continue;
                }
@@ -2166,14 +2170,14 @@ static void fix_pic_symconsts(ir_node *node, void *data)
                dbgi         = get_irn_dbg_info(pred);
                pic_symbol   = get_pic_symbol(be, entity);
                pic_symconst = new_rd_SymConst_addr_ent(dbgi, irg, mode_P_code,
-                                                       pic_symbol, NULL);
+                                                       pic_symbol);
                add = new_r_Add(block, pic_base, pic_symconst, mode);
                mark_irn_visited(add);
 
                /* 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_NoMem(), add, mode, cons_floats);
+               load     = new_r_Load(block, new_r_NoMem(irg), add, mode, cons_floats);
                load_res = new_r_Proj(load, mode, pn_Load_res);
 
                set_irn_n(node, i, load_res);
@@ -2188,22 +2192,30 @@ be_abi_irg_t *be_abi_introduce(ir_graph *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;
+       unsigned          r;
 
        pmap_entry *ent;
        ir_node *dummy;
 
-       env->ignore_regs  = pset_new_ptr_default();
+       /* determine allocatable registers */
+       assert(birg->allocatable_regs == NULL);
+       birg->allocatable_regs = rbitset_obstack_alloc(obst, arch_env->n_registers);
+       for (r = 0; r < arch_env->n_registers; ++r) {
+               const arch_register_t *reg = &arch_env->registers[r];
+               if ( !(reg->type & arch_register_type_ignore)) {
+                       rbitset_set(birg->allocatable_regs, r);
+               }
+       }
 
        /* 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);
-       if (arch_env->custom_abi)
-               return env;
 
        be_omit_fp      = options->omit_fp;
-       be_omit_leaf_fp = options->omit_leaf_fp;
 
        env->dce_survivor = new_survive_dce();
        env->keep_map     = pmap_create();
@@ -2263,8 +2275,6 @@ void be_abi_free(ir_graph *irg)
                be_abi_call_free(env->call);
        if (env->dce_survivor != NULL)
                free_survive_dce(env->dce_survivor);
-       if (env->ignore_regs != NULL)
-               del_pset(env->ignore_regs);
        if (env->regs != NULL)
                pmap_destroy(env->regs);
        free(env);
@@ -2272,48 +2282,58 @@ void be_abi_free(ir_graph *irg)
        be_set_irg_abi(irg, NULL);
 }
 
-void be_abi_put_ignore_regs(be_abi_irg_t *abi, const arch_register_class_t *cls, bitset_t *bs)
+void be_put_allocatable_regs(const ir_graph *irg,
+                             const arch_register_class_t *cls, bitset_t *bs)
 {
-       arch_register_t *reg;
+       be_irg_t *birg             = be_birg_from_irg(irg);
+       unsigned *allocatable_regs = birg->allocatable_regs;
+       unsigned  i;
 
-       for (reg = pset_first(abi->ignore_regs); reg; reg = pset_next(abi->ignore_regs))
-               if (reg->reg_class == cls)
-                       bitset_set(bs, reg->index);
+       assert(bitset_size(bs) == cls->n_regs);
+       bitset_clear_all(bs);
+       for (i = 0; i < cls->n_regs; ++i) {
+               const arch_register_t *reg = &cls->regs[i];
+               if (rbitset_is_set(allocatable_regs, reg->global_index))
+                       bitset_set(bs, i);
+       }
 }
 
-void be_abi_set_non_ignore_regs(be_abi_irg_t *abi, const arch_register_class_t *cls, unsigned *raw_bitset)
+unsigned be_get_n_allocatable_regs(const ir_graph *irg,
+                                   const arch_register_class_t *cls)
 {
-       unsigned         i;
-       arch_register_t *reg;
-
-       for (i = 0; i < cls->n_regs; ++i) {
-               if (arch_register_type_is(&cls->regs[i], ignore))
-                       continue;
-
-               rbitset_set(raw_bitset, i);
-       }
+       bitset_t *bs = bitset_alloca(cls->n_regs);
+       be_put_allocatable_regs(irg, cls, bs);
+       return bitset_popcount(bs);
+}
 
-       for (reg = pset_first(abi->ignore_regs); reg != NULL;
-            reg = pset_next(abi->ignore_regs)) {
-               if (reg->reg_class != cls)
-                       continue;
+void be_set_allocatable_regs(const ir_graph *irg,
+                             const arch_register_class_t *cls,
+                             unsigned *raw_bitset)
+{
+       be_irg_t *birg             = be_birg_from_irg(irg);
+       unsigned *allocatable_regs = birg->allocatable_regs;
+       unsigned  i;
 
-               rbitset_clear(raw_bitset, reg->index);
+       rbitset_clear_all(raw_bitset, cls->n_regs);
+       for (i = 0; i < cls->n_regs; ++i) {
+               const arch_register_t *reg = &cls->regs[i];
+               if (rbitset_is_set(allocatable_regs, reg->global_index))
+                       rbitset_set(raw_bitset, i);
        }
 }
 
 ir_node *be_abi_get_callee_save_irn(be_abi_irg_t *abi, const arch_register_t *reg)
 {
-       assert(arch_register_type_is(reg, callee_save));
+       assert(reg->type & arch_register_type_callee_save);
        assert(pmap_contains(abi->regs, (void *) reg));
-       return pmap_get(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(arch_register_type_is(reg, ignore));
+       assert(reg->type & arch_register_type_ignore);
        assert(pmap_contains(abi->regs, (void *) reg));
-       return pmap_get(abi->regs, (void *) reg);
+       return (ir_node*)pmap_get(abi->regs, (void *) reg);
 }
 
 BE_REGISTER_MODULE_CONSTRUCTOR(be_init_abi);