sbitmap.h (sbitmap_iter_init): Consistently treat bit_num as the current bit index...

	* sbitmap.h (sbitmap_iter_init): Consistently treat bit_num as
	the current bit index with no modulo.

From-SVN: r100720

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index e200023d66b03771e775e2c12a0b7bc73dda36b2..04974e53fe25b1e5e6766d5c0d2a8ddb905c0e31 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2005-06-07  Kazu Hirata  <kazu@codesourcery.com>
+
+       * sbitmap.h (sbitmap_iter_init): Consistently treat bit_num as
+       the current bit index with no modulo.
+
 2005-06-07  Sebastian Pop  <pop@cri.ensmp.fr>
 
        PR 18403 and meta PR 21861.

diff --git a/gcc/sbitmap.h b/gcc/sbitmap.h
index fe23cbf91fae20b6639ad1cd7f8542f4ba9f691e..7f40d8ae43ca718b20f255292c48cf9019d10d3f 100644 (file)
--- a/gcc/sbitmap.h
+++ b/gcc/sbitmap.h
@@ -66,7 +66,7 @@ typedef struct {
   /* The current word index.  */
   unsigned int word_num;
 
-  /* The current bit index.  */
+  /* The current bit index (not modulo SBITMAP_ELT_BITS).  */
   unsigned int bit_num;
 
   /* The words currently visited.  */
@@ -80,14 +80,15 @@ 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 % (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;
+    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