From fb994f44d91a4b94738ea4ebb83aab1a257ef123 Mon Sep 17 00:00:00 2001 From: Marek Olšák Date: Sun, 26 Nov 2023 09:23:10 -0500 Subject: util: make BITSET_TEST_RANGE_INSIDE_WORD take a value to compare with Reviewed-by: Pierre-Eric Pelloux-Prayer Part-of: --- src/util/bitset.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/util/bitset.h') diff --git a/src/util/bitset.h b/src/util/bitset.h index d5b5d6dae2d..cffbb73ecce 100644 --- a/src/util/bitset.h +++ b/src/util/bitset.h @@ -205,11 +205,11 @@ __bitset_shl(BITSET_WORD *x, unsigned amount, unsigned n) #define BITSET_SHL(x, n) \ __bitset_shl(x, n, ARRAY_SIZE(x)); -/* bit range operations +/* bit range operations (e=end is inclusive) */ -#define BITSET_TEST_RANGE_INSIDE_WORD(x, b, e) \ +#define BITSET_TEST_RANGE_INSIDE_WORD(x, b, e, mask) \ (BITSET_BITWORD(b) == BITSET_BITWORD(e) ? \ - (((x)[BITSET_BITWORD(b)] & BITSET_RANGE(b, e)) != 0) : \ + (((x)[BITSET_BITWORD(b)] & BITSET_RANGE(b, e)) == mask) : \ (assert (!"BITSET_TEST_RANGE: bit range crosses word boundary"), 0)) #define BITSET_SET_RANGE_INSIDE_WORD(x, b, e) \ (BITSET_BITWORD(b) == BITSET_BITWORD(e) ? \ @@ -227,7 +227,7 @@ __bitset_test_range(const BITSET_WORD *r, unsigned start, unsigned end) const unsigned start_mod = start % BITSET_WORDBITS; if (start_mod + size <= BITSET_WORDBITS) { - return BITSET_TEST_RANGE_INSIDE_WORD(r, start, end); + return !BITSET_TEST_RANGE_INSIDE_WORD(r, start, end, 0); } else { const unsigned first_size = BITSET_WORDBITS - start_mod; -- cgit v1.2.3