X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=ucw%2Fbitarray.h;h=def9e1ae8691c8f8c50e9a867fd783aff7d6b03d;hb=7dacb2a75daa733259c374fb0248312cc7e025f6;hp=724804154e58349b94bca592667edd2d0b200949;hpb=1cf8ac51f5495ccd5187dc220ffc69e95d6e0cfc;p=libucw.git

diff --git a/ucw/bitarray.h b/ucw/bitarray.h
index 72480415..def9e1ae 100644
--- a/ucw/bitarray.h
+++ b/ucw/bitarray.h
@@ -2,6 +2,7 @@
  *	UCW Library -- Bit Array Operations
  *
  *	(c) 2003--2006 Martin Mares <mj@ucw.cz>
+ *	(c) 2012 Pavel Charvat <pchar@ucw.cz>
  *
  *	This software may be freely distributed and used according to the terms
  *	of the GNU Lesser General Public License.
@@ -12,49 +13,54 @@
 
 #include <string.h>
 
-typedef u32 *bitarray_t;
+#ifdef CONFIG_UCW_CLEAN_ABI
+#define bit_array_count_bits ucw_bit_array_count_bits
+#define bit_array_xrealloc ucw_bit_array_xrealloc
+#endif
+
+typedef u32 *bitarray_t; // Must be initialized by bit_array_xmalloc(), bit_array_zero() or bit_array_set_all()
+
 #define BIT_ARRAY_WORDS(n) (((n)+31)/32)
 #define BIT_ARRAY_BYTES(n) (4*BIT_ARRAY_WORDS(n))
 #define BIT_ARRAY(name,size) u32 name[BIT_ARRAY_WORDS(size)]
 
-static inline bitarray_t
-bit_array_xmalloc(uns n)
+static inline bitarray_t bit_array_xmalloc(uns n)
 {
   return xmalloc(BIT_ARRAY_BYTES(n));
 }
 
-static inline bitarray_t
-bit_array_xmalloc_zero(uns n)
+bitarray_t bit_array_xrealloc(bitarray_t a, uns old_n, uns new_n);
+
+static inline bitarray_t bit_array_xmalloc_zero(uns n)
 {
   return xmalloc_zero(BIT_ARRAY_BYTES(n));
 }
 
-static inline void
-bit_array_zero(bitarray_t a, uns n)
+static inline void bit_array_zero(bitarray_t a, uns n)
 {
   bzero(a, BIT_ARRAY_BYTES(n));
 }
 
-static inline void
-bit_array_set_all(bitarray_t a, uns n)
+static inline void bit_array_set_all(bitarray_t a, uns n)
 {
-  memset(a, 255, BIT_ARRAY_BYTES(n));
+  uns w = n / 32;
+  memset(a, 255, w * 4);
+  uns m = n & 31;
+  if (m)
+    a[w] = (1U << m) - 1;
 }
 
-static inline void
-bit_array_set(bitarray_t a, uns i)
+static inline void bit_array_set(bitarray_t a, uns i)
 {
   a[i/32] |= (1 << (i%32));
 }
 
-static inline void
-bit_array_clear(bitarray_t a, uns i)
+static inline void bit_array_clear(bitarray_t a, uns i)
 {
   a[i/32] &= ~(1 << (i%32));
 }
 
-static inline void
-bit_array_assign(bitarray_t a, uns i, uns x)
+static inline void bit_array_assign(bitarray_t a, uns i, uns x)
 {
   if (x)
     bit_array_set(a, i);
@@ -62,46 +68,43 @@ bit_array_assign(bitarray_t a, uns i, uns x)
     bit_array_clear(a, i);
 }
 
-static inline uns
-bit_array_isset(bitarray_t a, uns i)
+static inline uns bit_array_isset(bitarray_t a, uns i)
 {
   return a[i/32] & (1 << (i%32));
 }
 
-static inline uns
-bit_array_get(bitarray_t a, uns i)
+static inline uns bit_array_get(bitarray_t a, uns i)
 {
   return !! bit_array_isset(a, i);
 }
 
-static inline uns
-bit_array_test_and_set(bitarray_t a, uns i)
+static inline uns bit_array_test_and_set(bitarray_t a, uns i)
 {
   uns t = bit_array_isset(a, i);
   bit_array_set(a, i);
   return t;
 }
 
-static inline uns
-bit_array_test_and_clear(bitarray_t a, uns i)
+static inline uns bit_array_test_and_clear(bitarray_t a, uns i)
 {
   uns t = bit_array_isset(a, i);
   bit_array_clear(a, i);
   return t;
 }
 
-/* Iterate over all set bits, possibly destructively */
+uns bit_array_count_bits(bitarray_t a, uns n);
+
+/* Iterate over all set bits */
 #define BIT_ARRAY_FISH_BITS_BEGIN(var,ary,size)					\
   for (uns var##_hi=0; var##_hi < BIT_ARRAY_WORDS(size); var##_hi++)		\
-    for (uns var##_lo=0; ary[var##_hi]; var##_lo++)				\
-      if (ary[var##_hi] & (1 << var##_lo))					\
-        {									\
-	  uns var = 32*var##_hi + var##_lo;					\
-	  ary[var##_hi] &= ~(1 << var##_lo);					\
+    {										\
+      u32 var##_cur = ary[var##_hi];						\
+      for (uns var = 32 * var##_hi; var##_cur; var++, var##_cur >>= 1)		\
+        if (var##_cur & 1)							\
 	  do
 
 #define BIT_ARRAY_FISH_BITS_END							\
 	  while (0);								\
-	}
+    }
 
 #endif