sparc: fix mode of fdiv result
[libfirm] / ir / be / sparc / sparc_transform.c
index 1d39dd4..9ca4fed 100644 (file)
@@ -26,6 +26,7 @@
 #include "config.h"
 
 #include <stdint.h>
+#include <stdbool.h>
 
 #include "irnode_t.h"
 #include "irgraph_t.h"
 
 DEBUG_ONLY(static firm_dbg_module_t *dbg = NULL;)
 
-static beabi_helper_env_t    *abihelper;
 static const arch_register_t *sp_reg = &sparc_registers[REG_SP];
 static const arch_register_t *fp_reg = &sparc_registers[REG_FRAME_POINTER];
-static calling_convention_t  *cconv  = NULL;
+static calling_convention_t  *current_cconv = NULL;
+static be_stackorder_t       *stackorder;
 static ir_mode               *mode_gp;
+static ir_mode               *mode_flags;
 static ir_mode               *mode_fp;
 static ir_mode               *mode_fp2;
 //static ir_mode               *mode_fp4;
 static pmap                  *node_to_stack;
+static size_t                 start_mem_offset;
+static ir_node               *start_mem;
+static size_t                 start_g0_offset;
+static ir_node               *start_g0;
+static size_t                 start_sp_offset;
+static ir_node               *start_sp;
+static size_t                 start_fp_offset;
+static ir_node               *start_fp;
+static ir_node               *frame_base;
+static size_t                 start_params_offset;
+static size_t                 start_callee_saves_offset;
+
+static const arch_register_t *const caller_saves[] = {
+       &sparc_registers[REG_G1],
+       &sparc_registers[REG_G2],
+       &sparc_registers[REG_G3],
+       &sparc_registers[REG_G4],
+       &sparc_registers[REG_O0],
+       &sparc_registers[REG_O1],
+       &sparc_registers[REG_O2],
+       &sparc_registers[REG_O3],
+       &sparc_registers[REG_O4],
+       &sparc_registers[REG_O5],
+
+       &sparc_registers[REG_F0],
+       &sparc_registers[REG_F1],
+       &sparc_registers[REG_F2],
+       &sparc_registers[REG_F3],
+       &sparc_registers[REG_F4],
+       &sparc_registers[REG_F5],
+       &sparc_registers[REG_F6],
+       &sparc_registers[REG_F7],
+       &sparc_registers[REG_F8],
+       &sparc_registers[REG_F9],
+       &sparc_registers[REG_F10],
+       &sparc_registers[REG_F11],
+       &sparc_registers[REG_F12],
+       &sparc_registers[REG_F13],
+       &sparc_registers[REG_F14],
+       &sparc_registers[REG_F15],
+       &sparc_registers[REG_F16],
+       &sparc_registers[REG_F17],
+       &sparc_registers[REG_F18],
+       &sparc_registers[REG_F19],
+       &sparc_registers[REG_F20],
+       &sparc_registers[REG_F21],
+       &sparc_registers[REG_F22],
+       &sparc_registers[REG_F23],
+       &sparc_registers[REG_F24],
+       &sparc_registers[REG_F25],
+       &sparc_registers[REG_F26],
+       &sparc_registers[REG_F27],
+       &sparc_registers[REG_F28],
+       &sparc_registers[REG_F29],
+       &sparc_registers[REG_F30],
+       &sparc_registers[REG_F31],
+};
+
+static const arch_register_t *const omit_fp_callee_saves[] = {
+       &sparc_registers[REG_L0],
+       &sparc_registers[REG_L1],
+       &sparc_registers[REG_L2],
+       &sparc_registers[REG_L3],
+       &sparc_registers[REG_L4],
+       &sparc_registers[REG_L5],
+       &sparc_registers[REG_L6],
+       &sparc_registers[REG_L7],
+       &sparc_registers[REG_I0],
+       &sparc_registers[REG_I1],
+       &sparc_registers[REG_I2],
+       &sparc_registers[REG_I3],
+       &sparc_registers[REG_I4],
+       &sparc_registers[REG_I5],
+};
 
-static inline int mode_needs_gp_reg(ir_mode *mode)
+static inline bool mode_needs_gp_reg(ir_mode *mode)
 {
-       return mode_is_int(mode) || mode_is_reference(mode);
+       if (mode_is_int(mode) || mode_is_reference(mode)) {
+               /* we should only see 32bit code */
+               assert(get_mode_size_bits(mode) <= 32);
+               return true;
+       }
+       return false;
 }
 
 /**
@@ -239,10 +320,13 @@ static ir_node *gen_helper_binop_args(ir_node *node,
        }
        mode1 = get_irn_mode(op1);
        mode2 = get_irn_mode(op2);
+       /* we shouldn't see 64bit code */
+       assert(get_mode_size_bits(mode1) <= 32);
+       assert(get_mode_size_bits(mode2) <= 32);
 
        if (is_imm_encodeable(op2)) {
-               ir_node *new_op1   = be_transform_node(op1);
                int32_t  immediate = get_tarval_long(get_Const_tarval(op2));
+               new_op1 = be_transform_node(op1);
                if (! (flags & MATCH_MODE_NEUTRAL) && needs_extension(mode1)) {
                        new_op1 = gen_extension(dbgi, block, new_op1, mode1);
                }
@@ -327,9 +411,54 @@ static ir_node *gen_helper_unfpop(ir_node *node, ir_mode *mode,
        panic("unsupported mode %+F for float op", mode);
 }
 
-static ir_node *get_g0(void)
+typedef ir_node* (*new_binopx_imm_func)(dbg_info *dbgi, ir_node *block,
+                                        ir_node *op1, ir_node *flags,
+                                        ir_entity *imm_entity, int32_t imm);
+
+typedef ir_node* (*new_binopx_reg_func)(dbg_info *dbgi, ir_node *block,
+                                        ir_node *op1, ir_node *op2,
+                                        ir_node *flags);
+
+static ir_node *gen_helper_binopx(ir_node *node, match_flags_t match_flags,
+                                  new_binopx_reg_func new_binopx_reg,
+                                  new_binopx_imm_func new_binopx_imm)
 {
-       return be_prolog_get_reg_value(abihelper, &sparc_registers[REG_G0]);
+       dbg_info *dbgi      = get_irn_dbg_info(node);
+       ir_node  *block     = be_transform_node(get_nodes_block(node));
+       ir_node  *op1       = get_irn_n(node, 0);
+       ir_node  *op2       = get_irn_n(node, 1);
+       ir_node  *flags     = get_irn_n(node, 2);
+       ir_node  *new_flags = be_transform_node(flags);
+       ir_node  *new_op1;
+       ir_node  *new_op2;
+
+       /* only support for mode-neutral implemented so far */
+       assert(match_flags & MATCH_MODE_NEUTRAL);
+
+       if (is_imm_encodeable(op2)) {
+               int32_t  immediate = get_tarval_long(get_Const_tarval(op2));
+               new_op1 = be_transform_node(op1);
+               return new_binopx_imm(dbgi, block, new_op1, new_flags, NULL, immediate);
+       }
+       new_op2 = be_transform_node(op2);
+       if ((match_flags & MATCH_COMMUTATIVE) && is_imm_encodeable(op1)) {
+               int32_t immediate = get_tarval_long(get_Const_tarval(op1));
+               return new_binopx_imm(dbgi, block, new_op2, new_flags, NULL, immediate);
+       }
+       new_op1 = be_transform_node(op1);
+       return new_binopx_reg(dbgi, block, new_op1, new_op2, new_flags);
+
+}
+
+static ir_node *get_g0(ir_graph *irg)
+{
+       if (start_g0 == NULL) {
+               /* this is already the transformed start node */
+               ir_node *start = get_irg_start(irg);
+               assert(is_sparc_Start(start));
+               start_g0 = new_r_Proj(start, mode_gp, start_g0_offset);
+       }
+       return start_g0;
 }
 
 typedef struct address_t {
@@ -437,6 +566,34 @@ static ir_node *gen_Add(ir_node *node)
                                new_bd_sparc_Add_reg, new_bd_sparc_Add_imm);
 }
 
+static ir_node *gen_AddCC_t(ir_node *node)
+{
+       return gen_helper_binop(node, MATCH_COMMUTATIVE | MATCH_MODE_NEUTRAL,
+                               new_bd_sparc_AddCC_reg, new_bd_sparc_AddCC_imm);
+}
+
+static ir_node *gen_Proj_AddCC_t(ir_node *node)
+{
+       long     pn       = get_Proj_proj(node);
+       ir_node *pred     = get_Proj_pred(node);
+       ir_node *new_pred = be_transform_node(pred);
+
+       switch (pn) {
+       case pn_sparc_AddCC_t_res:
+               return new_r_Proj(new_pred, mode_gp, pn_sparc_AddCC_res);
+       case pn_sparc_AddCC_t_flags:
+               return new_r_Proj(new_pred, mode_flags, pn_sparc_AddCC_flags);
+       default:
+               panic("Invalid AddCC_t proj found");
+       }
+}
+
+static ir_node *gen_AddX_t(ir_node *node)
+{
+       return gen_helper_binopx(node, MATCH_COMMUTATIVE | MATCH_MODE_NEUTRAL,
+                                new_bd_sparc_AddX_reg, new_bd_sparc_AddX_imm);
+}
+
 /**
  * Creates an sparc Sub.
  *
@@ -452,7 +609,36 @@ static ir_node *gen_Sub(ir_node *node)
                                          new_bd_sparc_fsub_d, new_bd_sparc_fsub_q);
        }
 
-       return gen_helper_binop(node, MATCH_NONE, new_bd_sparc_Sub_reg, new_bd_sparc_Sub_imm);
+       return gen_helper_binop(node, MATCH_MODE_NEUTRAL,
+                               new_bd_sparc_Sub_reg, new_bd_sparc_Sub_imm);
+}
+
+static ir_node *gen_SubCC_t(ir_node *node)
+{
+       return gen_helper_binop(node, MATCH_MODE_NEUTRAL,
+                               new_bd_sparc_SubCC_reg, new_bd_sparc_SubCC_imm);
+}
+
+static ir_node *gen_Proj_SubCC_t(ir_node *node)
+{
+       long     pn       = get_Proj_proj(node);
+       ir_node *pred     = get_Proj_pred(node);
+       ir_node *new_pred = be_transform_node(pred);
+
+       switch (pn) {
+       case pn_sparc_SubCC_t_res:
+               return new_r_Proj(new_pred, mode_gp, pn_sparc_SubCC_res);
+       case pn_sparc_SubCC_t_flags:
+               return new_r_Proj(new_pred, mode_flags, pn_sparc_SubCC_flags);
+       default:
+               panic("Invalid SubCC_t proj found");
+       }
+}
+
+static ir_node *gen_SubX_t(ir_node *node)
+{
+       return gen_helper_binopx(node, MATCH_MODE_NEUTRAL,
+                                new_bd_sparc_SubX_reg, new_bd_sparc_SubX_imm);
 }
 
 static ir_node *create_ldf(dbg_info *dbgi, ir_node *block, ir_node *ptr,
@@ -511,6 +697,10 @@ static ir_node *gen_Load(ir_node *node)
        ir_node  *new_load = NULL;
        address_t address;
 
+       if (get_Load_unaligned(node) == align_non_aligned) {
+               panic("sparc: transformation of unaligned Loads not implemented yet");
+       }
+
        if (mode_is_float(mode)) {
                match_address(ptr, &address, false);
                new_load = create_ldf(dbgi, block, address.ptr, new_mem, mode,
@@ -551,12 +741,17 @@ static ir_node *gen_Store(ir_node *node)
        ir_node  *new_store = NULL;
        address_t address;
 
+       if (get_Store_unaligned(node) == align_non_aligned) {
+               panic("sparc: transformation of unaligned Stores not implemented yet");
+       }
+
        if (mode_is_float(mode)) {
                /* TODO: variants with reg+reg address mode */
                match_address(ptr, &address, false);
                new_store = create_stf(dbgi, block, new_val, address.ptr, new_mem,
                                       mode, address.entity, address.offset, false);
        } else {
+               assert(get_mode_size_bits(mode) <= 32);
                match_address(ptr, &address, true);
                if (address.ptr2 != NULL) {
                        assert(address.entity == NULL && address.offset == 0);
@@ -654,7 +849,8 @@ static ir_node *gen_Div(ir_node *node)
                                                    new_right);
                }
        } else {
-               ir_node *left_high = get_g0();
+               ir_graph *irg       = get_irn_irg(node);
+               ir_node  *left_high = get_g0(irg);
                if (is_imm_encodeable(right)) {
                        int32_t immediate = get_tarval_long(get_Const_tarval(right));
                        res = new_bd_sparc_UDiv_imm(dbgi, new_block, left_high, left_low,
@@ -669,27 +865,6 @@ static ir_node *gen_Div(ir_node *node)
        return res;
 }
 
-#if 0
-static ir_node *gen_Abs(ir_node *node)
-{
-       ir_mode *const mode = get_irn_mode(node);
-
-       if (mode_is_float(mode)) {
-               return gen_helper_unfpop(node, mode, new_bd_sparc_fabs_s,
-                                        new_bd_sparc_fabs_d, new_bd_sparc_fabs_q);
-       } else {
-               ir_node  *const block  = be_transform_node(get_nodes_block(node));
-               dbg_info *const dbgi   = get_irn_dbg_info(node);
-               ir_node  *const op     = get_Abs_op(node);
-               ir_node  *const new_op = be_transform_node(op);
-               ir_node  *const sra    = new_bd_sparc_Sra_imm(dbgi, block, new_op, NULL, 31);
-               ir_node  *const xor    = new_bd_sparc_Xor_reg(dbgi, block, new_op, sra);
-               ir_node  *const sub    = new_bd_sparc_Sub_reg(dbgi, block, xor,    sra);
-               return sub;
-       }
-}
-#endif
-
 /**
  * Transforms a Not node.
  *
@@ -698,7 +873,8 @@ static ir_node *gen_Abs(ir_node *node)
 static ir_node *gen_Not(ir_node *node)
 {
        ir_node  *op     = get_Not_op(node);
-       ir_node  *zero   = get_g0();
+       ir_graph *irg    = get_irn_irg(node);
+       ir_node  *zero   = get_g0(irg);
        dbg_info *dbgi   = get_irn_dbg_info(node);
        ir_node  *block  = be_transform_node(get_nodes_block(node));
        ir_node  *new_op = be_transform_node(op);
@@ -762,16 +938,25 @@ static ir_node *gen_Eor(ir_node *node)
 
 static ir_node *gen_Shl(ir_node *node)
 {
+       ir_mode *mode = get_irn_mode(node);
+       if (get_mode_modulo_shift(mode) != 32)
+               panic("modulo_shift!=32 not supported by sparc backend");
        return gen_helper_binop(node, MATCH_NONE, new_bd_sparc_Sll_reg, new_bd_sparc_Sll_imm);
 }
 
 static ir_node *gen_Shr(ir_node *node)
 {
+       ir_mode *mode = get_irn_mode(node);
+       if (get_mode_modulo_shift(mode) != 32)
+               panic("modulo_shift!=32 not supported by sparc backend");
        return gen_helper_binop(node, MATCH_NONE, new_bd_sparc_Srl_reg, new_bd_sparc_Srl_imm);
 }
 
 static ir_node *gen_Shrs(ir_node *node)
 {
+       ir_mode *mode = get_irn_mode(node);
+       if (get_mode_modulo_shift(mode) != 32)
+               panic("modulo_shift!=32 not supported by sparc backend");
        return gen_helper_binop(node, MATCH_NONE, new_bd_sparc_Sra_reg, new_bd_sparc_Sra_imm);
 }
 
@@ -795,7 +980,7 @@ static ir_node *gen_Minus(ir_node *node)
        dbgi   = get_irn_dbg_info(node);
        op     = get_Minus_op(node);
        new_op = be_transform_node(op);
-       zero   = get_g0();
+       zero   = get_g0(get_irn_irg(node));
        return new_bd_sparc_Sub_reg(dbgi, block, zero, new_op);
 }
 
@@ -833,7 +1018,7 @@ static ir_node *gen_float_const(dbg_info *dbgi, ir_node *block, ir_tarval *tv)
 {
        ir_entity *entity = create_float_const_entity(tv);
        ir_node   *hi     = new_bd_sparc_SetHi(dbgi, block, entity, 0);
-       ir_node   *mem    = new_r_NoMem(current_ir_graph);
+       ir_node   *mem    = get_irg_no_mem(current_ir_graph);
        ir_mode   *mode   = get_tarval_mode(tv);
        ir_node   *new_op
                = create_ldf(dbgi, block, hi, mem, mode, entity, 0, false);
@@ -857,9 +1042,10 @@ static ir_node *gen_Const(ir_node *node)
 
        value = get_tarval_long(tv);
        if (value == 0) {
-               return get_g0();
+               return get_g0(get_irn_irg(node));
        } else if (sparc_is_value_imm_encodeable(value)) {
-               return new_bd_sparc_Or_imm(dbgi, block, get_g0(), NULL, value);
+               ir_graph *irg = get_irn_irg(node);
+               return new_bd_sparc_Or_imm(dbgi, block, get_g0(irg), NULL, value);
        } else {
                ir_node *hi = new_bd_sparc_SetHi(dbgi, block, NULL, value);
                if ((value & 0x3ff) != 0) {
@@ -885,6 +1071,9 @@ static ir_node *make_address(dbg_info *dbgi, ir_node *block, ir_entity *entity,
 {
        ir_node *hi  = new_bd_sparc_SetHi(dbgi, block, entity, offset);
        ir_node *low = new_bd_sparc_Or_imm(dbgi, block, hi, entity, offset);
+
+       if (get_entity_owner(entity) == get_tls_type())
+               panic("thread local storage not supported yet in sparc backend");
        return low;
 }
 
@@ -897,7 +1086,7 @@ static ir_node *gen_SwitchJmp(ir_node *node)
        long             default_pn   = get_Cond_default_proj(node);
        ir_entity       *entity;
        ir_node         *table_address;
-       ir_node         *index;
+       ir_node         *idx;
        ir_node         *load;
        ir_node         *address;
 
@@ -908,18 +1097,13 @@ static ir_node *gen_SwitchJmp(ir_node *node)
        set_entity_visibility(entity, ir_visibility_private);
        add_entity_linkage(entity, IR_LINKAGE_CONSTANT);
 
-       /* TODO: this code does not construct code to check for access
-        * out-of bounds of the jumptable yet. I think we should put this stuff
-        * into the switch_lowering phase to get some additional optimisations
-        * done. */
-
        /* construct base address */
        table_address = make_address(dbgi, block, entity, 0);
        /* scale index */
-       index = new_bd_sparc_Sll_imm(dbgi, block, new_selector, NULL, 2);
+       idx = new_bd_sparc_Sll_imm(dbgi, block, new_selector, NULL, 2);
        /* load from jumptable */
-       load = new_bd_sparc_Ld_reg(dbgi, block, table_address, index,
-                                  new_r_NoMem(current_ir_graph),
+       load = new_bd_sparc_Ld_reg(dbgi, block, table_address, idx,
+                                  get_irg_no_mem(current_ir_graph),
                                   mode_gp);
        address = new_r_Proj(load, mode_gp, pn_sparc_Ld_res);
 
@@ -1076,7 +1260,7 @@ static ir_node *create_ftoi(dbg_info *dbgi, ir_node *block, ir_node *op,
        {
        ir_graph *irg   = get_irn_irg(block);
        ir_node  *sp    = get_irg_frame(irg);
-       ir_node  *nomem = new_r_NoMem(irg);
+       ir_node  *nomem = get_irg_no_mem(irg);
        ir_node  *stf   = create_stf(dbgi, block, ftoi, sp, nomem, src_mode,
                                     NULL, 0, true);
        ir_node  *ld    = new_bd_sparc_Ld_imm(dbgi, block, sp, stf, mode_gp,
@@ -1093,7 +1277,7 @@ static ir_node *create_itof(dbg_info *dbgi, ir_node *block, ir_node *op,
 {
        ir_graph *irg   = get_irn_irg(block);
        ir_node  *sp    = get_irg_frame(irg);
-       ir_node  *nomem = new_r_NoMem(irg);
+       ir_node  *nomem = get_irg_no_mem(irg);
        ir_node  *st    = new_bd_sparc_St_imm(dbgi, block, op, sp, nomem,
                                              mode_gp, NULL, 0, true);
        ir_node  *ldf   = new_bd_sparc_Ldf_s(dbgi, block, sp, st, mode_fp,
@@ -1119,7 +1303,7 @@ static ir_node *gen_Conv(ir_node *node)
        ir_node  *op       = get_Conv_op(node);
        ir_mode  *src_mode = get_irn_mode(op);
        ir_mode  *dst_mode = get_irn_mode(node);
-       dbg_info *dbg      = get_irn_dbg_info(node);
+       dbg_info *dbgi     = get_irn_dbg_info(node);
        ir_node  *new_op;
 
        int src_bits = get_mode_size_bits(src_mode);
@@ -1138,21 +1322,21 @@ static ir_node *gen_Conv(ir_node *node)
                if (mode_is_float(src_mode)) {
                        if (mode_is_float(dst_mode)) {
                                /* float -> float conv */
-                               return create_fftof(dbg, block, new_op, src_mode, dst_mode);
+                               return create_fftof(dbgi, block, new_op, src_mode, dst_mode);
                        } else {
                                /* float -> int conv */
                                if (!mode_is_signed(dst_mode))
                                        panic("float to unsigned not implemented yet");
-                               return create_ftoi(dbg, block, new_op, src_mode);
+                               return create_ftoi(dbgi, block, new_op, src_mode);
                        }
                } else {
                        /* int -> float conv */
                        if (src_bits < 32) {
-                               new_op = gen_extension(dbg, block, new_op, src_mode);
+                               new_op = gen_extension(dbgi, block, new_op, src_mode);
                        } else if (src_bits == 32 && !mode_is_signed(src_mode)) {
                                panic("unsigned to float not lowered!");
                        }
-                       return create_itof(dbg, block, new_op, dst_mode);
+                       return create_itof(dbgi, block, new_op, dst_mode);
                }
        } else if (src_mode == mode_b) {
                panic("ConvB not lowered %+F", node);
@@ -1178,9 +1362,9 @@ static ir_node *gen_Conv(ir_node *node)
                }
 
                if (mode_is_signed(min_mode)) {
-                       return gen_sign_extension(dbg, block, new_op, min_bits);
+                       return gen_sign_extension(dbgi, block, new_op, min_bits);
                } else {
-                       return gen_zero_extension(dbg, block, new_op, min_bits);
+                       return gen_zero_extension(dbgi, block, new_op, min_bits);
                }
        }
 }
@@ -1193,7 +1377,8 @@ static ir_node *gen_Unknown(ir_node *node)
                ir_node *block = be_transform_node(get_nodes_block(node));
                return gen_float_const(NULL, block, get_mode_null(mode));
        } else if (mode_needs_gp_reg(mode)) {
-               return get_g0();
+               ir_graph *irg = get_irn_irg(node);
+               return get_g0(irg);
        }
 
        panic("Unexpected Unknown mode");
@@ -1208,7 +1393,7 @@ static ir_type *sparc_get_between_type(void)
        static ir_type *between_type  = NULL;
        static ir_type *between_type0 = NULL;
 
-       if (cconv->omit_fp) {
+       if (current_cconv->omit_fp) {
                if (between_type0 == NULL) {
                        between_type0
                                = new_type_class(new_id_from_str("sparc_between_type"));
@@ -1225,44 +1410,73 @@ static ir_type *sparc_get_between_type(void)
        return between_type;
 }
 
-static void create_stacklayout(ir_graph *irg)
+static ir_type *compute_arg_type(ir_graph *irg)
 {
-       ir_entity         *entity        = get_irg_entity(irg);
-       ir_type           *function_type = get_entity_type(entity);
-       be_stack_layout_t *layout        = be_get_irg_stack_layout(irg);
-       ir_type           *arg_type;
-       int                p;
-       int                n_params;
+       ir_entity  *entity    = get_irg_entity(irg);
+       ir_type    *mtp       = get_entity_type(entity);
+       size_t      n_params  = get_method_n_params(mtp);
+       ir_entity **param_map = ALLOCANZ(ir_entity*, n_params);
 
-       /* calling conventions must be decided by now */
-       assert(cconv != NULL);
+       ir_type *frame_type      = get_irg_frame_type(irg);
+       size_t   n_frame_members = get_compound_n_members(frame_type);
+       size_t   f;
+       size_t   i;
 
-       /* construct argument type */
-       arg_type = new_type_struct(id_mangle_u(get_entity_ident(entity), new_id_from_chars("arg_type", 8)));
-       n_params = get_method_n_params(function_type);
-       for (p = 0; p < n_params; ++p) {
-               reg_or_stackslot_t *param = &cconv->parameters[p];
-               char                buf[128];
-               ident              *id;
+       ir_type *res = new_type_struct(id_mangle_u(get_entity_ident(entity), new_id_from_chars("arg_type", 8)));
 
-               if (param->type == NULL)
+       /* search for existing value_param entities */
+       for (f = n_frame_members; f > 0; ) {
+               ir_entity *member = get_compound_member(frame_type, --f);
+               size_t     num;
+               const reg_or_stackslot_t *param;
+
+               if (!is_parameter_entity(member))
+                       continue;
+               num = get_entity_parameter_number(member);
+               assert(num < n_params);
+               if (param_map[num] != NULL)
+                       panic("multiple entities for parameter %u in %+F found", f, irg);
+
+               param = &current_cconv->parameters[num];
+               if (param->reg0 != NULL)
                        continue;
 
-               snprintf(buf, sizeof(buf), "param_%d", p);
-               id            = new_id_from_str(buf);
-               param->entity = new_entity(arg_type, id, param->type);
-               set_entity_offset(param->entity, param->offset);
+               param_map[num] = member;
+               /* move to new arg_type */
+               set_entity_owner(member, res);
+       }
+
+       for (i = 0; i < n_params; ++i) {
+               reg_or_stackslot_t *param = &current_cconv->parameters[i];
+               ir_entity          *entity;
+
+               if (param->reg0 != NULL)
+                       continue;
+               entity = param_map[i];
+               if (entity == NULL)
+                       entity = new_parameter_entity(res, i, param->type);
+               param->entity = entity;
+               set_entity_offset(entity, param->offset);
        }
 
+       return res;
+}
+
+static void create_stacklayout(ir_graph *irg)
+{
+       be_stack_layout_t *layout = be_get_irg_stack_layout(irg);
+
+       /* calling conventions must be decided by now */
+       assert(current_cconv != NULL);
+
        memset(layout, 0, sizeof(*layout));
 
        layout->frame_type     = get_irg_frame_type(irg);
        layout->between_type   = sparc_get_between_type();
-       layout->arg_type       = arg_type;
+       layout->arg_type       = compute_arg_type(irg);
        layout->initial_offset = 0;
        layout->initial_bias   = 0;
-       layout->stack_dir      = -1;
-       layout->sp_relative    = cconv->omit_fp;
+       layout->sp_relative    = current_cconv->omit_fp;
 
        assert(N_FRAME_TYPES == 3);
        layout->order[0] = layout->frame_type;
@@ -1271,7 +1485,7 @@ static void create_stacklayout(ir_graph *irg)
 }
 
 /**
- * transform the start node to the prolog code + initial barrier
+ * transform the start node to the prolog code
  */
 static ir_node *gen_Start(ir_node *node)
 {
@@ -1281,77 +1495,135 @@ static ir_node *gen_Start(ir_node *node)
        ir_node   *block         = get_nodes_block(node);
        ir_node   *new_block     = be_transform_node(block);
        dbg_info  *dbgi          = get_irn_dbg_info(node);
-       ir_node   *mem;
+       struct obstack *obst     = be_get_be_obst(irg);
+       const arch_register_req_t *req;
+       size_t     n_outs;
        ir_node   *start;
-       ir_node   *sp;
        size_t     i;
+       size_t     o;
+
+       /* start building list of start constraints */
+       assert(obstack_object_size(obst) == 0);
 
-       /* stackpointer is important at function prolog */
-       be_prolog_add_reg(abihelper, sp_reg,
+       /* calculate number of outputs */
+       n_outs = 3; /* memory, zero, sp */
+       if (!current_cconv->omit_fp)
+               ++n_outs; /* framepointer */
+       /* function parameters */
+       n_outs += current_cconv->n_param_regs;
+       /* callee saves */
+       if (current_cconv->omit_fp) {
+               n_outs += ARRAY_SIZE(omit_fp_callee_saves);
+       }
+
+       start = new_bd_sparc_Start(dbgi, new_block, n_outs);
+
+       o = 0;
+
+       /* first output is memory */
+       start_mem_offset = o;
+       arch_set_out_register_req(start, o++, arch_no_register_req);
+       /* the zero register */
+       start_g0_offset = o;
+       req = be_create_reg_req(obst, &sparc_registers[REG_G0],
+                               arch_register_req_type_ignore);
+       arch_set_out_register_req(start, o, req);
+       arch_irn_set_register(start, o, &sparc_registers[REG_G0]);
+       ++o;
+
+       /* we need an output for the stackpointer */
+       start_sp_offset = o;
+       req = be_create_reg_req(obst, sp_reg,
                        arch_register_req_type_produces_sp | arch_register_req_type_ignore);
-       be_prolog_add_reg(abihelper, &sparc_registers[REG_G0],
-               arch_register_req_type_ignore);
+       arch_set_out_register_req(start, o, req);
+       arch_irn_set_register(start, o, sp_reg);
+       ++o;
+
+       if (!current_cconv->omit_fp) {
+               start_fp_offset = o;
+               req = be_create_reg_req(obst, fp_reg, arch_register_req_type_ignore);
+               arch_set_out_register_req(start, o, req);
+               arch_irn_set_register(start, o, fp_reg);
+               ++o;
+       }
+
        /* function parameters in registers */
+       start_params_offset = o;
        for (i = 0; i < get_method_n_params(function_type); ++i) {
-               const reg_or_stackslot_t *param = &cconv->parameters[i];
-               if (param->reg0 != NULL) {
-                       be_prolog_add_reg(abihelper, param->reg0,
-                                         arch_register_req_type_none);
+               const reg_or_stackslot_t *param = &current_cconv->parameters[i];
+               const arch_register_t    *reg0  = param->reg0;
+               const arch_register_t    *reg1  = param->reg1;
+               if (reg0 != NULL) {
+                       arch_set_out_register_req(start, o, reg0->single_req);
+                       arch_irn_set_register(start, o, reg0);
+                       ++o;
                }
-               if (param->reg1 != NULL) {
-                       be_prolog_add_reg(abihelper, param->reg1,
-                                         arch_register_req_type_none);
+               if (reg1 != NULL) {
+                       arch_set_out_register_req(start, o, reg1->single_req);
+                       arch_irn_set_register(start, o, reg1);
+                       ++o;
                }
        }
        /* we need the values of the callee saves (Note: non omit-fp mode has no
         * callee saves) */
-       if (cconv->omit_fp) {
+       start_callee_saves_offset = o;
+       if (current_cconv->omit_fp) {
                size_t n_callee_saves = ARRAY_SIZE(omit_fp_callee_saves);
                size_t c;
                for (c = 0; c < n_callee_saves; ++c) {
-                       be_prolog_add_reg(abihelper, omit_fp_callee_saves[c],
-                                         arch_register_req_type_none);
+                       const arch_register_t *reg = omit_fp_callee_saves[c];
+                       arch_set_out_register_req(start, o, reg->single_req);
+                       arch_irn_set_register(start, o, reg);
+                       ++o;
                }
-       } else {
-               be_prolog_add_reg(abihelper, fp_reg, arch_register_req_type_ignore);
        }
+       assert(n_outs == o);
 
-       start = be_prolog_create_start(abihelper, dbgi, new_block);
-       mem   = be_prolog_get_memory(abihelper);
-       sp    = be_prolog_get_reg_value(abihelper, sp_reg);
+       return start;
+}
 
-       if (!cconv->omit_fp) {
-               ir_node *save = new_bd_sparc_Save_imm(NULL, block, sp, NULL,
-                                                     -SPARC_MIN_STACKSIZE);
-               arch_irn_add_flags(save, arch_irn_flags_prolog);
-               sp = new_r_Proj(save, mode_gp, pn_sparc_Save_stack);
-               arch_set_irn_register(sp, sp_reg);
+static ir_node *get_initial_sp(ir_graph *irg)
+{
+       if (start_sp == NULL) {
+               ir_node *start = get_irg_start(irg);
+               start_sp = new_r_Proj(start, mode_gp, start_sp_offset);
        }
+       return start_sp;
+}
 
-       sp = be_new_IncSP(sp_reg, new_block, sp, BE_STACK_FRAME_SIZE_EXPAND, 0);
-       arch_irn_add_flags(sp, arch_irn_flags_prolog);
-       be_prolog_set_reg_value(abihelper, sp_reg, sp);
-       be_prolog_set_memory(abihelper, mem);
+static ir_node *get_initial_fp(ir_graph *irg)
+{
+       if (start_fp == NULL) {
+               ir_node *start = get_irg_start(irg);
+               start_fp = new_r_Proj(start, mode_gp, start_fp_offset);
+       }
+       return start_fp;
+}
 
-       return start;
+static ir_node *get_initial_mem(ir_graph *irg)
+{
+       if (start_mem == NULL) {
+               ir_node *start = get_irg_start(irg);
+               start_mem = new_r_Proj(start, mode_M, start_mem_offset);
+       }
+       return start_mem;
 }
 
 static ir_node *get_stack_pointer_for(ir_node *node)
 {
        /* get predecessor in stack_order list */
-       ir_node *stack_pred = be_get_stack_pred(abihelper, node);
-       ir_node *stack_pred_transformed;
+       ir_node *stack_pred = be_get_stack_pred(stackorder, node);
        ir_node *stack;
 
        if (stack_pred == NULL) {
                /* first stack user in the current block. We can simply use the
                 * initial sp_proj for it */
-               ir_node *sp_proj = be_prolog_get_reg_value(abihelper, sp_reg);
-               return sp_proj;
+               ir_graph *irg = get_irn_irg(node);
+               return get_initial_sp(irg);
        }
 
-       stack_pred_transformed = be_transform_node(stack_pred);
-       stack                  = (ir_node*)pmap_get(node_to_stack, stack_pred);
+       be_transform_node(stack_pred);
+       stack = (ir_node*)pmap_get(node_to_stack, stack_pred);
        if (stack == NULL) {
                return get_stack_pointer_for(stack_pred);
        }
@@ -1364,62 +1636,68 @@ static ir_node *get_stack_pointer_for(ir_node *node)
  */
 static ir_node *gen_Return(ir_node *node)
 {
-       ir_node  *block          = get_nodes_block(node);
-       ir_node  *new_block      = be_transform_node(block);
-       dbg_info *dbgi           = get_irn_dbg_info(node);
-       ir_node  *mem            = get_Return_mem(node);
-       ir_node  *new_mem        = be_transform_node(mem);
-       ir_node  *sp             = get_stack_pointer_for(node);
-       size_t    n_res          = get_Return_n_ress(node);
+       ir_node  *block     = get_nodes_block(node);
+       ir_graph *irg       = get_irn_irg(node);
+       ir_node  *new_block = be_transform_node(block);
+       dbg_info *dbgi      = get_irn_dbg_info(node);
+       ir_node  *mem       = get_Return_mem(node);
+       ir_node  *new_mem   = be_transform_node(mem);
+       ir_node  *sp        = get_stack_pointer_for(node);
+       size_t    n_res     = get_Return_n_ress(node);
+       struct obstack *be_obst = be_get_be_obst(irg);
        ir_node  *bereturn;
+       ir_node **in;
+       const arch_register_req_t **reqs;
        size_t    i;
+       size_t    p;
+       size_t    n_ins;
 
-       be_epilog_begin(abihelper);
-       be_epilog_set_memory(abihelper, new_mem);
-       /* connect stack pointer with initial stack pointer. fix_stack phase
-          will later serialize all stack pointer adjusting nodes */
-       be_epilog_add_reg(abihelper, sp_reg,
-                       arch_register_req_type_produces_sp | arch_register_req_type_ignore,
-                       sp);
+       /* estimate number of return values */
+       n_ins = 2 + n_res; /* memory + stackpointer, return values */
+       if (current_cconv->omit_fp)
+               n_ins += ARRAY_SIZE(omit_fp_callee_saves);
+
+       in   = ALLOCAN(ir_node*, n_ins);
+       reqs = OALLOCN(be_obst, const arch_register_req_t*, n_ins);
+       p    = 0;
+
+       in[p]   = new_mem;
+       reqs[p] = arch_no_register_req;
+       ++p;
+
+       in[p]   = sp;
+       reqs[p] = sp_reg->single_req;
+       ++p;
 
        /* result values */
        for (i = 0; i < n_res; ++i) {
                ir_node                  *res_value     = get_Return_res(node, i);
                ir_node                  *new_res_value = be_transform_node(res_value);
-               const reg_or_stackslot_t *slot          = &cconv->results[i];
+               const reg_or_stackslot_t *slot          = &current_cconv->results[i];
                const arch_register_t    *reg           = slot->reg0;
                assert(slot->reg1 == NULL);
-               be_epilog_add_reg(abihelper, reg, arch_register_req_type_none,
-                                 new_res_value);
+               in[p]   = new_res_value;
+               reqs[p] = reg->single_req;
+               ++p;
        }
        /* callee saves */
-       if (cconv->omit_fp) {
-               size_t n_callee_saves = ARRAY_SIZE(omit_fp_callee_saves);
-               size_t i;
+       if (current_cconv->omit_fp) {
+               ir_node  *start          = get_irg_start(irg);
+               size_t    n_callee_saves = ARRAY_SIZE(omit_fp_callee_saves);
                for (i = 0; i < n_callee_saves; ++i) {
                        const arch_register_t *reg   = omit_fp_callee_saves[i];
+                       ir_mode               *mode  = reg->reg_class->mode;
                        ir_node               *value
-                               = be_prolog_get_reg_value(abihelper, reg);
-                       be_epilog_add_reg(abihelper, reg, arch_register_req_type_none,
-                                         value);
+                                       = new_r_Proj(start, mode, i + start_callee_saves_offset);
+                       in[p]   = value;
+                       reqs[p] = reg->single_req;
+                       ++p;
                }
        }
+       assert(p == n_ins);
 
-       /* epilog code: an incsp */
-       sp = be_epilog_get_reg_value(abihelper, sp_reg);
-       sp = be_new_IncSP(sp_reg, new_block, sp,
-                         BE_STACK_FRAME_SIZE_SHRINK, 0);
-       be_epilog_set_reg_value(abihelper, sp_reg, sp);
-
-       /* we need a restore instruction */
-       if (!cconv->omit_fp) {
-               ir_node *restore = new_bd_sparc_RestoreZero(NULL, block);
-               arch_irn_add_flags(restore, arch_irn_flags_epilog);
-               keep_alive(restore);
-       }
-
-       bereturn = be_epilog_create_return(abihelper, dbgi, new_block);
-       arch_irn_add_flags(bereturn, arch_irn_flags_epilog);
+       bereturn = new_bd_sparc_Return_reg(dbgi, new_block, n_ins, in);
+       arch_set_in_register_reqs(bereturn, reqs);
 
        return bereturn;
 }
@@ -1429,7 +1707,7 @@ static ir_node *bitcast_int_to_float(dbg_info *dbgi, ir_node *block,
 {
        ir_graph *irg   = current_ir_graph;
        ir_node  *sp    = get_irg_frame(irg);
-       ir_node  *nomem = new_r_NoMem(irg);
+       ir_node  *nomem = get_irg_no_mem(irg);
        ir_node  *st    = new_bd_sparc_St_imm(dbgi, block, value0, sp, nomem,
                                              mode_gp, NULL, 0, true);
        ir_mode  *mode;
@@ -1462,7 +1740,7 @@ static void bitcast_float_to_int(dbg_info *dbgi, ir_node *block,
 {
        ir_graph *irg   = current_ir_graph;
        ir_node  *stack = get_irg_frame(irg);
-       ir_node  *nomem = new_r_NoMem(irg);
+       ir_node  *nomem = get_irg_no_mem(irg);
        ir_node  *stf   = create_stf(dbgi, block, node, stack, nomem, float_mode,
                                     NULL, 0, true);
        int       bits  = get_mode_size_bits(float_mode);
@@ -1498,16 +1776,17 @@ static ir_node *gen_Call(ir_node *node)
        dbg_info        *dbgi         = get_irn_dbg_info(node);
        ir_type         *type         = get_Call_type(node);
        size_t           n_params     = get_Call_n_params(node);
-       size_t           n_param_regs = sizeof(param_regs)/sizeof(param_regs[0]);
        /* max inputs: memory, callee, register arguments */
-       int              max_inputs   = 2 + n_param_regs;
-       ir_node        **in           = ALLOCAN(ir_node*, max_inputs);
        ir_node        **sync_ins     = ALLOCAN(ir_node*, n_params);
        struct obstack  *obst         = be_get_be_obst(irg);
-       const arch_register_req_t **in_req
-               = OALLOCNZ(obst, const arch_register_req_t*, max_inputs);
        calling_convention_t *cconv
                = sparc_decide_calling_convention(type, NULL);
+       size_t           n_param_regs = cconv->n_param_regs;
+       /* param-regs + mem + stackpointer + callee */
+       unsigned         max_inputs   = 3 + n_param_regs;
+       ir_node        **in           = ALLOCAN(ir_node*, max_inputs);
+       const arch_register_req_t **in_req
+               = OALLOCNZ(obst, const arch_register_req_t*, max_inputs);
        int              in_arity     = 0;
        int              sync_arity   = 0;
        int              n_caller_saves
@@ -1592,7 +1871,6 @@ static ir_node *gen_Call(ir_node *node)
                set_irn_pinned(str, op_pin_state_floats);
                sync_ins[sync_arity++] = str;
        }
-       assert(in_arity <= max_inputs);
 
        /* construct memory input */
        if (sync_arity == 0) {
@@ -1610,6 +1888,7 @@ static ir_node *gen_Call(ir_node *node)
                in_req[in_arity] = sparc_reg_classes[CLASS_sparc_gp].class_req;
                ++in_arity;
        }
+       assert(in_arity <= (int)max_inputs);
 
        /* outputs:
         *  - memory
@@ -1664,10 +1943,6 @@ static ir_node *gen_Sel(ir_node *node)
        /* must be the frame pointer all other sels must have been lowered
         * already */
        assert(is_Proj(ptr) && is_Start(get_Proj_pred(ptr)));
-       /* we should not have value types from parameters anymore - they should be
-          lowered */
-       assert(get_entity_owner(entity) !=
-                       get_method_value_param_type(get_entity_type(get_irg_entity(get_irn_irg(node)))));
 
        return new_bd_sparc_FrameAddr(dbgi, new_block, new_ptr, entity, 0);
 }
@@ -1822,16 +2097,23 @@ static ir_node *gen_Proj_Div(ir_node *node)
        ir_node  *pred     = get_Proj_pred(node);
        ir_node  *new_pred = be_transform_node(pred);
        long      pn       = get_Proj_proj(node);
+       ir_mode  *res_mode;
 
-       assert(is_sparc_SDiv(new_pred) || is_sparc_UDiv(new_pred)
-              || is_sparc_fdiv(new_pred));
+       if (is_sparc_SDiv(new_pred) || is_sparc_UDiv(new_pred)) {
+               res_mode = mode_gp;
+       } else if (is_sparc_fdiv(new_pred)) {
+               res_mode = get_Div_resmode(pred);
+       } else {
+               panic("sparc backend: Div transformed to something unexpected: %+F",
+                     new_pred);
+       }
        assert((int)pn_sparc_SDiv_res == (int)pn_sparc_UDiv_res);
        assert((int)pn_sparc_SDiv_M   == (int)pn_sparc_UDiv_M);
        assert((int)pn_sparc_SDiv_res == (int)pn_sparc_fdiv_res);
        assert((int)pn_sparc_SDiv_M   == (int)pn_sparc_fdiv_M);
        switch (pn) {
        case pn_Div_res:
-               return new_r_Proj(new_pred, mode_gp, pn_sparc_SDiv_res);
+               return new_r_Proj(new_pred, res_mode, pn_sparc_SDiv_res);
        case pn_Div_M:
                return new_r_Proj(new_pred, mode_gp, pn_sparc_SDiv_M);
        default:
@@ -1840,33 +2122,38 @@ static ir_node *gen_Proj_Div(ir_node *node)
        panic("Unsupported Proj from Div");
 }
 
-static ir_node *get_frame_base(void)
+static ir_node *get_frame_base(ir_graph *irg)
 {
-       const arch_register_t *reg = cconv->omit_fp ? sp_reg : fp_reg;
-       return be_prolog_get_reg_value(abihelper, reg);
+       if (frame_base == NULL) {
+               if (current_cconv->omit_fp) {
+                       frame_base = get_initial_sp(irg);
+               } else {
+                       frame_base = get_initial_fp(irg);
+               }
+       }
+       return frame_base;
 }
 
 static ir_node *gen_Proj_Start(ir_node *node)
 {
        ir_node *block     = get_nodes_block(node);
        ir_node *new_block = be_transform_node(block);
-       ir_node *barrier   = be_transform_node(get_Proj_pred(node));
        long     pn        = get_Proj_proj(node);
+       /* make sure prolog is constructed */
+       be_transform_node(get_Proj_pred(node));
 
        switch ((pn_Start) pn) {
        case pn_Start_X_initial_exec:
                /* exchange ProjX with a jump */
                return new_bd_sparc_Ba(NULL, new_block);
-       case pn_Start_M:
-               return new_r_Proj(barrier, mode_M, 0);
+       case pn_Start_M: {
+               ir_graph *irg = get_irn_irg(node);
+               return get_initial_mem(irg);
+       }
        case pn_Start_T_args:
-               return barrier;
+               return new_r_Bad(get_irn_irg(block), mode_T);
        case pn_Start_P_frame_base:
-               return get_frame_base();
-       case pn_Start_P_tls:
-               return new_r_Bad(current_ir_graph);
-       case pn_Start_max:
-               break;
+               return get_frame_base(get_irn_irg(block));
        }
        panic("Unexpected start proj: %ld\n", pn);
 }
@@ -1875,31 +2162,39 @@ static ir_node *gen_Proj_Proj_Start(ir_node *node)
 {
        long       pn          = get_Proj_proj(node);
        ir_node   *block       = get_nodes_block(node);
+       ir_graph  *irg         = get_irn_irg(node);
        ir_node   *new_block   = be_transform_node(block);
-       ir_entity *entity      = get_irg_entity(current_ir_graph);
+       ir_entity *entity      = get_irg_entity(irg);
        ir_type   *method_type = get_entity_type(entity);
        ir_type   *param_type  = get_method_param_type(method_type, pn);
+       ir_node   *args        = get_Proj_pred(node);
+       ir_node   *start       = get_Proj_pred(args);
+       ir_node   *new_start   = be_transform_node(start);
        const reg_or_stackslot_t *param;
 
        /* Proj->Proj->Start must be a method argument */
        assert(get_Proj_proj(get_Proj_pred(node)) == pn_Start_T_args);
 
-       param = &cconv->parameters[pn];
+       param = &current_cconv->parameters[pn];
 
        if (param->reg0 != NULL) {
                /* argument transmitted in register */
-               ir_mode               *mode  = get_type_mode(param_type);
-               const arch_register_t *reg   = param->reg0;
-               ir_node               *value = be_prolog_get_reg_value(abihelper, reg);
+               ir_mode               *mode     = get_type_mode(param_type);
+               const arch_register_t *reg      = param->reg0;
+               ir_mode               *reg_mode = reg->reg_class->mode;
+               long                   pn       = param->reg_offset + start_params_offset;
+               ir_node               *value    = new_r_Proj(new_start, reg_mode, pn);
 
                if (mode_is_float(mode)) {
+                       const arch_register_t *reg1 = param->reg1;
                        ir_node *value1 = NULL;
 
-                       if (param->reg1 != NULL) {
-                               value1 = be_prolog_get_reg_value(abihelper, param->reg1);
+                       if (reg1 != NULL) {
+                               ir_mode *reg1_mode = reg1->reg_class->mode;
+                               value1 = new_r_Proj(new_start, reg1_mode, pn+1);
                        } else if (param->entity != NULL) {
-                               ir_node *fp  = be_prolog_get_reg_value(abihelper, fp_reg);
-                               ir_node *mem = be_prolog_get_memory(abihelper);
+                               ir_node *fp      = get_initial_fp(irg);
+                               ir_node *mem     = get_initial_mem(irg);
                                ir_node *ld  = new_bd_sparc_Ld_imm(NULL, new_block, fp, mem,
                                                                   mode_gp, param->entity,
                                                                   0, true);
@@ -1912,9 +2207,9 @@ static ir_node *gen_Proj_Proj_Start(ir_node *node)
                return value;
        } else {
                /* argument transmitted on stack */
-               ir_node  *mem  = be_prolog_get_memory(abihelper);
-               ir_mode  *mode = get_type_mode(param->type);
-               ir_node  *base = get_frame_base();
+               ir_node  *mem     = get_initial_mem(irg);
+               ir_mode  *mode    = get_type_mode(param->type);
+               ir_node  *base    = get_frame_base(irg);
                ir_node  *load;
                ir_node  *value;
 
@@ -1945,8 +2240,6 @@ static ir_node *gen_Proj_Call(ir_node *node)
        case pn_Call_X_regular:
        case pn_Call_X_except:
        case pn_Call_T_result:
-       case pn_Call_P_value_res_base:
-       case pn_Call_max:
                break;
        }
        panic("Unexpected Call proj %ld\n", pn);
@@ -2026,6 +2319,11 @@ static ir_node *gen_Proj(ir_node *node)
                /* FALLTHROUGH */
        }
        default:
+               if (is_sparc_AddCC_t(pred)) {
+                       return gen_Proj_AddCC_t(node);
+               } else if (is_sparc_SubCC_t(pred)) {
+                       return gen_Proj_SubCC_t(node);
+               }
                panic("code selection didn't expect Proj after %+F\n", pred);
        }
 }
@@ -2078,28 +2376,11 @@ static void sparc_register_transformers(void)
        be_set_transform_function(op_SymConst,     gen_SymConst);
        be_set_transform_function(op_Unknown,      gen_Unknown);
 
+       be_set_transform_function(op_sparc_AddX_t, gen_AddX_t);
+       be_set_transform_function(op_sparc_AddCC_t,gen_AddCC_t);
        be_set_transform_function(op_sparc_Save,   be_duplicate_node);
-}
-
-/* hack to avoid unused fp proj at start barrier */
-static void assure_fp_keep(void)
-{
-       unsigned         n_users = 0;
-       const ir_edge_t *edge;
-       ir_node         *fp_proj = be_prolog_get_reg_value(abihelper, fp_reg);
-
-       foreach_out_edge(fp_proj, edge) {
-               ir_node *succ = get_edge_src_irn(edge);
-               if (is_End(succ) || is_Anchor(succ))
-                       continue;
-               ++n_users;
-       }
-
-       if (n_users == 0) {
-               ir_node *block = get_nodes_block(fp_proj);
-               ir_node *in[1] = { fp_proj };
-               be_new_Keep(block, 1, in);
-       }
+       be_set_transform_function(op_sparc_SubX_t, gen_SubX_t);
+       be_set_transform_function(op_sparc_SubCC_t,gen_SubCC_t);
 }
 
 /**
@@ -2114,22 +2395,28 @@ void sparc_transform_graph(ir_graph *irg)
 
        node_to_stack = pmap_create();
 
-       mode_gp  = mode_Iu;
-       mode_fp  = mode_F;
-       mode_fp2 = mode_D;
+       mode_gp    = mode_Iu;
+       mode_fp    = mode_F;
+       mode_fp2   = mode_D;
+       mode_flags = mode_Bu;
        //mode_fp4 = ?
 
-       abihelper = be_abihelper_prepare(irg);
-       be_collect_stacknodes(abihelper);
-       cconv = sparc_decide_calling_convention(get_entity_type(entity), irg);
+       start_mem  = NULL;
+       start_g0   = NULL;
+       start_sp   = NULL;
+       start_fp   = NULL;
+       frame_base = NULL;
+
+       stackorder = be_collect_stacknodes(irg);
+       current_cconv
+               = sparc_decide_calling_convention(get_entity_type(entity), irg);
        create_stacklayout(irg);
+       be_add_parameter_entity_stores(irg);
 
        be_transform_graph(irg, NULL);
-       if (!cconv->omit_fp)
-               assure_fp_keep();
 
-       be_abihelper_finish(abihelper);
-       sparc_free_calling_convention(cconv);
+       be_free_stackorder(stackorder);
+       sparc_free_calling_convention(current_cconv);
 
        frame_type = get_irg_frame_type(irg);
        if (get_type_state(frame_type) == layout_undefined)