X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbeprefalloc.c;h=4b7f8fae3b4b625294f968cc712bc28cfcefbb3f;hb=320595b2d2f4b0bc4f7bea706c9c575146607dbf;hp=c8a13147b3a3ad1e1a7974fde8589089be876b24;hpb=1a26f4853c07d1ecd68a097409dd602edfe29eff;p=libfirm

diff --git a/ir/be/beprefalloc.c b/ir/be/beprefalloc.c
index c8a13147b..4b7f8fae3 100644
--- a/ir/be/beprefalloc.c
+++ b/ir/be/beprefalloc.c
@@ -252,7 +252,7 @@ static void give_penalties_for_limits(const ir_nodeset_t *live_nodes,
 		return;
 
 	penalty   *= NEIGHBOR_FACTOR;
-	n_allowed  = rbitset_popcnt(limited, n_regs);
+	n_allowed  = rbitset_popcount(limited, n_regs);
 	if (n_allowed > 1) {
 		/* only create a very weak penalty if multiple regs are allowed */
 		penalty = (penalty * 0.8f) / n_allowed;
@@ -314,7 +314,7 @@ static void check_defs(const ir_nodeset_t *live_nodes, float weight,
 		int                arity = get_irn_arity(insn);
 		int                i;
 
-		float factor = 1.0f / rbitset_popcnt(&req->other_same, arity);
+		float factor = 1.0f / rbitset_popcount(&req->other_same, arity);
 		for (i = 0; i < arity; ++i) {
 			ir_node           *op;
 			unsigned           r;
@@ -1021,12 +1021,12 @@ static void permute_values(ir_nodeset_t *live_nodes, ir_node *before,
 		DB((dbg, LEVEL_2, "Perm %+F (perm %+F,%+F, before %+F)\n",
 		    perm, in[0], in[1], before));
 
-		proj0 = new_r_Proj(block, perm, get_irn_mode(in[0]), 0);
+		proj0 = new_r_Proj(perm, get_irn_mode(in[0]), 0);
 		mark_as_copy_of(proj0, in[0]);
 		reg = arch_register_for_index(cls, old_r);
 		use_reg(proj0, reg);
 
-		proj1 = new_r_Proj(block, perm, get_irn_mode(in[1]), 1);
+		proj1 = new_r_Proj(perm, get_irn_mode(in[1]), 1);
 		mark_as_copy_of(proj1, in[1]);
 		reg = arch_register_for_index(cls, r2);
 		use_reg(proj1, reg);
@@ -2024,9 +2024,7 @@ static void be_pref_alloc(be_irg_t *new_birg)
 	obstack_free(&obst, NULL);
 }
 
-/**
- * Initializes this module.
- */
+BE_REGISTER_MODULE_CONSTRUCTOR(be_init_pref_alloc);
 void be_init_pref_alloc(void)
 {
 	static be_ra_t be_ra_pref = {
@@ -2039,5 +2037,3 @@ void be_init_pref_alloc(void)
 	be_register_allocator("pref", &be_ra_pref);
 	FIRM_DBG_REGISTER(dbg, "firm.be.prefalloc");
 }
-
-BE_REGISTER_MODULE_CONSTRUCTOR(be_init_pref_alloc);