X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fia32%2Fbearch_ia32.c;h=765cfdb42bdd58c6f3bb052065be2d8d1642a6d5;hb=53d7517e84d32d3a5b554eb05e8e1e777d7a6920;hp=a293d7fa326bfec22241990d67e9357db88d5a15;hpb=f84b4c9f7958e6c795e34a0666016198d9ff02c9;p=libfirm diff --git a/ir/be/ia32/bearch_ia32.c b/ir/be/ia32/bearch_ia32.c index a293d7fa3..765cfdb42 100644 --- a/ir/be/ia32/bearch_ia32.c +++ b/ir/be/ia32/bearch_ia32.c @@ -62,7 +62,6 @@ #include "be.h" #include "be_t.h" #include "beirgmod.h" -#include "be_dbgout.h" #include "beblocksched.h" #include "bespillutil.h" #include "bespillslots.h" @@ -190,14 +189,6 @@ static ir_node *ia32_get_admissible_noreg(ir_node *irn, int pos) } } -/** - * The IA32 ABI callback object. - */ -typedef struct { - be_abi_call_flags_bits_t flags; /**< The call flags. */ - ir_graph *irg; /**< The associated graph. */ -} ia32_abi_env_t; - static ir_entity *ia32_get_frame_entity(const ir_node *irn) { return is_ia32_irn(irn) ? get_ia32_frame_ent(irn) : NULL; @@ -672,7 +663,7 @@ static void ia32_prepare_graph(ir_graph *irg) /* do local optimizations (mainly CSE) */ optimize_graph_df(irg); /* backend code expects that outedges are always enabled */ - edges_assure(irg); + assure_edges(irg); if (irg_data->dump) dump_ir_graph(irg, "transformed"); @@ -683,7 +674,7 @@ static void ia32_prepare_graph(ir_graph *irg) /* do code placement, to optimize the position of constants */ place_code(irg); /* backend code expects that outedges are always enabled */ - edges_assure(irg); + assure_edges(irg); if (irg_data->dump) dump_ir_graph(irg, "place"); @@ -733,7 +724,6 @@ ir_node *ia32_turn_back_am(ir_node *node) /* rewire mem-proj */ if (get_irn_mode(node) == mode_T) { - const ir_edge_t *edge; foreach_out_edge(node, edge) { ir_node *out = get_edge_src_irn(edge); if (get_irn_mode(out) == mode_M) { @@ -980,16 +970,14 @@ static ir_node* create_spproj(ir_node *node, ir_node *pred, int pos) */ static void transform_MemPerm(ir_node *node) { - ir_node *block = get_nodes_block(node); - ir_graph *irg = get_irn_irg(node); - ir_node *sp = be_get_initial_reg_value(irg, &ia32_registers[REG_ESP]); - int arity = be_get_MemPerm_entity_arity(node); - ir_node **pops = ALLOCAN(ir_node*, arity); - ir_node *in[1]; - ir_node *keep; - int i; - const ir_edge_t *edge; - const ir_edge_t *next; + ir_node *block = get_nodes_block(node); + ir_graph *irg = get_irn_irg(node); + ir_node *sp = be_get_initial_reg_value(irg, &ia32_registers[REG_ESP]); + int arity = be_get_MemPerm_entity_arity(node); + ir_node **pops = ALLOCAN(ir_node*, arity); + ir_node *in[1]; + ir_node *keep; + int i; /* create Pushs */ for (i = 0; i < arity; ++i) { @@ -1050,7 +1038,7 @@ static void transform_MemPerm(ir_node *node) sched_add_before(node, keep); /* exchange memprojs */ - foreach_out_edge_safe(node, edge, next) { + foreach_out_edge_safe(node, edge) { ir_node *proj = get_edge_src_irn(edge); int p = get_Proj_proj(proj); @@ -1186,7 +1174,7 @@ static void introduce_epilog(ir_node *ret) ir_node *block = get_nodes_block(ret); ir_node *first_sp = get_irn_n(ret, n_be_Return_sp); ir_node *curr_sp = first_sp; - ir_mode *mode_gp = mode_Iu; + ir_mode *mode_gp = ia32_reg_classes[CLASS_ia32_gp].mode; if (!layout->sp_relative) { int n_ebp = determine_ebp_input(ret); @@ -1257,7 +1245,6 @@ static void introduce_prolog_epilog(ir_graph *irg) ir_node *incsp; curr_sp = new_r_Proj(push, mode_gp, pn_ia32_Push_stack); - mem = new_r_Proj(push, mode_M, pn_ia32_Push_M); arch_set_irn_register(curr_sp, sp); sched_add_after(start, push); @@ -1387,11 +1374,11 @@ static void ia32_init_graph(ir_graph *irg) struct obstack *obst = be_get_be_obst(irg); ia32_irg_data_t *irg_data = OALLOCZ(obst, ia32_irg_data_t); - irg_data->dump = (be_get_irg_options(irg)->dump_flags & DUMP_BE) ? 1 : 0; + irg_data->dump = (be_options.dump_flags & DUMP_BE) ? 1 : 0; if (gprof) { /* Linux gprof implementation needs base pointer */ - be_get_irg_options(irg)->omit_fp = 0; + be_options.omit_fp = 0; } be_birg_from_irg(irg)->isa_link = irg_data; @@ -1688,7 +1675,6 @@ static ir_node *ia32_create_trampoline_fkt(ir_node *block, ir_node *mem, ir_node p = new_r_Add(block, p, one, mode); st = new_r_Store(block, mem, p, callee, cons_none); mem = new_r_Proj(st, mode_M, pn_Store_M); - p = new_r_Add(block, p, four, mode); return mem; } @@ -1727,10 +1713,10 @@ static backend_params ia32_backend_params = { */ static void ia32_init(void) { - ir_mode *mode_long_long; - ir_mode *mode_unsigned_long_long; - ir_type *type_long_long; - ir_type *type_unsigned_long_long; + ir_mode *mode_long_long; + ir_mode *mode_unsigned_long_long; + ir_type *type_long_long; + ir_type *type_unsigned_long_long; ia32_setup_cg_config(); @@ -1743,7 +1729,7 @@ static void ia32_init(void) ia32_mode_E = new_float_mode("E", irma_x86_extended_float, 15, 63); ia32_type_E = new_type_primitive(ia32_mode_E); set_type_size_bytes(ia32_type_E, 12); - set_type_alignment_bytes(ia32_type_E, 16); + set_type_alignment_bytes(ia32_type_E, 4); mode_long_long = new_int_mode("long long", irma_twos_complement, 64, 1, 64); type_long_long = new_type_primitive(mode_long_long); @@ -1763,6 +1749,7 @@ static void ia32_init(void) } ia32_register_init(); + obstack_init(&opcodes_obst); ia32_create_opcodes(&ia32_irn_ops); } @@ -1773,6 +1760,7 @@ static void ia32_finish(void) between_type = NULL; } ia32_free_opcodes(); + obstack_free(&opcodes_obst, NULL); } /** @@ -1927,10 +1915,8 @@ static void ia32_get_call_abi(ir_type *method_type, be_abi_call_t *abi) be_abi_call_flags_t call_flags = be_abi_call_get_flags(abi); /* set abi flags for calls */ - call_flags.bits.store_args_sequential = 0; /* call_flags.bits.try_omit_fp not changed: can handle both settings */ - call_flags.bits.fp_free = 0; /* the frame pointer is fixed in IA32 */ - call_flags.bits.call_has_imm = 0; /* No call immediate, we handle this by ourselves */ + call_flags.bits.call_has_imm = false; /* No call immediate, we handle this by ourselves */ /* set parameter passing style */ be_abi_call_set_flags(abi, call_flags, &ia32_abi_callbacks); @@ -2041,6 +2027,7 @@ static int ia32_is_valid_clobber(const char *clobber) static void ia32_lower_for_target(void) { + ir_mode *mode_gp = ia32_reg_classes[CLASS_ia32_gp].mode; size_t i, n_irgs = get_irp_n_irgs(); /* perform doubleword lowering */ @@ -2065,6 +2052,12 @@ static void ia32_lower_for_target(void) lower_floating_point(); } + for (i = 0; i < n_irgs; ++i) { + ir_graph *irg = get_irp_irg(i); + /* break up switches with wide ranges */ + lower_switch(irg, 4, 256, mode_gp); + } + ir_prepare_dw_lowering(&lower_dw_params); ir_lower_dw_ops(); @@ -2072,8 +2065,6 @@ static void ia32_lower_for_target(void) ir_graph *irg = get_irp_irg(i); /* lower for mode_b stuff */ ir_lower_mode_b(irg, mode_Iu); - /* break up switches with wide ranges */ - lower_switch(irg, 4, 256, false); } for (i = 0; i < n_irgs; ++i) {