From 08b7917c9ede0f12b38f238f2fdb433854f0da33 Mon Sep 17 00:00:00 2001 From: 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. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@193066 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/cfgloop.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'gcc/cfgloop.c') diff --git a/gcc/cfgloop.c b/gcc/cfgloop.c index 83ac28d5713..5ab7c201688 100644 --- a/gcc/cfgloop.c +++ b/gcc/cfgloop.c @@ -420,7 +420,7 @@ flow_loops_find (struct loops *loops) && dominated_by_p (CDI_DOMINATORS, latch, header)) { /* Shared headers should be eliminated by now. */ - SET_BIT (headers, header->index); + bitmap_set_bit (headers, header->index); num_loops++; } } @@ -451,7 +451,7 @@ flow_loops_find (struct loops *loops) /* Search the nodes of the CFG in reverse completion order so that we can find outer loops first. */ - if (!TEST_BIT (headers, rc_order[b])) + if (!bitmap_bit_p (headers, rc_order[b])) continue; header = BASIC_BLOCK (rc_order[b]); @@ -1361,9 +1361,9 @@ verify_loop_structure (void) bb = bbs[j]; /* Ignore this block if it is in an inner loop. */ - if (TEST_BIT (visited, bb->index)) + if (bitmap_bit_p (visited, bb->index)) continue; - SET_BIT (visited, bb->index); + bitmap_set_bit (visited, bb->index); if (bb->loop_father != loop) { @@ -1426,9 +1426,9 @@ verify_loop_structure (void) { edge_iterator ei; if (bb->flags & BB_IRREDUCIBLE_LOOP) - SET_BIT (irreds, bb->index); + bitmap_set_bit (irreds, bb->index); else - RESET_BIT (irreds, bb->index); + bitmap_clear_bit (irreds, bb->index); FOR_EACH_EDGE (e, ei, bb->succs) if (e->flags & EDGE_IRREDUCIBLE_LOOP) e->flags |= EDGE_ALL_FLAGS + 1; @@ -1443,13 +1443,13 @@ verify_loop_structure (void) edge_iterator ei; if ((bb->flags & BB_IRREDUCIBLE_LOOP) - && !TEST_BIT (irreds, bb->index)) + && !bitmap_bit_p (irreds, bb->index)) { error ("basic block %d should be marked irreducible", bb->index); err = 1; } else if (!(bb->flags & BB_IRREDUCIBLE_LOOP) - && TEST_BIT (irreds, bb->index)) + && bitmap_bit_p (irreds, bb->index)) { error ("basic block %d should not be marked irreducible", bb->index); err = 1; -- cgit v1.2.1