X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fsparc%2Fsparc_transform.c;h=9ca4fede8bbea224def987e6800df98dc8830348;hb=67e049d5b177416c8883bbf8f827827bb424126f;hp=8fa46689f5b334d360eb6ef62aea076424b8d50c;hpb=b46a6da6b265982882b0705ed5104a24d0deb154;p=libfirm diff --git a/ir/be/sparc/sparc_transform.c b/ir/be/sparc/sparc_transform.c index 8fa46689f..9ca4fede8 100644 --- a/ir/be/sparc/sparc_transform.c +++ b/ir/be/sparc/sparc_transform.c @@ -61,16 +61,90 @@ DEBUG_ONLY(static firm_dbg_module_t *dbg = NULL;) -static beabi_helper_env_t *abihelper; static const arch_register_t *sp_reg = &sparc_registers[REG_SP]; static const arch_register_t *fp_reg = &sparc_registers[REG_FRAME_POINTER]; -static calling_convention_t *cconv = NULL; +static calling_convention_t *current_cconv = NULL; +static be_stackorder_t *stackorder; static ir_mode *mode_gp; static ir_mode *mode_flags; static ir_mode *mode_fp; static ir_mode *mode_fp2; //static ir_mode *mode_fp4; static pmap *node_to_stack; +static size_t start_mem_offset; +static ir_node *start_mem; +static size_t start_g0_offset; +static ir_node *start_g0; +static size_t start_sp_offset; +static ir_node *start_sp; +static size_t start_fp_offset; +static ir_node *start_fp; +static ir_node *frame_base; +static size_t start_params_offset; +static size_t start_callee_saves_offset; + +static const arch_register_t *const caller_saves[] = { + &sparc_registers[REG_G1], + &sparc_registers[REG_G2], + &sparc_registers[REG_G3], + &sparc_registers[REG_G4], + &sparc_registers[REG_O0], + &sparc_registers[REG_O1], + &sparc_registers[REG_O2], + &sparc_registers[REG_O3], + &sparc_registers[REG_O4], + &sparc_registers[REG_O5], + + &sparc_registers[REG_F0], + &sparc_registers[REG_F1], + &sparc_registers[REG_F2], + &sparc_registers[REG_F3], + &sparc_registers[REG_F4], + &sparc_registers[REG_F5], + &sparc_registers[REG_F6], + &sparc_registers[REG_F7], + &sparc_registers[REG_F8], + &sparc_registers[REG_F9], + &sparc_registers[REG_F10], + &sparc_registers[REG_F11], + &sparc_registers[REG_F12], + &sparc_registers[REG_F13], + &sparc_registers[REG_F14], + &sparc_registers[REG_F15], + &sparc_registers[REG_F16], + &sparc_registers[REG_F17], + &sparc_registers[REG_F18], + &sparc_registers[REG_F19], + &sparc_registers[REG_F20], + &sparc_registers[REG_F21], + &sparc_registers[REG_F22], + &sparc_registers[REG_F23], + &sparc_registers[REG_F24], + &sparc_registers[REG_F25], + &sparc_registers[REG_F26], + &sparc_registers[REG_F27], + &sparc_registers[REG_F28], + &sparc_registers[REG_F29], + &sparc_registers[REG_F30], + &sparc_registers[REG_F31], +}; + +static const arch_register_t *const omit_fp_callee_saves[] = { + &sparc_registers[REG_L0], + &sparc_registers[REG_L1], + &sparc_registers[REG_L2], + &sparc_registers[REG_L3], + &sparc_registers[REG_L4], + &sparc_registers[REG_L5], + &sparc_registers[REG_L6], + &sparc_registers[REG_L7], + &sparc_registers[REG_I0], + &sparc_registers[REG_I1], + &sparc_registers[REG_I2], + &sparc_registers[REG_I3], + &sparc_registers[REG_I4], + &sparc_registers[REG_I5], +}; static inline bool mode_needs_gp_reg(ir_mode *mode) { @@ -251,8 +325,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); } @@ -362,8 +436,8 @@ static ir_node *gen_helper_binopx(ir_node *node, match_flags_t match_flags, assert(match_flags & MATCH_MODE_NEUTRAL); 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); return new_binopx_imm(dbgi, block, new_op1, new_flags, NULL, immediate); } new_op2 = be_transform_node(op2); @@ -376,9 +450,15 @@ static ir_node *gen_helper_binopx(ir_node *node, match_flags_t match_flags, } -static ir_node *get_g0(void) +static ir_node *get_g0(ir_graph *irg) { - return be_prolog_get_reg_value(abihelper, &sparc_registers[REG_G0]); + if (start_g0 == NULL) { + /* this is already the transformed start node */ + ir_node *start = get_irg_start(irg); + assert(is_sparc_Start(start)); + start_g0 = new_r_Proj(start, mode_gp, start_g0_offset); + } + return start_g0; } typedef struct address_t { @@ -769,7 +849,8 @@ static ir_node *gen_Div(ir_node *node) new_right); } } else { - ir_node *left_high = get_g0(); + ir_graph *irg = get_irn_irg(node); + ir_node *left_high = get_g0(irg); if (is_imm_encodeable(right)) { int32_t immediate = get_tarval_long(get_Const_tarval(right)); res = new_bd_sparc_UDiv_imm(dbgi, new_block, left_high, left_low, @@ -792,7 +873,8 @@ static ir_node *gen_Div(ir_node *node) static ir_node *gen_Not(ir_node *node) { ir_node *op = get_Not_op(node); - ir_node *zero = get_g0(); + ir_graph *irg = get_irn_irg(node); + ir_node *zero = get_g0(irg); dbg_info *dbgi = get_irn_dbg_info(node); ir_node *block = be_transform_node(get_nodes_block(node)); ir_node *new_op = be_transform_node(op); @@ -856,16 +938,25 @@ static ir_node *gen_Eor(ir_node *node) static ir_node *gen_Shl(ir_node *node) { + ir_mode *mode = get_irn_mode(node); + if (get_mode_modulo_shift(mode) != 32) + panic("modulo_shift!=32 not supported by sparc backend"); return gen_helper_binop(node, MATCH_NONE, new_bd_sparc_Sll_reg, new_bd_sparc_Sll_imm); } static ir_node *gen_Shr(ir_node *node) { + ir_mode *mode = get_irn_mode(node); + if (get_mode_modulo_shift(mode) != 32) + panic("modulo_shift!=32 not supported by sparc backend"); return gen_helper_binop(node, MATCH_NONE, new_bd_sparc_Srl_reg, new_bd_sparc_Srl_imm); } static ir_node *gen_Shrs(ir_node *node) { + ir_mode *mode = get_irn_mode(node); + if (get_mode_modulo_shift(mode) != 32) + panic("modulo_shift!=32 not supported by sparc backend"); return gen_helper_binop(node, MATCH_NONE, new_bd_sparc_Sra_reg, new_bd_sparc_Sra_imm); } @@ -889,7 +980,7 @@ static ir_node *gen_Minus(ir_node *node) dbgi = get_irn_dbg_info(node); op = get_Minus_op(node); new_op = be_transform_node(op); - zero = get_g0(); + zero = get_g0(get_irn_irg(node)); return new_bd_sparc_Sub_reg(dbgi, block, zero, new_op); } @@ -951,9 +1042,10 @@ static ir_node *gen_Const(ir_node *node) value = get_tarval_long(tv); if (value == 0) { - return get_g0(); + return get_g0(get_irn_irg(node)); } else if (sparc_is_value_imm_encodeable(value)) { - return new_bd_sparc_Or_imm(dbgi, block, get_g0(), NULL, value); + ir_graph *irg = get_irn_irg(node); + return new_bd_sparc_Or_imm(dbgi, block, get_g0(irg), NULL, value); } else { ir_node *hi = new_bd_sparc_SetHi(dbgi, block, NULL, value); if ((value & 0x3ff) != 0) { @@ -994,7 +1086,7 @@ static ir_node *gen_SwitchJmp(ir_node *node) long default_pn = get_Cond_default_proj(node); ir_entity *entity; ir_node *table_address; - ir_node *index; + ir_node *idx; ir_node *load; ir_node *address; @@ -1008,9 +1100,9 @@ static ir_node *gen_SwitchJmp(ir_node *node) /* 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, + 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); @@ -1211,7 +1303,7 @@ static ir_node *gen_Conv(ir_node *node) ir_node *op = get_Conv_op(node); ir_mode *src_mode = get_irn_mode(op); ir_mode *dst_mode = get_irn_mode(node); - dbg_info *dbg = get_irn_dbg_info(node); + dbg_info *dbgi = get_irn_dbg_info(node); ir_node *new_op; int src_bits = get_mode_size_bits(src_mode); @@ -1230,21 +1322,21 @@ static ir_node *gen_Conv(ir_node *node) if (mode_is_float(src_mode)) { if (mode_is_float(dst_mode)) { /* float -> float conv */ - return create_fftof(dbg, block, new_op, src_mode, dst_mode); + return create_fftof(dbgi, block, new_op, src_mode, dst_mode); } else { /* float -> int conv */ if (!mode_is_signed(dst_mode)) panic("float to unsigned not implemented yet"); - return create_ftoi(dbg, block, new_op, src_mode); + return create_ftoi(dbgi, block, new_op, src_mode); } } else { /* int -> float conv */ if (src_bits < 32) { - new_op = gen_extension(dbg, block, new_op, src_mode); + new_op = gen_extension(dbgi, block, new_op, src_mode); } else if (src_bits == 32 && !mode_is_signed(src_mode)) { panic("unsigned to float not lowered!"); } - return create_itof(dbg, block, new_op, dst_mode); + return create_itof(dbgi, block, new_op, dst_mode); } } else if (src_mode == mode_b) { panic("ConvB not lowered %+F", node); @@ -1270,9 +1362,9 @@ static ir_node *gen_Conv(ir_node *node) } if (mode_is_signed(min_mode)) { - return gen_sign_extension(dbg, block, new_op, min_bits); + return gen_sign_extension(dbgi, block, new_op, min_bits); } else { - return gen_zero_extension(dbg, block, new_op, min_bits); + return gen_zero_extension(dbgi, block, new_op, min_bits); } } } @@ -1285,7 +1377,8 @@ static ir_node *gen_Unknown(ir_node *node) ir_node *block = be_transform_node(get_nodes_block(node)); return gen_float_const(NULL, block, get_mode_null(mode)); } else if (mode_needs_gp_reg(mode)) { - return get_g0(); + ir_graph *irg = get_irn_irg(node); + return get_g0(irg); } panic("Unexpected Unknown mode"); @@ -1300,7 +1393,7 @@ static ir_type *sparc_get_between_type(void) static ir_type *between_type = NULL; static ir_type *between_type0 = NULL; - if (cconv->omit_fp) { + if (current_cconv->omit_fp) { if (between_type0 == NULL) { between_type0 = new_type_class(new_id_from_str("sparc_between_type")); @@ -1317,43 +1410,73 @@ static ir_type *sparc_get_between_type(void) return between_type; } -static void create_stacklayout(ir_graph *irg) +static ir_type *compute_arg_type(ir_graph *irg) { - ir_entity *entity = get_irg_entity(irg); - ir_type *function_type = get_entity_type(entity); - be_stack_layout_t *layout = be_get_irg_stack_layout(irg); - ir_type *arg_type; - int p; - int n_params; + ir_entity *entity = get_irg_entity(irg); + ir_type *mtp = get_entity_type(entity); + size_t n_params = get_method_n_params(mtp); + ir_entity **param_map = ALLOCANZ(ir_entity*, n_params); - /* calling conventions must be decided by now */ - assert(cconv != NULL); + ir_type *frame_type = get_irg_frame_type(irg); + size_t n_frame_members = get_compound_n_members(frame_type); + size_t f; + size_t i; - /* construct argument type */ - arg_type = new_type_struct(id_mangle_u(get_entity_ident(entity), new_id_from_chars("arg_type", 8))); - n_params = get_method_n_params(function_type); - for (p = 0; p < n_params; ++p) { - reg_or_stackslot_t *param = &cconv->parameters[p]; - char buf[128]; - ident *id; + ir_type *res = new_type_struct(id_mangle_u(get_entity_ident(entity), new_id_from_chars("arg_type", 8))); + + /* 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); - if (param->type == NULL) + param = ¤t_cconv->parameters[num]; + if (param->reg0 != NULL) continue; - snprintf(buf, sizeof(buf), "param_%d", p); - id = new_id_from_str(buf); - param->entity = new_entity(arg_type, id, param->type); - set_entity_offset(param->entity, param->offset); + param_map[num] = member; + /* move to new arg_type */ + set_entity_owner(member, res); + } + + for (i = 0; i < n_params; ++i) { + reg_or_stackslot_t *param = ¤t_cconv->parameters[i]; + ir_entity *entity; + + if (param->reg0 != NULL) + continue; + entity = param_map[i]; + if (entity == NULL) + entity = new_parameter_entity(res, i, param->type); + param->entity = entity; + set_entity_offset(entity, param->offset); } + return res; +} + +static void create_stacklayout(ir_graph *irg) +{ + be_stack_layout_t *layout = be_get_irg_stack_layout(irg); + + /* calling conventions must be decided by now */ + assert(current_cconv != NULL); + memset(layout, 0, sizeof(*layout)); layout->frame_type = get_irg_frame_type(irg); layout->between_type = sparc_get_between_type(); - layout->arg_type = arg_type; + layout->arg_type = compute_arg_type(irg); layout->initial_offset = 0; layout->initial_bias = 0; - layout->sp_relative = cconv->omit_fp; + layout->sp_relative = current_cconv->omit_fp; assert(N_FRAME_TYPES == 3); layout->order[0] = layout->frame_type; @@ -1372,54 +1495,131 @@ 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); + struct obstack *obst = be_get_be_obst(irg); + const arch_register_req_t *req; + size_t n_outs; ir_node *start; size_t i; + size_t o; - /* stackpointer is important at function prolog */ - be_prolog_add_reg(abihelper, sp_reg, + /* start building list of start constraints */ + assert(obstack_object_size(obst) == 0); + + /* calculate number of outputs */ + n_outs = 3; /* memory, zero, sp */ + if (!current_cconv->omit_fp) + ++n_outs; /* framepointer */ + /* function parameters */ + n_outs += current_cconv->n_param_regs; + /* callee saves */ + if (current_cconv->omit_fp) { + n_outs += ARRAY_SIZE(omit_fp_callee_saves); + } + + start = new_bd_sparc_Start(dbgi, new_block, n_outs); + + o = 0; + + /* first output is memory */ + start_mem_offset = o; + arch_set_out_register_req(start, o++, arch_no_register_req); + /* the zero register */ + start_g0_offset = o; + req = be_create_reg_req(obst, &sparc_registers[REG_G0], + arch_register_req_type_ignore); + arch_set_out_register_req(start, o, req); + arch_irn_set_register(start, o, &sparc_registers[REG_G0]); + ++o; + + /* we need an output for the stackpointer */ + start_sp_offset = o; + req = be_create_reg_req(obst, sp_reg, arch_register_req_type_produces_sp | arch_register_req_type_ignore); - be_prolog_add_reg(abihelper, &sparc_registers[REG_G0], - arch_register_req_type_ignore); + arch_set_out_register_req(start, o, req); + arch_irn_set_register(start, o, sp_reg); + ++o; + + if (!current_cconv->omit_fp) { + start_fp_offset = o; + req = be_create_reg_req(obst, fp_reg, arch_register_req_type_ignore); + arch_set_out_register_req(start, o, req); + arch_irn_set_register(start, o, fp_reg); + ++o; + } + /* function parameters in registers */ + start_params_offset = o; for (i = 0; i < get_method_n_params(function_type); ++i) { - const reg_or_stackslot_t *param = &cconv->parameters[i]; - if (param->reg0 != NULL) { - be_prolog_add_reg(abihelper, param->reg0, - arch_register_req_type_none); + const reg_or_stackslot_t *param = ¤t_cconv->parameters[i]; + const arch_register_t *reg0 = param->reg0; + const arch_register_t *reg1 = param->reg1; + if (reg0 != NULL) { + arch_set_out_register_req(start, o, reg0->single_req); + arch_irn_set_register(start, o, reg0); + ++o; } - if (param->reg1 != NULL) { - be_prolog_add_reg(abihelper, param->reg1, - arch_register_req_type_none); + if (reg1 != NULL) { + arch_set_out_register_req(start, o, reg1->single_req); + arch_irn_set_register(start, o, reg1); + ++o; } } /* we need the values of the callee saves (Note: non omit-fp mode has no * callee saves) */ - if (cconv->omit_fp) { + start_callee_saves_offset = o; + if (current_cconv->omit_fp) { size_t n_callee_saves = ARRAY_SIZE(omit_fp_callee_saves); size_t c; for (c = 0; c < n_callee_saves; ++c) { - be_prolog_add_reg(abihelper, omit_fp_callee_saves[c], - arch_register_req_type_none); + const arch_register_t *reg = omit_fp_callee_saves[c]; + arch_set_out_register_req(start, o, reg->single_req); + arch_irn_set_register(start, o, reg); + ++o; } - } else { - be_prolog_add_reg(abihelper, fp_reg, arch_register_req_type_ignore); } + assert(n_outs == o); - start = be_prolog_create_start(abihelper, dbgi, new_block); return start; } +static ir_node *get_initial_sp(ir_graph *irg) +{ + if (start_sp == NULL) { + ir_node *start = get_irg_start(irg); + start_sp = new_r_Proj(start, mode_gp, start_sp_offset); + } + return start_sp; +} + +static ir_node *get_initial_fp(ir_graph *irg) +{ + if (start_fp == NULL) { + ir_node *start = get_irg_start(irg); + start_fp = new_r_Proj(start, mode_gp, start_fp_offset); + } + return start_fp; +} + +static ir_node *get_initial_mem(ir_graph *irg) +{ + if (start_mem == NULL) { + ir_node *start = get_irg_start(irg); + start_mem = new_r_Proj(start, mode_M, start_mem_offset); + } + return start_mem; +} + static ir_node *get_stack_pointer_for(ir_node *node) { /* get predecessor in stack_order list */ - ir_node *stack_pred = be_get_stack_pred(abihelper, node); + ir_node *stack_pred = be_get_stack_pred(stackorder, node); ir_node *stack; if (stack_pred == NULL) { /* first stack user in the current block. We can simply use the * initial sp_proj for it */ - ir_node *sp_proj = be_prolog_get_reg_value(abihelper, sp_reg); - return sp_proj; + ir_graph *irg = get_irn_irg(node); + return get_initial_sp(irg); } be_transform_node(stack_pred); @@ -1437,47 +1637,68 @@ static ir_node *get_stack_pointer_for(ir_node *node) static ir_node *gen_Return(ir_node *node) { ir_node *block = get_nodes_block(node); + ir_graph *irg = get_irn_irg(node); ir_node *new_block = be_transform_node(block); dbg_info *dbgi = get_irn_dbg_info(node); ir_node *mem = get_Return_mem(node); ir_node *new_mem = be_transform_node(mem); ir_node *sp = get_stack_pointer_for(node); size_t n_res = get_Return_n_ress(node); + struct obstack *be_obst = be_get_be_obst(irg); ir_node *bereturn; + ir_node **in; + const arch_register_req_t **reqs; size_t i; + size_t p; + size_t n_ins; + + /* estimate number of return values */ + n_ins = 2 + n_res; /* memory + stackpointer, return values */ + if (current_cconv->omit_fp) + n_ins += ARRAY_SIZE(omit_fp_callee_saves); + + in = ALLOCAN(ir_node*, n_ins); + reqs = OALLOCN(be_obst, const arch_register_req_t*, n_ins); + p = 0; - be_epilog_begin(abihelper); - be_epilog_set_memory(abihelper, new_mem); - /* connect stack pointer with initial stack pointer. fix_stack phase - will later serialize all stack pointer adjusting nodes */ - be_epilog_add_reg(abihelper, sp_reg, - arch_register_req_type_produces_sp | arch_register_req_type_ignore, - sp); + in[p] = new_mem; + reqs[p] = arch_no_register_req; + ++p; + + in[p] = sp; + reqs[p] = sp_reg->single_req; + ++p; /* result values */ for (i = 0; i < n_res; ++i) { ir_node *res_value = get_Return_res(node, i); ir_node *new_res_value = be_transform_node(res_value); - const reg_or_stackslot_t *slot = &cconv->results[i]; + const reg_or_stackslot_t *slot = ¤t_cconv->results[i]; const arch_register_t *reg = slot->reg0; assert(slot->reg1 == NULL); - be_epilog_add_reg(abihelper, reg, arch_register_req_type_none, - new_res_value); + in[p] = new_res_value; + reqs[p] = reg->single_req; + ++p; } /* callee saves */ - if (cconv->omit_fp) { - size_t n_callee_saves = ARRAY_SIZE(omit_fp_callee_saves); - size_t i; + if (current_cconv->omit_fp) { + ir_node *start = get_irg_start(irg); + size_t n_callee_saves = ARRAY_SIZE(omit_fp_callee_saves); for (i = 0; i < n_callee_saves; ++i) { const arch_register_t *reg = omit_fp_callee_saves[i]; + ir_mode *mode = reg->reg_class->mode; ir_node *value - = be_prolog_get_reg_value(abihelper, reg); - be_epilog_add_reg(abihelper, reg, arch_register_req_type_none, - value); + = new_r_Proj(start, mode, i + start_callee_saves_offset); + in[p] = value; + reqs[p] = reg->single_req; + ++p; } } + assert(p == n_ins); + + bereturn = new_bd_sparc_Return_reg(dbgi, new_block, n_ins, in); + arch_set_in_register_reqs(bereturn, reqs); - bereturn = be_epilog_create_return(abihelper, dbgi, new_block); return bereturn; } @@ -1555,16 +1776,17 @@ static ir_node *gen_Call(ir_node *node) dbg_info *dbgi = get_irn_dbg_info(node); ir_type *type = get_Call_type(node); size_t n_params = get_Call_n_params(node); - size_t n_param_regs = sizeof(param_regs)/sizeof(param_regs[0]); /* max inputs: memory, callee, register arguments */ - int max_inputs = 2 + n_param_regs; - ir_node **in = ALLOCAN(ir_node*, max_inputs); ir_node **sync_ins = ALLOCAN(ir_node*, n_params); struct obstack *obst = be_get_be_obst(irg); - const arch_register_req_t **in_req - = OALLOCNZ(obst, const arch_register_req_t*, max_inputs); calling_convention_t *cconv = sparc_decide_calling_convention(type, NULL); + size_t n_param_regs = cconv->n_param_regs; + /* param-regs + mem + stackpointer + callee */ + unsigned max_inputs = 3 + n_param_regs; + ir_node **in = ALLOCAN(ir_node*, max_inputs); + const arch_register_req_t **in_req + = OALLOCNZ(obst, const arch_register_req_t*, max_inputs); int in_arity = 0; int sync_arity = 0; int n_caller_saves @@ -1649,7 +1871,6 @@ static ir_node *gen_Call(ir_node *node) set_irn_pinned(str, op_pin_state_floats); sync_ins[sync_arity++] = str; } - assert(in_arity <= max_inputs); /* construct memory input */ if (sync_arity == 0) { @@ -1667,6 +1888,7 @@ static ir_node *gen_Call(ir_node *node) in_req[in_arity] = sparc_reg_classes[CLASS_sparc_gp].class_req; ++in_arity; } + assert(in_arity <= (int)max_inputs); /* outputs: * - memory @@ -1721,10 +1943,6 @@ static ir_node *gen_Sel(ir_node *node) /* must be the frame pointer all other sels must have been lowered * already */ assert(is_Proj(ptr) && is_Start(get_Proj_pred(ptr))); - /* we should not have value types from parameters anymore - they should be - lowered */ - assert(get_entity_owner(entity) != - get_method_value_param_type(get_entity_type(get_irg_entity(get_irn_irg(node))))); return new_bd_sparc_FrameAddr(dbgi, new_block, new_ptr, entity, 0); } @@ -1879,16 +2097,23 @@ static ir_node *gen_Proj_Div(ir_node *node) ir_node *pred = get_Proj_pred(node); ir_node *new_pred = be_transform_node(pred); long pn = get_Proj_proj(node); + ir_mode *res_mode; - assert(is_sparc_SDiv(new_pred) || is_sparc_UDiv(new_pred) - || is_sparc_fdiv(new_pred)); + if (is_sparc_SDiv(new_pred) || is_sparc_UDiv(new_pred)) { + res_mode = mode_gp; + } else if (is_sparc_fdiv(new_pred)) { + res_mode = get_Div_resmode(pred); + } else { + panic("sparc backend: Div transformed to something unexpected: %+F", + new_pred); + } assert((int)pn_sparc_SDiv_res == (int)pn_sparc_UDiv_res); assert((int)pn_sparc_SDiv_M == (int)pn_sparc_UDiv_M); assert((int)pn_sparc_SDiv_res == (int)pn_sparc_fdiv_res); assert((int)pn_sparc_SDiv_M == (int)pn_sparc_fdiv_M); switch (pn) { case pn_Div_res: - return new_r_Proj(new_pred, mode_gp, pn_sparc_SDiv_res); + return new_r_Proj(new_pred, res_mode, pn_sparc_SDiv_res); case pn_Div_M: return new_r_Proj(new_pred, mode_gp, pn_sparc_SDiv_M); default: @@ -1897,10 +2122,16 @@ static ir_node *gen_Proj_Div(ir_node *node) panic("Unsupported Proj from Div"); } -static ir_node *get_frame_base(void) +static ir_node *get_frame_base(ir_graph *irg) { - const arch_register_t *reg = cconv->omit_fp ? sp_reg : fp_reg; - return be_prolog_get_reg_value(abihelper, reg); + if (frame_base == NULL) { + if (current_cconv->omit_fp) { + frame_base = get_initial_sp(irg); + } else { + frame_base = get_initial_fp(irg); + } + } + return frame_base; } static ir_node *gen_Proj_Start(ir_node *node) @@ -1915,12 +2146,14 @@ static ir_node *gen_Proj_Start(ir_node *node) case pn_Start_X_initial_exec: /* exchange ProjX with a jump */ return new_bd_sparc_Ba(NULL, new_block); - case pn_Start_M: - return be_prolog_get_memory(abihelper); + case pn_Start_M: { + ir_graph *irg = get_irn_irg(node); + return get_initial_mem(irg); + } case pn_Start_T_args: return new_r_Bad(get_irn_irg(block), mode_T); case pn_Start_P_frame_base: - return get_frame_base(); + return get_frame_base(get_irn_irg(block)); } panic("Unexpected start proj: %ld\n", pn); } @@ -1929,31 +2162,39 @@ static ir_node *gen_Proj_Proj_Start(ir_node *node) { long pn = get_Proj_proj(node); ir_node *block = get_nodes_block(node); + ir_graph *irg = get_irn_irg(node); ir_node *new_block = be_transform_node(block); - ir_entity *entity = get_irg_entity(current_ir_graph); + ir_entity *entity = get_irg_entity(irg); ir_type *method_type = get_entity_type(entity); ir_type *param_type = get_method_param_type(method_type, pn); + ir_node *args = get_Proj_pred(node); + ir_node *start = get_Proj_pred(args); + ir_node *new_start = be_transform_node(start); const reg_or_stackslot_t *param; /* Proj->Proj->Start must be a method argument */ assert(get_Proj_proj(get_Proj_pred(node)) == pn_Start_T_args); - param = &cconv->parameters[pn]; + param = ¤t_cconv->parameters[pn]; if (param->reg0 != NULL) { /* argument transmitted in register */ - ir_mode *mode = get_type_mode(param_type); - const arch_register_t *reg = param->reg0; - ir_node *value = be_prolog_get_reg_value(abihelper, reg); + ir_mode *mode = get_type_mode(param_type); + const arch_register_t *reg = param->reg0; + ir_mode *reg_mode = reg->reg_class->mode; + long pn = param->reg_offset + start_params_offset; + ir_node *value = new_r_Proj(new_start, reg_mode, pn); if (mode_is_float(mode)) { + const arch_register_t *reg1 = param->reg1; ir_node *value1 = NULL; - if (param->reg1 != NULL) { - value1 = be_prolog_get_reg_value(abihelper, param->reg1); + if (reg1 != NULL) { + ir_mode *reg1_mode = reg1->reg_class->mode; + value1 = new_r_Proj(new_start, reg1_mode, pn+1); } else if (param->entity != NULL) { - ir_node *fp = be_prolog_get_reg_value(abihelper, fp_reg); - ir_node *mem = be_prolog_get_memory(abihelper); + ir_node *fp = get_initial_fp(irg); + ir_node *mem = get_initial_mem(irg); ir_node *ld = new_bd_sparc_Ld_imm(NULL, new_block, fp, mem, mode_gp, param->entity, 0, true); @@ -1966,9 +2207,9 @@ static ir_node *gen_Proj_Proj_Start(ir_node *node) return value; } else { /* argument transmitted on stack */ - ir_node *mem = be_prolog_get_memory(abihelper); - ir_mode *mode = get_type_mode(param->type); - ir_node *base = get_frame_base(); + ir_node *mem = get_initial_mem(irg); + ir_mode *mode = get_type_mode(param->type); + ir_node *base = get_frame_base(irg); ir_node *load; ir_node *value; @@ -2160,15 +2401,22 @@ void sparc_transform_graph(ir_graph *irg) mode_flags = mode_Bu; //mode_fp4 = ? - abihelper = be_abihelper_prepare(irg); - be_collect_stacknodes(abihelper); - cconv = sparc_decide_calling_convention(get_entity_type(entity), irg); + start_mem = NULL; + start_g0 = NULL; + start_sp = NULL; + start_fp = NULL; + frame_base = NULL; + + stackorder = be_collect_stacknodes(irg); + current_cconv + = sparc_decide_calling_convention(get_entity_type(entity), irg); create_stacklayout(irg); + be_add_parameter_entity_stores(irg); be_transform_graph(irg, NULL); - be_abihelper_finish(abihelper); - sparc_free_calling_convention(cconv); + be_free_stackorder(stackorder); + sparc_free_calling_convention(current_cconv); frame_type = get_irg_frame_type(irg); if (get_type_state(frame_type) == layout_undefined)