From d7c028c07b1998cc80f67e053c8131cf8b387af7 Mon Sep 17 00:00:00 2001 From: Lawrence Crowl Date: Thu, 1 Nov 2012 19:23:35 +0000 Subject: This patch normalizes more bitmap function names. sbitmap.h TEST_BIT -> bitmap_bit_p SET_BIT -> bitmap_set_bit SET_BIT_WITH_POPCOUNT -> bitmap_set_bit_with_popcount RESET_BIT -> bitmap_clear_bit RESET_BIT_WITH_POPCOUNT -> bitmap_clear_bit_with_popcount basic-block.h sbitmap_intersection_of_succs -> bitmap_intersection_of_succs sbitmap_intersection_of_preds -> bitmap_intersection_of_preds sbitmap_union_of_succs -> bitmap_union_of_succs sbitmap_union_of_preds -> bitmap_union_of_preds The sbitmap.h functions also needed their numeric paramter changed from unsigned int to int to match the bitmap functions. Callers updated to match. Tested on x86-64, config-list.mk testing. Index: gcc/ChangeLog 2012-11-01 Lawrence Crowl * sbitmap.h (TEST_BIT): Rename bitmap_bit_p, normalizing parameter type. Update callers to match. (SET_BIT): Rename bitmap_set_bit, normalizing parameter type. Update callers to match. (SET_BIT_WITH_POPCOUNT): Rename bitmap_set_bit_with_popcount, normalizing parameter type. Update callers to match. (RESET_BIT): Rename bitmap_clear_bit, normalizing parameter type. Update callers to match. (RESET_BIT_WITH_POPCOUNT): Rename bitmap_clear_bit_with_popcount, normalizing parameter type. Update callers to match. * basic-block.h (sbitmap_intersection_of_succs): Rename bitmap_intersection_of_succs. Update callers to match. * basic-block.h (sbitmap_intersection_of_preds): Rename bitmap_intersection_of_preds. Update callers to match. * basic-block.h (sbitmap_union_of_succs): Rename bitmap_union_of_succs. Update callers to match. * basic-block.h (sbitmap_union_of_preds): Rename bitmap_union_of_preds. Update callers to match. From-SVN: r193066 --- gcc/var-tracking.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'gcc/var-tracking.c') diff --git a/gcc/var-tracking.c b/gcc/var-tracking.c index b64604b..e0daa83 100644 --- a/gcc/var-tracking.c +++ b/gcc/var-tracking.c @@ -6768,15 +6768,15 @@ vt_find_locations (void) while (!fibheap_empty (worklist)) { bb = (basic_block) fibheap_extract_min (worklist); - RESET_BIT (in_worklist, bb->index); - gcc_assert (!TEST_BIT (visited, bb->index)); - if (!TEST_BIT (visited, bb->index)) + bitmap_clear_bit (in_worklist, bb->index); + gcc_assert (!bitmap_bit_p (visited, bb->index)); + if (!bitmap_bit_p (visited, bb->index)) { bool changed; edge_iterator ei; int oldinsz, oldoutsz; - SET_BIT (visited, bb->index); + bitmap_set_bit (visited, bb->index); if (VTI (bb)->in.vars) { @@ -6869,21 +6869,21 @@ vt_find_locations (void) if (e->dest == EXIT_BLOCK_PTR) continue; - if (TEST_BIT (visited, e->dest->index)) + if (bitmap_bit_p (visited, e->dest->index)) { - if (!TEST_BIT (in_pending, e->dest->index)) + if (!bitmap_bit_p (in_pending, e->dest->index)) { /* Send E->DEST to next round. */ - SET_BIT (in_pending, e->dest->index); + bitmap_set_bit (in_pending, e->dest->index); fibheap_insert (pending, bb_order[e->dest->index], e->dest); } } - else if (!TEST_BIT (in_worklist, e->dest->index)) + else if (!bitmap_bit_p (in_worklist, e->dest->index)) { /* Add E->DEST to current round. */ - SET_BIT (in_worklist, e->dest->index); + bitmap_set_bit (in_worklist, e->dest->index); fibheap_insert (worklist, bb_order[e->dest->index], e->dest); } -- cgit v1.1