X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fmips%2Fbearch_mips.c;h=70fa32d78882b0f07fc61b728d1dd75f85f9249a;hb=c1fdf770d4d000dd5cf22daead32369342c5f5d1;hp=29dbf648e750476e7907d2b3341a01577d911bac;hpb=29bb6875dc277a493d3764d1ef69d05100de03c0;p=libfirm diff --git a/ir/be/mips/bearch_mips.c b/ir/be/mips/bearch_mips.c index 29dbf648e..70fa32d78 100644 --- a/ir/be/mips/bearch_mips.c +++ b/ir/be/mips/bearch_mips.c @@ -23,9 +23,7 @@ * @author Matthias Braun, Mehdi * @version $Id$ */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include "pseudo_irg.h" #include "irgwalk.h" @@ -48,6 +46,8 @@ #include "../benode_t.h" #include "../belower.h" #include "../besched_t.h" +#include "../beblocksched.h" +#include "../beirg_t.h" #include "be.h" #include "../beabi.h" #include "../bemachine.h" @@ -190,8 +190,6 @@ static arch_irn_class_t mips_classify(const ir_node *irn) if (is_cfop(irn)) { return arch_irn_class_branch; - } else if (is_mips_irn(irn)) { - return arch_irn_class_normal; } return 0; @@ -236,10 +234,10 @@ static void mips_set_frame_entity(ir_node *node, ir_entity *entity) mips_load_store_attr_t *attr; if(!is_mips_irn(node)) { - panic("trying to set frame entity on non load/store node %+F\n", node); + panic("trying to set frame entity on non load/store node %+F", node); } if(!mips_is_Load(node) && !mips_is_Store(node)) { - panic("trying to set frame entity on non load/store node %+F\n", node); + panic("trying to set frame entity on non load/store node %+F", node); } attr = get_irn_generic_attr(node); @@ -255,10 +253,10 @@ static void mips_set_frame_offset(ir_node *node, int offset) mips_load_store_attr_t *attr; if(!is_mips_irn(node)) { - panic("trying to set frame offset on non load/store node %+F\n", node); + panic("trying to set frame offset on non load/store node %+F", node); } if(!mips_is_Load(node) && !mips_is_Store(node)) { - panic("trying to set frame offset on non load/store node %+F\n", node); + panic("trying to set frame offset on non load/store node %+F", node); } attr = get_irn_generic_attr(node); @@ -304,174 +302,35 @@ static const arch_irn_ops_t mips_irn_ops = { * |___/ **************************************************/ - -typedef struct { - ir_node *start; - ir_node *end; - unsigned cnt; -} anchor; - -/** - * Ext-Block walker: create a block schedule - */ -static void create_block_list(ir_extblk *blk, void *env) { - anchor *list = env; - int i, n; - - for (i = 0, n = get_extbb_n_blocks(blk); i < n; ++i) { - ir_node *block = get_extbb_block(blk, i); - - set_irn_link(block, NULL); - if (list->start) - set_irn_link(list->end, block); - else - list->start = block; - - list->end = block; - list->cnt += 1; - } -} - -/* return the scheduled block at position pos */ -ir_node *mips_get_sched_block(const mips_code_gen_t *cg, int pos) { - if (0 <= pos && pos < ARR_LEN(cg->bl_list)) - return cg->bl_list[pos]; - return NULL; -} - -/* return the number of scheduled blocks */ -int mips_get_sched_n_blocks(const mips_code_gen_t *cg) { - return ARR_LEN(cg->bl_list); -} - -/* set a block schedule number */ -void mips_set_block_sched_nr(ir_node *block, int nr) { - set_irn_link(block, INT_TO_PTR(nr)); -} - -/* get a block schedule number */ -int mips_get_block_sched_nr(ir_node *block) { - return PTR_TO_INT(get_irn_link(block)); -} - -/** - * Creates a block schedule for the given graph. - */ -static void mips_create_block_sched(mips_code_gen_t *cg) { - anchor list; - ir_node **bl_list, *block; - unsigned i; - - if (cg->bl_list) { - DEL_ARR_F(cg->bl_list); - free_survive_dce(cg->bl_list_sdce); - } - - /* calculate the block schedule here */ - compute_extbb(cg->irg); - - list.start = NULL; - list.end = NULL; - list.cnt = 0; - irg_extblock_walk_graph(cg->irg, NULL, create_block_list, &list); - - - bl_list = NEW_ARR_F(ir_node *, list.cnt); - cg->bl_list_sdce = new_survive_dce(); - for (i = 0, block = list.start; block; block = get_irn_link(block)) { - bl_list[i] = block; - survive_dce_register_irn(cg->bl_list_sdce, &bl_list[i]); - i++; - } - - cg->bl_list = bl_list; -} - -#if 0 -typedef struct _wenv_t { - ir_node *list; -} wenv_t; - -/** - * Walker: link all CopyB nodes - */ -static void collect_copyb_nodes(ir_node *node, void *env) { - wenv_t *wenv = env; - - if (get_irn_op(node) == op_CopyB) { - set_irn_link(node, wenv->list); - wenv->list = node; - } -} -#endif - -static void replace_copyb_nodes(mips_code_gen_t *cg) { -#if 0 - wenv_t env; - ir_node *copy, *next; - ir_node *old_bl, *new_bl, *jmp, *new_jmp, *mem; - const ir_edge_t *edge; - - /* build code for all copyB */ - env.list = NULL; - irg_walk_graph(cg->irg, NULL, collect_copyb_nodes, &env); - - for (copy = env.list; copy; copy = next) { - next = get_irn_link(copy); - - old_bl = get_nodes_block(copy); - part_block(copy); - jmp = get_Block_cfgpred(old_bl, 0); - new_jmp = new_r_Jmp(cg->irg, get_nodes_block(copy)); - - new_bl = new_r_Block(cg->irg, 1, &new_jmp); - set_nodes_block(jmp, new_bl); - - mem = gen_code_for_CopyB(new_bl, copy); - - /* fix copyB's out edges */ - foreach_out_edge(copy, edge) { - ir_node *succ = get_edge_src_irn(edge); - - assert(is_Proj(succ)); - switch (get_Proj_proj(succ)) { - case pn_CopyB_M_regular: - case pn_CopyB_M_except: - exchange(succ, mem); - break; - default: - exchange(succ, get_irg_bad(cg->irg)); - } - } - } -#endif - (void) cg; -} - /** * Transforms the standard firm graph into * a mips firm graph */ static void mips_prepare_graph(void *self) { mips_code_gen_t *cg = self; - int bl_nr, n; - - // replace all copyb nodes in the block with a loop - // and mips store/load nodes - replace_copyb_nodes(cg); - // Calculate block schedule - mips_create_block_sched(cg); + /* do local optimizations */ + optimize_graph_df(cg->irg); - /* enter the block number into every blocks link field */ - for (bl_nr = 0, n = mips_get_sched_n_blocks(cg); bl_nr < n; ++bl_nr) { - ir_node *bl = mips_get_sched_block(cg, bl_nr); - mips_set_block_sched_nr(bl, bl_nr); - } + /* TODO: we often have dead code reachable through out-edges here. So for + * now we rebuild edges (as we need correct user count for code selection) + */ +#if 1 + edges_deactivate(cg->irg); + edges_activate(cg->irg); +#endif // walk the graph and transform firm nodes into mips nodes where possible mips_transform_graph(cg); dump_ir_block_graph_sched(cg->irg, "-transformed"); + + /* do local optimizations (mainly CSE) */ + optimize_graph_df(cg->irg); + + /* do code placement, to optimize the position of constants */ + place_code(cg->irg); + + be_dump(cg->irg, "-place", dump_ir_block_graph_sched); } /** @@ -481,6 +340,10 @@ static void mips_finish_irg(void *self) { mips_code_gen_t *cg = self; ir_graph *irg = cg->irg; + /* create block schedule, this also removes empty blocks which might + * produce critical edges */ + cg->block_schedule = be_create_block_schedule(irg, cg->birg->exec_freq); + dump_ir_block_graph_sched(irg, "-mips-finished"); } @@ -521,10 +384,6 @@ static void mips_emit_and_done(void *self) /* de-allocate code generator */ del_set(cg->reg_set); - if (cg->bl_list) { - DEL_ARR_F(cg->bl_list); - free_survive_dce(cg->bl_list_sdce); - } free(cg); } @@ -550,15 +409,13 @@ static void *mips_cg_init(be_irg_t *birg) { const arch_env_t *arch_env = be_get_birg_arch_env(birg); mips_isa_t *isa = (mips_isa_t *) arch_env; - mips_code_gen_t *cg = xmalloc(sizeof(*cg)); + mips_code_gen_t *cg = XMALLOCZ(mips_code_gen_t); cg->impl = &mips_code_gen_if; cg->irg = be_get_birg_irg(birg); cg->reg_set = new_set(mips_cmp_irn_reg_assoc, 1024); - cg->arch_env = arch_env; cg->isa = isa; cg->birg = birg; - cg->bl_list = NULL; cur_reg_set = cg->reg_set; @@ -603,7 +460,7 @@ static arch_env_t *mips_init(FILE *file_handle) { return NULL; inited = 1; - isa = xcalloc(1, sizeof(isa[0])); + isa = XMALLOC(mips_isa_t); memcpy(isa, &mips_isa_template, sizeof(isa[0])); be_emit_init(file_handle); @@ -675,7 +532,7 @@ typedef struct { static void *mips_abi_init(const be_abi_call_t *call, const arch_env_t *arch_env, ir_graph *irg) { - mips_abi_env_t *env = xmalloc(sizeof(env[0])); + mips_abi_env_t *env = XMALLOC(mips_abi_env_t); be_abi_call_flags_t fl = be_abi_call_get_flags(call); env->flags = fl.bits; env->irg = irg; @@ -692,7 +549,7 @@ static void mips_abi_dont_save_regs(void *self, pset *s) pset_insert_ptr(s, env->arch_env->bp); } -static const arch_register_t *mips_abi_prologue(void *self, ir_node** mem, pmap *reg_map) +static const arch_register_t *mips_abi_prologue(void *self, ir_node** mem, pmap *reg_map, int *stack_bias) { mips_abi_env_t *env = self; ir_graph *irg = env->irg; @@ -701,7 +558,9 @@ static const arch_register_t *mips_abi_prologue(void *self, ir_node** mem, pmap ir_node *fp = be_abi_reg_map_get(reg_map, &mips_gp_regs[REG_FP]); int initialstackframesize; - if(env->debug) { + (void) stack_bias; + + if (env->debug) { /* * The calling conventions wants a stack frame of at least 24bytes size with * a0-a3 saved in offset 0-12 @@ -797,7 +656,7 @@ static void mips_abi_epilogue(void *self, ir_node *block, ir_node **mem, pmap *r fp = new_r_Proj(irg, block, load, mode_Iu, pn_mips_lw_res); *mem = new_r_Proj(irg, block, load, mode_Iu, pn_mips_lw_M); - arch_set_irn_register(env->arch_env, fp, &mips_gp_regs[REG_FP]); + arch_set_irn_register(fp, &mips_gp_regs[REG_FP]); be_abi_reg_map_set(reg_map, &mips_gp_regs[REG_FP], fp); be_abi_reg_map_set(reg_map, &mips_gp_regs[REG_SP], sp); @@ -949,16 +808,14 @@ static const be_execution_unit_t ***mips_get_allowed_execution_units( (void) self; (void) irn; /* TODO */ - assert(0); - return NULL; + panic("Unimplemented mips_get_allowed_execution_units()"); } static const be_machine_t *mips_get_machine(const void *self) { (void) self; /* TODO */ - assert(0); - return NULL; + panic("Unimplemented mips_get_machine()"); } /** @@ -998,11 +855,11 @@ static asm_constraint_flags_t mips_parse_asm_constraint(const void *self, return ASM_CONSTRAINT_FLAG_INVALID; } -static bool mips_is_valid_clobber(const void *self, const char *clobber) +static int mips_is_valid_clobber(const void *self, const char *clobber) { (void) self; (void) clobber; - return false; + return 0; } const arch_isa_if_t mips_isa_if = { @@ -1020,6 +877,7 @@ const arch_isa_if_t mips_isa_if = { mips_get_allowed_execution_units, mips_get_machine, mips_get_irg_list, + NULL, /* mark remat */ mips_parse_asm_constraint, mips_is_valid_clobber };