fix a bunch of warnings reported by cparser
[libfirm] / ir / be / sparc / sparc_transform.c
index b3f817c..bb1de87 100644 (file)
@@ -64,8 +64,9 @@ 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 ir_mode               *mode_gp;
+static ir_mode               *mode_flags;
 static ir_mode               *mode_fp;
 static ir_mode               *mode_fp2;
 //static ir_mode               *mode_fp4;
@@ -250,8 +251,8 @@ static ir_node *gen_helper_binop_args(ir_node *node,
        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);
                }
@@ -336,6 +337,45 @@ static ir_node *gen_helper_unfpop(ir_node *node, ir_mode *mode,
        panic("unsupported mode %+F for float op", mode);
 }
 
+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)
+{
+       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(void)
 {
        return be_prolog_get_reg_value(abihelper, &sparc_registers[REG_G0]);
@@ -446,6 +486,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.
  *
@@ -461,7 +529,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,
@@ -520,6 +617,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,
@@ -560,6 +661,10 @@ 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);
@@ -679,27 +784,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.
  *
@@ -843,7 +927,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);
@@ -895,6 +979,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;
 }
 
@@ -907,7 +994,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;
 
@@ -918,18 +1005,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);
 
@@ -1086,7 +1168,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,
@@ -1103,7 +1185,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,
@@ -1129,7 +1211,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);
@@ -1148,21 +1230,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);
@@ -1188,9 +1270,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);
                }
        }
 }
@@ -1218,7 +1300,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"));
@@ -1245,13 +1327,13 @@ static void create_stacklayout(ir_graph *irg)
        int                n_params;
 
        /* calling conventions must be decided by now */
-       assert(cconv != NULL);
+       assert(current_cconv != NULL);
 
        /* 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];
+               reg_or_stackslot_t *param = &current_cconv->parameters[p];
                char                buf[128];
                ident              *id;
 
@@ -1271,8 +1353,7 @@ static void create_stacklayout(ir_graph *irg)
        layout->arg_type       = arg_type;
        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;
@@ -1291,9 +1372,7 @@ 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;
        ir_node   *start;
-       ir_node   *sp;
        size_t     i;
 
        /* stackpointer is important at function prolog */
@@ -1303,7 +1382,7 @@ static ir_node *gen_Start(ir_node *node)
                arch_register_req_type_ignore);
        /* function parameters in registers */
        for (i = 0; i < get_method_n_params(function_type); ++i) {
-               const reg_or_stackslot_t *param = &cconv->parameters[i];
+               const reg_or_stackslot_t *param = &current_cconv->parameters[i];
                if (param->reg0 != NULL) {
                        be_prolog_add_reg(abihelper, param->reg0,
                                          arch_register_req_type_none);
@@ -1315,7 +1394,7 @@ static ir_node *gen_Start(ir_node *node)
        }
        /* we need the values of the callee saves (Note: non omit-fp mode has no
         * callee saves) */
-       if (cconv->omit_fp) {
+       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) {
@@ -1327,23 +1406,6 @@ static ir_node *gen_Start(ir_node *node)
        }
 
        start = be_prolog_create_start(abihelper, dbgi, new_block);
-       mem   = be_prolog_get_memory(abihelper);
-       sp    = be_prolog_get_reg_value(abihelper, sp_reg);
-
-       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);
-               arch_set_irn_register(save, sp_reg);
-               sp = save;
-               keep_alive(save);
-       }
-
-       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);
-
        return start;
 }
 
@@ -1351,7 +1413,6 @@ 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;
 
        if (stack_pred == NULL) {
@@ -1361,8 +1422,8 @@ static ir_node *get_stack_pointer_for(ir_node *node)
                return sp_proj;
        }
 
-       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);
        }
@@ -1397,16 +1458,15 @@ static ir_node *gen_Return(ir_node *node)
        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);
        }
        /* callee saves */
-       if (cconv->omit_fp) {
+       if (current_cconv->omit_fp) {
                size_t n_callee_saves = ARRAY_SIZE(omit_fp_callee_saves);
-               size_t i;
                for (i = 0; i < n_callee_saves; ++i) {
                        const arch_register_t *reg   = omit_fp_callee_saves[i];
                        ir_node               *value
@@ -1416,25 +1476,7 @@ static ir_node *gen_Return(ir_node *node)
                }
        }
 
-       /* we need a restore instruction */
-       if (!cconv->omit_fp) {
-               ir_node *fp      = be_prolog_get_reg_value(abihelper, fp_reg);
-               ir_node *restore = new_bd_sparc_RestoreZero(NULL, block, fp);
-               arch_irn_add_flags(restore, arch_irn_flags_epilog);
-               arch_set_irn_register(restore, sp_reg);
-               be_epilog_set_reg_value(abihelper, sp_reg, restore);
-       } else {
-               /* 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);
-               arch_irn_add_flags(sp, arch_irn_flags_epilog);
-               be_epilog_set_reg_value(abihelper, sp_reg, sp);
-       }
-
        bereturn = be_epilog_create_return(abihelper, dbgi, new_block);
-       arch_irn_add_flags(bereturn, arch_irn_flags_epilog);
-
        return bereturn;
 }
 
@@ -1443,7 +1485,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;
@@ -1476,7 +1518,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);
@@ -1856,7 +1898,7 @@ static ir_node *gen_Proj_Div(ir_node *node)
 
 static ir_node *get_frame_base(void)
 {
-       const arch_register_t *reg = cconv->omit_fp ? sp_reg : fp_reg;
+       const arch_register_t *reg = current_cconv->omit_fp ? sp_reg : fp_reg;
        return be_prolog_get_reg_value(abihelper, reg);
 }
 
@@ -1875,14 +1917,9 @@ static ir_node *gen_Proj_Start(ir_node *node)
        case pn_Start_M:
                return be_prolog_get_memory(abihelper);
        case pn_Start_T_args:
-               /* we should never need this explicitely */
-               return new_r_Bad(get_irn_irg(block));
+               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;
        }
        panic("Unexpected start proj: %ld\n", pn);
 }
@@ -1900,7 +1937,7 @@ static ir_node *gen_Proj_Proj_Start(ir_node *node)
        /* 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 */
@@ -1961,8 +1998,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);
@@ -2042,6 +2077,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);
        }
 }
@@ -2094,7 +2134,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);
+       be_set_transform_function(op_sparc_SubX_t, gen_SubX_t);
+       be_set_transform_function(op_sparc_SubCC_t,gen_SubCC_t);
 }
 
 /**
@@ -2109,20 +2153,22 @@ 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);
+       current_cconv
+               = sparc_decide_calling_convention(get_entity_type(entity), irg);
        create_stacklayout(irg);
 
        be_transform_graph(irg, NULL);
 
        be_abihelper_finish(abihelper);
-       sparc_free_calling_convention(cconv);
+       sparc_free_calling_convention(current_cconv);
 
        frame_type = get_irg_frame_type(irg);
        if (get_type_state(frame_type) == layout_undefined)