X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbechordal.c;h=ade9717316c0efd53470dce4d61de4690ff663db;hb=11b7b651234355a0298e1075d57703c554e0ef4d;hp=4f54e7b7522e17ee3395ab2e38df2377a90ee528;hpb=bb9f2e36362333c6635b89f5258171b06c786608;p=libfirm diff --git a/ir/be/bechordal.c b/ir/be/bechordal.c index 4f54e7b75..ade971731 100644 --- a/ir/be/bechordal.c +++ b/ir/be/bechordal.c @@ -241,7 +241,8 @@ static ir_node *prepare_constr_insn(be_chordal_env_t *env, ir_node *irn) const arch_register_t *reg; const arch_register_req_t *req; - if (arch_get_irn_reg_class(irn, i) != env->cls) + req = arch_get_register_req(irn, i); + if (req->cls != env->cls) continue; reg = arch_get_irn_register(op); @@ -251,7 +252,6 @@ static ir_node *prepare_constr_insn(be_chordal_env_t *env, ir_node *irn) if(arch_register_type_is(reg, joker)) continue; - req = arch_get_register_req(irn, i); if (!arch_register_req_is(req, limited)) continue; @@ -369,13 +369,9 @@ void be_pre_spill_prepare_constr(be_chordal_env_t *cenv) { static void pair_up_operands(const be_chordal_alloc_env_t *alloc_env, be_insn_t *insn) { const be_chordal_env_t *env = alloc_env->chordal_env; - - int n_uses = be_insn_n_uses(insn); - int n_defs = be_insn_n_defs(insn); - bitset_t *bs = bitset_alloca(env->cls->n_regs); - int *pairing = alloca(MAX(n_defs, n_uses) * sizeof(pairing[0])); - - int i, j; + bitset_t *bs = bitset_alloca(env->cls->n_regs); + int i; + int j; /* For each out operand, try to find an in operand which can be assigned the @@ -538,10 +534,10 @@ static ir_node *handle_constraints(be_chordal_alloc_env_t *alloc_env, n_regs = env->cls->n_regs; bs = bitset_alloca(n_regs); - alloc_nodes = alloca(n_regs * sizeof(alloc_nodes[0])); + alloc_nodes = ALLOCAN(ir_node*, n_regs); //bp = hungarian_new(n_regs, n_regs, 2, HUNGARIAN_MATCH_PERFECT); bp = bipartite_new(n_regs, n_regs); - assignment = alloca(n_regs * sizeof(assignment[0])); + assignment = ALLOCAN(int, n_regs); partners = pmap_create(); /*