From: Sebastian Hack <hack@ipd.info.uni-karlsruhe.de>
Date: Tue, 14 Mar 2006 17:15:52 +0000 (+0000)
Subject: Backported from libcore
X-Git-Url: http://nsz.repo.hu/git/?a=commitdiff_plain;h=b23faa48152b41087406b3340ecdf9b45a897584;p=libfirm

Backported from libcore

[r7439]
---

diff --git a/ir/adt/bitset.h b/ir/adt/bitset.h
index ad920a840..528a5bb92 100644
--- a/ir/adt/bitset.h
+++ b/ir/adt/bitset.h
@@ -13,6 +13,12 @@
 #include <assert.h>
 #include <string.h>
 
+#ifdef _WIN32
+#include <malloc.h>
+#else
+#include <alloca.h>
+#endif
+
 #include "firm_config.h"
 #include "bitfiddle.h"
 
@@ -265,43 +271,42 @@ static INLINE bitset_pos_t bitset_max(const bitset_t *bs)
 static INLINE bitset_pos_t _bitset_next(const bitset_t *bs,
 		bitset_pos_t pos, int set)
 {
-	bitset_pos_t unit_number = pos / BS_UNIT_SIZE_BITS;
-
-	if(unit_number >= bs->units)
+	if(pos >= bs->size)
 		return -1;
 
 	{
-		bitset_pos_t bit_in_unit = pos & BS_UNIT_MASK;
-		bitset_pos_t in_unit_mask = (1 << bit_in_unit) - 1;
+		lc_bitset_pos_t unit_number = pos / LC_BS_UNIT_SIZE_BITS;
+		lc_bitset_unit_t set_mask   = -set;
+		lc_bitset_pos_t bit_in_unit = pos & LC_BS_UNIT_MASK;
+		lc_bitset_pos_t in_unit_mask = (1 << bit_in_unit) - 1;
 
 		/*
 		 * Mask out the bits smaller than pos in the current unit.
 		 * We are only interested in bits set higher than pos.
 		 */
-		bitset_unit_t curr_unit = bs->data[unit_number];
+		lc_bitset_unit_t curr_unit = bs->data[unit_number];
 
 		/*
 		 * Find the next bit set in the unit.
 		 * Mind that this function returns 0, if the unit is -1 and
 		 * counts the bits from 1 on.
 		 */
-		bitset_pos_t next_in_this_unit =
-			_bitset_inside_ntz_value((set ? curr_unit : ~curr_unit) & ~in_unit_mask);
+		lc_bitset_pos_t next_in_this_unit =
+			_lc_bitset_inside_ntz_value((set_mask ^ curr_unit) & ~in_unit_mask);
 
 		/* If there is a bit set in the current unit, exit. */
-		if(next_in_this_unit < BS_UNIT_SIZE_BITS)
-			return next_in_this_unit + unit_number * BS_UNIT_SIZE_BITS;
+		if(next_in_this_unit < LC_BS_UNIT_SIZE_BITS)
+			return next_in_this_unit + unit_number * LC_BS_UNIT_SIZE_BITS;
 
 		/* Else search for set bits in the next units. */
 		else {
-			bitset_pos_t i;
+			lc_bitset_pos_t i;
 			for(i = unit_number + 1; i < bs->units; ++i) {
-				bitset_unit_t data = bs->data[i];
-				bitset_pos_t first_set =
-					_bitset_inside_ntz_value(set ? data : ~data);
+				lc_bitset_unit_t data = bs->data[i];
+				lc_bitset_pos_t first_set = _lc_bitset_inside_ntz_value(set_mask ^ data);
 
-				if(first_set < BS_UNIT_SIZE_BITS)
-					return first_set + i * BS_UNIT_SIZE_BITS;
+				if(first_set < LC_BS_UNIT_SIZE_BITS)
+					return first_set + i * LC_BS_UNIT_SIZE_BITS;
 			}
 		}
 	}