X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbelower.c;h=ac713af02f30556ec7107bab9e3eb50a8b2c91b5;hb=4d7a9507baf1737297cd4f7fc91eab209fd5d398;hp=9e395671c3d9c87c1cb76e1d50982f0549f1332b;hpb=8786fa72e7744afaaecdab0d002fc821539b79b9;p=libfirm diff --git a/ir/be/belower.c b/ir/be/belower.c index 9e395671c..ac713af02 100644 --- a/ir/be/belower.c +++ b/ir/be/belower.c @@ -257,7 +257,7 @@ static void lower_perm_node(ir_node *irn, void *walk_env) { ir_node *arg1, *arg2, *res1, *res2; ir_node *cpyxchg = NULL; - arch_env = env->chord_env->main_env->arch_env; + arch_env = env->chord_env->birg->main_env->arch_env; do_copy = env->do_copy; mod = env->dbg_module; block = get_nodes_block(irn); @@ -464,158 +464,61 @@ static void lower_perm_node(ir_node *irn, void *walk_env) { /** - * Adds Projs to keep nodes for each register class, which eats the - * caller saved registers. - * Note: The caller has to make sure, that call is a Call - * - * @param call The Call node - * @param walk_env The walker environment + * Checks if node has a should_be_different constraint in output + * and adds a Keep then to assure the constraint. */ -static void lower_call_node(ir_node *call, const void *walk_env) { - const arch_env_t *arch_env = walk_env; - int bitset_idx = 0; - int set_size = 0; - arch_isa_t *isa = arch_env_get_isa(arch_env); - const ir_node *proj_T = NULL; - ir_node *block = get_nodes_block(call); - const arch_register_class_t *reg_class; - int i, j, pn, keep_arity; - ir_node **in_keep; - bitset_t *proj_set; - const ir_edge_t *edge; - const arch_register_t *reg; - - /* Prepare the bitset where we store the projnums which are already in use*/ - for (i = 0; i < arch_isa_get_n_reg_class(isa); i++) { - reg_class = arch_isa_get_reg_class(isa, i); - set_size += arch_register_class_n_regs(reg_class); - } - - in_keep = xmalloc(set_size * sizeof(ir_node *)); - - proj_set = bitset_malloc(set_size); - bitset_clear_all(proj_set); - - /* check if there is a ProjT node and which arguments are used */ - foreach_out_edge(call, edge) { - if (get_irn_mode(get_edge_src_irn(edge)) == mode_T) - proj_T = get_edge_src_irn(edge); - } - - /* set all used arguments */ - if (proj_T) { - foreach_out_edge(proj_T, edge) { - ir_node *proj = get_edge_src_irn(edge); - - assert(is_Proj(proj)); - pn = isa->impl->handle_call_proj(isa, proj, 0); - bitset_set(proj_set, pn); - } - } - else { - proj_T = new_r_Proj(current_ir_graph, block, call, mode_T, pn_Call_T_result); - } - - /* Create for each caller save register a proj (keep node argument) */ - /* if this proj is not already present */ - for (i = 0; i < arch_isa_get_n_reg_class(isa); i++) { +static void assure_different_constraint(ir_node *irn, be_irg_t *birg) { + const arch_env_t *arch_env = birg->main_env->arch_env; + const arch_register_req_t *req; + arch_register_req_t req_temp; + ir_node *in[2], *keep; + firm_dbg_module_t *mod = firm_dbg_register("firm.be.lower"); - /* reset the keep input, as we need one keep for each register class */ - memset(in_keep, 0, set_size * sizeof(ir_node *)); - keep_arity = 0; - reg_class = arch_isa_get_reg_class(isa, i); + req = arch_get_register_req(arch_env, &req_temp, irn, -1); - for (j = 0; j < arch_register_class_n_regs(reg_class); j++) { - reg = arch_register_for_index(reg_class, j); + if (req && arch_register_req_is(req, should_be_different)) { + /* We found a should_be_different constraint. */ + assert(req->other_different && "missing irn for constraint"); - /* only check caller save registers */ - if (arch_register_type_is(reg, caller_save)) { + in[0] = irn; + in[1] = req->other_different; - /* Only create new proj, iff not already present */ - if (!bitset_is_set(proj_set, bitset_idx)) { - ir_node *proj = new_r_Proj(current_ir_graph, block, (ir_node *)proj_T, mode_Is, bitset_idx); - - pn = isa->impl->handle_call_proj(isa, proj, 1); - in_keep[keep_arity++] = proj; - } - - bitset_idx++; - } - } - - /* ok, we found some caller save register which are not in use but must be saved */ - if (keep_arity) { - be_new_Keep(reg_class, current_ir_graph, block, keep_arity, in_keep); - } + keep = be_new_Keep(req->cls, birg->irg, get_nodes_block(irn), 2, in); + DBG((mod, LEVEL_1, "created %+F for %+F to assure should_be_different\n", keep, irn)); } - - bitset_free(proj_set); - return; } /** - * Calls the backend code generator functions to lower Spill and - * Reload nodes into Store and Load. The backend is fully responsible - * for creating the new nodes and setting their input correct. - * Note: The caller of this has to make sure that irn is a Spill - * or Reload! + * Calls the functions to assure register constraints. * - * @param irn The Spill/Reload node + * @param irn The node to be checked for lowering * @param walk_env The walker environment */ -static void lower_spill_reload(ir_node *irn, void *walk_env) { - lower_env_t *env = walk_env; - arch_code_generator_t *cg = env->chord_env->main_env->cg; - const arch_env_t *aenv = env->chord_env->main_env->arch_env; - ir_node *res = NULL; - ir_node *sched_point; - - if (be_is_Spill(irn) && cg->impl->lower_spill) { - res = cg->impl->lower_spill(cg, irn); - } - else if (be_is_Reload(irn) && cg->impl->lower_reload) { - res = cg->impl->lower_reload(cg, irn); - if (res && res != irn) { - /* copy the result register from the reload to the load */ - arch_set_irn_register(aenv, res, arch_get_irn_register(aenv, irn)); - } - } +static void assure_constraints_walker(ir_node *irn, void *walk_env) { + if (is_Block(irn)) + return; - if (res && res != irn) { - sched_point = sched_prev(irn); - sched_remove(irn); - exchange(irn, res); - sched_add_after(sched_point, res); - } - else { - DBG((env->dbg_module, LEVEL_1, "node %+F not lowered\n", irn)); - } + if (mode_is_datab(get_irn_mode(irn))) + assure_different_constraint(irn, walk_env); return; } + /** - * Calls the corresponding lowering function for the node. + * Walks over all nodes to assure register constraints. * - * @param irn The node to be checked for lowering - * @param walk_env The walker environment + * @param birg The birg structure containing the irg */ -static void lower_nodes_before_sched_walker(ir_node *irn, void *walk_env) { - const arch_env_t *arch_env = walk_env; - - if (!is_Block(irn) && !is_Proj(irn)) { - if (is_Call(arch_env, irn)) { - lower_call_node(irn, walk_env); - } - } - - return; +void assure_constraints(be_irg_t *birg) { + irg_walk_blkwise_graph(birg->irg, NULL, assure_constraints_walker, birg); } + /** * Calls the corresponding lowering function for the node. * @@ -624,15 +527,12 @@ static void lower_nodes_before_sched_walker(ir_node *irn, void *walk_env) { */ static void lower_nodes_after_ra_walker(ir_node *irn, void *walk_env) { lower_env_t *env = walk_env; - const arch_env_t *arch_env = env->chord_env->main_env->arch_env; + const arch_env_t *arch_env = env->chord_env->birg->main_env->arch_env; if (!is_Block(irn) && !is_Proj(irn)) { if (is_Perm(arch_env, irn)) { lower_perm_node(irn, walk_env); } - else if (be_is_Spill(irn) || be_is_Reload(irn)) { - lower_spill_reload(irn, walk_env); - } } return; @@ -640,22 +540,9 @@ static void lower_nodes_after_ra_walker(ir_node *irn, void *walk_env) { -/** - * Walks over all blocks in an irg and performs lowering need - * to be done before scheduling (e.g. call lowering). - * - * @param chord_env The chordal environment containing the irg - * @param do_copy 1 == resolve cycles with a free reg if available - */ -void lower_nodes_before_sched(ir_graph *irg, const void *env) { - irg_walk_blkwise_graph(irg, NULL, lower_nodes_before_sched_walker, (void *)env); -} - - - /** * Walks over all blocks in an irg and performs lowering need to be - * done after register allocation (e.g. perm and spill/reload lowering). + * done after register allocation (e.g. perm lowering). * * @param chord_env The chordal environment containing the irg * @param do_copy 1 == resolve cycles with a free reg if available