drashna/qmk_firmware
1
0
Fork 0
Code Activity

[Core] Add support for 64-bit layer bitmask

Browse source
This commit is contained in:
Drashna Jael're 2023-08-31 19:17:40 -07:00
parent 2c64cdf760
commit 68ba4e0305
Signed by: drashna
GPG key ID: DBA1FD3A860D1B11
3 changed files with 51 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
quantum/action_layer.h
View file

@ -67,6 +67,13 @@ typedef uint32_t layer_state_t;
# define MAX_LAYER 32 # define MAX_LAYER 32
# endif # endif
# define get_highest_layer(state) biton32(state) # define get_highest_layer(state) biton32(state)
#elif defined(LAYER_STATE_64BIT)
typedef uint64_t layer_state_t;
# define MAX_LAYER_BITS 6
# ifndef MAX_LAYER
# define MAX_LAYER 64
# endif
# define get_highest_layer(state) biton64(state)
#else #else
# error Layer Mask size not specified. HOW?! # error Layer Mask size not specified. HOW?!
#endif #endif

41
quantum/bitwise.c
View file

@ -43,6 +43,13 @@ uint8_t bitpop32(uint32_t bits) {
return c; return c;
} }
uint8_t bitpop64(uint64_t bits) {
uint8_t c;
for (c = 0; bits; c++)
bits &= bits - 1;
return c;
}
// most significant on-bit - return highest location of on-bit // most significant on-bit - return highest location of on-bit
// NOTE: return 0 when bit0 is on or all bits are off // NOTE: return 0 when bit0 is on or all bits are off
__attribute__((noinline)) uint8_t biton(uint8_t bits) { __attribute__((noinline)) uint8_t biton(uint8_t bits) {
@ -108,6 +115,35 @@ uint8_t biton32(uint32_t bits) {
return n; return n;
} }
uint8_t biton64(uint64_t bits) {
uint8_t n = 0;
if (bits >> 32) {
bits >>= 32;
n += 32;
}
if (bits >> 16) {
bits >>= 16;
n += 16;
}
if (bits >> 8) {
bits >>= 8;
n += 8;
}
if (bits >> 4) {
bits >>= 4;
n += 4;
}
if (bits >> 2) {
bits >>= 2;
n += 2;
}
if (bits >> 1) {
bits >>= 1;
n += 1;
}
return n;
}
__attribute__((noinline)) uint8_t bitrev(uint8_t bits) { __attribute__((noinline)) uint8_t bitrev(uint8_t bits) {
bits = (bits & 0x0f) << 4 | (bits & 0xf0) >> 4; bits = (bits & 0x0f) << 4 | (bits & 0xf0) >> 4;
bits = (bits & 0b00110011) << 2 | (bits & 0b11001100) >> 2; bits = (bits & 0b00110011) << 2 | (bits & 0b11001100) >> 2;
@ -124,3 +160,8 @@ uint32_t bitrev32(uint32_t bits) {
bits = (uint32_t)bitrev16(bits & 0x0000ffff) << 16 | bitrev16((bits & 0xffff0000) >> 16); bits = (uint32_t)bitrev16(bits & 0x0000ffff) << 16 | bitrev16((bits & 0xffff0000) >> 16);
return bits; return bits;
} }
uint64_t bitrev64(uint64_t bits) {
bits = (uint64_t)bitrev32(bits & 0x00000000ffffffff) << 32 | bitrev32((bits & 0xffffffff00000000) >> 32);
return bits;
}

3
quantum/bitwise.h
View file

@ -26,14 +26,17 @@ extern "C" {
uint8_t bitpop(uint8_t bits); uint8_t bitpop(uint8_t bits);
uint8_t bitpop16(uint16_t bits); uint8_t bitpop16(uint16_t bits);
uint8_t bitpop32(uint32_t bits); uint8_t bitpop32(uint32_t bits);
uint8_t bitpop64(uint64_t bits);
uint8_t biton(uint8_t bits); uint8_t biton(uint8_t bits);
uint8_t biton16(uint16_t bits); uint8_t biton16(uint16_t bits);
uint8_t biton32(uint32_t bits); uint8_t biton32(uint32_t bits);
uint8_t biton64(uint64_t bits);
uint8_t bitrev(uint8_t bits); uint8_t bitrev(uint8_t bits);
uint16_t bitrev16(uint16_t bits); uint16_t bitrev16(uint16_t bits);
uint32_t bitrev32(uint32_t bits); uint32_t bitrev32(uint32_t bits);
uint64_t bitrev64(uint64_t bits);
#ifdef __cplusplus #ifdef __cplusplus
} }