diff options
| -rw-r--r-- | libmisc/include/libmisc/linkedlist.h | 21 | ||||
| -rw-r--r-- | libmisc/include/libmisc/macro.h | 12 |
2 files changed, 16 insertions, 17 deletions
diff --git a/libmisc/include/libmisc/linkedlist.h b/libmisc/include/libmisc/linkedlist.h index 045a468..8adef66 100644 --- a/libmisc/include/libmisc/linkedlist.h +++ b/libmisc/include/libmisc/linkedlist.h @@ -8,6 +8,7 @@ #define _LIBMISC_LINKEDLIST_H_ #include <libmisc/assert.h> +#include <libmisc/macro.h> /* singly linked list *********************************************************/ @@ -19,14 +20,8 @@ typedef struct { lm_sll_node *front, *rear; } lm_sll_root; -#define lm_sll_node_cast(node_typ, node_ptr) \ - ({ \ - static_assert(_Generic(node_ptr, lm_sll_node *: 1, default: 0), \ - "typeof("#node_ptr") != lm_sll_node *"); \ - assert(node_ptr); \ - static_assert(offsetof(node_typ, lm_sll_node) == 0); \ - ((node_typ*)(node_ptr)); \ - }) +#define lm_sll_node_cast(node_typ, node_ptr) \ + LM_CAST_FIELD_TO_STRUCT(node_typ, lm_sll_node, node_ptr) void lm_sll_push_to_rear(lm_sll_root *root, lm_sll_node *node); void lm_sll_pop_from_front(lm_sll_root *root); @@ -41,14 +36,8 @@ typedef struct { lm_dll_node *front, *rear; } lm_dll_root; -#define lm_dll_node_cast(node_typ, node_ptr) \ - ({ \ - static_assert(_Generic(node_ptr, lm_dll_node *: 1, default: 0), \ - "typeof("#node_ptr") != lm_dll_node *"); \ - assert(node_ptr); \ - static_assert(offsetof(node_typ, lm_dll_node) == 0); \ - ((node_typ*)(node_ptr)); \ - }) +#define lm_dll_node_cast(node_typ, node_ptr) \ + LM_CAST_FIELD_TO_STRUCT(node_typ, lm_dll_node, node_ptr) void lm_dll_push_to_rear(lm_dll_root *root, lm_dll_node *node); void lm_dll_remove(lm_dll_root *root, lm_dll_node *node); diff --git a/libmisc/include/libmisc/macro.h b/libmisc/include/libmisc/macro.h index b3e235c..4591b68 100644 --- a/libmisc/include/libmisc/macro.h +++ b/libmisc/include/libmisc/macro.h @@ -14,9 +14,19 @@ #define LM_NEVER_INLINE [[gnu::noinline]] #define LM_FLATTEN [[gnu::flatten]] -/* numeric */ +/* types */ #define LM_ARRAY_LEN(ary) (sizeof(ary)/sizeof((ary)[0])) + +#define LM_CAST_FIELD_TO_STRUCT(STRUCT_TYP, FIELD_NAME, PTR_TO_FIELD) ({ \ + /* The _fptr assignment is to get the compiler to do type checking. */ \ + typeof(((STRUCT_TYP *)NULL)->FIELD_NAME) *_fptr = (PTR_TO_FIELD); \ + assert(_fptr); \ + ((STRUCT_TYP*)( ((void*)_fptr) - offsetof(STRUCT_TYP, FIELD_NAME))); \ +}) + +/* numeric */ + #define LM_CEILDIV(n, d) ( ((n)+(d)-1) / (d) ) /** Return ceil(n/d) */ #define LM_ROUND_UP(n, d) ( LM_CEILDIV(n, d) * (d) ) /** Return `n` rounded up to the nearest multiple of `d` */ #define LM_ROUND_DOWN(n, d) ( ((n)/(d)) * (d) ) /** Return `n` rounded down to the nearest multiple of `d` */ |