From 0e8810ccbec84999727940e68a5a5d654ee589e1 Mon Sep 17 00:00:00 2001 From: Elliott Hughes Date: Sat, 29 Apr 2017 10:22:40 -0700 Subject: [PATCH] Remove unused cruft from . Bug: N/A Test: builds Change-Id: I5931f2b91b2d64d8e26f9ba092879c14d0ed3622 --- libcutils/include/cutils/bitops.h | 85 ++----------------------------- 1 file changed, 3 insertions(+), 82 deletions(-) diff --git a/libcutils/include/cutils/bitops.h b/libcutils/include/cutils/bitops.h index 045830d90..38d284039 100644 --- a/libcutils/include/cutils/bitops.h +++ b/libcutils/include/cutils/bitops.h @@ -24,94 +24,15 @@ __BEGIN_DECLS -/* - * Bitmask Operations - * - * Note this doesn't provide any locking/exclusion, and isn't atomic. - * Additionally no bounds checking is done on the bitmask array. - * - * Example: - * - * int num_resources; - * unsigned int resource_bits[BITS_TO_WORDS(num_resources)]; - * bitmask_init(resource_bits, num_resources); - * ... - * int bit = bitmask_ffz(resource_bits, num_resources); - * bitmask_set(resource_bits, bit); - * ... - * if (bitmask_test(resource_bits, bit)) { ... } - * ... - * bitmask_clear(resource_bits, bit); - * - */ - -#define BITS_PER_WORD (sizeof(unsigned int) * 8) -#define BITS_TO_WORDS(x) (((x) + BITS_PER_WORD - 1) / BITS_PER_WORD) -#define BIT_IN_WORD(x) ((x) % BITS_PER_WORD) -#define BIT_WORD(x) ((x) / BITS_PER_WORD) -#define BIT_MASK(x) (1 << BIT_IN_WORD(x)) - -static inline void bitmask_init(unsigned int *bitmask, int num_bits) -{ - memset(bitmask, 0, BITS_TO_WORDS(num_bits)*sizeof(unsigned int)); -} - -static inline int bitmask_ffz(unsigned int *bitmask, int num_bits) -{ - int bit, result; - size_t i; - - for (i = 0; i < BITS_TO_WORDS(num_bits); i++) { - bit = ffs(~bitmask[i]); - if (bit) { - // ffs is 1-indexed, return 0-indexed result - bit--; - result = BITS_PER_WORD * i + bit; - if (result >= num_bits) - return -1; - return result; - } - } - return -1; -} - -static inline int bitmask_weight(unsigned int *bitmask, int num_bits) -{ - size_t i; - int weight = 0; - - for (i = 0; i < BITS_TO_WORDS(num_bits); i++) - weight += __builtin_popcount(bitmask[i]); - return weight; -} - -static inline void bitmask_set(unsigned int *bitmask, int bit) -{ - bitmask[BIT_WORD(bit)] |= BIT_MASK(bit); -} - -static inline void bitmask_clear(unsigned int *bitmask, int bit) -{ - bitmask[BIT_WORD(bit)] &= ~BIT_MASK(bit); -} - -static inline bool bitmask_test(unsigned int *bitmask, int bit) -{ - return bitmask[BIT_WORD(bit)] & BIT_MASK(bit); -} - -static inline int popcount(unsigned int x) -{ +static inline int popcount(unsigned int x) { return __builtin_popcount(x); } -static inline int popcountl(unsigned long x) -{ +static inline int popcountl(unsigned long x) { return __builtin_popcountl(x); } -static inline int popcountll(unsigned long long x) -{ +static inline int popcountll(unsigned long long x) { return __builtin_popcountll(x); }