bitmap.c: Comment some functions; fiddle whitespace.

        * bitmap.c: Comment some functions; fiddle whitespace.
        (bitmap_free): Don't export.
        (bitmap_element_allocate): Use memset.
        * bitmap.h (bitmap_free): Don't declare.

From-SVN: r43940

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index ad18655f2c237f710164fac6243be3cd6f1a0e76..82cce17c0a001603d1a89889a67528df3de237ea 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+2001-07-11  Richard Henderson  <rth@redhat.com>
+
+       * bitmap.c: Comment some functions; fiddle whitespace.
+       (bitmap_free): Don't export.
+       (bitmap_element_allocate): Use memset.
+       * bitmap.h (bitmap_free): Don't declare.
+
 2001-07-11  Daniel Berlin  <dan@cgsoftware.com>
 
        * gcse.c, lcm.c, sched-deps.c:

diff --git a/gcc/bitmap.c b/gcc/bitmap.c
index 055024e36676ac8d6606f70d6d5e9ef399805f83..c19df31b76483e51ff70834c713dae02aca92028 100644 (file)
--- a/gcc/bitmap.c
+++ b/gcc/bitmap.c
@@ -39,7 +39,7 @@ static int bitmap_obstack_init = FALSE;
 
 /* Global data */
 bitmap_element bitmap_zero_bits;       /* An element of all zero bits. */
-bitmap_element *bitmap_free;           /* Freelist of bitmap elements. */
+static bitmap_element *bitmap_free;    /* Freelist of bitmap elements. */
 
 static void bitmap_element_free                PARAMS ((bitmap, bitmap_element *));
 static bitmap_element *bitmap_element_allocate PARAMS ((void));
@@ -47,7 +47,8 @@ static int bitmap_element_zerop               PARAMS ((bitmap_element *));
 static void bitmap_element_link                PARAMS ((bitmap, bitmap_element *));
 static bitmap_element *bitmap_find_bit PARAMS ((bitmap, unsigned int));
 \f
-/* Free a bitmap element */
+/* Free a bitmap element.  Since these are allocated off the
+   bitmap_obstack, "free" actually means "put onto the freelist".  */
 
 static INLINE void
 bitmap_element_free (head, elt)
@@ -81,9 +82,6 @@ static INLINE bitmap_element *
 bitmap_element_allocate ()
 {
   bitmap_element *element;
-#if BITMAP_ELEMENT_WORDS != 2
-  int i;
-#endif
 
   if (bitmap_free != 0)
     {
@@ -125,12 +123,7 @@ bitmap_element_allocate ()
                                                  sizeof (bitmap_element));
     }
 
-#if BITMAP_ELEMENT_WORDS == 2
-  element->bits[0] = element->bits[1] = 0;
-#else
-  for (i = 0; i < BITMAP_ELEMENT_WORDS; i++)
-    element->bits[i] = 0;
-#endif
+  memset (element->bits, 0, sizeof (element->bits));
 
   return element;
 }
@@ -242,7 +235,7 @@ bitmap_clear (head)
   head->first = head->current =  0;
 }
 \f
-/* Copy a bitmap to another bitmap */
+/* Copy a bitmap to another bitmap.  */
 
 void
 bitmap_copy (to, from)
@@ -350,7 +343,6 @@ bitmap_clear_bit (head, bit)
     }
 }
 
-\f
 /* Set a single bit in a bitmap.  */
 
 void
@@ -374,7 +366,7 @@ bitmap_set_bit (head, bit)
   else
     ptr->bits[word_num] |= bit_val;
 }
-\f
+
 /* Return whether a bit is set within a bitmap.  */
 
 int
@@ -397,6 +389,8 @@ bitmap_bit_p (head, bit)
   return (ptr->bits[word_num] >> bit_num) & 1;
 }
 \f
+/* Return the bit number of the first set bit in the bitmap, or -1
+   if the bitmap is empty.  */
 
 int 
 bitmap_first_set_bit (a)
@@ -448,6 +442,9 @@ bitmap_first_set_bit (a)
          + bit_num);
 }
 
+/* Return the bit number of the last set bit in the bitmap, or -1
+   if the bitmap is empty.  */
+
 int 
 bitmap_last_set_bit (a)
      bitmap a;
@@ -491,7 +488,7 @@ bitmap_last_set_bit (a)
   if (word & 0xc)
     word >>= 2, bit_num += 2;
   if (word & 0x2)
-    word >>= 1, bit_num += 1;
+    bit_num += 1;
 
   return (ptr->indx * BITMAP_ELEMENT_ALL_BITS
          + word_num * HOST_BITS_PER_WIDE_INT
@@ -766,7 +763,7 @@ debug_bitmap_file (file, head)
       fprintf (file, " }\n");
     }
 }
-\f
+
 /* Function to be called from the debugger to print the contents
    of a bitmap.  */
 
@@ -776,7 +773,7 @@ debug_bitmap (head)
 {
   debug_bitmap_file (stdout, head);
 }
-\f
+
 /* Function to print out the contents of a bitmap.  Unlike debug_bitmap_file,
    it does not print anything but the bits.  */
 

diff --git a/gcc/bitmap.h b/gcc/bitmap.h
index 42b5493c2871cf49f5070bf97be2ae16ed782045..0d11d40c38e1506443130b58a4d81fcf34161862 100644 (file)
--- a/gcc/bitmap.h
+++ b/gcc/bitmap.h
@@ -65,7 +65,6 @@ enum bitmap_bits {
 };
 
 /* Global data */
-extern bitmap_element *bitmap_free;    /* Freelist of bitmap elements */
 extern bitmap_element bitmap_zero_bits;        /* Zero bitmap element */
 
 /* Clear a bitmap by freeing up the linked list.  */