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/cprop.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'gcc/cprop.c') diff --git a/gcc/cprop.c b/gcc/cprop.c index 7945342ee36..56a4f9285f3 100644 --- a/gcc/cprop.c +++ b/gcc/cprop.c @@ -617,20 +617,20 @@ compute_local_properties (sbitmap *kill, sbitmap *comp, is killed in the block where the definition is. */ for (def = DF_REG_DEF_CHAIN (REGNO (expr->dest)); def; def = DF_REF_NEXT_REG (def)) - SET_BIT (kill[DF_REF_BB (def)->index], indx); + bitmap_set_bit (kill[DF_REF_BB (def)->index], indx); /* If the source is a pseudo-reg, for each definition of the source, the expression is killed in the block where the definition is. */ if (REG_P (expr->src)) for (def = DF_REG_DEF_CHAIN (REGNO (expr->src)); def; def = DF_REF_NEXT_REG (def)) - SET_BIT (kill[DF_REF_BB (def)->index], indx); + bitmap_set_bit (kill[DF_REF_BB (def)->index], indx); /* The occurrences recorded in avail_occr are exactly those that are locally available in the block where they are. */ for (occr = expr->avail_occr; occr != NULL; occr = occr->next) { - SET_BIT (comp[BLOCK_FOR_INSN (occr->insn)->index], indx); + bitmap_set_bit (comp[BLOCK_FOR_INSN (occr->insn)->index], indx); } } } @@ -658,7 +658,7 @@ compute_cprop_data (void) { int index = implicit_set_indexes[bb->index]; if (index != -1) - SET_BIT (cprop_avin[bb->index], index); + bitmap_set_bit (cprop_avin[bb->index], index); } } @@ -830,7 +830,7 @@ find_avail_set (int regno, rtx insn) which contains INSN. */ while (set) { - if (TEST_BIT (cprop_avin[BLOCK_FOR_INSN (insn)->index], + if (bitmap_bit_p (cprop_avin[BLOCK_FOR_INSN (insn)->index], set->bitmap_index)) break; set = next_set (regno, set); @@ -1447,7 +1447,7 @@ find_bypass_set (int regno, int bb) while (set) { - if (TEST_BIT (cprop_avout[bb], set->bitmap_index)) + if (bitmap_bit_p (cprop_avout[bb], set->bitmap_index)) break; set = next_set (regno, set); } -- cgit v1.2.1