sparc: support va_start
[libfirm] / ir / be / sparc / sparc_transform.c
index e4f5dd1..67267c5 100644 (file)
@@ -83,52 +83,6 @@ 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],
@@ -392,19 +346,19 @@ static ir_node *gen_helper_unfpop(ir_node *node, ir_mode *mode,
                                   new_unop_fp_func new_func_double,
                                   new_unop_fp_func new_func_quad)
 {
-       ir_node  *block   = be_transform_node(get_nodes_block(node));
-       ir_node  *op1     = get_binop_left(node);
-       ir_node  *new_op1 = be_transform_node(op1);
-       dbg_info *dbgi    = get_irn_dbg_info(node);
-       unsigned  bits    = get_mode_size_bits(mode);
+       ir_node  *block  = be_transform_node(get_nodes_block(node));
+       ir_node  *op     = get_unop_op(node);
+       ir_node  *new_op = be_transform_node(op);
+       dbg_info *dbgi   = get_irn_dbg_info(node);
+       unsigned  bits   = get_mode_size_bits(mode);
 
        switch (bits) {
        case 32:
-               return new_func_single(dbgi, block, new_op1, mode);
+               return new_func_single(dbgi, block, new_op, mode);
        case 64:
-               return new_func_double(dbgi, block, new_op1, mode);
+               return new_func_double(dbgi, block, new_op, mode);
        case 128:
-               return new_func_quad(dbgi, block, new_op1, mode);
+               return new_func_quad(dbgi, block, new_op, mode);
        default:
                break;
        }
@@ -641,9 +595,9 @@ static ir_node *gen_SubX_t(ir_node *node)
                                 new_bd_sparc_SubX_reg, new_bd_sparc_SubX_imm);
 }
 
-static ir_node *create_ldf(dbg_info *dbgi, ir_node *block, ir_node *ptr,
-                           ir_node *mem, ir_mode *mode, ir_entity *entity,
-                           long offset, bool is_frame_entity)
+ir_node *create_ldf(dbg_info *dbgi, ir_node *block, ir_node *ptr,
+                    ir_node *mem, ir_mode *mode, ir_entity *entity,
+                    long offset, bool is_frame_entity)
 {
        unsigned bits = get_mode_size_bits(mode);
        assert(mode_is_float(mode));
@@ -660,10 +614,10 @@ static ir_node *create_ldf(dbg_info *dbgi, ir_node *block, ir_node *ptr,
        }
 }
 
-static ir_node *create_stf(dbg_info *dbgi, ir_node *block, ir_node *value,
-                           ir_node *ptr, ir_node *mem, ir_mode *mode,
-                           ir_entity *entity, long offset,
-                           bool is_frame_entity)
+ir_node *create_stf(dbg_info *dbgi, ir_node *block, ir_node *value,
+                    ir_node *ptr, ir_node *mem, ir_mode *mode,
+                    ir_entity *entity, long offset,
+                    bool is_frame_entity)
 {
        unsigned bits = get_mode_size_bits(mode);
        assert(mode_is_float(mode));
@@ -1114,33 +1068,49 @@ static ir_node *gen_Cond(ir_node *node)
 {
        ir_node    *selector = get_Cond_selector(node);
        ir_mode    *mode     = get_irn_mode(selector);
-       ir_mode    *cmp_mode;
        ir_node    *block;
        ir_node    *flag_node;
        bool        is_unsigned;
        ir_relation relation;
        dbg_info   *dbgi;
 
-       // switch/case jumps
+       /* switch/case jumps */
        if (mode != mode_b) {
                return gen_SwitchJmp(node);
        }
 
-       // regular if/else jumps
-       assert(is_Cmp(selector));
+       block = be_transform_node(get_nodes_block(node));
+       dbgi  = get_irn_dbg_info(node);
 
-       cmp_mode = get_cmp_mode(selector);
+       /* regular if/else jumps */
+       if (is_Cmp(selector)) {
+               ir_mode *cmp_mode;
 
-       block       = be_transform_node(get_nodes_block(node));
-       dbgi        = get_irn_dbg_info(node);
-       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);
+               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);
+               }
        } else {
-               return new_bd_sparc_Bicc(dbgi, block, flag_node, relation, is_unsigned);
+               /* 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);
        }
 }
 
@@ -1349,6 +1319,11 @@ static ir_node *gen_Conv(ir_node *node)
                        return new_op;
                }
 
+               if (dst_mode == mode_b) {
+                       /* mode_b lowering already took care that we only have 0/1 values */
+                       return new_op;
+               }
+
                if (src_bits < dst_bits) {
                        min_bits = src_bits;
                        min_mode = src_mode;
@@ -1384,106 +1359,6 @@ static ir_node *gen_Unknown(ir_node *node)
        panic("Unexpected Unknown mode");
 }
 
-/**
- * Produces the type which sits between the stack args and the locals on the
- * stack.
- */
-static ir_type *sparc_get_between_type(void)
-{
-       static ir_type *between_type  = NULL;
-       static ir_type *between_type0 = NULL;
-
-       if (current_cconv->omit_fp) {
-               if (between_type0 == NULL) {
-                       between_type0
-                               = new_type_class(new_id_from_str("sparc_between_type"));
-                       set_type_size_bytes(between_type0, 0);
-               }
-               return between_type0;
-       }
-
-       if (between_type == NULL) {
-               between_type = new_type_class(new_id_from_str("sparc_between_type"));
-               set_type_size_bytes(between_type, SPARC_MIN_STACKSIZE);
-       }
-
-       return between_type;
-}
-
-static ir_type *compute_arg_type(ir_graph *irg)
-{
-       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);
-
-       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;
-
-       ir_type *res = new_type_struct(id_mangle_u(get_entity_ident(entity), new_id_from_chars("arg_type", 8)));
-
-       /* 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;
-
-               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       = compute_arg_type(irg);
-       layout->initial_offset = 0;
-       layout->initial_bias   = 0;
-       layout->sp_relative    = current_cconv->omit_fp;
-
-       assert(N_FRAME_TYPES == 3);
-       layout->order[0] = layout->frame_type;
-       layout->order[1] = layout->between_type;
-       layout->order[2] = layout->arg_type;
-}
-
 /**
  * transform the start node to the prolog code
  */
@@ -1522,28 +1397,30 @@ static ir_node *gen_Start(ir_node *node)
 
        /* first output is memory */
        start_mem_offset = o;
-       arch_set_out_register_req(start, o++, arch_no_register_req);
+       arch_set_irn_register_req_out(start, o, arch_no_register_req);
+       ++o;
+
        /* 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]);
+       arch_set_irn_register_req_out(start, o, req);
+       arch_set_irn_register_out(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);
-       arch_set_out_register_req(start, o, req);
-       arch_irn_set_register(start, o, sp_reg);
+       arch_set_irn_register_req_out(start, o, req);
+       arch_set_irn_register_out(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);
+               arch_set_irn_register_req_out(start, o, req);
+               arch_set_irn_register_out(start, o, fp_reg);
                ++o;
        }
 
@@ -1554,13 +1431,13 @@ static ir_node *gen_Start(ir_node *node)
                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);
+                       arch_set_irn_register_req_out(start, o, reg0->single_req);
+                       arch_set_irn_register_out(start, o, reg0);
                        ++o;
                }
                if (reg1 != NULL) {
-                       arch_set_out_register_req(start, o, reg1->single_req);
-                       arch_irn_set_register(start, o, reg1);
+                       arch_set_irn_register_req_out(start, o, reg1->single_req);
+                       arch_set_irn_register_out(start, o, reg1);
                        ++o;
                }
        }
@@ -1572,8 +1449,8 @@ static ir_node *gen_Start(ir_node *node)
                size_t c;
                for (c = 0; c < n_callee_saves; ++c) {
                        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);
+                       arch_set_irn_register_req_out(start, o, reg->single_req);
+                       arch_set_irn_register_out(start, o, reg);
                        ++o;
                }
        }
@@ -1674,10 +1551,9 @@ static ir_node *gen_Return(ir_node *node)
                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          = &current_cconv->results[i];
-               const arch_register_t    *reg           = slot->reg0;
-               assert(slot->reg1 == NULL);
+               assert(slot->req1 == NULL);
                in[p]   = new_res_value;
-               reqs[p] = reg->single_req;
+               reqs[p] = slot->req0;
                ++p;
        }
        /* callee saves */
@@ -1697,7 +1573,7 @@ static ir_node *gen_Return(ir_node *node)
        assert(p == n_ins);
 
        bereturn = new_bd_sparc_Return_reg(dbgi, new_block, n_ins, in);
-       arch_set_in_register_reqs(bereturn, reqs);
+       arch_set_irn_register_reqs_in(bereturn, reqs);
 
        return bereturn;
 }
@@ -1757,8 +1633,8 @@ static void bitcast_float_to_int(dbg_info *dbgi, ir_node *block,
                set_irn_pinned(ld, op_pin_state_floats);
                result[1] = new_r_Proj(ld2, mode_gp, pn_sparc_Ld_res);
 
-               arch_irn_add_flags(ld, (arch_irn_flags_t)sparc_arch_irn_flag_needs_64bit_spillslot);
-               arch_irn_add_flags(ld2, (arch_irn_flags_t)sparc_arch_irn_flag_needs_64bit_spillslot);
+               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;
@@ -1776,6 +1652,7 @@ 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_ress       = get_method_n_ress(type);
        /* max inputs: memory, callee, register arguments */
        ir_node        **sync_ins     = ALLOCAN(ir_node*, n_params);
        struct obstack  *obst         = be_get_be_obst(irg);
@@ -1790,13 +1667,16 @@ static ir_node *gen_Call(ir_node *node)
        int              in_arity     = 0;
        int              sync_arity   = 0;
        int              n_caller_saves
-               = sizeof(caller_saves)/sizeof(caller_saves[0]);
+               = rbitset_popcount(cconv->caller_saves, N_SPARC_REGISTERS);
        ir_entity       *entity       = NULL;
        ir_node         *new_frame    = get_stack_pointer_for(node);
+       bool             aggregate_return
+               = type->attr.ma.has_compound_ret_parameter;
        ir_node         *incsp;
        int              mem_pos;
        ir_node         *res;
        size_t           p;
+       size_t           r;
        int              i;
        int              o;
        int              out_arity;
@@ -1828,6 +1708,7 @@ static ir_node *gen_Call(ir_node *node)
                ir_mode                  *mode       = get_type_mode(param_type);
                ir_node                  *new_values[2];
                ir_node                  *str;
+               int                       offset;
 
                if (mode_is_float(mode) && param->reg0 != NULL) {
                        unsigned size_bits = get_mode_size_bits(mode);
@@ -1860,13 +1741,16 @@ static ir_node *gen_Call(ir_node *node)
                        mode      = mode_gp;
                }
 
-               /* create a parameter frame if necessary */
+               /* we need to skip over our save area when constructing the call
+                * arguments on stack */
+               offset = param->offset + SPARC_MIN_STACKSIZE;
+
                if (mode_is_float(mode)) {
                        str = create_stf(dbgi, new_block, new_value, incsp, new_mem,
-                                        mode, NULL, param->offset, true);
+                                        mode, NULL, offset, true);
                } else {
                        str = new_bd_sparc_St_imm(dbgi, new_block, new_value, incsp,
-                                                 new_mem, mode, NULL, param->offset, true);
+                                                 new_mem, mode, NULL, offset, true);
                }
                set_irn_pinned(str, op_pin_state_floats);
                sync_ins[sync_arity++] = str;
@@ -1892,25 +1776,39 @@ static ir_node *gen_Call(ir_node *node)
 
        /* outputs:
         *  - memory
+        *  - results
         *  - caller saves
         */
-       out_arity = 1 + n_caller_saves;
+       out_arity = 1 + cconv->n_reg_results + n_caller_saves;
 
        /* create call node */
        if (entity != NULL) {
                res = new_bd_sparc_Call_imm(dbgi, new_block, in_arity, in, out_arity,
-                                           entity, 0);
+                                           entity, 0, aggregate_return);
        } else {
-               res = new_bd_sparc_Call_reg(dbgi, new_block, in_arity, in, out_arity);
+               res = new_bd_sparc_Call_reg(dbgi, new_block, in_arity, in, out_arity,
+                                           aggregate_return);
        }
-       arch_set_in_register_reqs(res, in_req);
+       arch_set_irn_register_reqs_in(res, in_req);
 
        /* create output register reqs */
        o = 0;
-       arch_set_out_register_req(res, o++, arch_no_register_req);
-       for (i = 0; i < n_caller_saves; ++i) {
-               const arch_register_t *reg = caller_saves[i];
-               arch_set_out_register_req(res, o++, reg->single_req);
+       arch_set_irn_register_req_out(res, o++, arch_no_register_req);
+       /* add register requirements for the result regs */
+       for (r = 0; r < n_ress; ++r) {
+               const reg_or_stackslot_t  *result_info = &cconv->results[r];
+               const arch_register_req_t *req         = result_info->req0;
+               if (req != NULL) {
+                       arch_set_irn_register_req_out(res, o++, req);
+               }
+               assert(result_info->req1 == NULL);
+       }
+       for (i = 0; i < N_SPARC_REGISTERS; ++i) {
+               const arch_register_t *reg;
+               if (!rbitset_is_set(cconv->caller_saves, i))
+                       continue;
+               reg = &sparc_registers[i];
+               arch_set_irn_register_req_out(res, o++, reg->single_req);
        }
        assert(o == out_arity);
 
@@ -2018,7 +1916,7 @@ static ir_node *gen_Phi(ir_node *node)
        phi = new_ir_node(dbgi, irg, block, op_Phi, mode, get_irn_arity(node), get_irn_in(node) + 1);
        copy_node_attr(irg, node, phi);
        be_duplicate_deps(node, phi);
-       arch_set_out_register_req(phi, 0, req);
+       arch_set_irn_register_req_out(phi, 0, req);
        be_enqueue_preds(node);
        return phi;
 }
@@ -2045,7 +1943,10 @@ static ir_node *gen_Proj_Load(ir_node *node)
                break;
        case iro_sparc_Ldf:
                if (pn == pn_Load_res) {
-                       return new_rd_Proj(dbgi, new_load, mode_fp, pn_sparc_Ldf_res);
+                       const sparc_load_store_attr_t *attr
+                               = get_sparc_load_store_attr_const(new_load);
+                       ir_mode *mode = attr->load_store_mode;
+                       return new_rd_Proj(dbgi, new_load, mode, pn_sparc_Ldf_res);
                } else if (pn == pn_Load_M) {
                        return new_rd_Proj(dbgi, new_load, mode_M, pn_sparc_Ld_M);
                }
@@ -2097,16 +1998,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:
@@ -2153,16 +2061,13 @@ static ir_node *gen_Proj_Start(ir_node *node)
 
 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(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);
+       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_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 */
@@ -2172,22 +2077,32 @@ static ir_node *gen_Proj_Proj_Start(ir_node *node)
 
        if (param->reg0 != NULL) {
                /* argument transmitted in register */
-               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);
+               long                   new_pn   = param->reg_offset + start_params_offset;
+               ir_node               *value    = new_r_Proj(new_start, reg_mode, new_pn);
+               bool                   is_float = false;
+
+               {
+                       ir_entity *entity      = get_irg_entity(irg);
+                       ir_type   *method_type = get_entity_type(entity);
+                       if (pn < (long)get_method_n_params(method_type)) {
+                               ir_type *param_type = get_method_param_type(method_type, pn);
+                               ir_mode *mode       = get_type_mode(param_type);
+                               is_float = mode_is_float(mode);
+                       }
+               }
 
-               if (mode_is_float(mode)) {
+               if (is_float) {
                        const arch_register_t *reg1 = param->reg1;
                        ir_node *value1 = NULL;
 
                        if (reg1 != NULL) {
                                ir_mode *reg1_mode = reg1->reg_class->mode;
-                               value1 = new_r_Proj(new_start, reg1_mode, pn+1);
+                               value1 = new_r_Proj(new_start, reg1_mode, new_pn+1);
                        } else if (param->entity != NULL) {
-                               ir_node *fp      = get_initial_fp(irg);
-                               ir_node *mem     = get_initial_mem(irg);
+                               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);
@@ -2200,11 +2115,11 @@ static ir_node *gen_Proj_Proj_Start(ir_node *node)
                return value;
        } else {
                /* argument transmitted on stack */
-               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;
+               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;
 
                if (mode_is_float(mode)) {
                        load  = create_ldf(NULL, new_block, base, mem, mode,
@@ -2238,23 +2153,6 @@ static ir_node *gen_Proj_Call(ir_node *node)
        panic("Unexpected Call proj %ld\n", pn);
 }
 
-/**
- * Finds number of output value of a mode_T node which is constrained to
- * a single specific register.
- */
-static int find_out_for_reg(ir_node *node, const arch_register_t *reg)
-{
-       int n_outs = arch_irn_get_n_outs(node);
-       int o;
-
-       for (o = 0; o < n_outs; ++o) {
-               const arch_register_req_t *req = arch_get_out_register_req(node, o);
-               if (req == reg->single_req)
-                       return o;
-       }
-       return -1;
-}
-
 static ir_node *gen_Proj_Proj_Call(ir_node *node)
 {
        long                  pn            = get_Proj_proj(node);
@@ -2263,21 +2161,17 @@ static ir_node *gen_Proj_Proj_Call(ir_node *node)
        ir_type              *function_type = get_Call_type(call);
        calling_convention_t *cconv
                = sparc_decide_calling_convention(function_type, NULL);
-       const reg_or_stackslot_t *res = &cconv->results[pn];
-       const arch_register_t    *reg = res->reg0;
-       ir_mode                  *mode;
-       int                       regn;
+       const reg_or_stackslot_t  *res  = &cconv->results[pn];
+       ir_mode                   *mode = get_irn_mode(node);
+       long                       new_pn = 1 + res->reg_offset;
 
-       assert(res->reg0 != NULL && res->reg1 == NULL);
-       regn = find_out_for_reg(new_call, reg);
-       if (regn < 0) {
-               panic("Internal error in calling convention for return %+F", node);
+       assert(res->req0 != NULL && res->req1 == NULL);
+       if (mode_needs_gp_reg(mode)) {
+               mode = mode_gp;
        }
-       mode = res->reg0->reg_class->mode;
-
        sparc_free_calling_convention(cconv);
 
-       return new_r_Proj(new_call, mode, regn);
+       return new_r_Proj(new_call, mode, new_pn);
 }
 
 /**
@@ -2403,7 +2297,12 @@ void sparc_transform_graph(ir_graph *irg)
        stackorder = be_collect_stacknodes(irg);
        current_cconv
                = sparc_decide_calling_convention(get_entity_type(entity), irg);
-       create_stacklayout(irg);
+       if (sparc_variadic_fixups(irg, current_cconv)) {
+               sparc_free_calling_convention(current_cconv);
+               current_cconv
+                       = sparc_decide_calling_convention(get_entity_type(entity), irg);
+       }
+       sparc_create_stacklayout(irg, current_cconv);
        be_add_parameter_entity_stores(irg);
 
        be_transform_graph(irg, NULL);