X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Farm%2Farm_transform.c;h=c2413d9c11f7bc2d90527bcfd019903f660a7778;hb=3c3425a50a1d721b74a015c6812257e32feeac85;hp=7e7377751a4cc4bbcfd1a83d3b602591c09dca92;hpb=e3b765fcef0e337f4fe2e17d57d2fbaf1912ec79;p=libfirm diff --git a/ir/be/arm/arm_transform.c b/ir/be/arm/arm_transform.c index 7e7377751..c2413d9c1 100644 --- a/ir/be/arm/arm_transform.c +++ b/ir/be/arm/arm_transform.c @@ -21,7 +21,6 @@ * @file * @brief The codegenerator (transform FIRM into arm FIRM) * @author Matthias Braun, Oliver Richter, Tobias Gneist, Michael Beck - * @version $Id$ */ #include "config.h" @@ -36,6 +35,7 @@ #include "iropt_t.h" #include "debug.h" #include "error.h" +#include "util.h" #include "benode.h" #include "beirg.h" @@ -738,7 +738,7 @@ static ir_node *make_shift(ir_node *node, match_flags_t flags, ir_node *new_op2; if (get_mode_modulo_shift(mode) != 32) - panic("modulo shift!=32 not supported by arm backend"); + panic("modulo shift!=32 not supported"); if (flags & MATCH_SIZE_NEUTRAL) { op1 = arm_skip_downconv(op1); @@ -942,7 +942,7 @@ static ir_node *gen_Load(ir_node *node) ir_node *new_load = NULL; if (get_Load_unaligned(node) == align_non_aligned) - panic("arm: unaligned Loads not supported yet"); + panic("unaligned Loads not supported yet"); if (mode_is_float(mode)) { if (USE_FPA(isa)) { @@ -984,7 +984,7 @@ static ir_node *gen_Store(ir_node *node) ir_node *new_store = NULL; if (get_Store_unaligned(node) == align_non_aligned) - panic("arm: unaligned Stores not supported yet"); + panic("unaligned Stores not supported yet"); if (mode_is_float(mode)) { if (USE_FPA(isa)) { @@ -1013,46 +1013,23 @@ static ir_node *gen_Jmp(ir_node *node) return new_bd_arm_Jmp(dbgi, new_block); } -static ir_node *gen_SwitchJmp(ir_node *node) +static ir_node *gen_Switch(ir_node *node) { - ir_node *block = be_transform_node(get_nodes_block(node)); - ir_node *selector = get_Cond_selector(node); - dbg_info *dbgi = get_irn_dbg_info(node); - ir_node *new_op = be_transform_node(selector); - ir_node *const_graph; - ir_node *sub; - - ir_node *proj; - const ir_edge_t *edge; - int min = INT_MAX; - int max = INT_MIN; - int translation; - int pn; - int n_projs; - - foreach_out_edge(node, edge) { - proj = get_edge_src_irn(edge); - assert(is_Proj(proj) && "Only proj allowed at SwitchJmp"); + ir_graph *irg = get_irn_irg(node); + ir_node *block = be_transform_node(get_nodes_block(node)); + ir_node *selector = get_Switch_selector(node); + dbg_info *dbgi = get_irn_dbg_info(node); + ir_node *new_op = be_transform_node(selector); + ir_mode *mode = get_irn_mode(selector); + const ir_switch_table *table = get_Switch_table(node); + unsigned n_outs = get_Switch_n_outs(node); - pn = get_Proj_proj(proj); + table = ir_switch_table_duplicate(irg, table); - min = pnmax ? pn : max; - } - translation = min; - n_projs = max - translation + 1; - - foreach_out_edge(node, edge) { - proj = get_edge_src_irn(edge); - assert(is_Proj(proj) && "Only proj allowed at SwitchJmp"); - - pn = get_Proj_proj(proj) - translation; - set_Proj_proj(proj, pn); - } + /* switch with smaller modes not implemented yet */ + assert(get_mode_size_bits(mode) == 32); - const_graph = create_const_graph_value(dbgi, block, translation); - sub = new_bd_arm_Sub_reg(dbgi, block, new_op, const_graph); - return new_bd_arm_SwitchJmp(dbgi, block, sub, n_projs, get_Cond_default_proj(node) - translation); + return new_bd_arm_SwitchJmp(dbgi, block, new_op, n_outs, table); } static ir_node *gen_Cmp(ir_node *node) @@ -1089,15 +1066,11 @@ static ir_node *gen_Cmp(ir_node *node) static ir_node *gen_Cond(ir_node *node) { ir_node *selector = get_Cond_selector(node); - ir_mode *mode = get_irn_mode(selector); ir_relation relation; ir_node *block; ir_node *flag_node; dbg_info *dbgi; - if (mode != mode_b) { - return gen_SwitchJmp(node); - } assert(is_Cmp(selector)); block = be_transform_node(get_nodes_block(node)); @@ -1320,7 +1293,7 @@ static ir_node *gen_Builtin(ir_node *node) case ir_bk_inner_trampoline: break; } - panic("Builtin %s not implemented in ARM", get_builtin_kind_name(kind)); + panic("Builtin %s not implemented", get_builtin_kind_name(kind)); } /** @@ -1341,7 +1314,7 @@ static ir_node *gen_Proj_Builtin(ir_node *proj) case ir_bk_parity: case ir_bk_popcount: case ir_bk_bswap: - assert(get_Proj_proj(proj) == pn_Builtin_1_result); + assert(get_Proj_proj(proj) == pn_Builtin_max+1); return new_node; case ir_bk_trap: case ir_bk_debugbreak: @@ -1353,7 +1326,7 @@ static ir_node *gen_Proj_Builtin(ir_node *proj) case ir_bk_inner_trampoline: break; } - panic("Builtin %s not implemented in ARM", get_builtin_kind_name(kind)); + panic("Builtin %s not implemented", get_builtin_kind_name(kind)); } static ir_node *gen_Proj_Load(ir_node *node) @@ -1425,16 +1398,6 @@ static ir_node *gen_Proj_Div(ir_node *node) panic("Unsupported Proj from Div"); } -/** - * Transform the Projs from a Cmp. - */ -static ir_node *gen_Proj_Cmp(ir_node *node) -{ - (void) node; - /* we should only be here in case of a Mux node */ - panic("Mux NYI"); -} - static ir_node *gen_Proj_Start(ir_node *node) { ir_node *block = get_nodes_block(node); @@ -1607,11 +1570,10 @@ static ir_node *gen_Proj(ir_node *node) return gen_Proj_CopyB(node); case iro_Div: return gen_Proj_Div(node); - case iro_Cmp: - return gen_Proj_Cmp(node); case iro_Start: return gen_Proj_Start(node); case iro_Cond: + case iro_Switch: /* nothing to do */ return be_duplicate_node(node); case iro_Proj: { @@ -1721,7 +1683,6 @@ static void create_stacklayout(ir_graph *irg) layout->frame_type = get_irg_frame_type(irg); layout->between_type = arm_get_between_type(); layout->arg_type = arg_type; - layout->param_map = NULL; /* TODO */ layout->initial_offset = 0; layout->initial_bias = 0; layout->sp_relative = true; @@ -1758,7 +1719,7 @@ static ir_node *gen_Start(ir_node *node) be_prolog_add_reg(abihelper, param->reg1, arch_register_req_type_none); } /* announce that we need the values of the callee save regs */ - for (i = 0; i < (sizeof(callee_saves)/sizeof(callee_saves[0])); ++i) { + for (i = 0; i != ARRAY_SIZE(callee_saves); ++i) { be_prolog_add_reg(abihelper, callee_saves[i], arch_register_req_type_none); } @@ -1780,7 +1741,7 @@ static ir_node *get_stack_pointer_for(ir_node *node) } be_transform_node(stack_pred); - stack = (ir_node*)pmap_get(node_to_stack, stack_pred); + stack = pmap_get(ir_node, node_to_stack, stack_pred); if (stack == NULL) { return get_stack_pointer_for(stack_pred); } @@ -1798,11 +1759,11 @@ static ir_node *gen_Return(ir_node *node) dbg_info *dbgi = get_irn_dbg_info(node); ir_node *mem = get_Return_mem(node); ir_node *new_mem = be_transform_node(mem); - int n_callee_saves = sizeof(callee_saves)/sizeof(callee_saves[0]); + size_t n_callee_saves = ARRAY_SIZE(callee_saves); ir_node *sp_proj = get_stack_pointer_for(node); - int n_res = get_Return_n_ress(node); + size_t n_res = get_Return_n_ress(node); ir_node *bereturn; - int i; + size_t i; be_epilog_begin(abihelper); be_epilog_set_memory(abihelper, new_mem); @@ -1847,25 +1808,24 @@ static ir_node *gen_Call(ir_node *node) ir_type *type = get_Call_type(node); calling_convention_t *cconv = arm_decide_calling_convention(NULL, type); size_t n_params = get_Call_n_params(node); - size_t n_param_regs = cconv->n_reg_params; + size_t const n_param_regs = cconv->n_reg_params; /* max inputs: memory, callee, register arguments */ - int max_inputs = 2 + n_param_regs; + size_t const max_inputs = 2 + n_param_regs; ir_node **in = ALLOCAN(ir_node*, max_inputs); ir_node **sync_ins = ALLOCAN(ir_node*, max_inputs); struct obstack *obst = be_get_be_obst(irg); 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 - = sizeof(caller_saves)/sizeof(caller_saves[0]); - ir_entity *entity = NULL; - ir_node *incsp = NULL; + size_t in_arity = 0; + size_t sync_arity = 0; + size_t const n_caller_saves = ARRAY_SIZE(caller_saves); + ir_entity *entity = NULL; + ir_node *incsp = NULL; int mem_pos; ir_node *res; size_t p; - int o; - int out_arity; + size_t o; + size_t out_arity; assert(n_params == get_method_n_params(type)); @@ -2102,6 +2062,7 @@ static void arm_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); be_set_transform_function(op_Builtin, gen_Builtin);