From 42bf8872e5c970349761ae75d3566caa1866af6c Mon Sep 17 00:00:00 2001 From: mintsuki Date: Fri, 24 Jun 2022 07:07:27 +0200 Subject: [PATCH] stdint: Add missing types and macros --- stdint.h | 97 ++++++++++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 91 insertions(+), 6 deletions(-) diff --git a/stdint.h b/stdint.h index 5e15cbb..9369b28 100644 --- a/stdint.h +++ b/stdint.h @@ -6,32 +6,114 @@ typedef __UINT16_TYPE__ uint16_t; typedef __UINT32_TYPE__ uint32_t; typedef __UINT64_TYPE__ uint64_t; +typedef __UINT_LEAST8_TYPE__ uint_least8_t; +typedef __UINT_LEAST16_TYPE__ uint_least16_t; +typedef __UINT_LEAST32_TYPE__ uint_least32_t; +typedef __UINT_LEAST64_TYPE__ uint_least64_t; + +typedef __UINT_FAST8_TYPE__ uint_fast8_t; +typedef __UINT_FAST16_TYPE__ uint_fast16_t; +typedef __UINT_FAST32_TYPE__ uint_fast32_t; +typedef __UINT_FAST64_TYPE__ uint_fast64_t; + typedef __INT8_TYPE__ int8_t; typedef __INT16_TYPE__ int16_t; typedef __INT32_TYPE__ int32_t; typedef __INT64_TYPE__ int64_t; +typedef __INT_LEAST8_TYPE__ int_least8_t; +typedef __INT_LEAST16_TYPE__ int_least16_t; +typedef __INT_LEAST32_TYPE__ int_least32_t; +typedef __INT_LEAST64_TYPE__ int_least64_t; + +typedef __INT_FAST8_TYPE__ int_fast8_t; +typedef __INT_FAST16_TYPE__ int_fast16_t; +typedef __INT_FAST32_TYPE__ int_fast32_t; +typedef __INT_FAST64_TYPE__ int_fast64_t; + typedef __UINTPTR_TYPE__ uintptr_t; typedef __INTPTR_TYPE__ intptr_t; typedef __UINTMAX_TYPE__ uintmax_t; typedef __INTMAX_TYPE__ intmax_t; -#define INT8_MAX __INT8_MAX__ -#define INT16_MAX __INT16_MAX__ -#define INT32_MAX __INT32_MAX__ -#define INT64_MAX __INT64_MAX__ +// Clang and GCC have different mechanisms for INT32_C and friends. +#ifdef __clang__ +# define __LIBC_C_EXPAND_JOIN(x, suffix) x ## suffix +# define __LIBC_C_JOIN(x, suffix) __LIBC_C_EXPAND_JOIN(x, suffix) + +# define INT8_C(x) __LIBC_C_JOIN(x, __INT8_C_SUFFIX__) +# define INT16_C(x) __LIBC_C_JOIN(x, __INT16_C_SUFFIX__) +# define INT32_C(x) __LIBC_C_JOIN(x, __INT32_C_SUFFIX__) +# define INT64_C(x) __LIBC_C_JOIN(x, __INT64_C_SUFFIX__) + +# define UINT8_C(x) __LIBC_C_JOIN(x, __UINT8_C_SUFFIX__) +# define UINT16_C(x) __LIBC_C_JOIN(x, __UINT16_C_SUFFIX__) +# define UINT32_C(x) __LIBC_C_JOIN(x, __UINT32_C_SUFFIX__) +# define UINT64_C(x) __LIBC_C_JOIN(x, __UINT64_C_SUFFIX__) + +# define INTMAX_C(x) __LIBC_C_JOIN(x, __INTMAX_C_SUFFIX__) +# define UINTMAX_C(x) __LIBC_C_JOIN(x, __UINTMAX_C_SUFFIX__) +#else +# define INT8_C(x) __INT8_C(x) +# define INT16_C(x) __INT16_C(x) +# define INT32_C(x) __INT32_C(x) +# define INT64_C(x) __INT64_C(x) + +# define UINT8_C(x) __UINT8_C(x) +# define UINT16_C(x) __UINT16_C(x) +# define UINT32_C(x) __UINT32_C(x) +# define UINT64_C(x) __UINT64_C(x) + +# define INTMAX_C(x) __INTMAX_C(x) +# define UINTMAX_C(x) __UINTMAX_C(x) +#endif #define UINT8_MAX __UINT8_MAX__ #define UINT16_MAX __UINT16_MAX__ #define UINT32_MAX __UINT32_MAX__ #define UINT64_MAX __UINT64_MAX__ +#define INT8_MAX __INT8_MAX__ +#define INT16_MAX __INT16_MAX__ +#define INT32_MAX __INT32_MAX__ +#define INT64_MAX __INT64_MAX__ + #define INT8_MIN (-INT8_MAX - 1) #define INT16_MIN (-INT16_MAX - 1) #define INT32_MIN (-INT32_MAX - 1) #define INT64_MIN (-INT64_MAX - 1) +#define UINT_LEAST8_MAX __UINT_LEAST8_MAX__ +#define UINT_LEAST16_MAX __UINT_LEAST16_MAX__ +#define UINT_LEAST32_MAX __UINT_LEAST32_MAX__ +#define UINT_LEAST64_MAX __UINT_LEAST64_MAX__ + +#define INT_LEAST8_MAX __INT_LEAST8_MAX__ +#define INT_LEAST16_MAX __INT_LEAST16_MAX__ +#define INT_LEAST32_MAX __INT_LEAST32_MAX__ +#define INT_LEAST64_MAX __INT_LEAST64_MAX__ + +#define INT_LEAST8_MIN (-INT_LEAST8_MAX - 1) +#define INT_LEAST16_MIN (-INT_LEAST16_MAX - 1) +#define INT_LEAST32_MIN (-INT_LEAST32_MAX - 1) +#define INT_LEAST64_MIN (-INT_LEAST64_MAX - 1) + +#define UINT_FAST8_MAX __UINT_FAST8_MAX__ +#define UINT_FAST16_MAX __UINT_FAST16_MAX__ +#define UINT_FAST32_MAX __UINT_FAST32_MAX__ +#define UINT_FAST64_MAX __UINT_FAST64_MAX__ + +#define INT_FAST8_MAX __INT_FAST8_MAX__ +#define INT_FAST16_MAX __INT_FAST16_MAX__ +#define INT_FAST32_MAX __INT_FAST32_MAX__ +#define INT_FAST64_MAX __INT_FAST64_MAX__ + +#define INT_FAST8_MIN (-INT_FAST8_MAX - 1) +#define INT_FAST16_MIN (-INT_FAST16_MAX - 1) +#define INT_FAST32_MIN (-INT_FAST32_MAX - 1) +#define INT_FAST64_MIN (-INT_FAST64_MAX - 1) + #define UINTPTR_MAX __UINTPTR_MAX__ #define INTPTR_MAX __INTPTR_MAX__ #define INTPTR_MIN (-INTPTR_MAX - 1) @@ -43,12 +125,15 @@ typedef __INTMAX_TYPE__ intmax_t; #define PTRDIFF_MAX __PTRDIFF_MAX__ #define PTRDIFF_MIN (-PTRDIFF_MAX - 1) +#define SIG_ATOMIC_MAX __SIG_ATOMIC_MAX__ +#define SIG_ATOMIC_MIN (-SIG_ATOMIC_MAX - 1) + #define SIZE_MAX __SIZE_MAX__ #define WCHAR_MAX __WCHAR_MAX__ -#define WCHAR_MIN __WCHAR_MIN__ +#define WCHAR_MIN (-WCHAR_MAX - 1) #define WINT_MAX __WINT_MAX__ -#define WINT_MIN __WINT_MIN__ +#define WINT_MIN (-WINT_MAX - 1) #endif