X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fia32%2Fia32_optimize.c;h=73ff3ba4ef4327a5bf697c9ac60d5f801dbdede8;hb=87fea9e1e34fcdd7b43ab60cb03b08c716f69571;hp=be267946afb466ca641a36ee7257f722e0c34b34;hpb=05f6a4d20ee5ea88231166cd4458108c5800a84b;p=libfirm diff --git a/ir/be/ia32/ia32_optimize.c b/ir/be/ia32/ia32_optimize.c index be267946a..73ff3ba4e 100644 --- a/ir/be/ia32/ia32_optimize.c +++ b/ir/be/ia32/ia32_optimize.c @@ -61,8 +61,6 @@ DEBUG_ONLY(static firm_dbg_module_t *dbg = NULL;) static const arch_env_t *arch_env; static ia32_code_gen_t *cg; -static void peephole_IncSP_IncSP(ir_node *node); - #if 0 static void peephole_ia32_Store_IncSP_to_push(ir_node *node) { @@ -95,7 +93,7 @@ static void peephole_ia32_Store_IncSP_to_push(ir_node *node) if(!be_is_IncSP(incsp)) return; - peephole_IncSP_IncSP(incsp); + be_peephole_IncSP_IncSP(incsp); /* must be in the same block */ if(get_nodes_block(incsp) != get_nodes_block(node)) @@ -477,58 +475,6 @@ static void peephole_IncSP_Store_to_push(ir_node *irn) be_set_IncSP_pred(irn, curr_sp); } -/** - * Tries to optimize two following IncSP. - */ -static void peephole_IncSP_IncSP(ir_node *node) -{ - int pred_offs; - int curr_offs; - int offs; - ir_node *pred = be_get_IncSP_pred(node); - ir_node *predpred; - - if(!be_is_IncSP(pred)) - return; - - if(get_irn_n_edges(pred) > 1) - return; - - pred_offs = be_get_IncSP_offset(pred); - curr_offs = be_get_IncSP_offset(node); - - if(pred_offs == BE_STACK_FRAME_SIZE_EXPAND) { - if(curr_offs != BE_STACK_FRAME_SIZE_SHRINK) { - return; - } - offs = 0; - } else if(pred_offs == BE_STACK_FRAME_SIZE_SHRINK) { - if(curr_offs != BE_STACK_FRAME_SIZE_EXPAND) { - return; - } - offs = 0; - } else if(curr_offs == BE_STACK_FRAME_SIZE_EXPAND - || curr_offs == BE_STACK_FRAME_SIZE_SHRINK) { - return; - } else { - offs = curr_offs + pred_offs; - } - - /* add pred offset to ours and remove pred IncSP */ - be_set_IncSP_offset(node, offs); - - predpred = be_get_IncSP_pred(pred); - be_peephole_before_exchange(pred, predpred); - - /* rewire dependency edges */ - edges_reroute_kind(pred, predpred, EDGE_KIND_DEP, current_ir_graph); - be_set_IncSP_pred(node, predpred); - sched_remove(pred); - be_kill_node(pred); - - be_peephole_after_exchange(predpred); -} - /** * Find a free GP register if possible, else return NULL. */ @@ -548,9 +494,21 @@ static const arch_register_t *get_free_gp_reg(void) return NULL; } +/** + * Creates a Pop instruction before the given schedule point. + * + * @param dbgi debug info + * @param irg the graph + * @param block the block + * @param stack the previous stack value + * @param schedpoint the new node is added before this node + * @param reg the register to pop + * + * @return the new stack value + */ static ir_node *create_pop(dbg_info *dbgi, ir_graph *irg, ir_node *block, ir_node *stack, ir_node *schedpoint, - const arch_register_t *free_reg) + const arch_register_t *reg) { const arch_register_t *esp = &ia32_gp_regs[REG_ESP]; ir_node *pop; @@ -563,7 +521,7 @@ static ir_node *create_pop(dbg_info *dbgi, ir_graph *irg, ir_node *block, stack = new_r_Proj(irg, block, pop, mode_Iu, pn_ia32_Pop_stack); arch_set_irn_register(arch_env, stack, esp); val = new_r_Proj(irg, block, pop, mode_Iu, pn_ia32_Pop_res); - arch_set_irn_register(arch_env, val, free_reg); + arch_set_irn_register(arch_env, val, reg); sched_add_before(schedpoint, pop); @@ -574,6 +532,43 @@ static ir_node *create_pop(dbg_info *dbgi, ir_graph *irg, ir_node *block, return stack; } +/** + * Creates a Push instruction before the given schedule point. + * + * @param dbgi debug info + * @param irg the graph + * @param block the block + * @param stack the previous stack value + * @param schedpoint the new node is added before this node + * @param reg the register to pop + * + * @return the new stack value + */ +static ir_node *create_push(dbg_info *dbgi, ir_graph *irg, ir_node *block, + ir_node *stack, ir_node *schedpoint, + const arch_register_t *reg) +{ + const arch_register_t *esp = &ia32_gp_regs[REG_ESP]; + ir_node *noreg, *nomem, *push, *val; + + val = new_rd_ia32_ProduceVal(NULL, irg, block); + arch_set_irn_register(arch_env, val, reg); + sched_add_before(schedpoint, val); + + noreg = ia32_new_NoReg_gp(cg); + nomem = get_irg_no_mem(irg); + push = new_rd_ia32_Push(dbgi, irg, block, noreg, noreg, nomem, val, stack); + sched_add_before(schedpoint, push); + + stack = new_r_Proj(irg, block, push, mode_Iu, pn_ia32_Push_stack); + arch_set_irn_register(arch_env, stack, esp); + + return stack; +} + +/** + * Optimize an IncSp by replacing it with push/pop + */ static void peephole_be_IncSP(ir_node *node) { const arch_register_t *esp = &ia32_gp_regs[REG_ESP]; @@ -585,7 +580,7 @@ static void peephole_be_IncSP(ir_node *node) int offset; /* first optimize incsp->incsp combinations */ - peephole_IncSP_IncSP(node); + be_peephole_IncSP_IncSP(node); /* transform IncSP->Store combinations to Push where possible */ peephole_IncSP_Store_to_push(node); @@ -595,16 +590,16 @@ static void peephole_be_IncSP(ir_node *node) /* replace IncSP -4 by Pop freereg when possible */ offset = be_get_IncSP_offset(node); - if ((offset != -8 || !ia32_cg_config.use_add_esp_8) && - (offset != -4 || !ia32_cg_config.use_add_esp_4) && - (offset != +4 || !ia32_cg_config.use_sub_esp_4) && - (offset != +8 || !ia32_cg_config.use_sub_esp_8)) + if ((offset != -8 || ia32_cg_config.use_add_esp_8) && + (offset != -4 || ia32_cg_config.use_add_esp_4) && + (offset != +4 || ia32_cg_config.use_sub_esp_4) && + (offset != +8 || ia32_cg_config.use_sub_esp_8)) return; if (offset < 0) { /* we need a free register for pop */ reg = get_free_gp_reg(); - if(reg == NULL) + if (reg == NULL) return; dbgi = get_irn_dbg_info(node); @@ -617,8 +612,16 @@ static void peephole_be_IncSP(ir_node *node) stack = create_pop(dbgi, irg, block, stack, node, reg); } } else { - /* NIY: create pushs */ - return; + dbgi = get_irn_dbg_info(node); + block = get_nodes_block(node); + stack = be_get_IncSP_pred(node); + reg = &ia32_gp_regs[REG_EAX]; + + stack = create_push(dbgi, irg, block, stack, node, reg); + + if (offset == +8) { + stack = create_push(dbgi, irg, block, stack, node, reg); + } } be_peephole_before_exchange(node, stack);