besched: Add and use sched_foreach_reverse_safe().
[libfirm] / ir / be / arm / bearch_arm.c
index fe90c96..65f9ebe 100644 (file)
@@ -1,34 +1,18 @@
 /*
- * Copyright (C) 1995-2008 University of Karlsruhe.  All right reserved.
- *
  * This file is part of libFirm.
- *
- * This file may be distributed and/or modified under the terms of the
- * GNU General Public License version 2 as published by the Free Software
- * Foundation and appearing in the file LICENSE.GPL included in the
- * packaging of this file.
- *
- * Licensees holding valid libFirm Professional Edition licenses may use
- * this file in accordance with the libFirm Commercial License.
- * Agreement provided with the Software.
- *
- * This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
- * WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE.
+ * Copyright (C) 2012 University of Karlsruhe.
  */
 
 /**
  * @file
  * @brief   The main arm backend driver file.
- * @author  Oliver Richter, Tobias Gneist
- * @version $Id$
+ * @author  Matthias Braun, Oliver Richter, Tobias Gneist
  */
 #include "config.h"
 
 #include "lc_opts.h"
 #include "lc_opts_enum.h"
 
-#include "pseudo_irg.h"
 #include "irgwalk.h"
 #include "irprog.h"
 #include "irprintf.h"
@@ -36,7 +20,8 @@
 #include "irgmod.h"
 #include "irgopt.h"
 #include "iroptimize.h"
-#include "lowering.h"
+#include "irdump.h"
+#include "lower_calls.h"
 #include "error.h"
 
 #include "bitset.h"
 #include "array_t.h"
 #include "irtools.h"
 
-#include "../bearch.h"                /* the general register allocator interface */
-#include "../benode.h"
-#include "../belower.h"
-#include "../besched.h"
+#include "bearch.h"
+#include "benode.h"
+#include "belower.h"
+#include "besched.h"
 #include "be.h"
-#include "../beabi.h"
-#include "../bemachine.h"
-#include "../beilpsched.h"
-#include "../bemodule.h"
-#include "../beirg.h"
-#include "../bespillslots.h"
-#include "../begnuas.h"
-#include "../belistsched.h"
+#include "bemodule.h"
+#include "beirg.h"
+#include "bespillslots.h"
+#include "bespillutil.h"
+#include "begnuas.h"
+#include "belistsched.h"
+#include "beflags.h"
+#include "bestack.h"
 
 #include "bearch_arm_t.h"
 
-#include "arm_new_nodes.h"           /* arm nodes interface */
-#include "gen_arm_regalloc_if.h"     /* the generated interface (register type and class defenitions) */
+#include "arm_new_nodes.h"
+#include "gen_arm_regalloc_if.h"
 #include "arm_transform.h"
 #include "arm_optimize.h"
 #include "arm_emitter.h"
 #include "arm_map_regs.h"
 
-#define DEBUG_MODULE "firm.be.arm.isa"
-
-/* TODO: ugly, but we need it to get access to the registers assigned to Phi nodes */
-static set *cur_reg_set = NULL;
-
-/**************************************************
- *                         _ _              _  __
- *                        | | |            (_)/ _|
- *  _ __ ___  __ _    __ _| | | ___   ___   _| |_
- * | '__/ _ \/ _` |  / _` | | |/ _ \ / __| | |  _|
- * | | |  __/ (_| | | (_| | | | (_) | (__  | | |
- * |_|  \___|\__, |  \__,_|_|_|\___/ \___| |_|_|
- *            __/ |
- *           |___/
- **************************************************/
-
-static arch_irn_class_t arm_classify(const ir_node *irn)
+static ir_entity *arm_get_frame_entity(const ir_node *irn)
 {
-       (void) irn;
-       return 0;
-}
+       const arm_attr_t *attr = get_arm_attr_const(irn);
 
-static ir_entity *arm_get_frame_entity(const ir_node *irn) {
-       /* we do NOT transform be_Spill or be_Reload nodes, so we never
-          have frame access using ARM nodes. */
-       (void) irn;
+       if (is_arm_FrameAddr(irn)) {
+               const arm_SymConst_attr_t *frame_attr = get_arm_SymConst_attr_const(irn);
+               return frame_attr->entity;
+       }
+       if (attr->is_load_store) {
+               const arm_load_store_attr_t *load_store_attr
+                       = get_arm_load_store_attr_const(irn);
+               if (load_store_attr->is_frame_entity) {
+                       return load_store_attr->entity;
+               }
+       }
        return NULL;
 }
 
-static void arm_set_frame_entity(ir_node *irn, ir_entity *ent) {
-       (void) irn;
-       (void) ent;
-       panic("arm_set_frame_entity() called. This should not happen.");
-}
-
 /**
  * This function is called by the generic backend to correct offsets for
  * nodes accessing the stack.
  */
 static void arm_set_stack_bias(ir_node *irn, int bias)
 {
-       (void) irn;
-       (void) bias;
-       /* TODO: correct offset if irn accesses the stack */
+       if (is_arm_FrameAddr(irn)) {
+               arm_SymConst_attr_t *attr = get_arm_SymConst_attr(irn);
+               attr->fp_offset += bias;
+       } else {
+               arm_load_store_attr_t *attr = get_arm_load_store_attr(irn);
+               assert(attr->base.is_load_store);
+               attr->offset += bias;
+       }
 }
 
 static int arm_get_sp_bias(const ir_node *irn)
 {
+       /* We don't have any nodes changing the stack pointer.
+          We probably want to support post-/pre increment/decrement later */
        (void) irn;
        return 0;
 }
@@ -122,348 +97,164 @@ static int arm_get_sp_bias(const ir_node *irn)
 /* fill register allocator interface */
 
 static const arch_irn_ops_t arm_irn_ops = {
-       get_arm_in_req,
-       arm_classify,
        arm_get_frame_entity,
-       arm_set_frame_entity,
        arm_set_stack_bias,
        arm_get_sp_bias,
-       NULL,    /* get_inverse             */
        NULL,    /* get_op_estimated_cost   */
        NULL,    /* possible_memory_operand */
        NULL,    /* perform_memory_operand  */
 };
 
-/**************************************************
- *                _                         _  __
- *               | |                       (_)/ _|
- *   ___ ___   __| | ___  __ _  ___ _ __    _| |_
- *  / __/ _ \ / _` |/ _ \/ _` |/ _ \ '_ \  | |  _|
- * | (_| (_) | (_| |  __/ (_| |  __/ | | | | | |
- *  \___\___/ \__,_|\___|\__, |\___|_| |_| |_|_|
- *                        __/ |
- *                       |___/
- **************************************************/
-
 /**
  * Transforms the standard Firm graph into
  * a ARM firm graph.
  */
-static void arm_prepare_graph(void *self) {
-       arm_code_gen_t *cg = self;
-
+static void arm_prepare_graph(ir_graph *irg)
+{
        /* transform nodes into assembler instructions */
-       arm_transform_graph(cg);
+       arm_transform_graph(irg);
 
        /* do local optimizations (mainly CSE) */
-       local_optimize_graph(cg->irg);
-
-       if (cg->dump)
-               be_dump(cg->irg, "-transformed", dump_ir_block_graph_sched);
+       local_optimize_graph(irg);
 
        /* do code placement, to optimize the position of constants */
-       place_code(cg->irg);
-
-       if (cg->dump)
-               be_dump(cg->irg, "-place", dump_ir_block_graph_sched);
+       place_code(irg);
 }
 
-/**
- * Called immediately before emit phase.
- */
-static void arm_finish_irg(void *self)
+static void arm_collect_frame_entity_nodes(ir_node *node, void *data)
 {
-       arm_code_gen_t *cg = self;
-
-       /* do peephole optimizations and fix stack offsets */
-       arm_peephole_optimization(cg);
-}
+       be_fec_env_t  *env = (be_fec_env_t*)data;
+       const ir_mode *mode;
+       int            align;
+       ir_entity     *entity;
+       const arm_load_store_attr_t *attr;
+
+       if (be_is_Reload(node) && be_get_frame_entity(node) == NULL) {
+               mode  = get_irn_mode(node);
+               align = get_mode_size_bytes(mode);
+               be_node_needs_frame_entity(env, node, mode, align);
+               return;
+       }
 
+       switch (get_arm_irn_opcode(node)) {
+       case iro_arm_Ldf:
+       case iro_arm_Ldr:
+               break;
+       default:
+               return;
+       }
 
-static void arm_before_ra(void *self)
-{
-       (void) self;
-       /* Some stuff you need to do immediately after register allocation */
+       attr   = get_arm_load_store_attr_const(node);
+       entity = attr->entity;
+       mode   = attr->load_store_mode;
+       align  = get_mode_size_bytes(mode);
+       if (entity != NULL)
+               return;
+       if (!attr->is_frame_entity)
+               return;
+       be_node_needs_frame_entity(env, node, mode, align);
 }
 
-/**
- * We transform Spill and Reload here. This needs to be done before
- * stack biasing otherwise we would miss the corrected offset for these nodes.
- */
-static void arm_after_ra(void *self)
+static void arm_set_frame_entity(ir_node *node, ir_entity *entity)
 {
-       arm_code_gen_t *cg = self;
-       be_coalesce_spillslots(cg->birg);
+       if (is_be_node(node)) {
+               be_node_set_frame_entity(node, entity);
+       } else {
+               arm_load_store_attr_t *attr = get_arm_load_store_attr(node);
+               attr->entity = entity;
+       }
 }
 
-/**
- * Emits the code, closes the output file and frees
- * the code generator interface.
- */
-static void arm_emit_and_done(void *self) {
-       arm_code_gen_t *cg = self;
-       ir_graph       *irg = cg->irg;
+static void transform_Reload(ir_node *node)
+{
+       ir_node   *block  = get_nodes_block(node);
+       dbg_info  *dbgi   = get_irn_dbg_info(node);
+       ir_node   *ptr    = get_irn_n(node, n_be_Reload_frame);
+       ir_node   *mem    = get_irn_n(node, n_be_Reload_mem);
+       ir_mode   *mode   = get_irn_mode(node);
+       ir_entity *entity = be_get_frame_entity(node);
+       const arch_register_t *reg;
+       ir_node   *proj;
+       ir_node   *load;
 
-       arm_gen_routine(cg, irg);
+       load = new_bd_arm_Ldr(dbgi, block, ptr, mem, mode, entity, false, 0, true);
+       sched_replace(node, load);
 
-       cur_reg_set = NULL;
+       proj = new_rd_Proj(dbgi, load, mode, pn_arm_Ldr_res);
 
-       /* de-allocate code generator */
-       del_set(cg->reg_set);
-       free(self);
-}
+       reg = arch_get_irn_register(node);
+       arch_set_irn_register(proj, reg);
 
-/**
- * Move a double floating point value into an integer register.
- * Place the move operation into block bl.
- *
- * Handle some special cases here:
- * 1.) A constant: simply split into two
- * 2.) A load: simply split into two
- */
-static ir_node *convert_dbl_to_int(ir_node *bl, ir_node *arg, ir_node *mem,
-                                   ir_node **resH, ir_node **resL) {
-       if (is_Const(arg)) {
-               tarval *tv = get_Const_tarval(arg);
-               unsigned v;
-
-               /* get the upper 32 bits */
-               v =            get_tarval_sub_bits(tv, 7);
-               v = (v << 8) | get_tarval_sub_bits(tv, 6);
-               v = (v << 8) | get_tarval_sub_bits(tv, 5);
-               v = (v << 8) | get_tarval_sub_bits(tv, 4);
-               *resH = new_Const_long(mode_Is, v);
-
-               /* get the lower 32 bits */
-               v =            get_tarval_sub_bits(tv, 3);
-               v = (v << 8) | get_tarval_sub_bits(tv, 2);
-               v = (v << 8) | get_tarval_sub_bits(tv, 1);
-               v = (v << 8) | get_tarval_sub_bits(tv, 0);
-               *resL = new_Const_long(mode_Is, v);
-       } else if (is_Load(skip_Proj(arg))) {
-               /* FIXME: handling of low/high depends on LE/BE here */
-               panic("Unimplemented convert_dbl_to_int() case");
-       }
-       else {
-               ir_node *conv;
-
-               conv = new_bd_arm_fpaDbl2GP(NULL, bl, arg, mem);
-               /* move high/low */
-               *resL = new_r_Proj(bl, conv, mode_Is, pn_arm_fpaDbl2GP_low);
-               *resH = new_r_Proj(bl, conv, mode_Is, pn_arm_fpaDbl2GP_high);
-               mem   = new_r_Proj(bl, conv, mode_M,  pn_arm_fpaDbl2GP_M);
-       }
-       return mem;
+       exchange(node, proj);
 }
 
-/**
- * Move a single floating point value into an integer register.
- * Place the move operation into block bl.
- *
- * Handle some special cases here:
- * 1.) A constant: simply move
- * 2.) A load: simply load
- */
-static ir_node *convert_sng_to_int(ir_node *bl, ir_node *arg)
+static void transform_Spill(ir_node *node)
 {
-       (void) bl;
-
-       if (is_Const(arg)) {
-               tarval *tv = get_Const_tarval(arg);
-               unsigned v;
-
-               /* get the lower 32 bits */
-               v =            get_tarval_sub_bits(tv, 3);
-               v = (v << 8) | get_tarval_sub_bits(tv, 2);
-               v = (v << 8) | get_tarval_sub_bits(tv, 1);
-               v = (v << 8) | get_tarval_sub_bits(tv, 0);
-               return new_Const_long(mode_Is, v);
-       } else if (is_Load(skip_Proj(arg))) {
-               ir_node *load;
-
-               load = skip_Proj(arg);
-       }
-       panic("Unimplemented convert_sng_to_int() case");
+       ir_node   *block  = get_nodes_block(node);
+       dbg_info  *dbgi   = get_irn_dbg_info(node);
+       ir_node   *ptr    = get_irn_n(node, n_be_Spill_frame);
+       ir_graph  *irg    = get_irn_irg(node);
+       ir_node   *mem    = get_irg_no_mem(irg);
+       ir_node   *val    = get_irn_n(node, n_be_Spill_val);
+       ir_mode   *mode   = get_irn_mode(val);
+       ir_entity *entity = be_get_frame_entity(node);
+       ir_node   *store;
+
+       store = new_bd_arm_Str(dbgi, block, ptr, val, mem, mode, entity, false, 0,
+                              true);
+       sched_replace(node, store);
+
+       exchange(node, store);
 }
 
-/**
- * Convert the arguments of a call to support the
- * ARM calling convention of general purpose AND floating
- * point arguments.
- */
-static void handle_calls(ir_node *call, void *env)
+static void arm_after_ra_walker(ir_node *block, void *data)
 {
-       arm_code_gen_t *cg = env;
-       int i, j, n, size, idx, flag, n_param, n_res, first_variadic;
-       ir_type *mtp, *new_mtd, *new_tp[5];
-       ir_node *new_in[5], **in;
-       ir_node *bl;
-
-       if (! is_Call(call))
-               return;
+       (void) data;
 
-       /* check, if we need conversions */
-       n = get_Call_n_params(call);
-       mtp = get_Call_type(call);
-       assert(get_method_n_params(mtp) == n);
-
-       /* it's always enough to handle the first 4 parameters */
-       if (n > 4)
-               n = 4;
-       flag = size = idx = 0;
-       bl = get_nodes_block(call);
-       for (i = 0; i < n; ++i) {
-               ir_type *param_tp = get_method_param_type(mtp, i);
-
-               if (is_compound_type(param_tp)) {
-                       /* an aggregate parameter: bad case */
-                       assert(0);
+       sched_foreach_reverse_safe(block, node) {
+               if (be_is_Reload(node)) {
+                       transform_Reload(node);
+               } else if (be_is_Spill(node)) {
+                       transform_Spill(node);
                }
-               else {
-                       /* a primitive parameter */
-                       ir_mode *mode = get_type_mode(param_tp);
-
-                       if (mode_is_float(mode)) {
-                               if (get_mode_size_bits(mode) > 32) {
-                                       ir_node *mem = get_Call_mem(call);
-
-                                       /* Beware: ARM wants the high part first */
-                                       size += 2 * 4;
-                                       new_tp[idx]   = cg->int_tp;
-                                       new_tp[idx+1] = cg->int_tp;
-                                       mem = convert_dbl_to_int(bl, get_Call_param(call, i), mem, &new_in[idx], &new_in[idx+1]);
-                                       idx += 2;
-                                       set_Call_mem(call, mem);
-                               }
-                               else {
-                                       size += 4;
-                                       new_tp[idx] = cg->int_tp;
-                                       new_in[idx] = convert_sng_to_int(bl, get_Call_param(call, i));
-                                       ++idx;
-                               }
-                               flag = 1;
-                       }
-                       else {
-                               size += 4;
-                               new_tp[idx] = param_tp;
-                               new_in[idx] = get_Call_param(call, i);
-                               ++idx;
-                       }
-               }
-
-               if (size >= 16)
-                       break;
        }
-
-       /* if flag is NOT set, no need to translate the method type */
-       if (! flag)
-               return;
-
-       /* construct a new method type */
-       n       = i;
-       n_param = get_method_n_params(mtp) - n + idx;
-       n_res   = get_method_n_ress(mtp);
-       new_mtd = new_d_type_method(get_type_ident(mtp), n_param, n_res, get_type_dbg_info(mtp));
-
-       for (i = 0; i < idx; ++i)
-               set_method_param_type(new_mtd, i, new_tp[i]);
-       for (i = n, j = idx; i < get_method_n_params(mtp); ++i)
-               set_method_param_type(new_mtd, j++, get_method_param_type(mtp, i));
-       for (i = 0; i < n_res; ++i)
-               set_method_res_type(new_mtd, i, get_method_res_type(mtp, i));
-
-       set_method_calling_convention(new_mtd, get_method_calling_convention(mtp));
-       first_variadic = get_method_first_variadic_param_index(mtp);
-       if (first_variadic >= 0)
-               set_method_first_variadic_param_index(new_mtd, first_variadic);
-
-       if (is_lowered_type(mtp)) {
-               mtp = get_associated_type(mtp);
-       }
-       set_lowered_type(mtp, new_mtd);
-
-       set_Call_type(call, new_mtd);
-
-       /* calculate new in array of the Call */
-       NEW_ARR_A(ir_node *, in, n_param + 2);
-       for (i = 0; i < idx; ++i)
-               in[2 + i] = new_in[i];
-       for (i = n, j = idx; i < get_method_n_params(mtp); ++i)
-               in[2 + j++] = get_Call_param(call, i);
-
-       in[0] = get_Call_mem(call);
-       in[1] = get_Call_ptr(call);
-
-       /* finally, change the call inputs */
-       set_irn_in(call, n_param + 2, in);
 }
 
 /**
- * Handle graph transformations before the abi converter does its work.
- */
-static void arm_before_abi(void *self) {
-       arm_code_gen_t *cg = self;
-
-       irg_walk_graph(cg->irg, NULL, handle_calls, cg);
-}
-
-/* forward */
-static void *arm_cg_init(be_irg_t *birg);
-
-static const arch_code_generator_if_t arm_code_gen_if = {
-       arm_cg_init,
-       NULL,               /* get_pic_base */
-       arm_before_abi,     /* before abi introduce */
-       arm_prepare_graph,
-       NULL,               /* spill */
-       arm_before_ra,      /* before register allocation hook */
-       arm_after_ra,
-       arm_finish_irg,
-       arm_emit_and_done,
-};
-
-/**
- * Initializes the code generator.
+ * Called immediately before emit phase.
  */
-static void *arm_cg_init(be_irg_t *birg) {
-       static ir_type *int_tp = NULL;
-       arm_isa_t      *isa = (arm_isa_t *)birg->main_env->arch_env;
-       arm_code_gen_t *cg;
-
-       if (! int_tp) {
-               /* create an integer type with machine size */
-               int_tp = new_type_primitive(new_id_from_chars("int", 3), mode_Is);
-       }
-
-       cg = XMALLOC(arm_code_gen_t);
-       cg->impl         = &arm_code_gen_if;
-       cg->irg          = birg->irg;
-       cg->reg_set      = new_set(arm_cmp_irn_reg_assoc, 1024);
-       cg->isa          = isa;
-       cg->birg         = birg;
-       cg->int_tp       = int_tp;
-       cg->have_fp_insn = 0;
-       cg->unknown_gp   = NULL;
-       cg->unknown_fpa  = NULL;
-       cg->dump         = (birg->main_env->options->dump_flags & DUMP_BE) ? 1 : 0;
+static void arm_finish_irg(ir_graph *irg)
+{
+       be_stack_layout_t *stack_layout = be_get_irg_stack_layout(irg);
+       bool               at_begin     = stack_layout->sp_relative ? true : false;
+       be_fec_env_t      *fec_env      = be_new_frame_entity_coalescer(irg);
 
-       FIRM_DBG_REGISTER(cg->mod, "firm.be.arm.cg");
+       irg_walk_graph(irg, NULL, arm_collect_frame_entity_nodes, fec_env);
+       be_assign_entities(fec_env, arm_set_frame_entity, at_begin);
+       be_free_frame_entity_coalescer(fec_env);
 
-       cur_reg_set = cg->reg_set;
+       irg_block_walk_graph(irg, NULL, arm_after_ra_walker, NULL);
 
-       /* enter the current code generator */
-       isa->cg = cg;
+       /* fix stack entity offsets */
+       be_abi_fix_stack_nodes(irg);
+       be_abi_fix_stack_bias(irg);
 
-       return (arch_code_generator_t *)cg;
+       /* do peephole optimizations and fix stack offsets */
+       arm_peephole_optimization(irg);
 }
 
+static void arm_before_ra(ir_graph *irg)
+{
+       be_sched_fix_flags(irg, &arm_reg_classes[CLASS_arm_flags], NULL, NULL);
+}
 
 /**
  * Maps all intrinsic calls that the backend support
  * and map all instructions the backend did not support
  * to runtime calls.
  */
-static void arm_handle_intrinsics(void) {
+static void arm_handle_intrinsics(void)
+{
        ir_type *tp, *int_tp, *uint_tp;
        i_record records[8];
        int n_records = 0;
@@ -472,14 +263,14 @@ static void arm_handle_intrinsics(void) {
 
 #define ID(x) new_id_from_chars(x, sizeof(x)-1)
 
-       int_tp  = new_type_primitive(ID("int"), mode_Is);
-       uint_tp = new_type_primitive(ID("uint"), mode_Iu);
+       int_tp  = get_type_for_mode(mode_Is);
+       uint_tp = get_type_for_mode(mode_Iu);
 
        /* ARM has neither a signed div instruction ... */
        {
                i_instr_record *map_Div = &records[n_records++].i_instr;
 
-               tp = new_type_method(ID("rt_iDiv"), 2, 1);
+               tp = new_type_method(2, 1);
                set_method_param_type(tp, 0, int_tp);
                set_method_param_type(tp, 1, int_tp);
                set_method_res_type(tp, 0, int_tp);
@@ -491,10 +282,10 @@ static void arm_handle_intrinsics(void) {
                rt_iDiv.mem_proj_nr     = pn_Div_M;
                rt_iDiv.regular_proj_nr = pn_Div_X_regular;
                rt_iDiv.exc_proj_nr     = pn_Div_X_except;
-               rt_iDiv.exc_mem_proj_nr = pn_Div_M;
                rt_iDiv.res_proj_nr     = pn_Div_res;
 
-               set_entity_visibility(rt_iDiv.ent, visibility_external_allocated);
+               add_entity_linkage(rt_iDiv.ent, IR_LINKAGE_CONSTANT);
+               set_entity_visibility(rt_iDiv.ent, ir_visibility_external);
 
                map_Div->kind     = INTRINSIC_INSTR;
                map_Div->op       = op_Div;
@@ -505,7 +296,7 @@ static void arm_handle_intrinsics(void) {
        {
                i_instr_record *map_Div = &records[n_records++].i_instr;
 
-               tp = new_type_method(ID("rt_uDiv"), 2, 1);
+               tp = new_type_method(2, 1);
                set_method_param_type(tp, 0, uint_tp);
                set_method_param_type(tp, 1, uint_tp);
                set_method_res_type(tp, 0, uint_tp);
@@ -517,10 +308,9 @@ static void arm_handle_intrinsics(void) {
                rt_uDiv.mem_proj_nr     = pn_Div_M;
                rt_uDiv.regular_proj_nr = pn_Div_X_regular;
                rt_uDiv.exc_proj_nr     = pn_Div_X_except;
-               rt_uDiv.exc_mem_proj_nr = pn_Div_M;
                rt_uDiv.res_proj_nr     = pn_Div_res;
 
-               set_entity_visibility(rt_uDiv.ent, visibility_external_allocated);
+               set_entity_visibility(rt_uDiv.ent, ir_visibility_external);
 
                map_Div->kind     = INTRINSIC_INSTR;
                map_Div->op       = op_Div;
@@ -531,7 +321,7 @@ static void arm_handle_intrinsics(void) {
        {
                i_instr_record *map_Mod = &records[n_records++].i_instr;
 
-               tp = new_type_method(ID("rt_iMod"), 2, 1);
+               tp = new_type_method(2, 1);
                set_method_param_type(tp, 0, int_tp);
                set_method_param_type(tp, 1, int_tp);
                set_method_res_type(tp, 0, int_tp);
@@ -543,10 +333,9 @@ static void arm_handle_intrinsics(void) {
                rt_iMod.mem_proj_nr     = pn_Mod_M;
                rt_iMod.regular_proj_nr = pn_Mod_X_regular;
                rt_iMod.exc_proj_nr     = pn_Mod_X_except;
-               rt_iMod.exc_mem_proj_nr = pn_Mod_M;
                rt_iMod.res_proj_nr     = pn_Mod_res;
 
-               set_entity_visibility(rt_iMod.ent, visibility_external_allocated);
+               set_entity_visibility(rt_iMod.ent, ir_visibility_external);
 
                map_Mod->kind     = INTRINSIC_INSTR;
                map_Mod->op       = op_Mod;
@@ -557,7 +346,7 @@ static void arm_handle_intrinsics(void) {
        {
                i_instr_record *map_Mod = &records[n_records++].i_instr;
 
-               tp = new_type_method(ID("rt_uMod"), 2, 1);
+               tp = new_type_method(2, 1);
                set_method_param_type(tp, 0, uint_tp);
                set_method_param_type(tp, 1, uint_tp);
                set_method_res_type(tp, 0, uint_tp);
@@ -569,10 +358,9 @@ static void arm_handle_intrinsics(void) {
                rt_uMod.mem_proj_nr     = pn_Mod_M;
                rt_uMod.regular_proj_nr = pn_Mod_X_regular;
                rt_uMod.exc_proj_nr     = pn_Mod_X_except;
-               rt_uMod.exc_mem_proj_nr = pn_Mod_M;
                rt_uMod.res_proj_nr     = pn_Mod_res;
 
-               set_entity_visibility(rt_uMod.ent, visibility_external_allocated);
+               set_entity_visibility(rt_uMod.ent, ir_visibility_external);
 
                map_Mod->kind     = INTRINSIC_INSTR;
                map_Mod->op       = op_Mod;
@@ -584,454 +372,65 @@ static void arm_handle_intrinsics(void) {
                lower_intrinsics(records, n_records, /*part_block_used=*/0);
 }
 
-/*****************************************************************
- *  ____             _                  _   _____  _____
- * |  _ \           | |                | | |_   _|/ ____|  /\
- * | |_) | __ _  ___| | _____ _ __   __| |   | | | (___   /  \
- * |  _ < / _` |/ __| |/ / _ \ '_ \ / _` |   | |  \___ \ / /\ \
- * | |_) | (_| | (__|   <  __/ | | | (_| |  _| |_ ____) / ____ \
- * |____/ \__,_|\___|_|\_\___|_| |_|\__,_| |_____|_____/_/    \_\
- *
- *****************************************************************/
-
+extern const arch_isa_if_t arm_isa_if;
 static arm_isa_t arm_isa_template = {
        {
-               &arm_isa_if,           /* isa interface */
-               &arm_gp_regs[REG_SP],  /* stack pointer */
-               &arm_gp_regs[REG_R11], /* base pointer */
-               &arm_reg_classes[CLASS_arm_gp],  /* static link pointer class */
-               -1,                    /* stack direction */
-               2,                     /* power of two stack alignment for calls, 2^2 == 4 */
-               NULL,                  /* main environment */
-               7,                     /* spill costs */
-               5,                     /* reload costs */
+               &arm_isa_if,             /* isa interface */
+               N_ARM_REGISTERS,
+               arm_registers,
+               N_ARM_CLASSES,
+               arm_reg_classes,
+               &arm_registers[REG_SP],  /* stack pointer */
+               &arm_registers[REG_R11], /* base pointer */
+               2,                       /* power of two stack alignment for calls, 2^2 == 4 */
+               7,                       /* spill costs */
+               5,                       /* reload costs */
+               true,                    /* we do have custom abi handling */
        },
-       0,                     /* use generic register names instead of SP, LR, PC */
-       ARM_FPU_ARCH_FPE,      /* FPU architecture */
-       NULL,                  /* current code generator */
+       ARM_FPU_ARCH_FPE,          /* FPU architecture */
 };
 
-/**
- * Initializes the backend ISA and opens the output file.
- */
-static arch_env_t *arm_init(FILE *file_handle) {
-       static int inited = 0;
-       arm_isa_t *isa;
-
-       if (inited)
-               return NULL;
-
-       isa = XMALLOC(arm_isa_t);
-       memcpy(isa, &arm_isa_template, sizeof(*isa));
-
+static void arm_init(void)
+{
        arm_register_init();
 
-       isa->cg  = NULL;
-       be_emit_init(file_handle);
-
        arm_create_opcodes(&arm_irn_ops);
-       arm_handle_intrinsics();
-
-       /* needed for the debug support */
-       be_gas_emit_switch_section(GAS_SECTION_TEXT);
-       be_emit_cstring(".Ltext0:\n");
-       be_emit_write_line();
-
-       /* we mark referenced global entities, so we can only emit those which
-        * are actually referenced. (Note: you mustn't use the type visited flag
-        * elsewhere in the backend)
-        */
-       inc_master_type_visited();
-
-       inited = 1;
-       return &isa->arch_env;
-}
-
-
-
-/**
- * Closes the output file and frees the ISA structure.
- */
-static void arm_done(void *self) {
-       arm_isa_t *isa = self;
-
-       be_gas_emit_decls(isa->arch_env.main_env, 1);
-
-       be_emit_exit();
-       free(self);
-}
-
-
-/**
- * Report the number of register classes.
- * If we don't have fp instructions, report only GP
- * here to speed up register allocation (and makes dumps
- * smaller and more readable).
- */
-static unsigned arm_get_n_reg_class(void) {
-       return N_CLASSES;
-}
-
-/**
- * Return the register class with requested index.
- */
-static const arch_register_class_t *arm_get_reg_class(unsigned i) {
-       assert(i < N_CLASSES);
-       return &arm_reg_classes[i];
-}
-
-/**
- * Get the register class which shall be used to store a value of a given mode.
- * @param self The this pointer.
- * @param mode The mode in question.
- * @return A register class which can hold values of the given mode.
- */
-const arch_register_class_t *arm_get_reg_class_for_mode(const ir_mode *mode) {
-       if (mode_is_float(mode))
-               return &arm_reg_classes[CLASS_arm_fpa];
-       else
-               return &arm_reg_classes[CLASS_arm_gp];
-}
-
-/**
- * Produces the type which sits between the stack args and the locals on the stack.
- * it will contain the return address and space to store the old base pointer.
- * @return The Firm type modeling the ABI between type.
- */
-static ir_type *arm_get_between_type(void *self) {
-       static ir_type *between_type = NULL;
-       static ir_entity *old_bp_ent = NULL;
-       (void) self;
-
-       if (between_type == NULL) {
-               ir_entity *ret_addr_ent;
-               ir_type *ret_addr_type = new_type_primitive(new_id_from_str("return_addr"), mode_P);
-               ir_type *old_bp_type   = new_type_primitive(new_id_from_str("bp"), mode_P);
-
-               between_type           = new_type_class(new_id_from_str("arm_between_type"));
-               old_bp_ent             = new_entity(between_type, new_id_from_str("old_bp"), old_bp_type);
-               ret_addr_ent           = new_entity(between_type, new_id_from_str("old_bp"), ret_addr_type);
-
-               set_entity_offset(old_bp_ent, 0);
-               set_entity_offset(ret_addr_ent, get_type_size_bytes(old_bp_type));
-               set_type_size_bytes(between_type, get_type_size_bytes(old_bp_type) + get_type_size_bytes(ret_addr_type));
-       }
-
-       return between_type;
 }
 
-
-typedef struct {
-       be_abi_call_flags_bits_t flags;
-       const arch_env_t *arch_env;
-       ir_graph *irg;
-} arm_abi_env_t;
-
-static void *arm_abi_init(const be_abi_call_t *call, const arch_env_t *arch_env, ir_graph *irg)
+static void arm_finish(void)
 {
-       arm_abi_env_t       *env = XMALLOC(arm_abi_env_t);
-       be_abi_call_flags_t  fl  = be_abi_call_get_flags(call);
-       env->flags    = fl.bits;
-       env->irg      = irg;
-       env->arch_env = arch_env;
-       return env;
-}
-
-/**
- * Generate the routine prologue.
- *
- * @param self       The callback object.
- * @param mem        A pointer to the mem node. Update this if you define new memory.
- * @param reg_map    A map mapping all callee_save/ignore/parameter registers to their defining nodes.
- * @param stack_bias Points to the current stack bias, can be modified if needed.
- *
- * @return        The register which shall be used as a stack frame base.
- *
- * All nodes which define registers in @p reg_map must keep @p reg_map current.
- */
-static const arch_register_t *arm_abi_prologue(void *self, ir_node **mem, pmap *reg_map, int *stack_bias) {
-       arm_abi_env_t         *env = self;
-       ir_node               *store;
-       ir_graph              *irg;
-       ir_node               *block;
-       arch_register_class_t *gp;
-
-       ir_node               *fp, *ip, *lr, *pc;
-       ir_node               *sp = be_abi_reg_map_get(reg_map, env->arch_env->sp);
-
-       (void) stack_bias;
-
-       if (env->flags.try_omit_fp)
-               return env->arch_env->sp;
-
-       fp = be_abi_reg_map_get(reg_map, env->arch_env->bp);
-       ip = be_abi_reg_map_get(reg_map, &arm_gp_regs[REG_R12]);
-       lr = be_abi_reg_map_get(reg_map, &arm_gp_regs[REG_LR]);
-       pc = be_abi_reg_map_get(reg_map, &arm_gp_regs[REG_PC]);
-
-       gp    = &arm_reg_classes[CLASS_arm_gp];
-       irg   = env->irg;
-       block = get_irg_start_block(irg);
-
-       /* mark bp register as ignore */
-       be_set_constr_single_reg_out(get_Proj_pred(fp),
-                                    get_Proj_proj(fp), env->arch_env->bp,
-                                    arch_register_req_type_ignore);
-
-       /* copy SP to IP (so we can spill it */
-       ip = be_new_Copy(gp, block, sp);
-       be_set_constr_single_reg_out(ip, 0, &arm_gp_regs[REG_R12], 0);
-
-       /* spill stuff */
-       store = new_bd_arm_StoreStackM4Inc(NULL, block, sp, fp, ip, lr, pc, *mem);
-
-       sp = new_r_Proj(block, store, env->arch_env->sp->reg_class->mode, pn_arm_StoreStackM4Inc_ptr);
-       arch_set_irn_register(sp, env->arch_env->sp);
-       *mem = new_r_Proj(block, store, mode_M, pn_arm_StoreStackM4Inc_M);
-
-       /* frame pointer is ip-4 (because ip is our old sp value) */
-       fp = new_bd_arm_Sub_i(NULL, block, ip, get_irn_mode(fp), 4);
-       arch_set_irn_register(fp, env->arch_env->bp);
-
-       /* beware: we change the fp but the StoreStackM4Inc above wants the old
-        * fp value. We are not allowed to spill or anything in the prolog, so we
-        * have to enforce some order here. (scheduler/regalloc are too stupid
-        * to extract this order from register requirements) */
-       add_irn_dep(fp, store);
-
-       fp = be_new_Copy(gp, block, fp); // XXX Gammelfix: only be_ have custom register requirements
-       be_set_constr_single_reg_out(fp, 0, env->arch_env->bp,
-                                    arch_register_req_type_ignore);
-       arch_set_irn_register(fp, env->arch_env->bp);
-
-       be_abi_reg_map_set(reg_map, env->arch_env->bp, fp);
-       be_abi_reg_map_set(reg_map, &arm_gp_regs[REG_R12], ip);
-       be_abi_reg_map_set(reg_map, env->arch_env->sp, sp);
-       be_abi_reg_map_set(reg_map, &arm_gp_regs[REG_LR], lr);
-       be_abi_reg_map_set(reg_map, &arm_gp_regs[REG_PC], pc);
-
-       return env->arch_env->bp;
-}
-
-/**
- * Builds the ARM epilogue
- */
-static void arm_abi_epilogue(void *self, ir_node *bl, ir_node **mem, pmap *reg_map) {
-       arm_abi_env_t *env = self;
-       ir_node *curr_sp = be_abi_reg_map_get(reg_map, env->arch_env->sp);
-       ir_node *curr_bp = be_abi_reg_map_get(reg_map, env->arch_env->bp);
-       ir_node *curr_pc = be_abi_reg_map_get(reg_map, &arm_gp_regs[REG_PC]);
-       ir_node *curr_lr = be_abi_reg_map_get(reg_map, &arm_gp_regs[REG_LR]);
-
-       // TODO: Activate Omit fp in epilogue
-       if (env->flags.try_omit_fp) {
-               curr_sp = be_new_IncSP(env->arch_env->sp, bl, curr_sp, BE_STACK_FRAME_SIZE_SHRINK, 0);
-
-               curr_lr = be_new_CopyKeep_single(&arm_reg_classes[CLASS_arm_gp], bl, curr_lr, curr_sp, get_irn_mode(curr_lr));
-               be_set_constr_single_reg_out(curr_lr, 0, &arm_gp_regs[REG_LR], 0);
-
-               curr_pc = be_new_Copy(&arm_reg_classes[CLASS_arm_gp], bl, curr_lr );
-               be_set_constr_single_reg_out(curr_pc, BE_OUT_POS(0), &arm_gp_regs[REG_PC], 0);
-       } else {
-               ir_node *load_node;
-
-               load_node = new_bd_arm_LoadStackM3Epilogue(NULL, bl, curr_bp, *mem);
-
-               curr_bp = new_r_Proj(bl, load_node, env->arch_env->bp->reg_class->mode, pn_arm_LoadStackM3Epilogue_res0);
-               curr_sp = new_r_Proj(bl, load_node, env->arch_env->sp->reg_class->mode, pn_arm_LoadStackM3Epilogue_res1);
-               curr_pc = new_r_Proj(bl, load_node, mode_Iu, pn_arm_LoadStackM3Epilogue_res2);
-               *mem    = new_r_Proj(bl, load_node, mode_M, pn_arm_LoadStackM3Epilogue_M);
-               arch_set_irn_register(curr_bp, env->arch_env->bp);
-               arch_set_irn_register(curr_sp, env->arch_env->sp);
-               arch_set_irn_register(curr_pc, &arm_gp_regs[REG_PC]);
-       }
-       be_abi_reg_map_set(reg_map, env->arch_env->sp, curr_sp);
-       be_abi_reg_map_set(reg_map, env->arch_env->bp, curr_bp);
-       be_abi_reg_map_set(reg_map, &arm_gp_regs[REG_LR], curr_lr);
-       be_abi_reg_map_set(reg_map, &arm_gp_regs[REG_PC], curr_pc);
-}
-
-static const be_abi_callbacks_t arm_abi_callbacks = {
-       arm_abi_init,
-       free,
-       arm_get_between_type,
-       arm_abi_prologue,
-       arm_abi_epilogue,
-};
-
-
-/**
- * Get the ABI restrictions for procedure calls.
- * @param self        The this pointer.
- * @param method_type The type of the method (procedure) in question.
- * @param abi         The abi object to be modified
- */
-void arm_get_call_abi(const void *self, ir_type *method_type, be_abi_call_t *abi) {
-       ir_type  *tp;
-       ir_mode  *mode;
-       int       i;
-       int       n = get_method_n_params(method_type);
-       be_abi_call_flags_t call_flags = be_abi_call_get_flags(abi);
-       (void) self;
-
-       /* set abi flags for calls */
-       call_flags.bits.left_to_right         = 0;
-       call_flags.bits.store_args_sequential = 0;
-       /* call_flags.bits.try_omit_fp     don't change this we can handle both */
-       call_flags.bits.fp_free               = 0;
-       call_flags.bits.call_has_imm          = 1;  /* IA32 calls can have immediate address */
-
-       /* set stack parameter passing style */
-       be_abi_call_set_flags(abi, call_flags, &arm_abi_callbacks);
-
-       for (i = 0; i < n; i++) {
-               /* reg = get reg for param i;          */
-               /* be_abi_call_param_reg(abi, i, reg); */
-               if (i < 4) {
-                       be_abi_call_param_reg(abi, i, arm_get_RegParam_reg(i));
-               } else {
-                       tp   = get_method_param_type(method_type, i);
-                       mode = get_type_mode(tp);
-                       be_abi_call_param_stack(abi, i, mode, 4, 0, 0);
-               }
-       }
-
-       /* set return registers */
-       n = get_method_n_ress(method_type);
-
-       assert(n <= 2 && "more than two results not supported");
-
-       /* In case of 64bit returns, we will have two 32bit values */
-       if (n == 2) {
-               tp   = get_method_res_type(method_type, 0);
-               mode = get_type_mode(tp);
-
-               assert(!mode_is_float(mode) && "two FP results not supported");
-
-               tp   = get_method_res_type(method_type, 1);
-               mode = get_type_mode(tp);
-
-               assert(!mode_is_float(mode) && "mixed INT, FP results not supported");
-
-               be_abi_call_res_reg(abi, 0, &arm_gp_regs[REG_R0]);
-               be_abi_call_res_reg(abi, 1, &arm_gp_regs[REG_R1]);
-       } else if (n == 1) {
-               const arch_register_t *reg;
-
-               tp   = get_method_res_type(method_type, 0);
-               assert(is_atomic_type(tp));
-               mode = get_type_mode(tp);
-
-               reg = mode_is_float(mode) ? &arm_fpa_regs[REG_F0] : &arm_gp_regs[REG_R0];
-               be_abi_call_res_reg(abi, 0, reg);
-       }
-}
-
-int arm_to_appear_in_schedule(void *block_env, const ir_node *irn) {
-       (void) block_env;
-       if(!is_arm_irn(irn))
-               return -1;
-
-       return 1;
-}
-
-/**
- * Initializes the code generator interface.
- */
-static const arch_code_generator_if_t *arm_get_code_generator_if(void *self) {
-       (void) self;
-       return &arm_code_gen_if;
-}
-
-list_sched_selector_t arm_sched_selector;
-
-/**
- * Returns the reg_pressure scheduler with to_appear_in_schedule() over\loaded
- */
-static const list_sched_selector_t *arm_get_list_sched_selector(const void *self, list_sched_selector_t *selector) {
-       (void) self;
-       memcpy(&arm_sched_selector, selector, sizeof(arm_sched_selector));
-       /* arm_sched_selector.exectime              = arm_sched_exectime; */
-       arm_sched_selector.to_appear_in_schedule = arm_to_appear_in_schedule;
-       return &arm_sched_selector;
-
-}
-
-static const ilp_sched_selector_t *arm_get_ilp_sched_selector(const void *self) {
-       (void) self;
-       return NULL;
+       arm_free_opcodes();
 }
 
-/**
- * Returns the necessary byte alignment for storing a register of given class.
- */
-static int arm_get_reg_class_alignment(const arch_register_class_t *cls)
+static arch_env_t *arm_begin_codegeneration(void)
 {
-       (void) cls;
-       /* ARM is a 32 bit CPU, no need for other alignment */
-       return 4;
-}
+       arm_isa_t *isa = XMALLOC(arm_isa_t);
+       *isa = arm_isa_template;
 
-static const be_execution_unit_t ***arm_get_allowed_execution_units(const ir_node *irn) {
-       (void) irn;
-       /* TODO */
-       panic("Unimplemented arm_get_allowed_execution_units()");
-}
+       be_gas_emit_types = false;
 
-static const be_machine_t *arm_get_machine(const void *self) {
-       (void) self;
-       /* TODO */
-       panic("Unimplemented arm_get_machine()");
+       return &isa->base;
 }
 
 /**
- * Return irp irgs in the desired order.
+ * Closes the output file and frees the ISA structure.
  */
-static ir_graph **arm_get_irg_list(const void *self, ir_graph ***irg_list) {
-       (void) self;
-       (void) irg_list;
-       return NULL;
+static void arm_end_codegeneration(void *self)
+{
+       free(self);
 }
 
 /**
  * Allows or disallows the creation of Psi nodes for the given Phi nodes.
  * @return 1 if allowed, 0 otherwise
  */
-static int arm_is_psi_allowed(ir_node *sel, ir_node *phi_list, int i, int j) {
-       ir_node *cmp, *cmp_a, *phi;
-       ir_mode *mode;
-
-
-       /* currently Psi support is not implemented */
-       return 0;
-
-/* we don't want long long Psi */
-#define IS_BAD_PSI_MODE(mode) (!mode_is_float(mode) && get_mode_size_bits(mode) > 32)
-
-       if (get_irn_mode(sel) != mode_b)
-               return 0;
-
-       cmp   = get_Proj_pred(sel);
-       cmp_a = get_Cmp_left(cmp);
-       mode  = get_irn_mode(cmp_a);
-
-       if (IS_BAD_PSI_MODE(mode))
-               return 0;
-
-       /* check the Phi nodes */
-       for (phi = phi_list; phi; phi = get_irn_link(phi)) {
-               ir_node *pred_i = get_irn_n(phi, i);
-               ir_node *pred_j = get_irn_n(phi, j);
-               ir_mode *mode_i = get_irn_mode(pred_i);
-               ir_mode *mode_j = get_irn_mode(pred_j);
-
-               if (IS_BAD_PSI_MODE(mode_i) || IS_BAD_PSI_MODE(mode_j))
-                       return 0;
-       }
-
-#undef IS_BAD_PSI_MODE
-
-       return 1;
+static int arm_is_mux_allowed(ir_node *sel, ir_node *mux_false,
+                              ir_node *mux_true)
+{
+       (void) sel;
+       (void) mux_false;
+       (void) mux_true;
+       return false;
 }
 
 static asm_constraint_flags_t arm_parse_asm_constraint(const char **c)
@@ -1047,17 +446,36 @@ static int arm_is_valid_clobber(const char *clobber)
        return 0;
 }
 
+static void arm_lower_for_target(void)
+{
+       ir_mode *mode_gp = arm_reg_classes[CLASS_arm_gp].mode;
+       size_t i, n_irgs = get_irp_n_irgs();
+
+       /* lower compound param handling */
+       lower_calls_with_compounds(LF_RETURN_HIDDEN);
+
+       for (i = 0; i < n_irgs; ++i) {
+               ir_graph *irg = get_irp_irg(i);
+               lower_switch(irg, 4, 256, mode_gp);
+       }
+
+       for (i = 0; i < n_irgs; ++i) {
+               ir_graph *irg = get_irp_irg(i);
+               /* Turn all small CopyBs into loads/stores and all bigger CopyBs into
+                * memcpy calls.
+                * TODO:  These constants need arm-specific tuning. */
+               lower_CopyB(irg, 31, 32, false);
+       }
+}
+
 /**
  * Returns the libFirm configuration parameter for this backend.
  */
-static const backend_params *arm_get_libfirm_params(void) {
-       static const ir_settings_if_conv_t ifconv = {
-               4,                    /* maxdepth, doesn't matter for Psi-conversion */
-               arm_is_psi_allowed   /* allows or disallows Psi creation for given selector */
-       };
+static const backend_params *arm_get_libfirm_params(void)
+{
        static ir_settings_arch_dep_t ad = {
                1,    /* allow subs */
-               1,        /* Muls are fast enough on ARM but ... */
+               1,    /* Muls are fast enough on ARM but ... */
                31,   /* ... one shift would be possible better */
                NULL, /* no evaluator function */
                0,    /* SMUL is needed, only in Arch M */
@@ -1065,21 +483,24 @@ static const backend_params *arm_get_libfirm_params(void) {
                32,   /* SMUL & UMUL available for 32 bit */
        };
        static backend_params p = {
-               1,     /* need dword lowering */
                0,     /* don't support inline assembler yet */
-               NULL,  /* will be set later */
-               NULL,  /* but yet no creator function */
-               NULL,  /* context for create_intrinsic_fkt */
-               NULL,  /* ifconv_info will be set below */
+               1,     /* support Rotl nodes */
+               1,     /* big endian */
+               1,     /* modulo shift efficient */
+               0,     /* non-modulo shift not efficient */
+               &ad,   /* will be set later */
+               arm_is_mux_allowed, /* allow_ifconv function */
+               32,    /* machine size */
                NULL,  /* float arithmetic mode (TODO) */
+               NULL,  /* long long type */
+               NULL,  /* unsigned long long type */
+               NULL,  /* long double type */
                0,     /* no trampoline support: size 0 */
                0,     /* no trampoline support: align 0 */
                NULL,  /* no trampoline support: no trampoline builder */
                4      /* alignment of stack parameter */
        };
 
-       p.dep_param    = &ad;
-       p.if_conv_info = &ifconv;
        return &p;
 }
 
@@ -1100,31 +521,36 @@ static lc_opt_enum_int_var_t arch_fpu_var = {
 
 static const lc_opt_table_entry_t arm_options[] = {
        LC_OPT_ENT_ENUM_INT("fpunit",    "select the floating point unit", &arch_fpu_var),
-       LC_OPT_ENT_BOOL("gen_reg_names", "use generic register names", &arm_isa_template.gen_reg_names),
        LC_OPT_LAST
 };
 
 const arch_isa_if_t arm_isa_if = {
        arm_init,
-       arm_done,
-       NULL,  /* handle_intrinsics */
-       arm_get_n_reg_class,
-       arm_get_reg_class,
-       arm_get_reg_class_for_mode,
-       arm_get_call_abi,
-       arm_get_code_generator_if,
-       arm_get_list_sched_selector,
-       arm_get_ilp_sched_selector,
-       arm_get_reg_class_alignment,
+       arm_finish,
        arm_get_libfirm_params,
-       arm_get_allowed_execution_units,
-       arm_get_machine,
-       arm_get_irg_list,
-       NULL,               /* mark remat */
+       arm_lower_for_target,
        arm_parse_asm_constraint,
-       arm_is_valid_clobber
+       arm_is_valid_clobber,
+
+       arm_begin_codegeneration,
+       arm_end_codegeneration,
+       NULL,
+       NULL,  /* get call abi */
+       NULL,  /* mark remat */
+       NULL,  /* get_pic_base */
+       be_new_spill,
+       be_new_reload,
+       NULL,  /* register_saved_by */
+
+       arm_handle_intrinsics, /* handle_intrinsics */
+       NULL,  /* before_abi */
+       arm_prepare_graph,
+       arm_before_ra,
+       arm_finish_irg,
+       arm_gen_routine,
 };
 
+BE_REGISTER_MODULE_CONSTRUCTOR(be_init_arch_arm)
 void be_init_arch_arm(void)
 {
        lc_opt_entry_t *be_grp = lc_opt_get_grp(firm_opt_get_root(), "be");
@@ -1137,5 +563,3 @@ void be_init_arch_arm(void)
        arm_init_transform();
        arm_init_emitter();
 }
-
-BE_REGISTER_MODULE_CONSTRUCTOR(be_init_arch_arm);