lby/lk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[lib][console] include stdalign.h and use alignof/alignas

Browse Source 
Instead of manually calling out the alignment to a void *, use alignas
to the real type.
This commit is contained in:
Travis Geiselbrecht
2021-11-09 23:27:05 -08:00
parent b4e6747a62
commit 552606651c
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
lib/console/include/lib/console/cmd.h
View File

@@ -9,14 +9,17 @@
#include <stdbool.h> #include <stdbool.h>
#include <stddef.h> #include <stddef.h>
#include <stdalign.h>
#include <sys/types.h> #include <sys/types.h>
#include <lk/compiler.h> #include <lk/compiler.h>
__BEGIN_CDECLS __BEGIN_CDECLS
/* included from top level lk/console_cmd.h when lib/console is built. /* Included from top level lk/console_cmd.h when lib/console is built.
* Provides definitions for how to register a command block to be picked up by * Provides definitions for how to register a command block to be picked up by
* the lib/console machinery. * the lib/console machinery.
*
* Do not include directly.
*/ */
/* an individual command */ /* an individual command */
@@ -36,15 +39,15 @@ typedef struct _cmd_block {
#define STATIC_COMMAND_START static const console_cmd _cmd_list[] = { #define STATIC_COMMAND_START static const console_cmd _cmd_list[] = {
#define STATIC_COMMAND_END(name) }; const console_cmd_block _cmd_block_##name \ #define STATIC_COMMAND_END(name) }; alignas(console_cmd_block) const console_cmd_block _cmd_block_##name \
__ALIGNED(sizeof(void *)) __SECTION("commands") = \ __SECTION("commands") = \
{ #name, sizeof(_cmd_list) / sizeof(_cmd_list[0]), _cmd_list } { #name, sizeof(_cmd_list) / sizeof(_cmd_list[0]), _cmd_list }
/* same as above but with a suffixed name to make the list unique within the file */ /* same as above but with a suffixed name to make the list unique within the file */
#define STATIC_COMMAND_START_NAMED(name) static const console_cmd _cmd_list_##name[] = { #define STATIC_COMMAND_START_NAMED(name) static const console_cmd _cmd_list_##name[] = {
#define STATIC_COMMAND_END_NAMED(name) }; const console_cmd_block _cmd_block_##name \ #define STATIC_COMMAND_END_NAMED(name) }; alignas(console_cmd_block) const console_cmd_block _cmd_block_##name \
__ALIGNED(sizeof(void *)) __SECTION("commands") = \ __SECTION("commands") = \
{ #name, sizeof(_cmd_list_##name) / sizeof(_cmd_list_##name[0]), _cmd_list_##name } { #name, sizeof(_cmd_list_##name) / sizeof(_cmd_list_##name[0]), _cmd_list_##name }
#define STATIC_COMMAND(command_str, help_str, func) \ #define STATIC_COMMAND(command_str, help_str, func) \