diff options
| author | Dave Airlie <[email protected]> | 2019-04-29 13:17:41 +1000 |
|---|---|---|
| committer | Dave Airlie <[email protected]> | 2019-05-03 15:23:04 +1000 |
| commit | 512a31a41299758f0f60d0452b8c9e8c02238189 (patch) | |
| tree | 7615894398d16e9827bf40f284ad6432b88072ed /src | |
| parent | 18973a450ed986a0f56aa35b14c8e9fd9260f168 (diff) | |
util/bitset: fix bitset range mask calculations.
The MASK macro is used in the RANGE macro, and it should
return the pre-bitset word mask for the (b) value.
i.e.
BITSET_MASK(0) should be undefined since it's meaningless.
BITSET_MASK(31) should give 0x7fffffff
BITSET_MASK(32) should give 0xffffffff
BITSET_MASK(33) should give 0x00000001
BITSET_MASK(64) should give 0xffffffff
However then BITSET_RANGE ends up broken for cases where
it's (b) value is the 0,32,64 value as in that case the lower
mask would be 0 not 0xffffffff.
This fixes the unit tests that I've added, and my code that
uses bitsets.
Reviewed-by: Jason Ekstrand <[email protected]>
Fixes: bb38cadb1c5f2 "More GLSL code"
Reviewed-by: Kristian H. Kristensen <[email protected]>
Diffstat (limited to 'src')
| -rw-r--r-- | src/util/bitset.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/util/bitset.h b/src/util/bitset.h index e610d5f897e..7f116214b92 100644 --- a/src/util/bitset.h +++ b/src/util/bitset.h @@ -62,8 +62,8 @@ #define BITSET_SET(x, b) ((x)[BITSET_BITWORD(b)] |= BITSET_BIT(b)) #define BITSET_CLEAR(x, b) ((x)[BITSET_BITWORD(b)] &= ~BITSET_BIT(b)) -#define BITSET_MASK(b) ((b) == BITSET_WORDBITS ? ~0 : BITSET_BIT(b) - 1) -#define BITSET_RANGE(b, e) (BITSET_MASK((e) + 1) & ~BITSET_MASK(b)) +#define BITSET_MASK(b) (((b) % BITSET_WORDBITS == 0) ? ~0 : BITSET_BIT(b) - 1) +#define BITSET_RANGE(b, e) ((BITSET_MASK((e) + 1)) & ~(BITSET_BIT(b) - 1)) /* bit range operations */ |