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/lra-lives.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gcc/lra-lives.c') diff --git a/gcc/lra-lives.c b/gcc/lra-lives.c index 501e205ffd5..f03e8ef9b7e 100644 --- a/gcc/lra-lives.c +++ b/gcc/lra-lives.c @@ -780,8 +780,8 @@ remove_some_program_points_and_update_live_ranges (void) for (r = lra_reg_info[i].live_ranges; r != NULL; r = r->next) { lra_assert (r->start <= r->finish); - SET_BIT (born, r->start); - SET_BIT (dead, r->finish); + bitmap_set_bit (born, r->start); + bitmap_set_bit (dead, r->finish); } } born_or_dead = sbitmap_alloc (lra_live_max_point); @@ -791,8 +791,8 @@ remove_some_program_points_and_update_live_ranges (void) prev_born_p = prev_dead_p = false; EXECUTE_IF_SET_IN_SBITMAP (born_or_dead, 0, i, sbi) { - born_p = TEST_BIT (born, i); - dead_p = TEST_BIT (dead, i); + born_p = bitmap_bit_p (born, i); + dead_p = bitmap_bit_p (dead, i); if ((prev_born_p && ! prev_dead_p && born_p && ! dead_p) || (prev_dead_p && ! prev_born_p && dead_p && ! born_p)) { -- cgit v1.2.1