diff options
Diffstat (limited to 'include/apos/utils.h')
| -rw-r--r-- | include/apos/utils.h | 132 |
1 files changed, 72 insertions, 60 deletions
diff --git a/include/apos/utils.h b/include/apos/utils.h index 03e1a59..d7dd8b9 100644 --- a/include/apos/utils.h +++ b/include/apos/utils.h @@ -51,20 +51,22 @@ /* clang-format doesn't like _Generic, but I guess that's fine. */ #define align_up(x, y) \ - _Generic((x), int8_t \ - : align_up_int8_t, int16_t \ - : align_up_int16_t, int32_t \ - : align_up_int32_t, int64_t \ - : align_up_int64_t, \ + _Generic((x), signed char \ + : align_up_c, signed short \ + : align_up_s, signed int \ + : align_up_i, signed long \ + : align_up_l, signed long long \ + : align_up_ll,\ \ - uint8_t \ - : align_up_uint8_t, uint16_t \ - : align_up_uint16_t, uint32_t \ - : align_up_uint32_t, uint64_t \ - : align_up_uint64_t)((x), (y)) + unsigned char \ + : align_up_uc, unsigned short \ + : align_up_us, unsigned int \ + : align_up_ui, unsigned long \ + : align_up_ul, unsigned long long\ + : align_up_ull)((x), (y)) -#define DEFINE_ALIGN_UP(type) \ - static inline type align_up_##type(type val, type a) \ +#define DEFINE_ALIGN_UP(name, type) \ + static inline type align_up_##name(type val, type a) \ { \ if (!a) \ return val; \ @@ -77,31 +79,35 @@ return val + a - rem; \ } -DEFINE_ALIGN_UP(int8_t); -DEFINE_ALIGN_UP(int16_t); -DEFINE_ALIGN_UP(int32_t); -DEFINE_ALIGN_UP(int64_t); +DEFINE_ALIGN_UP(c, signed char); +DEFINE_ALIGN_UP(s, signed short); +DEFINE_ALIGN_UP(i, signed int); +DEFINE_ALIGN_UP(l, signed long); +DEFINE_ALIGN_UP(ll, signed long long); -DEFINE_ALIGN_UP(uint8_t); -DEFINE_ALIGN_UP(uint16_t); -DEFINE_ALIGN_UP(uint32_t); -DEFINE_ALIGN_UP(uint64_t); +DEFINE_ALIGN_UP(uc, unsigned char); +DEFINE_ALIGN_UP(us, unsigned short); +DEFINE_ALIGN_UP(ui, unsigned int); +DEFINE_ALIGN_UP(ul, unsigned long); +DEFINE_ALIGN_UP(ull, unsigned long long); #define align_down(x, y) \ - _Generic((x), int8_t \ - : align_down_int8_t, int16_t \ - : align_down_int16_t, int32_t \ - : align_down_int32_t, int64_t \ - : align_down_int64_t, \ + _Generic((x), signed char \ + : align_down_c, signed short \ + : align_down_s, signed int \ + : align_down_i, signed long \ + : align_down_l, signed long long \ + : align_down_ll,\ \ - uint8_t \ - : align_down_uint8_t, uint16_t \ - : align_down_uint16_t, uint32_t \ - : align_down_uint32_t, uint64_t \ - : align_down_uint64_t)((x), (y)) + unsigned char \ + : align_down_uc, unsigned short \ + : align_down_us, unsigned int \ + : align_down_ui, unsigned long \ + : align_down_ul, unsigned long long\ + : align_down_ull)((x), (y)) -#define DEFINE_ALIGN_DOWN(type) \ - static inline type align_down_##type(type val, type a) \ +#define DEFINE_ALIGN_DOWN(name, type) \ + static inline type align_down_##name(type val, type a) \ { \ if (!a) \ return val; \ @@ -109,31 +115,35 @@ DEFINE_ALIGN_UP(uint64_t); return val - (val % a); \ } -DEFINE_ALIGN_DOWN(int8_t); -DEFINE_ALIGN_DOWN(int16_t); -DEFINE_ALIGN_DOWN(int32_t); -DEFINE_ALIGN_DOWN(int64_t); +DEFINE_ALIGN_DOWN(c, signed char); +DEFINE_ALIGN_DOWN(s, signed short); +DEFINE_ALIGN_DOWN(i, signed int); +DEFINE_ALIGN_DOWN(l, signed long); +DEFINE_ALIGN_DOWN(ll, signed long long); -DEFINE_ALIGN_DOWN(uint8_t); -DEFINE_ALIGN_DOWN(uint16_t); -DEFINE_ALIGN_DOWN(uint32_t); -DEFINE_ALIGN_DOWN(uint64_t); +DEFINE_ALIGN_DOWN(uc, unsigned char); +DEFINE_ALIGN_DOWN(us, unsigned short); +DEFINE_ALIGN_DOWN(ui, unsigned int); +DEFINE_ALIGN_DOWN(ul, unsigned long); +DEFINE_ALIGN_DOWN(ull, unsigned long long); #define is_aligned(x, y) \ - _Generic((x), int8_t \ - : is_aligned_int8_t, int16_t \ - : is_aligned_int16_t, int32_t \ - : is_aligned_int32_t, int64_t \ - : is_aligned_int64_t, \ + _Generic((x), signed char \ + : is_aligned_c, signed short \ + : is_aligned_s, signed int \ + : is_aligned_i, signed long \ + : is_aligned_l, signed long long \ + : is_aligned_ll,\ \ - uint8_t \ - : is_aligned_uint8_t, uint16_t \ - : is_aligned_uint16_t, uint32_t \ - : is_aligned_uint32_t, uint64_t \ - : is_aligned_uint64_t)((x), (y)) + unsigned char \ + : is_aligned_uc, unsigned short \ + : is_aligned_us, unsigned int \ + : is_aligned_ui, unsigned long \ + : is_aligned_ul, unsigned long long \ + : is_aligned_ll)((x), (y)) -#define DEFINE_ALIGNED(type) \ - static inline bool is_aligned_##type(type val, type a) \ +#define DEFINE_ALIGNED(name, type) \ + static inline bool is_aligned_##name(type val, type a) \ { \ if (!a) \ return true; \ @@ -141,15 +151,17 @@ DEFINE_ALIGN_DOWN(uint64_t); return val % a == 0; \ } -DEFINE_ALIGNED(int8_t); -DEFINE_ALIGNED(int16_t); -DEFINE_ALIGNED(int32_t); -DEFINE_ALIGNED(int64_t); +DEFINE_ALIGNED(c, signed char); +DEFINE_ALIGNED(s, signed short); +DEFINE_ALIGNED(i, signed int); +DEFINE_ALIGNED(l, signed long); +DEFINE_ALIGNED(ll, signed long long); -DEFINE_ALIGNED(uint8_t); -DEFINE_ALIGNED(uint16_t); -DEFINE_ALIGNED(uint32_t); -DEFINE_ALIGNED(uint64_t); +DEFINE_ALIGNED(uc, unsigned char); +DEFINE_ALIGNED(us, unsigned short); +DEFINE_ALIGNED(ui, unsigned int); +DEFINE_ALIGNED(ul, unsigned long); +DEFINE_ALIGNED(ull, unsigned long long); static inline int asciinum(char c) { |