Changeset 3f7fe9e in mainline for abi/include/inttypes.h

Timestamp:

2018-10-01T18:36:42Z (6 years ago)

Author:

Jiří Zárevúcky <jiri.zarevucky@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

5cef315

Parents:

1938b381

git-author:

Jiří Zárevúcky <jiri.zarevucky@…> (2018-09-29 16:13:55)

git-committer:

Jiří Zárevúcky <jiri.zarevucky@…> (2018-10-01 18:36:42)

Message:

Clean up headers

Depends on <limits.h> and <stdint.h> being provided, which is a step up from
depending on mostly undocumented predefined macros.
In principle, <limits.h> and <stdint.h> mostly describe properties of
the compiler, so even though we depend on certain values for their contents,
actually defining them in the library is kind of reversal of concerns.

File:

• abi/include/inttypes.h (modified) (4 diffs)

abi/include/inttypes.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2010 Jiri Svoboda
+ * Copyright (c) 2017 CZ.NIC, z.s.p.o.
  * All rights reserved.
  *
@@ -27 +27 @@
  */
 
-/** @addtogroup libc
+/*
+ * Authors:
+ *      Jiří Zárevúcky (jzr) <zarevucky.jiri@gmail.com>
+ */
+
+/** @addtogroup bits
  * @{
  */
@@ -33 +38 @@
  */
 
-#ifndef LIBC_INTTYPES_H_
-#define LIBC_INTTYPES_H_
+#ifndef _BITS_INTTYPES_H_
+#define _BITS_INTTYPES_H_
+
+#include <stdint.h>
+#include <_bits/wchar_t.h>
+
+/*
+ * We assume the -helenos target is in use, which means the following assignment:
+ *
+ *            32b             64b
+ * int8_t     unsigned char   unsigned char
+ * int16_t    short           short
+ * int32_t    int             int
+ * int64_t    long long       long
+ * intptr_t   int             long
+ * size_t     unsigned int    unsigned long
+ * ptrdiff_t  int             long
+ * intmax_t   long long       long long
+ *
+ * intleast*_t    same as int*_t
+ * intfast*_t     at least int, otherwise same as int*_t
+ */
+
+#define PRId8       "hhd"
+#define PRIdLEAST8  "hhd"
+#define PRIdFAST8   "d"
+
+#define PRIi8       "hhi"
+#define PRIiLEAST8  "hhi"
+#define PRIiFAST8   "i"
+
+#define PRIo8       "hho"
+#define PRIoLEAST8  "hho"
+#define PRIoFAST8   "o"
+
+#define PRIu8       "hhu"
+#define PRIuLEAST8  "hhu"
+#define PRIuFAST8   "u"
+
+#define PRIx8       "hhx"
+#define PRIxLEAST8  "hhx"
+#define PRIxFAST8   "x"
+
+#define PRIX8       "hhX"
+#define PRIXLEAST8  "hhX"
+#define PRIXFAST8   "X"
+
+#define SCNd8       "hhd"
+#define SCNdLEAST8  "hhd"
+#define SCNdFAST8   "d"
+
+#define SCNi8       "hhi"
+#define SCNiLEAST8  "hhi"
+#define SCNiFAST8   "i"
+
+#define SCNo8       "hho"
+#define SCNoLEAST8  "hho"
+#define SCNoFAST8   "o"
+
+#define SCNu8       "hhu"
+#define SCNuLEAST8  "hhu"
+#define SCNuFAST8   "u"
+
+#define SCNx8       "hhx"
+#define SCNxLEAST8  "hhx"
+#define SCNxFAST8   "x"
+
+#define PRId16       "hd"
+#define PRIdLEAST16  "hd"
+#define PRIdFAST16   "d"
+
+#define PRIi16       "hi"
+#define PRIiLEAST16  "hi"
+#define PRIiFAST16   "i"
+
+#define PRIo16       "ho"
+#define PRIoLEAST16  "ho"
+#define PRIoFAST16   "o"
+
+#define PRIu16       "hu"
+#define PRIuLEAST16  "hu"
+#define PRIuFAST16   "u"
+
+#define PRIx16       "hx"
+#define PRIxLEAST16  "hx"
+#define PRIxFAST16   "x"
+
+#define PRIX16       "hX"
+#define PRIXLEAST16  "hX"
+#define PRIXFAST16   "X"
+
+#define SCNd16       "hd"
+#define SCNdLEAST16  "hd"
+#define SCNdFAST16   "d"
+
+#define SCNi16       "hi"
+#define SCNiLEAST16  "hi"
+#define SCNiFAST16   "i"
+
+#define SCNo16       "ho"
+#define SCNoLEAST16  "ho"
+#define SCNoFAST16   "o"
+
+#define SCNu16       "hu"
+#define SCNuLEAST16  "hu"
+#define SCNuFAST16   "u"
+
+#define SCNx16       "hx"
+#define SCNxLEAST16  "hx"
+#define SCNxFAST16   "x"
+
+#define PRId32       "d"
+#define PRIdLEAST32  "d"
+#define PRIdFAST32   "d"
+
+#define PRIi32       "i"
+#define PRIiLEAST32  "i"
+#define PRIiFAST32   "i"
+
+#define PRIo32       "o"
+#define PRIoLEAST32  "o"
+#define PRIoFAST32   "o"
+
+#define PRIu32       "u"
+#define PRIuLEAST32  "u"
+#define PRIuFAST32   "u"
+
+#define PRIx32       "x"
+#define PRIxLEAST32  "x"
+#define PRIxFAST32   "x"
+
+#define PRIX32       "X"
+#define PRIXLEAST32  "X"
+#define PRIXFAST32   "X"
+
+#define SCNd32       "d"
+#define SCNdLEAST32  "d"
+#define SCNdFAST32   "d"
+
+#define SCNi32       "i"
+#define SCNiLEAST32  "i"
+#define SCNiFAST32   "i"
+
+#define SCNo32       "o"
+#define SCNoLEAST32  "o"
+#define SCNoFAST32   "o"
+
+#define SCNu32       "u"
+#define SCNuLEAST32  "u"
+#define SCNuFAST32   "u"
+
+#define SCNx32       "x"
+#define SCNxLEAST32  "x"
+#define SCNxFAST32   "x"
+
+#if INTPTR_MAX == 0x7fffffff
+
+#define PRIdPTR  "d"
+#define PRIiPTR  "i"
+#define PRIoPTR  "o"
+#define PRIuPTR  "u"
+#define PRIxPTR  "x"
+#define PRIXPTR  "X"
+#define SCNdPTR  "d"
+#define SCNiPTR  "i"
+#define SCNoPTR  "o"
+#define SCNuPTR  "u"
+#define SCNxPTR  "x"
+
+#define PRId64       "lld"
+#define PRIdLEAST64  "lld"
+#define PRIdFAST64   "lld"
+
+#define PRIi64       "lli"
+#define PRIiLEAST64  "lli"
+#define PRIiFAST64   "lli"
+
+#define PRIo64       "llo"
+#define PRIoLEAST64  "llo"
+#define PRIoFAST64   "llo"
+
+#define PRIu64       "llu"
+#define PRIuLEAST64  "llu"
+#define PRIuFAST64   "llu"
+
+#define PRIx64       "llx"
+#define PRIxLEAST64  "llx"
+#define PRIxFAST64   "llx"
+
+#define PRIX64       "llX"
+#define PRIXLEAST64  "llX"
+#define PRIXFAST64   "llX"
+
+#define SCNd64       "lld"
+#define SCNdLEAST64  "lld"
+#define SCNdFAST64   "lld"
+
+#define SCNi64       "lli"
+#define SCNiLEAST64  "lli"
+#define SCNiFAST64   "lli"
+
+#define SCNo64       "llo"
+#define SCNoLEAST64  "llo"
+#define SCNoFAST64   "llo"
+
+#define SCNu64       "llu"
+#define SCNuLEAST64  "llu"
+#define SCNuFAST64   "llu"
+
+#define SCNx64       "llx"
+#define SCNxLEAST64  "llx"
+#define SCNxFAST64   "llx"
+
+#else
+
+#define PRIdPTR  "ld"
+#define PRIiPTR  "li"
+#define PRIoPTR  "lo"
+#define PRIuPTR  "lu"
+#define PRIxPTR  "lx"
+#define PRIXPTR  "lX"
+#define SCNdPTR  "ld"
+#define SCNiPTR  "li"
+#define SCNoPTR  "lo"
+#define SCNuPTR  "lu"
+#define SCNxPTR  "lx"
+
+#define PRId64       "ld"
+#define PRIdLEAST64  "ld"
+#define PRIdFAST64   "ld"
+
+#define PRIi64       "li"
+#define PRIiLEAST64  "li"
+#define PRIiFAST64   "li"
+
+#define PRIo64       "lo"
+#define PRIoLEAST64  "lo"
+#define PRIoFAST64   "lo"
+
+#define PRIu64       "lu"
+#define PRIuLEAST64  "lu"
+#define PRIuFAST64   "lu"
+
+#define PRIx64       "lx"
+#define PRIxLEAST64  "lx"
+#define PRIxFAST64   "lx"
+
+#define PRIX64       "lX"
+#define PRIXLEAST64  "lX"
+#define PRIXFAST64   "lX"
+
+#define SCNd64       "ld"
+#define SCNdLEAST64  "ld"
+#define SCNdFAST64   "ld"
+
+#define SCNi64       "li"
+#define SCNiLEAST64  "li"
+#define SCNiFAST64   "li"
+
+#define SCNo64       "lo"
+#define SCNoLEAST64  "lo"
+#define SCNoFAST64   "lo"
+
+#define SCNu64       "lu"
+#define SCNuLEAST64  "lu"
+#define SCNuFAST64   "lu"
+
+#define SCNx64       "lx"
+#define SCNxLEAST64  "lx"
+#define SCNxFAST64   "lx"
+
+#endif
+
+#ifdef _HELENOS_SOURCE
+#define UINT8_MIN   0
+#define UINT16_MIN  0
+#define UINT32_MIN  0
+#define UINT64_MIN  0
+#endif
+
+#define PRIdMAX  "lld"
+#define PRIiMAX  "lli"
+#define PRIoMAX  "llo"
+#define PRIuMAX  "llu"
+#define PRIxMAX  "llx"
+#define PRIXMAX  "llX"
+#define SCNdMAX  "lld"
+#define SCNiMAX  "lli"
+#define SCNoMAX  "llo"
+#define SCNuMAX  "llu"
+#define SCNxMAX  "llx"
 
 #ifdef __cplusplus
@@ -40 +334 @@
 #endif
 
-#include <_bits/inttypes.h>
-
-#ifndef __HELENOS_DISABLE_INTMAX__
+typedef struct {
+        intmax_t quot;
+        intmax_t rem;
+} imaxdiv_t;
+
 intmax_t imaxabs(intmax_t);
 imaxdiv_t imaxdiv(intmax_t, intmax_t);
-intmax_t strtoimax(const char *__restrict__ nptr,
-    char **__restrict__ endptr, int base);
-uintmax_t strtoumax(const char *__restrict__ nptr,
-    char **__restrict__ endptr, int base);
-#endif
+intmax_t strtoimax(const char *__restrict__, char **__restrict__, int);
+uintmax_t strtoumax(const char *__restrict__, char **__restrict__, int);
 
 #ifdef __cplusplus