Changeset 3f7fe9e in mainline for abi/include/limits.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/limits.h (moved) (moved from uspace/lib/c/include/limits.h ) (1 diff)

abi/include/limits.h

@@ -36 +36 @@
 #define LIBC_LIMITS_H_
 
-#ifdef __cplusplus
-extern "C" {
+#ifdef __GNUC__
+/*
+ * Default to compiler's version of limits.h, so we don't have to care about
+ * language version and whatnot.
+ */
+#include_next <limits.h>
+#else
+
+/* HelenOS requires 8-bit char and two's complement arithmetic. */
+#define CHAR_BIT    8
+#define SCHAR_MAX   0x7f
+#define SCHAR_MIN   (-SCHAR_MAX - 1)
+#define SHRT_MAX    0x7fff
+#define SHRT_MIN    (-SHRT_MAX - 1)
+#define INT_MAX     0x7fffffff
+#define INT_MIN     (-INT_MAX - 1)
+#define LLONG_MAX   0x7fffffffffffffffll
+#define LLONG_MIN   (-LLONG_MAX - 1)
+
+#define UCHAR_MAX   0xff
+#define USHRT_MAX   0xffff
+#define UINT_MAX    0xffffffffu
+#define ULLONG_MAX  0xffffffffffffffffull
+
+#if __STDC_VERSION__ >= 201112L
+_Static_assert(((char)-1) < 0, "char should be signed");
 #endif
 
-#include <_bits/limits.h>
+#define CHAR_MAX  SCHAR_MAX
+#define CHAR_MIN  SCHAR_MIN
 
-#ifdef __cplusplus
-}
+#ifdef __32_BITS__
+#define LONG_MAX   0x7fffffffl
+#define LONG_MIN   (-LONG_MAX - 1)
+#define ULONG_MAX  0xfffffffful
+#endif
+
+#ifdef __64_BITS__
+#define LONG_MAX   0x7fffffffffffffffl
+#define LONG_MIN   (-LONG_MAX - 1)
+#define ULONG_MAX  0xfffffffffffffffful
+#endif
+
+#endif  /* !defined(__GNUC__) */
+
+#undef MB_LEN_MAX
+#define MB_LEN_MAX 4
+
+#define UCHAR_MIN   0
+#define USHRT_MIN   0
+#define UINT_MIN    (0u)
+#define ULONG_MIN   (0ul)
+#define ULLONG_MIN  (0ull)
+
+/* GCC's <limits.h> doesn't define these for C++11, even though it should. */
+#if __cplusplus >= 201103L
+#ifndef LLONG_MAX
+#define LLONG_MAX  0x7fffffffffffffffll
+#endif
+#ifndef LLONG_MIN
+#define LLONG_MIN  (-LLONG_MAX - 1)
+#endif
+#ifndef ULLONG_MAX
+#define ULLONG_MAX  0xffffffffffffffffull
+#endif
 #endif