put register classes into arch_env struct, no need for complicated callbacks
[libfirm] / ir / be / arm / arm_transform.c
index 4ded99b..d204372 100644 (file)
@@ -30,7 +30,6 @@
 #include "irmode_t.h"
 #include "irgmod.h"
 #include "iredges.h"
-#include "irvrfy.h"
 #include "ircons.h"
 #include "irprintf.h"
 #include "dbginfo.h"
 
 DEBUG_ONLY(static firm_dbg_module_t *dbg = NULL;)
 
-/** hold the current code generator during transformation */
-static arm_code_gen_t *env_cg;
-
-static const arch_register_t *sp_reg = &arm_gp_regs[REG_SP];
+static const arch_register_t *sp_reg = &arm_registers[REG_SP];
 static ir_mode               *mode_gp;
 static ir_mode               *mode_fp;
 static beabi_helper_env_t    *abihelper;
 static calling_convention_t  *cconv = NULL;
+static arm_isa_t             *isa;
 
 static pmap                  *node_to_stack;
 
@@ -216,7 +213,7 @@ static ir_node *gen_Conv(ir_node *node)
                return new_op;
 
        if (mode_is_float(src_mode) || mode_is_float(dst_mode)) {
-               if (USE_FPA(env_cg->isa)) {
+               if (USE_FPA(isa)) {
                        if (mode_is_float(src_mode)) {
                                if (mode_is_float(dst_mode)) {
                                        /* from float to float */
@@ -227,9 +224,13 @@ static ir_node *gen_Conv(ir_node *node)
                                }
                        } else {
                                /* from int to float */
-                               panic("TODO");
+                               if (!mode_is_signed(src_mode)) {
+                                       panic("TODO");
+                               } else {
+                                       return new_bd_arm_FltX(dbg, block, new_op, dst_mode);
+                               }
                        }
-               } else if (USE_VFP(env_cg->isa)) {
+               } else if (USE_VFP(isa)) {
                        panic("VFP not supported yet");
                } else {
                        panic("Softfloat not supported yet");
@@ -348,15 +349,28 @@ static ir_node *arm_skip_downconv(ir_node *node)
 
 typedef enum {
        MATCH_NONE         = 0,
-       MATCH_COMMUTATIVE  = 1 << 0,
-       MATCH_SIZE_NEUTRAL = 1 << 1,
+       MATCH_COMMUTATIVE  = 1 << 0,  /**< commutative node */
+       MATCH_REVERSE      = 1 << 1,  /**< support reverse opcode */
+       MATCH_SIZE_NEUTRAL = 1 << 2,
+       MATCH_SKIP_NOT     = 1 << 3,  /**< skip Not on ONE input */
 } match_flags_t;
 
-typedef ir_node* (*new_binop_reg_func) (dbg_info *dbgi, ir_node *block, ir_node *op1, ir_node *op2);
-typedef ir_node* (*new_binop_imm_func) (dbg_info *dbgi, ir_node *block, ir_node *op1, unsigned char imm8, unsigned char imm_rot);
+/**
+ * possible binop constructors.
+ */
+typedef struct arm_binop_factory_t {
+       /** normal reg op reg operation. */
+       ir_node *(*new_binop_reg)(dbg_info *dbgi, ir_node *block, ir_node *op1, ir_node *op2);
+       /** normal reg op imm operation. */
+       ir_node *(*new_binop_imm)(dbg_info *dbgi, ir_node *block, ir_node *op1, unsigned char imm8, unsigned char imm_rot);
+       /** barrel shifter reg op (reg shift reg operation. */
+       ir_node *(*new_binop_reg_shift_reg)(dbg_info *dbgi, ir_node *block, ir_node *left, ir_node *right, ir_node *shift, arm_shift_modifier_t shift_modifier);
+       /** barrel shifter reg op (reg shift imm operation. */
+       ir_node *(*new_binop_reg_shift_imm)(dbg_info *dbgi, ir_node *block, ir_node *left, ir_node *right, arm_shift_modifier_t shift_modifier, unsigned shift_immediate);
+} arm_binop_factory_t;
 
 static ir_node *gen_int_binop(ir_node *node, match_flags_t flags,
-               new_binop_reg_func new_reg, new_binop_imm_func new_imm)
+               const arm_binop_factory_t *factory)
 {
        ir_node  *block   = be_transform_node(get_nodes_block(node));
        ir_node  *op1     = get_binop_left(node);
@@ -366,6 +380,14 @@ static ir_node *gen_int_binop(ir_node *node, match_flags_t flags,
        dbg_info *dbgi    = get_irn_dbg_info(node);
        arm_immediate_t imm;
 
+       if (flags & MATCH_SKIP_NOT) {
+               if (is_Not(op1))
+                       op1 = get_Not_op(op1);
+               else if (is_Not(op2))
+                       op2 = get_Not_op(op2);
+               else
+                       panic("cannot execute MATCH_SKIP_NOT");
+       }
        if (flags & MATCH_SIZE_NEUTRAL) {
                op1 = arm_skip_downconv(op1);
                op2 = arm_skip_downconv(op2);
@@ -375,15 +397,91 @@ static ir_node *gen_int_binop(ir_node *node, match_flags_t flags,
 
        if (try_encode_as_immediate(op2, &imm)) {
                ir_node *new_op1 = be_transform_node(op1);
-               return new_imm(dbgi, block, new_op1, imm.imm_8, imm.rot);
+               return factory->new_binop_imm(dbgi, block, new_op1, imm.imm_8, imm.rot);
        }
        new_op2 = be_transform_node(op2);
-    if ((flags & MATCH_COMMUTATIVE) && try_encode_as_immediate(op1, &imm)) {
-               return new_imm(dbgi, block, new_op2, imm.imm_8, imm.rot);
+    if ((flags & (MATCH_COMMUTATIVE|MATCH_REVERSE)) && try_encode_as_immediate(op1, &imm)) {
+               if (flags & MATCH_REVERSE)
+                       return factory[1].new_binop_imm(dbgi, block, new_op2, imm.imm_8, imm.rot);
+               else
+                       return factory[0].new_binop_imm(dbgi, block, new_op2, imm.imm_8, imm.rot);
        }
        new_op1 = be_transform_node(op1);
 
-       return new_reg(dbgi, block, new_op1, new_op2);
+       /* check if we can fold in a Mov */
+       if (is_arm_Mov(new_op2)) {
+               const arm_shifter_operand_t *attr = get_arm_shifter_operand_attr_const(new_op2);
+
+               switch (attr->shift_modifier) {
+               case ARM_SHF_IMM:
+               case ARM_SHF_ASR_IMM:
+               case ARM_SHF_LSL_IMM:
+               case ARM_SHF_LSR_IMM:
+               case ARM_SHF_ROR_IMM:
+                       if (factory->new_binop_reg_shift_imm) {
+                               ir_node *mov_op = get_irn_n(new_op2, 0);
+                               return factory->new_binop_reg_shift_imm(dbgi, block, new_op1, mov_op,
+                                       attr->shift_modifier, attr->shift_immediate);
+                       }
+                       break;
+
+               case ARM_SHF_ASR_REG:
+               case ARM_SHF_LSL_REG:
+               case ARM_SHF_LSR_REG:
+               case ARM_SHF_ROR_REG:
+                       if (factory->new_binop_reg_shift_reg) {
+                               ir_node *mov_op  = get_irn_n(new_op2, 0);
+                               ir_node *mov_sft = get_irn_n(new_op2, 1);
+                               return factory->new_binop_reg_shift_reg(dbgi, block, new_op1, mov_op, mov_sft,
+                                       attr->shift_modifier);
+                       }
+                       break;
+               case ARM_SHF_REG:
+               case ARM_SHF_RRX:
+                       break;
+               case ARM_SHF_INVALID:
+                       panic("invalid shift");
+               }
+       }
+       if ((flags & (MATCH_COMMUTATIVE|MATCH_REVERSE)) && is_arm_Mov(new_op1)) {
+               const arm_shifter_operand_t *attr = get_arm_shifter_operand_attr_const(new_op1);
+               int idx = flags & MATCH_REVERSE ? 1 : 0;
+
+               switch (attr->shift_modifier) {
+               ir_node *mov_op, *mov_sft;
+
+               case ARM_SHF_IMM:
+               case ARM_SHF_ASR_IMM:
+               case ARM_SHF_LSL_IMM:
+               case ARM_SHF_LSR_IMM:
+               case ARM_SHF_ROR_IMM:
+                       if (factory[idx].new_binop_reg_shift_imm) {
+                               mov_op = get_irn_n(new_op1, 0);
+                               return factory[idx].new_binop_reg_shift_imm(dbgi, block, new_op2, mov_op,
+                                       attr->shift_modifier, attr->shift_immediate);
+                       }
+                       break;
+
+               case ARM_SHF_ASR_REG:
+               case ARM_SHF_LSL_REG:
+               case ARM_SHF_LSR_REG:
+               case ARM_SHF_ROR_REG:
+                       if (factory[idx].new_binop_reg_shift_reg) {
+                               mov_op  = get_irn_n(new_op1, 0);
+                               mov_sft = get_irn_n(new_op1, 1);
+                               return factory[idx].new_binop_reg_shift_reg(dbgi, block, new_op2, mov_op, mov_sft,
+                                       attr->shift_modifier);
+                       }
+                       break;
+
+               case ARM_SHF_REG:
+               case ARM_SHF_RRX:
+                       break;
+               case ARM_SHF_INVALID:
+                       panic("invalid shift");
+               }
+       }
+       return factory->new_binop_reg(dbgi, block, new_op1, new_op2);
 }
 
 /**
@@ -393,7 +491,14 @@ static ir_node *gen_int_binop(ir_node *node, match_flags_t flags,
  */
 static ir_node *gen_Add(ir_node *node)
 {
-       ir_mode  *mode    = get_irn_mode(node);
+       static const arm_binop_factory_t add_factory = {
+               new_bd_arm_Add_reg,
+               new_bd_arm_Add_imm,
+               new_bd_arm_Add_reg_shift_reg,
+               new_bd_arm_Add_reg_shift_imm
+       };
+
+       ir_mode *mode = get_irn_mode(node);
 
        if (mode_is_float(mode)) {
                ir_node  *block   = be_transform_node(get_nodes_block(node));
@@ -402,9 +507,9 @@ static ir_node *gen_Add(ir_node *node)
                dbg_info *dbgi    = get_irn_dbg_info(node);
                ir_node  *new_op1 = be_transform_node(op1);
                ir_node  *new_op2 = be_transform_node(op2);
-               if (USE_FPA(env_cg->isa)) {
+               if (USE_FPA(isa)) {
                        return new_bd_arm_Adf(dbgi, block, new_op1, new_op2, mode);
-               } else if (USE_VFP(env_cg->isa)) {
+               } else if (USE_VFP(isa)) {
                        assert(mode != mode_E && "IEEE Extended FP not supported");
                        panic("VFP not supported yet");
                } else {
@@ -429,8 +534,7 @@ static ir_node *gen_Add(ir_node *node)
                }
 #endif
 
-               return gen_int_binop(node, MATCH_COMMUTATIVE | MATCH_SIZE_NEUTRAL,
-                               new_bd_arm_Add_reg, new_bd_arm_Add_imm);
+               return gen_int_binop(node, MATCH_COMMUTATIVE | MATCH_SIZE_NEUTRAL, &add_factory);
        }
 }
 
@@ -450,9 +554,9 @@ static ir_node *gen_Mul(ir_node *node)
        dbg_info *dbg     = get_irn_dbg_info(node);
 
        if (mode_is_float(mode)) {
-               if (USE_FPA(env_cg->isa)) {
+               if (USE_FPA(isa)) {
                        return new_bd_arm_Muf(dbg, block, new_op1, new_op2, mode);
-               } else if (USE_VFP(env_cg->isa)) {
+               } else if (USE_VFP(isa)) {
                        assert(mode != mode_E && "IEEE Extended FP not supported");
                        panic("VFP not supported yet");
                } else {
@@ -475,9 +579,9 @@ static ir_node *gen_Quot(ir_node *node)
 
        assert(mode != mode_E && "IEEE Extended FP not supported");
 
-       if (USE_FPA(env_cg->isa)) {
+       if (USE_FPA(isa)) {
                return new_bd_arm_Dvf(dbg, block, new_op1, new_op2, mode);
-       } else if (USE_VFP(env_cg->isa)) {
+       } else if (USE_VFP(isa)) {
                assert(mode != mode_E && "IEEE Extended FP not supported");
                panic("VFP not supported yet");
        } else {
@@ -487,24 +591,72 @@ static ir_node *gen_Quot(ir_node *node)
 
 static ir_node *gen_And(ir_node *node)
 {
-       return gen_int_binop(node, MATCH_COMMUTATIVE | MATCH_SIZE_NEUTRAL,
-                       new_bd_arm_And_reg, new_bd_arm_And_imm);
+       static const arm_binop_factory_t and_factory = {
+               new_bd_arm_And_reg,
+               new_bd_arm_And_imm,
+               new_bd_arm_And_reg_shift_reg,
+               new_bd_arm_And_reg_shift_imm
+       };
+       static const arm_binop_factory_t bic_factory = {
+               new_bd_arm_Bic_reg,
+               new_bd_arm_Bic_imm,
+               new_bd_arm_Bic_reg_shift_reg,
+               new_bd_arm_Bic_reg_shift_imm
+       };
+
+       /* check for and not */
+       ir_node *left  = get_And_left(node);
+       ir_node *right = get_And_right(node);
+
+       if (is_Not(left) || is_Not(right)) {
+               return gen_int_binop(node, MATCH_COMMUTATIVE | MATCH_SIZE_NEUTRAL | MATCH_SKIP_NOT,
+                       &bic_factory);
+       }
+
+       return gen_int_binop(node, MATCH_COMMUTATIVE | MATCH_SIZE_NEUTRAL, &and_factory);
 }
 
 static ir_node *gen_Or(ir_node *node)
 {
-       return gen_int_binop(node, MATCH_COMMUTATIVE | MATCH_SIZE_NEUTRAL,
-                       new_bd_arm_Or_reg, new_bd_arm_Or_imm);
+       static const arm_binop_factory_t or_factory = {
+               new_bd_arm_Or_reg,
+               new_bd_arm_Or_imm,
+               new_bd_arm_Or_reg_shift_reg,
+               new_bd_arm_Or_reg_shift_imm
+       };
+
+       return gen_int_binop(node, MATCH_COMMUTATIVE | MATCH_SIZE_NEUTRAL, &or_factory);
 }
 
 static ir_node *gen_Eor(ir_node *node)
 {
-       return gen_int_binop(node, MATCH_COMMUTATIVE | MATCH_SIZE_NEUTRAL,
-                       new_bd_arm_Eor_reg, new_bd_arm_Eor_imm);
+       static const arm_binop_factory_t eor_factory = {
+               new_bd_arm_Eor_reg,
+               new_bd_arm_Eor_imm,
+               new_bd_arm_Eor_reg_shift_reg,
+               new_bd_arm_Eor_reg_shift_imm
+       };
+
+       return gen_int_binop(node, MATCH_COMMUTATIVE | MATCH_SIZE_NEUTRAL, &eor_factory);
 }
 
 static ir_node *gen_Sub(ir_node *node)
 {
+       static const arm_binop_factory_t sub_rsb_factory[2] = {
+               {
+                       new_bd_arm_Sub_reg,
+                       new_bd_arm_Sub_imm,
+                       new_bd_arm_Sub_reg_shift_reg,
+                       new_bd_arm_Sub_reg_shift_imm
+               },
+               {
+                       new_bd_arm_Rsb_reg,
+                       new_bd_arm_Rsb_imm,
+                       new_bd_arm_Rsb_reg_shift_reg,
+                       new_bd_arm_Rsb_reg_shift_imm
+               }
+       };
+
        ir_node  *block   = be_transform_node(get_nodes_block(node));
        ir_node  *op1     = get_Sub_left(node);
        ir_node  *new_op1 = be_transform_node(op1);
@@ -514,17 +666,16 @@ static ir_node *gen_Sub(ir_node *node)
        dbg_info *dbgi    = get_irn_dbg_info(node);
 
        if (mode_is_float(mode)) {
-               if (USE_FPA(env_cg->isa)) {
+               if (USE_FPA(isa)) {
                        return new_bd_arm_Suf(dbgi, block, new_op1, new_op2, mode);
-               } else if (USE_VFP(env_cg->isa)) {
+               } else if (USE_VFP(isa)) {
                        assert(mode != mode_E && "IEEE Extended FP not supported");
                        panic("VFP not supported yet");
                } else {
                        panic("Softfloat not supported yet");
                }
        } else {
-               return gen_int_binop(node, MATCH_SIZE_NEUTRAL,
-                               new_bd_arm_Sub_reg, new_bd_arm_Sub_imm);
+               return gen_int_binop(node, MATCH_SIZE_NEUTRAL | MATCH_REVERSE, sub_rsb_factory);
        }
 }
 
@@ -692,7 +843,38 @@ static ir_node *gen_Not(ir_node *node)
        ir_node  *new_op  = be_transform_node(op);
        dbg_info *dbgi    = get_irn_dbg_info(node);
 
-       /* TODO: we could do alot more here with all the Mvn variations */
+       /* check if we can fold in a Mov */
+       if (is_arm_Mov(new_op)) {
+               const arm_shifter_operand_t *attr = get_arm_shifter_operand_attr_const(new_op);
+
+               switch (attr->shift_modifier) {
+               ir_node *mov_op, *mov_sft;
+
+               case ARM_SHF_IMM:
+               case ARM_SHF_ASR_IMM:
+               case ARM_SHF_LSL_IMM:
+               case ARM_SHF_LSR_IMM:
+               case ARM_SHF_ROR_IMM:
+                       mov_op = get_irn_n(new_op, 0);
+                       return new_bd_arm_Mvn_reg_shift_imm(dbgi, block, mov_op,
+                               attr->shift_modifier, attr->shift_immediate);
+
+               case ARM_SHF_ASR_REG:
+               case ARM_SHF_LSL_REG:
+               case ARM_SHF_LSR_REG:
+               case ARM_SHF_ROR_REG:
+                       mov_op  = get_irn_n(new_op, 0);
+                       mov_sft = get_irn_n(new_op, 1);
+                       return new_bd_arm_Mvn_reg_shift_reg(dbgi, block, mov_op, mov_sft,
+                               attr->shift_modifier);
+
+               case ARM_SHF_REG:
+               case ARM_SHF_RRX:
+                       break;
+               case ARM_SHF_INVALID:
+                       panic("invalid shift");
+               }
+       }
 
        return new_bd_arm_Mvn_reg(dbgi, block, new_op);
 }
@@ -706,9 +888,9 @@ static ir_node *gen_Minus(ir_node *node)
        ir_mode  *mode    = get_irn_mode(node);
 
        if (mode_is_float(mode)) {
-               if (USE_FPA(env_cg->isa)) {
+               if (USE_FPA(isa)) {
                        return new_bd_arm_Mvf(dbgi, block, op, mode);
-               } else if (USE_VFP(env_cg->isa)) {
+               } else if (USE_VFP(isa)) {
                        assert(mode != mode_E && "IEEE Extended FP not supported");
                        panic("VFP not supported yet");
                } else {
@@ -731,10 +913,10 @@ static ir_node *gen_Load(ir_node *node)
        ir_node  *new_load = NULL;
 
        if (mode_is_float(mode)) {
-               if (USE_FPA(env_cg->isa)) {
+               if (USE_FPA(isa)) {
                        new_load = new_bd_arm_Ldf(dbgi, block, new_ptr, new_mem, mode,
                                                  NULL, 0, 0, false);
-               } else if (USE_VFP(env_cg->isa)) {
+               } else if (USE_VFP(isa)) {
                        assert(mode != mode_E && "IEEE Extended FP not supported");
                        panic("VFP not supported yet");
                } else {
@@ -771,10 +953,10 @@ static ir_node *gen_Store(ir_node *node)
        ir_node *new_store = NULL;
 
        if (mode_is_float(mode)) {
-               if (USE_FPA(env_cg->isa)) {
+               if (USE_FPA(isa)) {
                        new_store = new_bd_arm_Stf(dbgi, block, new_ptr, new_val,
                                                   new_mem, mode, NULL, 0, 0, false);
-               } else if (USE_VFP(env_cg->isa)) {
+               } else if (USE_VFP(isa)) {
                        assert(mode != mode_E && "IEEE Extended FP not supported");
                        panic("VFP not supported yet");
                } else {
@@ -857,39 +1039,11 @@ static ir_node *gen_Cmp(ir_node *node)
                new_op2 = be_transform_node(op2);
 
                return new_bd_arm_Cmfe(dbgi, block, new_op1, new_op2, false);
-
-               panic("FloatCmp NIY");
-#if 0
-               ir_node *new_op2  = be_transform_node(op2);
-               /* floating point compare */
-               pn_Cmp pnc = get_Proj_proj(selector);
-
-               if (pnc & pn_Cmp_Uo) {
-                       /* check for unordered, need cmf */
-                       return new_bd_arm_CmfBra(dbgi, block, new_op1, new_op2, pnc);
-               }
-               /* Hmm: use need cmfe */
-               return new_bd_arm_CmfeBra(dbgi, block, new_op1, new_op2, pnc);
-#endif
        }
 
        assert(get_irn_mode(op2) == cmp_mode);
        is_unsigned = !mode_is_signed(cmp_mode);
 
-       /* compare with 0 can be done with Tst */
-       if (is_Const(op2) && tarval_is_null(get_Const_tarval(op2))) {
-               new_op1 = be_transform_node(op1);
-               new_op1 = gen_extension(dbgi, block, new_op1, cmp_mode);
-               return new_bd_arm_Tst_reg(dbgi, block, new_op1, new_op1, false,
-                                         is_unsigned);
-       }
-       if (is_Const(op1) && tarval_is_null(get_Const_tarval(op1))) {
-               new_op2 = be_transform_node(op2);
-               new_op2 = gen_extension(dbgi, block, new_op2, cmp_mode);
-               return new_bd_arm_Tst_reg(dbgi, block, new_op2, new_op2, true,
-                                         is_unsigned);
-       }
-
        /* integer compare, TODO: use shifter_op in all its combinations */
        new_op1 = be_transform_node(op1);
        new_op1 = gen_extension(dbgi, block, new_op1, cmp_mode);
@@ -962,12 +1116,12 @@ static ir_node *gen_Const(ir_node *node)
        dbg_info *dbg = get_irn_dbg_info(node);
 
        if (mode_is_float(mode)) {
-               if (USE_FPA(env_cg->isa)) {
+               if (USE_FPA(isa)) {
                        tarval *tv = get_Const_tarval(node);
                        node       = new_bd_arm_fConst(dbg, block, tv);
                        be_dep_on_frame(node);
                        return node;
-               } else if (USE_VFP(env_cg->isa)) {
+               } else if (USE_VFP(isa)) {
                        assert(mode != mode_E && "IEEE Extended FP not supported");
                        panic("VFP not supported yet");
                } else {
@@ -997,7 +1151,7 @@ static ir_node *ints_to_double(dbg_info *dbgi, ir_node *block, ir_node *node0,
         * registers... */
        ir_graph *irg   = current_ir_graph;
        ir_node  *stack = get_irg_frame(irg);
-       ir_node  *nomem = new_NoMem();
+       ir_node  *nomem = new_r_NoMem(irg);
        ir_node  *str0  = new_bd_arm_Str(dbgi, block, stack, node0, nomem, mode_gp,
                                         NULL, 0, 0, true);
        ir_node  *str1  = new_bd_arm_Str(dbgi, block, stack, node1, nomem, mode_gp,
@@ -1011,14 +1165,14 @@ static ir_node *ints_to_double(dbg_info *dbgi, ir_node *block, ir_node *node0,
        ldf = new_bd_arm_Ldf(dbgi, block, stack, sync, mode_D, NULL, 0, 0, true);
        set_irn_pinned(ldf, op_pin_state_floats);
 
-       return new_Proj(ldf, mode_fp, pn_arm_Ldf_res);
+       return new_r_Proj(ldf, mode_fp, pn_arm_Ldf_res);
 }
 
 static ir_node *int_to_float(dbg_info *dbgi, ir_node *block, ir_node *node)
 {
        ir_graph *irg   = current_ir_graph;
        ir_node  *stack = get_irg_frame(irg);
-       ir_node  *nomem = new_NoMem();
+       ir_node  *nomem = new_r_NoMem(irg);
        ir_node  *str   = new_bd_arm_Str(dbgi, block, stack, node, nomem, mode_gp,
                                         NULL, 0, 0, true);
        ir_node  *ldf;
@@ -1027,14 +1181,14 @@ static ir_node *int_to_float(dbg_info *dbgi, ir_node *block, ir_node *node)
        ldf = new_bd_arm_Ldf(dbgi, block, stack, str, mode_F, NULL, 0, 0, true);
        set_irn_pinned(ldf, op_pin_state_floats);
 
-       return new_Proj(ldf, mode_fp, pn_arm_Ldf_res);
+       return new_r_Proj(ldf, mode_fp, pn_arm_Ldf_res);
 }
 
 static ir_node *float_to_int(dbg_info *dbgi, ir_node *block, ir_node *node)
 {
        ir_graph *irg   = current_ir_graph;
        ir_node  *stack = get_irg_frame(irg);
-       ir_node  *nomem = new_NoMem();
+       ir_node  *nomem = new_r_NoMem(irg);
        ir_node  *stf   = new_bd_arm_Stf(dbgi, block, stack, node, nomem, mode_F,
                                         NULL, 0, 0, true);
        ir_node  *ldr;
@@ -1043,7 +1197,7 @@ static ir_node *float_to_int(dbg_info *dbgi, ir_node *block, ir_node *node)
        ldr = new_bd_arm_Ldr(dbgi, block, stack, stf, mode_gp, NULL, 0, 0, true);
        set_irn_pinned(ldr, op_pin_state_floats);
 
-       return new_Proj(ldr, mode_gp, pn_arm_Ldr_res);
+       return new_r_Proj(ldr, mode_gp, pn_arm_Ldr_res);
 }
 
 static void double_to_ints(dbg_info *dbgi, ir_node *block, ir_node *node,
@@ -1051,7 +1205,7 @@ static void double_to_ints(dbg_info *dbgi, ir_node *block, ir_node *node,
 {
        ir_graph *irg   = current_ir_graph;
        ir_node  *stack = get_irg_frame(irg);
-       ir_node  *nomem = new_NoMem();
+       ir_node  *nomem = new_r_NoMem(irg);
        ir_node  *stf   = new_bd_arm_Stf(dbgi, block, stack, node, nomem, mode_D,
                                         NULL, 0, 0, true);
        ir_node  *ldr0, *ldr1;
@@ -1062,8 +1216,8 @@ static void double_to_ints(dbg_info *dbgi, ir_node *block, ir_node *node,
        ldr1 = new_bd_arm_Ldr(dbgi, block, stack, stf, mode_gp, NULL, 0, 4, true);
        set_irn_pinned(ldr1, op_pin_state_floats);
 
-       *out_value0 = new_Proj(ldr0, mode_gp, pn_arm_Ldr_res);
-       *out_value1 = new_Proj(ldr1, mode_gp, pn_arm_Ldr_res);
+       *out_value0 = new_r_Proj(ldr0, mode_gp, pn_arm_Ldr_res);
+       *out_value1 = new_r_Proj(ldr1, mode_gp, pn_arm_Ldr_res);
 }
 
 static ir_node *gen_CopyB(ir_node *node)
@@ -1090,6 +1244,82 @@ static ir_node *gen_CopyB(ir_node *node)
                        new_mem, size);
 }
 
+/**
+ * Transform builtin clz.
+ */
+static ir_node *gen_clz(ir_node *node)
+{
+       ir_node  *block  = be_transform_node(get_nodes_block(node));
+       dbg_info *dbg    = get_irn_dbg_info(node);
+       ir_node  *op     = get_irn_n(node, 1);
+       ir_node  *new_op = be_transform_node(op);
+
+       /* TODO armv5 instruction, otherwise create a call */
+       return new_bd_arm_Clz(dbg, block, new_op);
+}
+
+/**
+ * Transform Builtin node.
+ */
+static ir_node *gen_Builtin(ir_node *node)
+{
+       ir_builtin_kind kind = get_Builtin_kind(node);
+
+       switch (kind) {
+       case ir_bk_trap:
+       case ir_bk_debugbreak:
+       case ir_bk_return_address:
+       case ir_bk_frame_address:
+       case ir_bk_prefetch:
+       case ir_bk_ffs:
+               break;
+       case ir_bk_clz:
+               return gen_clz(node);
+       case ir_bk_ctz:
+       case ir_bk_parity:
+       case ir_bk_popcount:
+       case ir_bk_bswap:
+       case ir_bk_outport:
+       case ir_bk_inport:
+       case ir_bk_inner_trampoline:
+               break;
+       }
+       panic("Builtin %s not implemented in ARM", get_builtin_kind_name(kind));
+}
+
+/**
+ * Transform Proj(Builtin) node.
+ */
+static ir_node *gen_Proj_Builtin(ir_node *proj)
+{
+       ir_node         *node     = get_Proj_pred(proj);
+       ir_node         *new_node = be_transform_node(node);
+       ir_builtin_kind kind      = get_Builtin_kind(node);
+
+       switch (kind) {
+       case ir_bk_return_address:
+       case ir_bk_frame_address:
+       case ir_bk_ffs:
+       case ir_bk_clz:
+       case ir_bk_ctz:
+       case ir_bk_parity:
+       case ir_bk_popcount:
+       case ir_bk_bswap:
+               assert(get_Proj_proj(proj) == pn_Builtin_1_result);
+               return new_node;
+       case ir_bk_trap:
+       case ir_bk_debugbreak:
+       case ir_bk_prefetch:
+       case ir_bk_outport:
+               assert(get_Proj_proj(proj) == pn_Builtin_M);
+               return new_node;
+       case ir_bk_inport:
+       case ir_bk_inner_trampoline:
+               break;
+       }
+       panic("Builtin %s not implemented in ARM", get_builtin_kind_name(kind));
+}
+
 static ir_node *gen_Proj_Load(ir_node *node)
 {
        ir_node  *load     = get_Proj_pred(node);
@@ -1197,7 +1427,7 @@ static ir_node *gen_Proj_Start(ir_node *node)
                return be_prolog_get_reg_value(abihelper, sp_reg);
 
        case pn_Start_P_tls:
-               return new_Bad();
+               return new_r_Bad(get_irn_irg(node));
 
        case pn_Start_max:
                break;
@@ -1237,7 +1467,7 @@ static ir_node *gen_Proj_Proj_Start(ir_node *node)
                                ir_node  *ldr = new_bd_arm_Ldr(NULL, new_block, fp, mem,
                                                               mode_gp, param->entity,
                                                               0, 0, true);
-                               value1 = new_Proj(ldr, mode_gp, pn_arm_Ldr_res);
+                               value1 = new_r_Proj(ldr, mode_gp, pn_arm_Ldr_res);
                        }
 
                        /* convert integer value to float */
@@ -1295,7 +1525,7 @@ static ir_node *gen_Proj_Proj_Call(ir_node *node)
        ir_node              *call          = get_Proj_pred(get_Proj_pred(node));
        ir_node              *new_call      = be_transform_node(call);
        ir_type              *function_type = get_Call_type(call);
-       calling_convention_t *cconv = decide_calling_convention(function_type);
+       calling_convention_t *cconv = arm_decide_calling_convention(function_type);
        const reg_or_stackslot_t *res = &cconv->results[pn];
        ir_mode              *mode;
        int                   regn;
@@ -1308,7 +1538,7 @@ static ir_node *gen_Proj_Proj_Call(ir_node *node)
        }
        mode = res->reg0->reg_class->mode;
 
-       free_calling_convention(cconv);
+       arm_free_calling_convention(cconv);
 
        return new_r_Proj(new_call, mode, regn);
 }
@@ -1371,6 +1601,8 @@ static ir_node *gen_Proj(ir_node *node)
                }
                /* FALLTHROUGH */
        }
+       case iro_Builtin:
+               return gen_Proj_Builtin(node);
        default:
                panic("code selection didn't expect Proj after %+F\n", pred);
        }
@@ -1378,7 +1610,7 @@ static ir_node *gen_Proj(ir_node *node)
 
 typedef ir_node *(*create_const_node_func)(dbg_info *db, ir_node *block);
 
-static inline ir_node *create_const(ir_node **place,
+static inline ir_node *create_const(ir_graph *irg, ir_node **place,
                                     create_const_node_func func,
                                     const arch_register_t* reg)
 {
@@ -1387,7 +1619,7 @@ static inline ir_node *create_const(ir_node **place,
        if (*place != NULL)
                return *place;
 
-       block = get_irg_start_block(env_cg->irg);
+       block = get_irg_start_block(irg);
        res = func(NULL, block);
        arch_set_irn_register(res, reg);
        *place = res;
@@ -1612,7 +1844,7 @@ static ir_node *gen_Call(ir_node *node)
        ir_node              *new_mem      = be_transform_node(mem);
        dbg_info             *dbgi         = get_irn_dbg_info(node);
        ir_type              *type         = get_Call_type(node);
-       calling_convention_t *cconv        = decide_calling_convention(type);
+       calling_convention_t *cconv        = arm_decide_calling_convention(type);
        int                   n_params     = get_Call_n_params(node);
        int                   n_param_regs = sizeof(param_regs)/sizeof(param_regs[0]);
        /* max inputs: memory, callee, register arguments */
@@ -1766,7 +1998,7 @@ static ir_node *gen_Call(ir_node *node)
                pmap_insert(node_to_stack, node, incsp);
        }
 
-       set_arm_in_req_all(res, in_req);
+       arch_set_in_register_reqs(res, in_req);
 
        /* create output register reqs */
        arch_set_out_register_req(res, 0, arch_no_register_req);
@@ -1778,7 +2010,7 @@ static ir_node *gen_Call(ir_node *node)
        /* copy pinned attribute */
        set_irn_pinned(res, get_irn_pinned(node));
 
-       free_calling_convention(cconv);
+       arm_free_calling_convention(cconv);
        return res;
 }
 
@@ -1875,6 +2107,7 @@ static void arm_register_transformers(void)
        be_set_transform_function(op_Sub,      gen_Sub);
        be_set_transform_function(op_SymConst, gen_SymConst);
        be_set_transform_function(op_Unknown,  gen_Unknown);
+       be_set_transform_function(op_Builtin,  gen_Builtin);
 }
 
 /**
@@ -1914,11 +2147,11 @@ static void arm_init_fpa_immediate(void)
 /**
  * Transform a Firm graph into an ARM graph.
  */
-void arm_transform_graph(arm_code_gen_t *cg)
+void arm_transform_graph(ir_graph *irg)
 {
        static int imm_initialized = 0;
-       ir_graph  *irg             = cg->irg;
        ir_entity *entity          = get_irg_entity(irg);
+       const arch_env_t *arch_env = be_get_irg_arch_env(irg);
        ir_type   *frame_type;
 
        mode_gp = mode_Iu;
@@ -1929,7 +2162,8 @@ void arm_transform_graph(arm_code_gen_t *cg)
                imm_initialized = 1;
        }
        arm_register_transformers();
-       env_cg = cg;
+
+       isa = (arm_isa_t*) arch_env;
 
        node_to_stack = pmap_create();
 
@@ -1937,15 +2171,15 @@ void arm_transform_graph(arm_code_gen_t *cg)
        abihelper = be_abihelper_prepare(irg);
        be_collect_stacknodes(abihelper);
        assert(cconv == NULL);
-       cconv = decide_calling_convention(get_entity_type(entity));
+       cconv = arm_decide_calling_convention(get_entity_type(entity));
        create_stacklayout(irg);
 
-       be_transform_graph(cg->irg, NULL);
+       be_transform_graph(irg, NULL);
 
        be_abihelper_finish(abihelper);
        abihelper = NULL;
 
-       free_calling_convention(cconv);
+       arm_free_calling_convention(cconv);
        cconv = NULL;
 
        frame_type = get_irg_frame_type(irg);