make unique types/entities part of irprog
[libfirm] / ir / be / sparc / sparc_transform.c
index 67267c5..fffa4ce 100644 (file)
@@ -21,7 +21,6 @@
  * @file
  * @brief   code selection (transform FIRM into SPARC FIRM)
  * @author  Hannes Rapp, Matthias Braun
- * @version $Id$
  */
 #include "config.h"
 
 #include "error.h"
 #include "util.h"
 
-#include "../benode.h"
-#include "../beirg.h"
-#include "../beutil.h"
-#include "../betranshlp.h"
-#include "../beabihelper.h"
+#include "benode.h"
+#include "beirg.h"
+#include "beutil.h"
+#include "betranshlp.h"
+#include "beabihelper.h"
 #include "bearch_sparc_t.h"
 
 #include "sparc_nodes_attr.h"
@@ -75,6 +74,8 @@ 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_g7_offset;
+static ir_node               *start_g7;
 static size_t                 start_sp_offset;
 static ir_node               *start_sp;
 static size_t                 start_fp_offset;
@@ -155,11 +156,86 @@ static ir_node *gen_sign_extension(dbg_info *dbgi, ir_node *block, ir_node *op,
  * are 0 for unsigned and a copy of the last significant bit for signed
  * numbers.
  */
-static bool upper_bits_clean(ir_node *transformed_node, ir_mode *mode)
+static bool upper_bits_clean(ir_node *node, ir_mode *mode)
 {
-       (void) transformed_node;
-       (void) mode;
-       /* TODO */
+       switch ((ir_opcode)get_irn_opcode(node)) {
+       case iro_And:
+               if (!mode_is_signed(mode)) {
+                       return upper_bits_clean(get_And_left(node), mode)
+                           || upper_bits_clean(get_And_right(node), mode);
+               }
+               /* FALLTHROUGH */
+       case iro_Or:
+       case iro_Eor:
+               return upper_bits_clean(get_binop_left(node), mode)
+                   && upper_bits_clean(get_binop_right(node), mode);
+
+       case iro_Shr:
+               if (mode_is_signed(mode)) {
+                       return false; /* TODO */
+               } else {
+                       ir_node *right = get_Shr_right(node);
+                       if (is_Const(right)) {
+                               ir_tarval *tv  = get_Const_tarval(right);
+                               long       val = get_tarval_long(tv);
+                               if (val >= 32 - (long)get_mode_size_bits(mode))
+                                       return true;
+                       }
+                       return upper_bits_clean(get_Shr_left(node), mode);
+               }
+
+       case iro_Shrs:
+               return upper_bits_clean(get_Shrs_left(node), mode);
+
+       case iro_Const: {
+               ir_tarval *tv  = get_Const_tarval(node);
+               long       val = get_tarval_long(tv);
+               if (mode_is_signed(mode)) {
+                       long    shifted = val >> (get_mode_size_bits(mode)-1);
+                       return shifted == 0 || shifted == -1;
+               } else {
+                       unsigned long shifted = (unsigned long)val;
+                       shifted >>= get_mode_size_bits(mode)-1;
+                       shifted >>= 1;
+                       return shifted == 0;
+               }
+       }
+
+       case iro_Conv: {
+               ir_mode *dest_mode = get_irn_mode(node);
+               ir_node *op        = get_Conv_op(node);
+               ir_mode *src_mode  = get_irn_mode(op);
+               unsigned src_bits  = get_mode_size_bits(src_mode);
+               unsigned dest_bits = get_mode_size_bits(dest_mode);
+               /* downconvs are a nop */
+               if (src_bits <= dest_bits)
+                       return upper_bits_clean(op, mode);
+               if (dest_bits <= get_mode_size_bits(mode)
+                   && mode_is_signed(dest_mode) == mode_is_signed(mode))
+                       return true;
+               return false;
+       }
+
+       case iro_Proj: {
+               ir_node *pred = get_Proj_pred(node);
+               switch (get_irn_opcode(pred)) {
+               case iro_Load: {
+                       ir_mode *load_mode = get_Load_mode(pred);
+                       unsigned load_bits = get_mode_size_bits(load_mode);
+                       unsigned bits      = get_mode_size_bits(mode);
+                       if (load_bits > bits)
+                               return false;
+                       if (mode_is_signed(mode) != mode_is_signed(load_mode))
+                               return false;
+                       return true;
+               }
+               default:
+                       break;
+               }
+       }
+       default:
+               break;
+       }
        return false;
 }
 
@@ -175,8 +251,7 @@ static ir_node *gen_extension(dbg_info *dbgi, ir_node *block, ir_node *op,
                               ir_mode *orig_mode)
 {
        int bits = get_mode_size_bits(orig_mode);
-       if (bits == 32)
-               return op;
+       assert(bits < 32);
 
        if (mode_is_signed(orig_mode)) {
                return gen_sign_extension(dbgi, block, op, bits);
@@ -212,9 +287,12 @@ static bool is_imm_encodeable(const ir_node *node)
        return sparc_is_value_imm_encodeable(value);
 }
 
-static bool needs_extension(ir_mode *mode)
+static bool needs_extension(ir_node *op)
 {
-       return get_mode_size_bits(mode) < get_mode_size_bits(mode_gp);
+       ir_mode *mode = get_irn_mode(op);
+       if (get_mode_size_bits(mode) >= get_mode_size_bits(mode_gp))
+               return false;
+       return !upper_bits_clean(op, mode);
 }
 
 /**
@@ -241,7 +319,7 @@ static bool is_downconv(const ir_node *node)
                get_mode_size_bits(dest_mode) <= get_mode_size_bits(src_mode);
 }
 
-static ir_node *sparc_skip_downconv(ir_node *node)
+static ir_node *skip_downconv(ir_node *node)
 {
        while (is_downconv(node)) {
                node = get_Conv_op(node);
@@ -269,8 +347,8 @@ static ir_node *gen_helper_binop_args(ir_node *node,
        ir_mode  *mode2;
 
        if (flags & MATCH_MODE_NEUTRAL) {
-               op1 = sparc_skip_downconv(op1);
-               op2 = sparc_skip_downconv(op2);
+               op1 = skip_downconv(op1);
+               op2 = skip_downconv(op2);
        }
        mode1 = get_irn_mode(op1);
        mode2 = get_irn_mode(op2);
@@ -281,13 +359,13 @@ static ir_node *gen_helper_binop_args(ir_node *node,
        if (is_imm_encodeable(op2)) {
                int32_t  immediate = get_tarval_long(get_Const_tarval(op2));
                new_op1 = be_transform_node(op1);
-               if (! (flags & MATCH_MODE_NEUTRAL) && needs_extension(mode1)) {
+               if (! (flags & MATCH_MODE_NEUTRAL) && needs_extension(op1)) {
                        new_op1 = gen_extension(dbgi, block, new_op1, mode1);
                }
                return new_imm(dbgi, block, new_op1, NULL, immediate);
        }
        new_op2 = be_transform_node(op2);
-       if (! (flags & MATCH_MODE_NEUTRAL) && needs_extension(mode2)) {
+       if (! (flags & MATCH_MODE_NEUTRAL) && needs_extension(op2)) {
                new_op2 = gen_extension(dbgi, block, new_op2, mode2);
        }
 
@@ -297,7 +375,7 @@ static ir_node *gen_helper_binop_args(ir_node *node,
        }
 
        new_op1 = be_transform_node(op1);
-       if (! (flags & MATCH_MODE_NEUTRAL) && needs_extension(mode1)) {
+       if (! (flags & MATCH_MODE_NEUTRAL) && needs_extension(op1)) {
                new_op1 = gen_extension(dbgi, block, new_op1, mode1);
        }
        return new_reg(dbgi, block, new_op1, new_op2);
@@ -415,6 +493,40 @@ static ir_node *get_g0(ir_graph *irg)
        return start_g0;
 }
 
+static ir_node *get_g7(ir_graph *irg)
+{
+       if (start_g7 == NULL) {
+               ir_node *start = get_irg_start(irg);
+               assert(is_sparc_Start(start));
+               start_g7 = new_r_Proj(start, mode_gp, start_g7_offset);
+       }
+       return start_g7;
+}
+
+static ir_node *make_tls_offset(dbg_info *dbgi, ir_node *block,
+                                ir_entity *entity, int32_t offset)
+{
+       ir_node  *hi  = new_bd_sparc_SetHi(dbgi, block, entity, offset);
+       ir_node  *low = new_bd_sparc_Xor_imm(dbgi, block, hi, entity, offset);
+       return low;
+}
+
+static ir_node *make_address(dbg_info *dbgi, ir_node *block, ir_entity *entity,
+                             int32_t offset)
+{
+       if (get_entity_owner(entity) == get_tls_type()) {
+               ir_graph *irg     = get_irn_irg(block);
+               ir_node  *g7      = get_g7(irg);
+               ir_node  *offsetn = make_tls_offset(dbgi, block, entity, offset);
+               ir_node  *add     = new_bd_sparc_Add_reg(dbgi, block, g7, offsetn);
+               return add;
+       } else {
+               ir_node *hi  = new_bd_sparc_SetHi(dbgi, block, entity, offset);
+               ir_node *low = new_bd_sparc_Or_imm(dbgi, block, hi, entity, offset);
+               return low;
+       }
+}
+
 typedef struct address_t {
        ir_node   *ptr;
        ir_node   *ptr2;
@@ -446,15 +558,28 @@ static void match_address(ir_node *ptr, address_t *address, bool use_ptr2)
         * won't save anything but produce multiple sethi+or combinations with
         * just different offsets */
        if (is_SymConst(base) && get_irn_n_edges(base) == 1) {
-               dbg_info *dbgi      = get_irn_dbg_info(ptr);
-               ir_node  *block     = get_nodes_block(ptr);
-               ir_node  *new_block = be_transform_node(block);
-               entity = get_SymConst_entity(base);
-               base   = new_bd_sparc_SetHi(dbgi, new_block, entity, offset);
-       } else if (use_ptr2 && is_Add(base) && entity == NULL && offset == 0) {
+               ir_entity *sc_entity = get_SymConst_entity(base);
+               dbg_info  *dbgi      = get_irn_dbg_info(ptr);
+               ir_node   *block     = get_nodes_block(ptr);
+               ir_node   *new_block = be_transform_node(block);
+
+               if (get_entity_owner(sc_entity) == get_tls_type()) {
+                       if (!use_ptr2) {
+                               goto only_offset;
+                       } else {
+                               ptr2   = make_tls_offset(dbgi, new_block, sc_entity, offset);
+                               offset = 0;
+                               base   = get_g7(get_irn_irg(base));
+                       }
+               } else {
+                       entity = sc_entity;
+                       base   = new_bd_sparc_SetHi(dbgi, new_block, entity, offset);
+               }
+       } else if (use_ptr2 && is_Add(base) && offset == 0) {
                ptr2 = be_transform_node(get_Add_right(base));
                base = be_transform_node(get_Add_left(base));
        } else {
+only_offset:
                if (sparc_is_value_imm_encodeable(offset)) {
                        base = be_transform_node(base);
                } else {
@@ -689,7 +814,6 @@ static ir_node *gen_Store(ir_node *node)
        ir_node  *mem      = get_Store_mem(node);
        ir_node  *new_mem  = be_transform_node(mem);
        ir_node  *val      = get_Store_value(node);
-       ir_node  *new_val  = be_transform_node(val);
        ir_mode  *mode     = get_irn_mode(val);
        dbg_info *dbgi     = get_irn_dbg_info(node);
        ir_node  *new_store = NULL;
@@ -700,12 +824,21 @@ static ir_node *gen_Store(ir_node *node)
        }
 
        if (mode_is_float(mode)) {
+               ir_node *new_val = be_transform_node(val);
                /* 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);
+               ir_node *new_val;
+               unsigned dest_bits = get_mode_size_bits(mode);
+               while (is_downconv(node)
+                      && get_mode_size_bits(get_irn_mode(node)) >= dest_bits) {
+                   val = get_Conv_op(val);
+               }
+               new_val = be_transform_node(val);
+
+               assert(dest_bits <= 32);
                match_address(ptr, &address, true);
                if (address.ptr2 != NULL) {
                        assert(address.entity == NULL && address.offset == 0);
@@ -754,8 +887,13 @@ static ir_node *gen_Mulh(ir_node *node)
        if (mode_is_float(mode))
                panic("FP not supported yet");
 
-       mul = gen_helper_binop(node, MATCH_COMMUTATIVE, new_bd_sparc_Mulh_reg, new_bd_sparc_Mulh_imm);
-       return new_r_Proj(mul, mode_gp, pn_sparc_Mulh_low);
+       if (mode_is_signed(mode)) {
+               mul = gen_helper_binop(node, MATCH_COMMUTATIVE, new_bd_sparc_SMulh_reg, new_bd_sparc_SMulh_imm);
+               return new_r_Proj(mul, mode_gp, pn_sparc_SMulh_low);
+       } else {
+               mul = gen_helper_binop(node, MATCH_COMMUTATIVE, new_bd_sparc_UMulh_reg, new_bd_sparc_UMulh_imm);
+               return new_r_Proj(mul, mode_gp, pn_sparc_UMulh_low);
+       }
 }
 
 static ir_node *gen_sign_extension_value(ir_node *node)
@@ -844,22 +982,41 @@ static ir_node *gen_helper_bitop(ir_node *node,
                                  new_binop_reg_func new_reg,
                                  new_binop_imm_func new_imm,
                                  new_binop_reg_func new_not_reg,
-                                 new_binop_imm_func new_not_imm)
+                                 new_binop_imm_func new_not_imm,
+                                 match_flags_t flags)
 {
        ir_node *op1 = get_binop_left(node);
        ir_node *op2 = get_binop_right(node);
        if (is_Not(op1)) {
                return gen_helper_binop_args(node, op2, get_Not_op(op1),
-                                            MATCH_MODE_NEUTRAL,
+                                            flags,
                                             new_not_reg, new_not_imm);
        }
        if (is_Not(op2)) {
                return gen_helper_binop_args(node, op1, get_Not_op(op2),
-                                            MATCH_MODE_NEUTRAL,
+                                            flags,
                                             new_not_reg, new_not_imm);
        }
+       if (is_Const(op2) && get_irn_n_edges(op2) == 1) {
+               ir_tarval *tv    = get_Const_tarval(op2);
+               long       value = get_tarval_long(tv);
+               if (!sparc_is_value_imm_encodeable(value)) {
+                       long notvalue = ~value;
+                       if ((notvalue & 0x3ff) == 0) {
+                               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  *new_op2
+                                       = new_bd_sparc_SetHi(NULL, new_block, NULL, notvalue);
+                               ir_node  *new_op1   = be_transform_node(op1);
+                               ir_node  *result
+                                       = new_not_reg(dbgi, new_block, new_op1, new_op2);
+                               return result;
+                       }
+               }
+       }
        return gen_helper_binop_args(node, op1, op2,
-                                                                MATCH_MODE_NEUTRAL | MATCH_COMMUTATIVE,
+                                                                flags | MATCH_COMMUTATIVE,
                                                                 new_reg, new_imm);
 }
 
@@ -869,7 +1026,8 @@ static ir_node *gen_And(ir_node *node)
                                new_bd_sparc_And_reg,
                                new_bd_sparc_And_imm,
                                new_bd_sparc_AndN_reg,
-                               new_bd_sparc_AndN_imm);
+                               new_bd_sparc_AndN_imm,
+                               MATCH_MODE_NEUTRAL);
 }
 
 static ir_node *gen_Or(ir_node *node)
@@ -878,7 +1036,8 @@ static ir_node *gen_Or(ir_node *node)
                                new_bd_sparc_Or_reg,
                                new_bd_sparc_Or_imm,
                                new_bd_sparc_OrN_reg,
-                               new_bd_sparc_OrN_imm);
+                               new_bd_sparc_OrN_imm,
+                               MATCH_MODE_NEUTRAL);
 }
 
 static ir_node *gen_Eor(ir_node *node)
@@ -887,7 +1046,8 @@ static ir_node *gen_Eor(ir_node *node)
                                new_bd_sparc_Xor_reg,
                                new_bd_sparc_Xor_imm,
                                new_bd_sparc_XNor_reg,
-                               new_bd_sparc_XNor_imm);
+                               new_bd_sparc_XNor_imm,
+                               MATCH_MODE_NEUTRAL);
 }
 
 static ir_node *gen_Shl(ir_node *node)
@@ -982,67 +1142,57 @@ static ir_node *gen_float_const(dbg_info *dbgi, ir_node *block, ir_tarval *tv)
        return proj;
 }
 
-static ir_node *gen_Const(ir_node *node)
+static ir_node *create_int_const(ir_node *block, int32_t value)
 {
-       ir_node   *block = be_transform_node(get_nodes_block(node));
-       ir_mode   *mode  = get_irn_mode(node);
-       dbg_info  *dbgi  = get_irn_dbg_info(node);
-       ir_tarval *tv    = get_Const_tarval(node);
-       long       value;
-
-       if (mode_is_float(mode)) {
-               return gen_float_const(dbgi, block, tv);
-       }
-
-       value = get_tarval_long(tv);
        if (value == 0) {
-               return get_g0(get_irn_irg(node));
+               ir_graph *irg = get_irn_irg(block);
+               return get_g0(irg);
        } else if (sparc_is_value_imm_encodeable(value)) {
-               ir_graph *irg = get_irn_irg(node);
-               return new_bd_sparc_Or_imm(dbgi, block, get_g0(irg), NULL, value);
+               ir_graph *irg = get_irn_irg(block);
+               return new_bd_sparc_Or_imm(NULL, block, get_g0(irg), NULL, value);
        } else {
-               ir_node *hi = new_bd_sparc_SetHi(dbgi, block, NULL, value);
+               ir_node *hi = new_bd_sparc_SetHi(NULL, block, NULL, value);
                if ((value & 0x3ff) != 0) {
-                       return new_bd_sparc_Or_imm(dbgi, block, hi, NULL, value & 0x3ff);
+                       return new_bd_sparc_Or_imm(NULL, block, hi, NULL, value & 0x3ff);
                } else {
                        return hi;
                }
        }
 }
 
-static ir_mode *get_cmp_mode(ir_node *b_value)
+static ir_node *gen_Const(ir_node *node)
 {
-       ir_node *op;
+       ir_node   *block = be_transform_node(get_nodes_block(node));
+       ir_mode   *mode  = get_irn_mode(node);
+       dbg_info  *dbgi  = get_irn_dbg_info(node);
+       ir_tarval *tv    = get_Const_tarval(node);
+       int32_t    val;
 
-       if (!is_Cmp(b_value))
-               panic("can't determine cond signednes (no cmp)");
-       op = get_Cmp_left(b_value);
-       return get_irn_mode(op);
+       if (mode_is_float(mode)) {
+               return gen_float_const(dbgi, block, tv);
+       }
+       val = (int32_t)get_tarval_long(tv);
+       assert((long)val == get_tarval_long(tv));
+       return create_int_const(block, val);
 }
 
-static ir_node *make_address(dbg_info *dbgi, ir_node *block, ir_entity *entity,
-                             int32_t offset)
+static ir_node *gen_Switch(ir_node *node)
 {
-       ir_node *hi  = new_bd_sparc_SetHi(dbgi, block, entity, offset);
-       ir_node *low = new_bd_sparc_Or_imm(dbgi, block, hi, entity, offset);
+       dbg_info              *dbgi         = get_irn_dbg_info(node);
+       ir_node               *block        = get_nodes_block(node);
+       ir_node               *new_block    = be_transform_node(block);
+       ir_graph              *irg          = get_irn_irg(block);
+       ir_node               *selector     = get_Switch_selector(node);
+       ir_node               *new_selector = be_transform_node(selector);
+       const ir_switch_table *table        = get_Switch_table(node);
+       unsigned               n_outs       = get_Switch_n_outs(node);
+       ir_entity             *entity;
+       ir_node               *table_address;
+       ir_node               *idx;
+       ir_node               *load;
+       ir_node               *address;
 
-       if (get_entity_owner(entity) == get_tls_type())
-               panic("thread local storage not supported yet in sparc backend");
-       return low;
-}
-
-static ir_node *gen_SwitchJmp(ir_node *node)
-{
-       dbg_info        *dbgi         = get_irn_dbg_info(node);
-       ir_node         *block        = be_transform_node(get_nodes_block(node));
-       ir_node         *selector     = get_Cond_selector(node);
-       ir_node         *new_selector = be_transform_node(selector);
-       long             default_pn   = get_Cond_default_proj(node);
-       ir_entity       *entity;
-       ir_node         *table_address;
-       ir_node         *idx;
-       ir_node         *load;
-       ir_node         *address;
+       table = ir_switch_table_duplicate(irg, table);
 
        /* switch with smaller mode not implemented yet */
        assert(get_mode_size_bits(get_irn_mode(selector)) == 32);
@@ -1052,65 +1202,40 @@ static ir_node *gen_SwitchJmp(ir_node *node)
        add_entity_linkage(entity, IR_LINKAGE_CONSTANT);
 
        /* construct base address */
-       table_address = make_address(dbgi, block, entity, 0);
+       table_address = make_address(dbgi, new_block, entity, 0);
        /* scale index */
-       idx = new_bd_sparc_Sll_imm(dbgi, block, new_selector, NULL, 2);
+       idx = new_bd_sparc_Sll_imm(dbgi, new_block, new_selector, NULL, 2);
        /* load from jumptable */
-       load = new_bd_sparc_Ld_reg(dbgi, block, table_address, idx,
+       load = new_bd_sparc_Ld_reg(dbgi, new_block, table_address, idx,
                                   get_irg_no_mem(current_ir_graph),
                                   mode_gp);
        address = new_r_Proj(load, mode_gp, pn_sparc_Ld_res);
 
-       return new_bd_sparc_SwitchJmp(dbgi, block, address, default_pn, entity);
+       return new_bd_sparc_SwitchJmp(dbgi, new_block, address, n_outs, table, entity);
 }
 
 static ir_node *gen_Cond(ir_node *node)
 {
        ir_node    *selector = get_Cond_selector(node);
-       ir_mode    *mode     = get_irn_mode(selector);
+       ir_node    *cmp_left;
+       ir_mode    *cmp_mode;
        ir_node    *block;
        ir_node    *flag_node;
-       bool        is_unsigned;
        ir_relation relation;
        dbg_info   *dbgi;
 
-       /* switch/case jumps */
-       if (mode != mode_b) {
-               return gen_SwitchJmp(node);
-       }
-
-       block = be_transform_node(get_nodes_block(node));
-       dbgi  = get_irn_dbg_info(node);
-
-       /* regular if/else jumps */
-       if (is_Cmp(selector)) {
-               ir_mode *cmp_mode;
-
-               cmp_mode    = get_cmp_mode(selector);
-               flag_node   = be_transform_node(selector);
-               relation    = get_Cmp_relation(selector);
-               is_unsigned = !mode_is_signed(cmp_mode);
-               if (mode_is_float(cmp_mode)) {
-                       assert(!is_unsigned);
-                       return new_bd_sparc_fbfcc(dbgi, block, flag_node, relation);
-               } else {
-                       return new_bd_sparc_Bicc(dbgi, block, flag_node, relation, is_unsigned);
-               }
+       /* note: after lower_mode_b we are guaranteed to have a Cmp input */
+       block       = be_transform_node(get_nodes_block(node));
+       dbgi        = get_irn_dbg_info(node);
+       cmp_left    = get_Cmp_left(selector);
+       cmp_mode    = get_irn_mode(cmp_left);
+       flag_node   = be_transform_node(selector);
+       relation    = get_Cmp_relation(selector);
+       if (mode_is_float(cmp_mode)) {
+               return new_bd_sparc_fbfcc(dbgi, block, flag_node, relation);
        } else {
-               /* in this case, the selector must already deliver a mode_b value.
-                * this happens, for example, when the Cond is connected to a Conv
-                * which converts its argument to mode_b. */
-               ir_node  *new_op;
-               ir_graph *irg;
-               assert(mode == mode_b);
-
-               block     = be_transform_node(get_nodes_block(node));
-               irg       = get_irn_irg(block);
-               dbgi      = get_irn_dbg_info(node);
-               new_op    = be_transform_node(selector);
-               /* follow the SPARC architecture manual and use orcc for tst */
-               flag_node = new_bd_sparc_OrCCZero_reg(dbgi, block, new_op, get_g0(irg));
-               return new_bd_sparc_Bicc(dbgi, block, flag_node, ir_relation_less_greater, true);
+               bool is_unsigned = !mode_is_signed(cmp_mode);
+               return new_bd_sparc_Bicc(dbgi, block, flag_node, relation, is_unsigned);
        }
 }
 
@@ -1150,19 +1275,34 @@ static ir_node *gen_Cmp(ir_node *node)
                                                new_bd_sparc_AndCCZero_reg,
                                                new_bd_sparc_AndCCZero_imm,
                                                new_bd_sparc_AndNCCZero_reg,
-                                               new_bd_sparc_AndNCCZero_imm);
+                                               new_bd_sparc_AndNCCZero_imm,
+                                               MATCH_NONE);
                } else if (is_Or(op1)) {
                        return gen_helper_bitop(op1,
                                                new_bd_sparc_OrCCZero_reg,
                                                new_bd_sparc_OrCCZero_imm,
                                                new_bd_sparc_OrNCCZero_reg,
-                                               new_bd_sparc_OrNCCZero_imm);
+                                               new_bd_sparc_OrNCCZero_imm,
+                                               MATCH_NONE);
                } else if (is_Eor(op1)) {
                        return gen_helper_bitop(op1,
                                                new_bd_sparc_XorCCZero_reg,
                                                new_bd_sparc_XorCCZero_imm,
                                                new_bd_sparc_XNorCCZero_reg,
-                                               new_bd_sparc_XNorCCZero_imm);
+                                               new_bd_sparc_XNorCCZero_imm,
+                                               MATCH_NONE);
+               } else if (is_Add(op1)) {
+                       return gen_helper_binop(op1, MATCH_COMMUTATIVE,
+                                               new_bd_sparc_AddCCZero_reg,
+                                               new_bd_sparc_AddCCZero_imm);
+               } else if (is_Sub(op1)) {
+                       return gen_helper_binop(op1, MATCH_NONE,
+                                               new_bd_sparc_SubCCZero_reg,
+                                               new_bd_sparc_SubCCZero_imm);
+               } else if (is_Mul(op1)) {
+                       return gen_helper_binop(op1, MATCH_COMMUTATIVE,
+                                               new_bd_sparc_MulCCZero_reg,
+                                               new_bd_sparc_MulCCZero_imm);
                }
        }
 
@@ -1282,13 +1422,13 @@ static ir_node *gen_Conv(ir_node *node)
        if (src_mode == mode_b)
                panic("ConvB not lowered %+F", node);
 
-       new_op = be_transform_node(op);
        if (src_mode == dst_mode)
-               return new_op;
+               return be_transform_node(op);
 
        if (mode_is_float(src_mode) || mode_is_float(dst_mode)) {
                assert((src_bits <= 64 && dst_bits <= 64) && "quad FP not implemented");
 
+               new_op = be_transform_node(op);
                if (mode_is_float(src_mode)) {
                        if (mode_is_float(dst_mode)) {
                                /* float -> float conv */
@@ -1308,20 +1448,13 @@ static ir_node *gen_Conv(ir_node *node)
                        }
                        return create_itof(dbgi, block, new_op, dst_mode);
                }
-       } else if (src_mode == mode_b) {
-               panic("ConvB not lowered %+F", node);
        } else { /* complete in gp registers */
                int min_bits;
                ir_mode *min_mode;
 
-               if (src_bits == dst_bits) {
+               if (src_bits == dst_bits || dst_mode == mode_b) {
                        /* kill unnecessary conv */
-                       return new_op;
-               }
-
-               if (dst_mode == mode_b) {
-                       /* mode_b lowering already took care that we only have 0/1 values */
-                       return new_op;
+                       return be_transform_node(op);
                }
 
                if (src_bits < dst_bits) {
@@ -1332,9 +1465,10 @@ static ir_node *gen_Conv(ir_node *node)
                        min_mode = dst_mode;
                }
 
-               if (upper_bits_clean(new_op, min_mode)) {
-                       return new_op;
+               if (upper_bits_clean(op, min_mode)) {
+                       return be_transform_node(op);
                }
+               new_op = be_transform_node(op);
 
                if (mode_is_signed(min_mode)) {
                        return gen_sign_extension(dbgi, block, new_op, min_bits);
@@ -1381,7 +1515,7 @@ static ir_node *gen_Start(ir_node *node)
        assert(obstack_object_size(obst) == 0);
 
        /* calculate number of outputs */
-       n_outs = 3; /* memory, zero, sp */
+       n_outs = 4; /* memory, g0, g7, sp */
        if (!current_cconv->omit_fp)
                ++n_outs; /* framepointer */
        /* function parameters */
@@ -1408,6 +1542,14 @@ static ir_node *gen_Start(ir_node *node)
        arch_set_irn_register_out(start, o, &sparc_registers[REG_G0]);
        ++o;
 
+       /* g7 is used for TLS data */
+       start_g7_offset = o;
+       req = be_create_reg_req(obst, &sparc_registers[REG_G7],
+                               arch_register_req_type_ignore);
+       arch_set_irn_register_req_out(start, o, req);
+       arch_set_irn_register_out(start, o, &sparc_registers[REG_G7]);
+       ++o;
+
        /* we need an output for the stackpointer */
        start_sp_offset = o;
        req = be_create_reg_req(obst, sp_reg,
@@ -1611,33 +1753,53 @@ static ir_node *bitcast_int_to_float(dbg_info *dbgi, ir_node *block,
 }
 
 static void bitcast_float_to_int(dbg_info *dbgi, ir_node *block,
-                                 ir_node *node, ir_mode *float_mode,
+                                 ir_node *value, ir_mode *float_mode,
                                  ir_node **result)
 {
-       ir_graph *irg   = current_ir_graph;
-       ir_node  *stack = get_irg_frame(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);
-       ir_node  *ld;
-       set_irn_pinned(stf, op_pin_state_floats);
-
-       ld = new_bd_sparc_Ld_imm(dbgi, block, stack, stf, mode_gp, NULL, 0, true);
-       set_irn_pinned(ld, op_pin_state_floats);
-       result[0] = new_r_Proj(ld, mode_gp, pn_sparc_Ld_res);
-
-       if (bits == 64) {
-               ir_node *ld2 = new_bd_sparc_Ld_imm(dbgi, block, stack, stf, mode_gp,
-                                                  NULL, 4, true);
+       int bits = get_mode_size_bits(float_mode);
+       if (is_Const(value)) {
+               ir_tarval *tv = get_Const_tarval(value);
+               int32_t val = get_tarval_sub_bits(tv, 0)         |
+                             (get_tarval_sub_bits(tv, 1) << 8)  |
+                             (get_tarval_sub_bits(tv, 2) << 16) |
+                             (get_tarval_sub_bits(tv, 3) << 24);
+               result[0] = create_int_const(block, val);
+               if (bits == 64) {
+                       int32_t val = get_tarval_sub_bits(tv, 4)         |
+                                                 (get_tarval_sub_bits(tv, 5) << 8)  |
+                                                 (get_tarval_sub_bits(tv, 6) << 16) |
+                                                 (get_tarval_sub_bits(tv, 7) << 24);
+                       result[1] = create_int_const(block, val);
+               } else {
+                       assert(bits == 32);
+                       result[1] = NULL;
+               }
+       } else {
+               ir_graph *irg   = current_ir_graph;
+               ir_node  *stack = get_irg_frame(irg);
+               ir_node  *nomem = get_irg_no_mem(irg);
+               ir_node  *new_value = be_transform_node(value);
+               ir_node  *stf   = create_stf(dbgi, block, new_value, stack, nomem,
+                                            float_mode, NULL, 0, true);
+               ir_node  *ld;
+               set_irn_pinned(stf, op_pin_state_floats);
+
+               ld = new_bd_sparc_Ld_imm(dbgi, block, stack, stf, mode_gp, NULL, 0, true);
                set_irn_pinned(ld, op_pin_state_floats);
-               result[1] = new_r_Proj(ld2, mode_gp, pn_sparc_Ld_res);
+               result[0] = new_r_Proj(ld, mode_gp, pn_sparc_Ld_res);
 
-               arch_add_irn_flags(ld, (arch_irn_flags_t)sparc_arch_irn_flag_needs_64bit_spillslot);
-               arch_add_irn_flags(ld2, (arch_irn_flags_t)sparc_arch_irn_flag_needs_64bit_spillslot);
-       } else {
-               assert(bits == 32);
-               result[1] = NULL;
+               if (bits == 64) {
+                       ir_node *ld2 = new_bd_sparc_Ld_imm(dbgi, block, stack, stf, mode_gp,
+                                                                                          NULL, 4, true);
+                       set_irn_pinned(ld, op_pin_state_floats);
+                       result[1] = new_r_Proj(ld2, mode_gp, pn_sparc_Ld_res);
+
+                       arch_add_irn_flags(ld, (arch_irn_flags_t)sparc_arch_irn_flag_needs_64bit_spillslot);
+                       arch_add_irn_flags(ld2, (arch_irn_flags_t)sparc_arch_irn_flag_needs_64bit_spillslot);
+               } else {
+                       assert(bits == 32);
+                       result[1] = NULL;
+               }
        }
 }
 
@@ -1671,7 +1833,7 @@ static ir_node *gen_Call(ir_node *node)
        ir_entity       *entity       = NULL;
        ir_node         *new_frame    = get_stack_pointer_for(node);
        bool             aggregate_return
-               = type->attr.ma.has_compound_ret_parameter;
+               = get_method_calling_convention(type) & cc_compound_ret;
        ir_node         *incsp;
        int              mem_pos;
        ir_node         *res;
@@ -1702,10 +1864,10 @@ static ir_node *gen_Call(ir_node *node)
        /* parameters */
        for (p = 0; p < n_params; ++p) {
                ir_node                  *value      = get_Call_param(node, p);
-               ir_node                  *new_value  = be_transform_node(value);
                const reg_or_stackslot_t *param      = &cconv->parameters[p];
                ir_type                  *param_type = get_method_param_type(type, p);
                ir_mode                  *mode       = get_type_mode(param_type);
+               ir_node                  *partial_value;
                ir_node                  *new_values[2];
                ir_node                  *str;
                int                       offset;
@@ -1713,8 +1875,9 @@ static ir_node *gen_Call(ir_node *node)
                if (mode_is_float(mode) && param->reg0 != NULL) {
                        unsigned size_bits = get_mode_size_bits(mode);
                        assert(size_bits <= 64);
-                       bitcast_float_to_int(dbgi, new_block, new_value, mode, new_values);
+                       bitcast_float_to_int(dbgi, new_block, value, mode, new_values);
                } else {
+                       ir_node *new_value = be_transform_node(value);
                        new_values[0] = new_value;
                        new_values[1] = NULL;
                }
@@ -1737,8 +1900,10 @@ static ir_node *gen_Call(ir_node *node)
 
                /* we need a store if we're here */
                if (new_values[1] != NULL) {
-                       new_value = new_values[1];
-                       mode      = mode_gp;
+                       partial_value = new_values[1];
+                       mode          = mode_gp;
+               } else {
+                       partial_value = new_values[0];
                }
 
                /* we need to skip over our save area when constructing the call
@@ -1746,10 +1911,10 @@ static ir_node *gen_Call(ir_node *node)
                offset = param->offset + SPARC_MIN_STACKSIZE;
 
                if (mode_is_float(mode)) {
-                       str = create_stf(dbgi, new_block, new_value, incsp, new_mem,
+                       str = create_stf(dbgi, new_block, partial_value, incsp, new_mem,
                                         mode, NULL, offset, true);
                } else {
-                       str = new_bd_sparc_St_imm(dbgi, new_block, new_value, incsp,
+                       str = new_bd_sparc_St_imm(dbgi, new_block, partial_value, incsp,
                                                  new_mem, mode, NULL, offset, true);
                }
                set_irn_pinned(str, op_pin_state_floats);
@@ -1845,6 +2010,102 @@ static ir_node *gen_Sel(ir_node *node)
        return new_bd_sparc_FrameAddr(dbgi, new_block, new_ptr, entity, 0);
 }
 
+static ir_node *gen_Alloc(ir_node *node)
+{
+       dbg_info *dbgi       = get_irn_dbg_info(node);
+       ir_node  *block      = get_nodes_block(node);
+       ir_node  *new_block  = be_transform_node(block);
+       ir_type  *type       = get_Alloc_type(node);
+       ir_node  *size       = get_Alloc_count(node);
+       ir_node  *stack_pred = get_stack_pointer_for(node);
+       ir_node  *subsp;
+       if (get_Alloc_where(node) != stack_alloc)
+               panic("only stack-alloc supported in sparc backend (at %+F)", node);
+       /* lowerer should have transformed all allocas to byte size */
+       if (!is_unknown_type(type) && get_type_size_bytes(type) != 1)
+               panic("Found non-byte alloc in sparc backend (at %+F)", node);
+
+       if (is_Const(size)) {
+               ir_tarval *tv    = get_Const_tarval(size);
+               long       sizel = get_tarval_long(tv);
+               subsp = be_new_IncSP(sp_reg, new_block, stack_pred, sizel, 0);
+               set_irn_dbg_info(subsp, dbgi);
+       } else {
+               ir_node *new_size = be_transform_node(size);
+               subsp = new_bd_sparc_SubSP(dbgi, new_block, stack_pred, new_size);
+               arch_set_irn_register(subsp, sp_reg);
+       }
+
+       /* if we are the last IncSP producer in a block then we have to keep
+        * the stack value.
+        * Note: This here keeps all producers which is more than necessary */
+       keep_alive(subsp);
+
+       pmap_insert(node_to_stack, node, subsp);
+       /* the "result" is the unmodified sp value */
+       return stack_pred;
+}
+
+static ir_node *gen_Proj_Alloc(ir_node *node)
+{
+       ir_node *alloc = get_Proj_pred(node);
+       long     pn    = get_Proj_proj(node);
+
+       switch ((pn_Alloc)pn) {
+       case pn_Alloc_M: {
+               ir_node *alloc_mem = get_Alloc_mem(alloc);
+               return be_transform_node(alloc_mem);
+       }
+       case pn_Alloc_res: {
+               ir_node *new_alloc = be_transform_node(alloc);
+               return new_alloc;
+       }
+       case pn_Alloc_X_regular:
+       case pn_Alloc_X_except:
+               panic("sparc backend: exception output of alloc not supported (at %+F)",
+                     node);
+       }
+       panic("sparc backend: invalid Proj->Alloc");
+}
+
+static ir_node *gen_Free(ir_node *node)
+{
+       dbg_info *dbgi       = get_irn_dbg_info(node);
+       ir_node  *block      = get_nodes_block(node);
+       ir_node  *new_block  = be_transform_node(block);
+       ir_type  *type       = get_Free_type(node);
+       ir_node  *size       = get_Free_count(node);
+       ir_node  *mem        = get_Free_mem(node);
+       ir_node  *new_mem    = be_transform_node(mem);
+       ir_node  *stack_pred = get_stack_pointer_for(node);
+       ir_node  *addsp;
+       if (get_Alloc_where(node) != stack_alloc)
+               panic("only stack-alloc supported in sparc backend (at %+F)", node);
+       /* lowerer should have transformed all allocas to byte size */
+       if (!is_unknown_type(type) && get_type_size_bytes(type) != 1)
+               panic("Found non-byte alloc in sparc backend (at %+F)", node);
+
+       if (is_Const(size)) {
+               ir_tarval *tv    = get_Const_tarval(size);
+               long       sizel = get_tarval_long(tv);
+               addsp = be_new_IncSP(sp_reg, new_block, stack_pred, -sizel, 0);
+               set_irn_dbg_info(addsp, dbgi);
+       } else {
+               ir_node *new_size = be_transform_node(size);
+               addsp = new_bd_sparc_AddSP(dbgi, new_block, stack_pred, new_size);
+               arch_set_irn_register(addsp, sp_reg);
+       }
+
+       /* if we are the last IncSP producer in a block then we have to keep
+        * the stack value.
+        * Note: This here keeps all producers which is more than necessary */
+       keep_alive(addsp);
+
+       pmap_insert(node_to_stack, node, addsp);
+       /* the "result" is the unmodified sp value */
+       return new_mem;
+}
+
 static const arch_register_req_t float1_req = {
        arch_register_req_type_normal,
        &sparc_reg_classes[CLASS_sparc_fp],
@@ -1873,16 +2134,12 @@ static const arch_register_req_t float4_req = {
 
 static const arch_register_req_t *get_float_req(ir_mode *mode)
 {
-       unsigned bits = get_mode_size_bits(mode);
-
        assert(mode_is_float(mode));
-       if (bits == 32) {
-               return &float1_req;
-       } else if (bits == 64) {
-               return &float2_req;
-       } else {
-               assert(bits == 128);
-               return &float4_req;
+       switch (get_mode_size_bits(mode)) {
+               case  32: return &float1_req;
+               case  64: return &float2_req;
+               case 128: return &float4_req;
+               default:  panic("invalid float mode");
        }
 }
 
@@ -1905,7 +2162,6 @@ static ir_node *gen_Phi(ir_node *node)
                mode = mode_gp;
                req  = sparc_reg_classes[CLASS_sparc_gp].class_req;
        } else if (mode_is_float(mode)) {
-               mode = mode;
                req  = get_float_req(mode);
        } else {
                req = arch_no_register_req;
@@ -2182,6 +2438,8 @@ static ir_node *gen_Proj(ir_node *node)
        ir_node *pred = get_Proj_pred(node);
 
        switch (get_irn_opcode(pred)) {
+       case iro_Alloc:
+               return gen_Proj_Alloc(node);
        case iro_Store:
                return gen_Proj_Store(node);
        case iro_Load:
@@ -2190,6 +2448,7 @@ static ir_node *gen_Proj(ir_node *node)
                return gen_Proj_Call(node);
        case iro_Cmp:
                return gen_Proj_Cmp(node);
+       case iro_Switch:
        case iro_Cond:
                return be_duplicate_node(node);
        case iro_Div:
@@ -2235,6 +2494,7 @@ static void sparc_register_transformers(void)
        be_start_transform_setup();
 
        be_set_transform_function(op_Add,          gen_Add);
+       be_set_transform_function(op_Alloc,        gen_Alloc);
        be_set_transform_function(op_And,          gen_And);
        be_set_transform_function(op_Call,         gen_Call);
        be_set_transform_function(op_Cmp,          gen_Cmp);
@@ -2243,6 +2503,7 @@ static void sparc_register_transformers(void)
        be_set_transform_function(op_Conv,         gen_Conv);
        be_set_transform_function(op_Div,          gen_Div);
        be_set_transform_function(op_Eor,          gen_Eor);
+       be_set_transform_function(op_Free,         gen_Free);
        be_set_transform_function(op_Jmp,          gen_Jmp);
        be_set_transform_function(op_Load,         gen_Load);
        be_set_transform_function(op_Minus,        gen_Minus);
@@ -2260,6 +2521,7 @@ static void sparc_register_transformers(void)
        be_set_transform_function(op_Start,        gen_Start);
        be_set_transform_function(op_Store,        gen_Store);
        be_set_transform_function(op_Sub,          gen_Sub);
+       be_set_transform_function(op_Switch,       gen_Switch);
        be_set_transform_function(op_SymConst,     gen_SymConst);
        be_set_transform_function(op_Unknown,      gen_Unknown);
 
@@ -2282,14 +2544,16 @@ void sparc_transform_graph(ir_graph *irg)
 
        node_to_stack = pmap_create();
 
-       mode_gp    = mode_Iu;
-       mode_fp    = mode_F;
+       mode_gp    = sparc_reg_classes[CLASS_sparc_gp].mode;
+       mode_fp    = sparc_reg_classes[CLASS_sparc_fp].mode;
        mode_fp2   = mode_D;
-       mode_flags = mode_Bu;
        //mode_fp4 = ?
+       mode_flags = sparc_reg_classes[CLASS_sparc_flags_class].mode;
+       assert(sparc_reg_classes[CLASS_sparc_fpflags_class].mode == mode_flags);
 
        start_mem  = NULL;
        start_g0   = NULL;
+       start_g7   = NULL;
        start_sp   = NULL;
        start_fp   = NULL;
        frame_base = NULL;
@@ -2321,6 +2585,8 @@ void sparc_transform_graph(ir_graph *irg)
 
        /* do code placement, to optimize the position of constants */
        place_code(irg);
+       /* backend expects outedges to be always on */
+       edges_assure(irg);
 }
 
 void sparc_init_transform(void)