X-Git-Url: http://git.sourceforge.jp/view?a=blobdiff_plain;f=gcc%2Fsbitmap.h;h=aacc665f4e70c2103faa257f9c0ed4fad87634ca;hb=5865514819db1b7b720f3b1da912b1758c39e2a0;hp=779a99611293d22625ef121e7c388640da10bf89;hpb=00d6ff75338a72decbb928a2a774058bcd9d2d7e;p=pf3gnuchains%2Fgcc-fork.git diff --git a/gcc/sbitmap.h b/gcc/sbitmap.h index 779a9961129..aacc665f4e7 100644 --- a/gcc/sbitmap.h +++ b/gcc/sbitmap.h @@ -15,8 +15,8 @@ for more details. You should have received a copy of the GNU General Public License along with GCC; see the file COPYING. If not, write to the Free -Software Foundation, 59 Temple Place - Suite 330, Boston, MA -02111-1307, USA. */ +Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA +02110-1301, USA. */ #ifndef GCC_SBITMAP_H #define GCC_SBITMAP_H @@ -28,11 +28,19 @@ Software Foundation, 59 Temple Place - Suite 330, Boston, MA #define SBITMAP_ELT_BITS ((unsigned) HOST_BITS_PER_WIDEST_FAST_INT) #define SBITMAP_ELT_TYPE unsigned HOST_WIDEST_FAST_INT +/* Can't use SBITMAP_ELT_BITS in this macro because it contains a + cast. There is no perfect macro in GCC to test against. This + suffices for roughly 99% of the hosts we run on, and the rest + don't have 256 bit integers. */ +#if HOST_BITS_PER_WIDEST_FAST_INT > 255 +#error Need to increase size of datatype used for popcount +#endif + typedef struct simple_bitmap_def { + unsigned char *popcount; /* Population count. */ unsigned int n_bits; /* Number of bits. */ unsigned int size; /* Size in elements. */ - unsigned int bytes; /* Size in bytes. */ SBITMAP_ELT_TYPE elms[1]; /* The elements. */ } *sbitmap; @@ -40,51 +48,129 @@ typedef SBITMAP_ELT_TYPE *sbitmap_ptr; /* Return the set size needed for N elements. */ #define SBITMAP_SET_SIZE(N) (((N) + SBITMAP_ELT_BITS - 1) / SBITMAP_ELT_BITS) - -/* Set bit number bitno in the bitmap. */ -#define SET_BIT(BITMAP, BITNO) \ - ((BITMAP)->elms [(BITNO) / SBITMAP_ELT_BITS] \ - |= (SBITMAP_ELT_TYPE) 1 << (BITNO) % SBITMAP_ELT_BITS) +#define SBITMAP_SIZE_BYTES(BITMAP) ((BITMAP)->size * sizeof (SBITMAP_ELT_TYPE)) /* Test if bit number bitno in the bitmap is set. */ #define TEST_BIT(BITMAP, BITNO) \ ((BITMAP)->elms [(BITNO) / SBITMAP_ELT_BITS] >> (BITNO) % SBITMAP_ELT_BITS & 1) -/* Reset bit number bitno in the bitmap. */ -#define RESET_BIT(BITMAP, BITNO) \ - ((BITMAP)->elms [(BITNO) / SBITMAP_ELT_BITS] \ - &= ~((SBITMAP_ELT_TYPE) 1 << (BITNO) % SBITMAP_ELT_BITS)) +/* Set bit number BITNO in the sbitmap MAP. Updates population count + if this bitmap has one. */ -/* Loop over all elements of SBITSET, starting with MIN. */ -#define EXECUTE_IF_SET_IN_SBITMAP(SBITMAP, MIN, N, CODE) \ -do { \ - unsigned int word_num_ = (MIN) / (unsigned int) SBITMAP_ELT_BITS; \ - unsigned int bit_num_ = (MIN) % (unsigned int) SBITMAP_ELT_BITS; \ - unsigned int size_ = (SBITMAP)->size; \ - SBITMAP_ELT_TYPE *ptr_ = (SBITMAP)->elms; \ - SBITMAP_ELT_TYPE word_; \ - \ - if (word_num_ < size_) \ - { \ - word_ = ptr_[word_num_] >> bit_num_; \ - \ - while (1) \ - { \ - for (; word_ != 0; word_ >>= 1, bit_num_++) \ - { \ - if ((word_ & 1) != 0) \ - { \ - (N) = word_num_ * SBITMAP_ELT_BITS + bit_num_; \ - CODE; \ - } \ - } \ - word_num_++; \ - if (word_num_ >= size_) \ - break; \ - bit_num_ = 0, word_ = ptr_[word_num_]; \ - } \ - } \ -} while (0) +static inline void +SET_BIT (sbitmap map, unsigned int bitno) +{ + if (map->popcount) + { + bool oldbit; + oldbit = TEST_BIT (map, bitno); + if (!oldbit) + map->popcount[bitno / SBITMAP_ELT_BITS]++; + } + map->elms[bitno / SBITMAP_ELT_BITS] + |= (SBITMAP_ELT_TYPE) 1 << (bitno) % SBITMAP_ELT_BITS; +} + + + +/* Reset bit number BITNO in the sbitmap MAP. Updates population + count if this bitmap has one. */ + +static inline void +RESET_BIT (sbitmap map, unsigned int bitno) +{ + if (map->popcount) + { + bool oldbit; + oldbit = TEST_BIT (map, bitno); + if (oldbit) + map->popcount[bitno / SBITMAP_ELT_BITS]--; + } + map->elms[bitno / SBITMAP_ELT_BITS] + &= ~((SBITMAP_ELT_TYPE) 1 << (bitno) % SBITMAP_ELT_BITS); +} + +/* The iterator for sbitmap. */ +typedef struct { + /* The pointer to the first word of the bitmap. */ + SBITMAP_ELT_TYPE *ptr; + + /* The size of the bitmap. */ + unsigned int size; + + /* The current word index. */ + unsigned int word_num; + + /* The current bit index (not modulo SBITMAP_ELT_BITS). */ + unsigned int bit_num; + + /* The words currently visited. */ + SBITMAP_ELT_TYPE word; +} sbitmap_iterator; + +/* Initialize the iterator I with sbitmap BMP and the initial index + MIN. */ + +static inline void +sbitmap_iter_init (sbitmap_iterator *i, sbitmap bmp, unsigned int min) +{ + i->word_num = min / (unsigned int) SBITMAP_ELT_BITS; + i->bit_num = min; + i->size = bmp->size; + i->ptr = bmp->elms; + + if (i->word_num >= i->size) + i->word = 0; + else + i->word = (i->ptr[i->word_num] + >> (i->bit_num % (unsigned int) SBITMAP_ELT_BITS)); +} + +/* Return true if we have more bits to visit, in which case *N is set + to the index of the bit to be visited. Otherwise, return + false. */ + +static inline bool +sbitmap_iter_cond (sbitmap_iterator *i, unsigned int *n) +{ + /* Skip words that are zeros. */ + for (; i->word == 0; i->word = i->ptr[i->word_num]) + { + i->word_num++; + + /* If we have reached the end, break. */ + if (i->word_num >= i->size) + return false; + + i->bit_num = i->word_num * SBITMAP_ELT_BITS; + } + + /* Skip bits that are zero. */ + for (; (i->word & 1) == 0; i->word >>= 1) + i->bit_num++; + + *n = i->bit_num; + + return true; +} + +/* Advance to the next bit. */ + +static inline void +sbitmap_iter_next (sbitmap_iterator *i) +{ + i->word >>= 1; + i->bit_num++; +} + +/* Loop over all elements of SBITMAP, starting with MIN. In each + iteration, N is set to the index of the bit being visited. ITER is + an instance of sbitmap_iterator used to iterate the bitmap. */ + +#define EXECUTE_IF_SET_IN_SBITMAP(SBITMAP, MIN, N, ITER) \ + for (sbitmap_iter_init (&(ITER), (SBITMAP), (MIN)); \ + sbitmap_iter_cond (&(ITER), &(N)); \ + sbitmap_iter_next (&(ITER))) #define EXECUTE_IF_SET_IN_SBITMAP_REV(SBITMAP, N, CODE) \ do { \ @@ -114,7 +200,7 @@ do { \ } \ } while (0) -#define sbitmap_free(MAP) free(MAP) +#define sbitmap_free(MAP) (free((MAP)->popcount), free((MAP))) #define sbitmap_vector_free(VEC) free(VEC) struct int_list; @@ -124,9 +210,11 @@ extern void dump_sbitmap_file (FILE *, sbitmap); extern void dump_sbitmap_vector (FILE *, const char *, const char *, sbitmap *, int); extern sbitmap sbitmap_alloc (unsigned int); +extern sbitmap sbitmap_alloc_with_popcount (unsigned int); extern sbitmap *sbitmap_vector_alloc (unsigned int, unsigned int); extern sbitmap sbitmap_resize (sbitmap, unsigned int, int); extern void sbitmap_copy (sbitmap, sbitmap); +extern void sbitmap_copy_n (sbitmap, sbitmap, unsigned int); extern int sbitmap_equal (sbitmap, sbitmap); extern void sbitmap_zero (sbitmap); extern void sbitmap_ones (sbitmap); @@ -141,6 +229,7 @@ extern void sbitmap_a_or_b_and_c (sbitmap, sbitmap, sbitmap, sbitmap); extern bool sbitmap_a_or_b_and_c_cg (sbitmap, sbitmap, sbitmap, sbitmap); extern void sbitmap_a_and_b_or_c (sbitmap, sbitmap, sbitmap, sbitmap); extern bool sbitmap_a_and_b_or_c_cg (sbitmap, sbitmap, sbitmap, sbitmap); +extern bool sbitmap_any_common_bits (sbitmap, sbitmap); extern void sbitmap_a_and_b (sbitmap, sbitmap, sbitmap); extern bool sbitmap_a_and_b_cg (sbitmap, sbitmap, sbitmap); extern void sbitmap_a_or_b (sbitmap, sbitmap, sbitmap); @@ -172,4 +261,6 @@ extern void sbitmap_union_of_preds (sbitmap, sbitmap *, int); extern void debug_sbitmap (sbitmap); extern sbitmap sbitmap_realloc (sbitmap, unsigned int); +extern unsigned long sbitmap_popcount(sbitmap, unsigned long); +extern void sbitmap_verify_popcount (sbitmap); #endif /* ! GCC_SBITMAP_H */