diff options
| author | Lawrence Crowl <crowl@google.com> | 2012-11-01 19:23:35 +0000 |
|---|---|---|
| committer | Lawrence Crowl <crowl@google.com> | 2012-11-01 19:23:35 +0000 |
| commit | 572a5a39d3fc0fc529dbfe08eac9daaf518691d5 (patch) | |
| tree | 5ec5bcd56906f1ff213b4652971a165736d6fda7 /gcc/cse.c | |
| parent | 1ce2131d67b851f022a68697262363d94d2fab17 (diff) | |
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 <crowl@google.com>
* 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: https://gcc.gnu.org/svn/gcc/trunk@193066 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/cse.c')
| -rw-r--r-- | gcc/cse.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/gcc/cse.c b/gcc/cse.c index 20bda3122e7..4d1d016dcf2 100644 --- a/gcc/cse.c +++ b/gcc/cse.c @@ -6151,7 +6151,7 @@ cse_find_path (basic_block first_bb, struct cse_basic_block_data *data, edge e; int path_size; - SET_BIT (cse_visited_basic_blocks, first_bb->index); + bitmap_set_bit (cse_visited_basic_blocks, first_bb->index); /* See if there is a previous path. */ path_size = data->path_size; @@ -6208,9 +6208,9 @@ cse_find_path (basic_block first_bb, struct cse_basic_block_data *data, We still want to visit each basic block only once, so halt the path here if we have already visited BB. */ - && !TEST_BIT (cse_visited_basic_blocks, bb->index)) + && !bitmap_bit_p (cse_visited_basic_blocks, bb->index)) { - SET_BIT (cse_visited_basic_blocks, bb->index); + bitmap_set_bit (cse_visited_basic_blocks, bb->index); data->path[path_size++].bb = bb; break; } @@ -6253,10 +6253,10 @@ cse_find_path (basic_block first_bb, struct cse_basic_block_data *data, && single_pred_p (e->dest) /* Avoid visiting basic blocks twice. The large comment above explains why this can happen. */ - && !TEST_BIT (cse_visited_basic_blocks, e->dest->index)) + && !bitmap_bit_p (cse_visited_basic_blocks, e->dest->index)) { basic_block bb2 = e->dest; - SET_BIT (cse_visited_basic_blocks, bb2->index); + bitmap_set_bit (cse_visited_basic_blocks, bb2->index); data->path[path_size++].bb = bb2; bb = bb2; } @@ -6468,7 +6468,7 @@ cse_extended_basic_block (struct cse_basic_block_data *ebb_data) /* If we truncate the path, we must also reset the visited bit on the remaining blocks in the path, or we will never visit them at all. */ - RESET_BIT (cse_visited_basic_blocks, + bitmap_clear_bit (cse_visited_basic_blocks, ebb_data->path[path_size].bb->index); ebb_data->path[path_size].bb = NULL; } @@ -6560,7 +6560,7 @@ cse_main (rtx f ATTRIBUTE_UNUSED, int nregs) { bb = BASIC_BLOCK (rc_order[i++]); } - while (TEST_BIT (cse_visited_basic_blocks, bb->index) + while (bitmap_bit_p (cse_visited_basic_blocks, bb->index) && i < n_blocks); /* Find all paths starting with BB, and process them. */ |