X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbecopyheur2.c;h=46453c57b773820665c1130ffaa38fd4dc170223;hb=5a5b0a8806277f92f5950cfedd8a231f4d00a306;hp=684d7d7e205445023b72c98aade9ee7d937b712e;hpb=3a655a311371c919abe77558a5ef6986fc4be093;p=libfirm diff --git a/ir/be/becopyheur2.c b/ir/be/becopyheur2.c index 684d7d7e2..46453c57b 100644 --- a/ir/be/becopyheur2.c +++ b/ir/be/becopyheur2.c @@ -180,12 +180,12 @@ typedef struct { #define get_co2_irn(co2, irn) ((co2_irn_t *) phase_get_or_set_irn_data(&co2->ph, irn)) #define get_co2_cloud_irn(co2, irn) ((co2_cloud_irn_t *) phase_get_or_set_irn_data(&co2->ph, irn)) -static void *co2_irn_init(ir_phase *ph, const ir_node *irn, void *data) +static void *co2_irn_init(ir_phase *ph, const ir_node *irn) { co2_t *env = (co2_t *) ph; affinity_node_t *a = get_affinity_info(env->co, irn); size_t size = a ? sizeof(co2_cloud_irn_t) : sizeof(co2_irn_t); - co2_irn_t *ci = data ? data : phase_alloc(ph, size); + co2_irn_t *ci = phase_alloc(ph, size); memset(ci, 0, size); INIT_LIST_HEAD(&ci->changed_list); @@ -1227,13 +1227,13 @@ int co_solve_heuristic_new(copy_opt_t *co) co2_t env; FILE *f; - phase_init(&env.ph, co->cenv->birg->irg, co2_irn_init); + phase_init(&env.ph, co->cenv->irg, co2_irn_init); env.touched = NULL; env.visited = 0; env.co = co; env.n_regs = co->cls->n_regs; env.ignore_regs = bitset_alloca(co->cls->n_regs); - be_put_ignore_regs(co->cenv->birg, co->cls, env.ignore_regs); + be_put_ignore_regs(co->cenv->irg, co->cls, env.ignore_regs); FIRM_DBG_REGISTER(env.dbg, "firm.be.co2"); INIT_LIST_HEAD(&env.cloud_head);