From 53256bdaa7291d751e0f708e5c9a40fbb6f194cc Mon Sep 17 00:00:00 2001 From: YAMAMOTO Takashi Date: Fri, 6 Nov 2020 07:49:02 +0900 Subject: [PATCH] sim: inttypes.h: Make the #ifdef block minimum --- arch/sim/include/inttypes.h | 565 ++++++++++++------------------------ 1 file changed, 183 insertions(+), 382 deletions(-) diff --git a/arch/sim/include/inttypes.h b/arch/sim/include/inttypes.h index 33061e6bce..11c2fe9bbc 100644 --- a/arch/sim/include/inttypes.h +++ b/arch/sim/include/inttypes.h @@ -44,412 +44,213 @@ * Pre-processor Definitions ****************************************************************************/ +# define PRId8 "d" +# define PRId16 "d" +# define PRId32 "d" +# define PRId64 "lld" + +# define PRIdLEAST8 "d" +# define PRIdLEAST16 "d" +# define PRIdLEAST32 "d" +# define PRIdLEAST64 "lld" + +# define PRIdFAST8 "d" +# define PRIdFAST16 "d" +# define PRIdFAST32 "d" +# define PRIdFAST64 "lld" + +# define PRIi8 "i" +# define PRIi16 "i" +# define PRIi32 "i" +# define PRIi64 "lli" + +# define PRIiLEAST8 "i" +# define PRIiLEAST16 "i" +# define PRIiLEAST32 "i" +# define PRIiLEAST64 "lli" + +# define PRIiFAST8 "i" +# define PRIiFAST16 "i" +# define PRIiFAST32 "i" +# define PRIiFAST64 "lli" + +# define PRIo8 "o" +# define PRIo16 "o" +# define PRIo32 "o" +# define PRIo64 "llo" + +# define PRIoLEAST8 "o" +# define PRIoLEAST16 "o" +# define PRIoLEAST32 "o" +# define PRIoLEAST64 "llo" + +# define PRIoFAST8 "o" +# define PRIoFAST16 "o" +# define PRIoFAST32 "o" +# define PRIoFAST64 "llo" + +# define PRIu8 "u" +# define PRIu16 "u" +# define PRIu32 "u" +# define PRIu64 "llu" + +# define PRIuLEAST8 "u" +# define PRIuLEAST16 "u" +# define PRIuLEAST32 "u" +# define PRIuLEAST64 "llu" + +# define PRIuFAST8 "u" +# define PRIuFAST16 "u" +# define PRIuFAST32 "u" +# define PRIuFAST64 "llu" + +# define PRIuMAX "llu" + +# define PRIx8 "x" +# define PRIx16 "x" +# define PRIx32 "x" +# define PRIx64 "llx" + +# define PRIxLEAST8 "x" +# define PRIxLEAST16 "x" +# define PRIxLEAST32 "x" +# define PRIxLEAST64 "llx" + +# define PRIxFAST8 "x" +# define PRIxFAST16 "x" +# define PRIxFAST32 "x" +# define PRIxFAST64 "llx" + +# define PRIX8 "X" +# define PRIX16 "X" +# define PRIX32 "X" +# define PRIX64 "llX" + +# define PRIXLEAST8 "X" +# define PRIXLEAST16 "X" +# define PRIXLEAST32 "X" +# define PRIXLEAST64 "llX" + +# define PRIXFAST8 "X" +# define PRIXFAST16 "X" +# define PRIXFAST32 "X" +# define PRIXFAST64 "llX" + +# define SCNd8 "hhd" +# define SCNd16 "hd" +# define SCNd32 "d" +# define SCNd64 "lld" + +# define SCNdLEAST8 "hhd" +# define SCNdLEAST16 "hd" +# define SCNdLEAST32 "d" +# define SCNdLEAST64 "lld" + +# define SCNdFAST8 "hhd" +# define SCNdFAST16 "hd" +# define SCNdFAST32 "d" +# define SCNdFAST64 "lld" + +# define SCNdMAX "lld" + +# define SCNi8 "hhi" +# define SCNi16 "hi" +# define SCNi32 "i" +# define SCNi64 "lli" + +# define SCNiLEAST8 "hhi" +# define SCNiLEAST16 "hi" +# define SCNiLEAST32 "i" +# define SCNiLEAST64 "lli" + +# define SCNiFAST8 "hhi" +# define SCNiFAST16 "hi" +# define SCNiFAST32 "i" +# define SCNiFAST64 "lli" + +# define SCNiMAX "lli" + +# define SCNo8 "hho" +# define SCNo16 "ho" +# define SCNo32 "o" +# define SCNo64 "llo" + +# define SCNoLEAST8 "hho" +# define SCNoLEAST16 "ho" +# define SCNoLEAST32 "o" +# define SCNoLEAST64 "llo" + +# define SCNoFAST8 "hho" +# define SCNoFAST16 "ho" +# define SCNoFAST32 "o" +# define SCNoFAST64 "llo" + +# define SCNoMAX "llo" + +# define SCNu8 "hhu" +# define SCNu16 "hu" +# define SCNu32 "u" +# define SCNu64 "llu" + +# define SCNuLEAST8 "hhu" +# define SCNuLEAST16 "hu" +# define SCNuLEAST32 "u" +# define SCNuLEAST64 "llu" + +# define SCNuFAST8 "hhu" +# define SCNuFAST16 "hu" +# define SCNuFAST32 "u" +# define SCNuFAST64 "llu" + +# define SCNx8 "hhx" +# define SCNx16 "hx" +# define SCNx32 "x" +# define SCNx64 "llx" + +# define SCNxLEAST8 "hhx" +# define SCNxLEAST16 "hx" +# define SCNxLEAST32 "x" +# define SCNxLEAST64 "llx" + +# define SCNxFAST8 "hhx" +# define SCNxFAST16 "hx" +# define SCNxFAST32 "x" +# define SCNxFAST64 "llx" + +# define INT8_C(x) x +# define INT16_C(x) x +# define INT32_C(x) x +# define INT64_C(x) x ## ll + +# define UINT8_C(x) x +# define UINT16_C(x) x +# define UINT32_C(x) x ## u +# define UINT64_C(x) x ## ull + #if defined(CONFIG_HOST_X86_64) && !defined(CONFIG_SIM_M32) - -# define PRId8 "d" -# define PRId16 "d" -# define PRId32 "d" -# define PRId64 "lld" - -# define PRIdLEAST8 "d" -# define PRIdLEAST16 "d" -# define PRIdLEAST32 "d" -# define PRIdLEAST64 "lld" - -# define PRIdFAST8 "d" -# define PRIdFAST16 "d" -# define PRIdFAST32 "d" -# define PRIdFAST64 "lld" - # define PRIdPTR "lld" - -# define PRIi8 "i" -# define PRIi16 "i" -# define PRIi32 "i" -# define PRIi64 "lli" - -# define PRIiLEAST8 "i" -# define PRIiLEAST16 "i" -# define PRIiLEAST32 "i" -# define PRIiLEAST64 "lli" - -# define PRIiFAST8 "i" -# define PRIiFAST16 "i" -# define PRIiFAST32 "i" -# define PRIiFAST64 "lli" - # define PRIiPTR "lli" - -# define PRIo8 "o" -# define PRIo16 "o" -# define PRIo32 "o" -# define PRIo64 "llo" - -# define PRIoLEAST8 "o" -# define PRIoLEAST16 "o" -# define PRIoLEAST32 "o" -# define PRIoLEAST64 "llo" - -# define PRIoFAST8 "o" -# define PRIoFAST16 "o" -# define PRIoFAST32 "o" -# define PRIoFAST64 "llo" - # define PRIoPTR "llo" - -# define PRIu8 "u" -# define PRIu16 "u" -# define PRIu32 "u" -# define PRIu64 "llu" - -# define PRIuLEAST8 "u" -# define PRIuLEAST16 "u" -# define PRIuLEAST32 "u" -# define PRIuLEAST64 "llu" - -# define PRIuFAST8 "u" -# define PRIuFAST16 "u" -# define PRIuFAST32 "u" -# define PRIuFAST64 "llu" - -# define PRIuMAX "llu" # define PRIuPTR "llu" - -# define PRIx8 "x" -# define PRIx16 "x" -# define PRIx32 "x" -# define PRIx64 "llx" - -# define PRIxLEAST8 "x" -# define PRIxLEAST16 "x" -# define PRIxLEAST32 "x" -# define PRIxLEAST64 "llx" - -# define PRIxFAST8 "x" -# define PRIxFAST16 "x" -# define PRIxFAST32 "x" -# define PRIxFAST64 "llx" - # define PRIxPTR "llx" - -# define PRIX8 "X" -# define PRIX16 "X" -# define PRIX32 "X" -# define PRIX64 "llX" - -# define PRIXLEAST8 "X" -# define PRIXLEAST16 "X" -# define PRIXLEAST32 "X" -# define PRIXLEAST64 "llX" - -# define PRIXFAST8 "X" -# define PRIXFAST16 "X" -# define PRIXFAST32 "X" -# define PRIXFAST64 "llX" - # define PRIXPTR "llX" - -# define SCNd8 "hhd" -# define SCNd16 "hd" -# define SCNd32 "d" -# define SCNd64 "lld" - -# define SCNdLEAST8 "hhd" -# define SCNdLEAST16 "hd" -# define SCNdLEAST32 "d" -# define SCNdLEAST64 "lld" - -# define SCNdFAST8 "hhd" -# define SCNdFAST16 "hd" -# define SCNdFAST32 "d" -# define SCNdFAST64 "lld" - -# define SCNdMAX "lld" # define SCNdPTR "lld" - -# define SCNi8 "hhi" -# define SCNi16 "hi" -# define SCNi32 "i" -# define SCNi64 "lli" - -# define SCNiLEAST8 "hhi" -# define SCNiLEAST16 "hi" -# define SCNiLEAST32 "i" -# define SCNiLEAST64 "lli" - -# define SCNiFAST8 "hhi" -# define SCNiFAST16 "hi" -# define SCNiFAST32 "i" -# define SCNiFAST64 "lli" - -# define SCNiMAX "lli" # define SCNiPTR "lli" - -# define SCNo8 "hho" -# define SCNo16 "ho" -# define SCNo32 "o" -# define SCNo64 "llo" - -# define SCNoLEAST8 "hho" -# define SCNoLEAST16 "ho" -# define SCNoLEAST32 "o" -# define SCNoLEAST64 "llo" - -# define SCNoFAST8 "hho" -# define SCNoFAST16 "ho" -# define SCNoFAST32 "o" -# define SCNoFAST64 "llo" - -# define SCNoMAX "llo" # define SCNoPTR "llo" - -# define SCNu8 "hhu" -# define SCNu16 "hu" -# define SCNu32 "u" -# define SCNu64 "llu" - -# define SCNuLEAST8 "hhu" -# define SCNuLEAST16 "hu" -# define SCNuLEAST32 "u" -# define SCNuLEAST64 "llu" - -# define SCNuFAST8 "hhu" -# define SCNuFAST16 "hu" -# define SCNuFAST32 "u" -# define SCNuFAST64 "llu" - # define SCNuPTR "llu" - -# define SCNx8 "hhx" -# define SCNx16 "hx" -# define SCNx32 "x" -# define SCNx64 "llx" - -# define SCNxLEAST8 "hhx" -# define SCNxLEAST16 "hx" -# define SCNxLEAST32 "x" -# define SCNxLEAST64 "llx" - -# define SCNxFAST8 "hhx" -# define SCNxFAST16 "hx" -# define SCNxFAST32 "x" -# define SCNxFAST64 "llx" - # define SCNxPTR "llx" - -# define INT8_C(x) x -# define INT16_C(x) x -# define INT32_C(x) x -# define INT64_C(x) x ## ll - -# define UINT8_C(x) x -# define UINT16_C(x) x -# define UINT32_C(x) x ## u -# define UINT64_C(x) x ## ull - #else - -# define PRId8 "d" -# define PRId16 "d" -# define PRId32 "d" -# define PRId64 "lld" - -# define PRIdLEAST8 "d" -# define PRIdLEAST16 "d" -# define PRIdLEAST32 "d" -# define PRIdLEAST64 "lld" - -# define PRIdFAST8 "d" -# define PRIdFAST16 "d" -# define PRIdFAST32 "d" -# define PRIdFAST64 "lld" - # define PRIdPTR "d" - -# define PRIi8 "i" -# define PRIi16 "i" -# define PRIi32 "i" -# define PRIi64 "lli" - -# define PRIiLEAST8 "i" -# define PRIiLEAST16 "i" -# define PRIiLEAST32 "i" -# define PRIiLEAST64 "lli" - -# define PRIiFAST8 "i" -# define PRIiFAST16 "i" -# define PRIiFAST32 "i" -# define PRIiFAST64 "lli" - # define PRIiPTR "i" - -# define PRIo8 "o" -# define PRIo16 "o" -# define PRIo32 "o" -# define PRIo64 "llo" - -# define PRIoLEAST8 "o" -# define PRIoLEAST16 "o" -# define PRIoLEAST32 "o" -# define PRIoLEAST64 "llo" - -# define PRIoFAST8 "o" -# define PRIoFAST16 "o" -# define PRIoFAST32 "o" -# define PRIoFAST64 "llo" - # define PRIoPTR "o" - -# define PRIu8 "u" -# define PRIu16 "u" -# define PRIu32 "u" -# define PRIu64 "llu" - -# define PRIuLEAST8 "u" -# define PRIuLEAST16 "u" -# define PRIuLEAST32 "u" -# define PRIuLEAST64 "llu" - -# define PRIuFAST8 "u" -# define PRIuFAST16 "u" -# define PRIuFAST32 "u" -# define PRIuFAST64 "llu" - -# define PRIuMAX "llu" # define PRIuPTR "u" - -# define PRIx8 "x" -# define PRIx16 "x" -# define PRIx32 "x" -# define PRIx64 "llx" - -# define PRIxLEAST8 "x" -# define PRIxLEAST16 "x" -# define PRIxLEAST32 "x" -# define PRIxLEAST64 "llx" - -# define PRIxFAST8 "x" -# define PRIxFAST16 "x" -# define PRIxFAST32 "x" -# define PRIxFAST64 "llx" - # define PRIxPTR "x" - -# define PRIX8 "X" -# define PRIX16 "X" -# define PRIX32 "X" -# define PRIX64 "llX" - -# define PRIXLEAST8 "X" -# define PRIXLEAST16 "X" -# define PRIXLEAST32 "X" -# define PRIXLEAST64 "llX" - -# define PRIXFAST8 "X" -# define PRIXFAST16 "X" -# define PRIXFAST32 "X" -# define PRIXFAST64 "llX" - # define PRIXPTR "X" - -# define SCNd8 "hhd" -# define SCNd16 "hd" -# define SCNd32 "d" -# define SCNd64 "lld" - -# define SCNdLEAST8 "hhd" -# define SCNdLEAST16 "hd" -# define SCNdLEAST32 "d" -# define SCNdLEAST64 "lld" - -# define SCNdFAST8 "hhd" -# define SCNdFAST16 "hd" -# define SCNdFAST32 "d" -# define SCNdFAST64 "lld" - -# define SCNdMAX "lld" # define SCNdPTR "d" - -# define SCNi8 "hhi" -# define SCNi16 "hi" -# define SCNi32 "i" -# define SCNi64 "lli" - -# define SCNiLEAST8 "hhi" -# define SCNiLEAST16 "hi" -# define SCNiLEAST32 "i" -# define SCNiLEAST64 "lli" - -# define SCNiFAST8 "hhi" -# define SCNiFAST16 "hi" -# define SCNiFAST32 "i" -# define SCNiFAST64 "lli" - -# define SCNiMAX "lli" # define SCNiPTR "i" - -# define SCNo8 "hho" -# define SCNo16 "ho" -# define SCNo32 "o" -# define SCNo64 "llo" - -# define SCNoLEAST8 "hho" -# define SCNoLEAST16 "ho" -# define SCNoLEAST32 "o" -# define SCNoLEAST64 "llo" - -# define SCNoFAST8 "hho" -# define SCNoFAST16 "ho" -# define SCNoFAST32 "o" -# define SCNoFAST64 "llo" - -# define SCNoMAX "llo" # define SCNoPTR "o" - -# define SCNu8 "hhu" -# define SCNu16 "hu" -# define SCNu32 "u" -# define SCNu64 "llu" - -# define SCNuLEAST8 "hhu" -# define SCNuLEAST16 "hu" -# define SCNuLEAST32 "u" -# define SCNuLEAST64 "llu" - -# define SCNuFAST8 "hhu" -# define SCNuFAST16 "hu" -# define SCNuFAST32 "u" -# define SCNuFAST64 "llu" - # define SCNuPTR "u" - -# define SCNx8 "hhx" -# define SCNx16 "hx" -# define SCNx32 "x" -# define SCNx64 "llx" - -# define SCNxLEAST8 "hhx" -# define SCNxLEAST16 "hx" -# define SCNxLEAST32 "x" -# define SCNxLEAST64 "llx" - -# define SCNxFAST8 "hhx" -# define SCNxFAST16 "hx" -# define SCNxFAST32 "x" -# define SCNxFAST64 "llx" - # define SCNxPTR "x" - -# define INT8_C(x) x -# define INT16_C(x) x -# define INT32_C(x) x -# define INT64_C(x) x ## ll - -# define UINT8_C(x) x -# define UINT16_C(x) x -# define UINT32_C(x) x ## u -# define UINT64_C(x) x ## ull - #endif #endif /* __ARCH_SIM_INCLUDE_INTTYPES_H */