X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbecopyheur.c;h=3b1c1d3231893751b17b4b9c6c818e60b32fbb13;hb=523e83e345a3dddd5bb82d8090aa26de3b290df3;hp=6d4adff569dd68b4a8fc1531e24cc5dd2ed9497d;hpb=ea75e9d38674b468f602a0699fb64b9c01254797;p=libfirm diff --git a/ir/be/becopyheur.c b/ir/be/becopyheur.c index 6d4adff56..3b1c1d323 100644 --- a/ir/be/becopyheur.c +++ b/ir/be/becopyheur.c @@ -397,7 +397,7 @@ static inline void qnode_max_ind_set(qnode_t *qn, const unit_t *ou) ir_node **safe, **unsafe; int i, o, safe_count, safe_costs, unsafe_count, *unsafe_costs; bitset_t *curr, *best; - bitset_pos_t pos; + unsigned pos; int next, curr_weight, best_weight = 0; /* assign the nodes into two groups. @@ -477,7 +477,7 @@ no_stable_set: } /* transfer the best set into the qn */ - qn->mis_size = 1+safe_count+bitset_popcnt(best); + qn->mis_size = 1+safe_count+bitset_popcount(best); qn->mis_costs = safe_costs+best_weight; qn->mis[0] = ou->nodes[0]; /* the root is always in a max stable set */ next = 1; @@ -552,8 +552,8 @@ static void ou_optimize(unit_t *ou) qnode_t *tmp; const arch_register_req_t *req; bitset_t const* ignore; - bitset_pos_t n_regs; - bitset_pos_t idx; + unsigned n_regs; + unsigned idx; int i; DBG((dbg, LEVEL_1, "\tOptimizing unit:\n")); @@ -567,7 +567,7 @@ static void ou_optimize(unit_t *ou) ignore = ou->co->cenv->ignore_colors; n_regs = req->cls->n_regs; if (arch_register_req_is(req, limited)) { - rawbs_base_t const* limited = req->limited; + unsigned const* limited = req->limited; for (idx = 0; idx != n_regs; ++idx) { if (bitset_is_set(ignore, idx))