9632360caa
* Add ARRAY_SIZE and CEILING utility macros * Apply a coccinelle patch to use ARRAY_SIZE * fix up some straggling items * Fix 'make test:secure' * Enhance ARRAY_SIZE macro to reject acting on pointers The previous definition would not produce a diagnostic for ``` int *p; size_t num_elem = ARRAY_SIZE(p) ``` but the new one will. * explicitly get definition of ARRAY_SIZE * Convert to ARRAY_SIZE when const is involved The following spatch finds additional instances where the array is const and the division is by the size of the type, not the size of the first element: ``` @ rule5a using "empty.iso" @ type T; const T[] E; @@ - (sizeof(E)/sizeof(T)) + ARRAY_SIZE(E) @ rule6a using "empty.iso" @ type T; const T[] E; @@ - sizeof(E)/sizeof(T) + ARRAY_SIZE(E) ``` * New instances of ARRAY_SIZE added since initial spatch run * Use `ARRAY_SIZE` in docs (found by grep) * Manually use ARRAY_SIZE hs_set is expected to be the same size as uint16_t, though it's made of two 8-bit integers * Just like char, sizeof(uint8_t) is guaranteed to be 1 This is at least true on any plausible system where qmk is actually used. Per my understanding it's universally true, assuming that uint8_t exists: https://stackoverflow.com/questions/48655310/can-i-assume-that-sizeofuint8-t-1 * Run qmk-format on core C files touched in this branch Co-authored-by: Stefan Kerkmann <karlk90@pm.me>
122 lines
2.5 KiB
C
122 lines
2.5 KiB
C
/* If for some reason you're still here, maybe due to horror, shock or
|
|
* some other godforsaken reason. Meet X Macros.
|
|
*
|
|
* The we abuse the include system to generate data structures that are
|
|
* used by the internal chording engine. The alternative to this is
|
|
* using a external generator (Like is done for the ASETNIOP base keymaps)
|
|
* With this disgusting bodge, you can just edit your .defs and compile!
|
|
*/
|
|
|
|
// Clear all X Macros
|
|
#define PRES BLANK
|
|
#define KEYS BLANK
|
|
#define SUBS BLANK
|
|
#define EXEC BLANK
|
|
#define SPEC BLANK
|
|
|
|
// Process single key pushes
|
|
#undef PRES
|
|
#define PRES P_KEYMAP
|
|
const struct keyEntry keyDict[] = {
|
|
#include "dicts.def"
|
|
};
|
|
#undef PRES
|
|
#define PRES BLANK
|
|
|
|
// Process Combos
|
|
#undef KEYS
|
|
#define KEYS K_ACTION
|
|
#include "dicts.def"
|
|
#undef KEYS
|
|
#define KEYS BLANK
|
|
|
|
#undef KEYS
|
|
#define KEYS K_KEYMAP
|
|
const struct comboEntry PROGMEM cmbDict[] = {
|
|
#include "dicts.def"
|
|
};
|
|
#undef KEYS
|
|
#define KEYS BLANK
|
|
|
|
// Process String stubs
|
|
#undef SUBS
|
|
#define SUBS S_ACTION
|
|
#include "dicts.def"
|
|
#undef SUBS
|
|
#define SUBS BLANK
|
|
|
|
// Generate dict for strings
|
|
#undef SUBS
|
|
#define SUBS S_KEYMAP
|
|
const struct stringEntry PROGMEM strDict[] = {
|
|
#include "dicts.def"
|
|
};
|
|
#undef SUBS
|
|
#define SUBS BLANK
|
|
|
|
// Generate function stubs
|
|
#undef EXEC
|
|
#define EXEC X_ACTION
|
|
#include "dicts.def"
|
|
#undef EXEC
|
|
#define EXEC BLANK
|
|
|
|
// Process the function structure
|
|
#undef EXEC
|
|
#define EXEC X_KEYMAP
|
|
const struct funcEntry funDict[] = {
|
|
#include "dicts.def"
|
|
};
|
|
#undef EXEC
|
|
#define EXEC BLANK
|
|
|
|
// Handle Special calls
|
|
#undef SPEC
|
|
#define SPEC Z_KEYMAP
|
|
const struct specialEntry spcDict[] = {
|
|
#include "dicts.def"
|
|
};
|
|
#undef SPEC
|
|
#define SPEC BLANK
|
|
|
|
// Test for collisions!
|
|
// Switch statement will explode on duplicate
|
|
// chords. This will be optimized out
|
|
#undef PRES
|
|
#undef KEYS
|
|
#undef SUBS
|
|
#undef EXEC
|
|
#undef SPEC
|
|
#define PRES TEST_COLLISION
|
|
#define KEYS TEST_COLLISION
|
|
#define SUBS TEST_COLLISION
|
|
#define EXEC TEST_COLLISION
|
|
#define SPEC TEST_COLLISION
|
|
void testCollisions(void) {
|
|
C_SIZE bomb = 0;
|
|
switch (bomb) {
|
|
#include "dicts.def"
|
|
}
|
|
}
|
|
|
|
// Test for unexpected input
|
|
// Should return blank lines for all valid input
|
|
#undef PRES
|
|
#undef KEYS
|
|
#undef SUBS
|
|
#undef EXEC
|
|
#undef SPEC
|
|
#define PRES BLANK
|
|
#define KEYS BLANK
|
|
#define SUBS BLANK
|
|
#define EXEC BLANK
|
|
#define SPEC BLANK
|
|
#include "dicts.def"
|
|
|
|
// Get size data back into the engine
|
|
size_t funcsLen = ARRAY_SIZE(funDict);
|
|
size_t stringLen = ARRAY_SIZE(strDict);
|
|
size_t keyLen = ARRAY_SIZE(keyDict);
|
|
size_t comboLen = ARRAY_SIZE(cmbDict);
|
|
size_t specialLen = ARRAY_SIZE(spcDict);
|