m + add stdint

Signed-off-by: Mattias Andrée <maandree@operamail.com>

2 files changed, 201 insertions, 0 deletions

diff --git a/include/bits/intconf.h b/include/bits/intconf.h
new file mode 100644
index 0000000..f76c999
--- /dev/null
+++ b/include/bits/intconf.h
@@ -0,0 +1,47 @@
+/**
+ * slibc — Yet another C library
+ * Copyright © 2015  Mattias Andrée (maandree@member.fsf.org)
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#ifndef _BITS_INTCONF_H
+#define _BITS_INTCONF_H
+
+
+#define __MAX_TO_MIN(max)  (-(max) - 1)
+#define __CHAR_BIT         8
+#define __SHORT_BIT        16
+#define __INT_BIT          32
+#define __LONG_BIT         64
+#define __LONG_LONG_BIT    64
+#define __INT8             char
+#define __INT16            short int
+#define __INT32            int
+#define __INT64            long int
+#define __INT_FAST8        __INT8
+#define __INT_FAST16       __INT64
+#define __INT_FAST32       __INT64
+#define __INT_FAST64       __INT64
+#define __INT_FAST8_MAX    INT8_MAX
+#define __INT_FAST16_MAX   INT64_MAX
+#define __INT_FAST32_MAX   INT64_MAX
+#define __INT_FAST64_MAX   INT64_MAX
+#define __UINT_FAST8_MAX   UINT8_MAX
+#define __UINT_FAST16_MAX  UINT64_MAX
+#define __UINT_FAST32_MAX  UINT64_MAX
+#define __UINT_FAST64_MAX  UINT64_MAX
+
+
+#endif
+
diff --git a/include/bits/types.h b/include/bits/types.h
index 1fffa0c..618cb98 100644
--- a/include/bits/types.h
+++ b/include/bits/types.h
@@ -21,6 +21,19 @@
  * order headers are included. */
 
 
+#include <bits/intconf.h>
+
+
+/**
+ * Returns the maximum value of an unsigned integer type,
+ * in that type.
+ */
+#ifndef __MAX_OF
+# define  __MAX_OF(type)  \
+  (((type)1) << sizeof(type))
+#define
+
+
 /**
  * Signed integer type of the result of subtracting two pointers.
  * May not be greater than the with of type long.
@@ -54,6 +67,16 @@ typedef unsigned long int uptrdiff_t;
 #if defined(__NEED_wchar_t) && !defined(__DEFINED_wchar_t)
 # define __DEFINED_wchar_t
 typedef long int wchar_t;
+# define  __WCHAR_MAX  INTPTR_MAX
+#endif
+
+
+/**
+ * Variant of `wchar_t` cna can hold the value of `WEOF`.
+ */
+#if defined(__NEED_wint_t) && !defined(__DEFINED_wint_t)
+# define __DEFINED_wint_t
+typedef wchar_t wint_t;
 #endif
 
 
@@ -90,3 +113,134 @@ typedef struct
 } max_align_t;
 #endif
 
+
+/**
+ * Signed exact-width integer types.
+ * 
+ * These types are guaranteed to use two's complement.
+ */
+#if defined(__NEED_intN_t) && !defined(__DEFINED_intN_t)
+# define __DEFINED_intN_t
+typedef signed __INT8 int8_t;
+typedef signed __INT16 int16_t;
+typedef signed __INT32 int32_t;
+typedef signed __INT64 int64_t;
+#endif
+
+
+/**
+ * Unsigned exact-width integer types.
+ */
+#if defined(__NEED_uintN_t) && !defined(__DEFINED_uintN_t)
+# define __DEFINED_uintN_t
+typedef unsigned __INT8 uint8_t;
+typedef unsigned __INT16 uint16_t;
+typedef unsigned __INT32 uint32_t;
+typedef unsigned __INT64 uint64_t;
+#endif
+
+
+/**
+ * Signed integer types with guaranteed minimum length
+ * with otherwise minimal length.
+ * 
+ * `int_least8_t`, `int_least16_t`, `int_least32_t`, and
+ * `int_least64_t` are guaranteed to be defined.
+ */
+#if defined(__NEED_int_leastN_t) && !defined(__DEFINED_int_leastN_t)
+# define __DEFINED_int_leastN_t
+typedef signed __INT8 int_least8_t;
+typedef signed __INT16 int_least16_t;
+typedef signed __INT32 int_least32_t;
+typedef signed __INT64 int_least64_t;
+#endif
+
+
+/**
+ * Unsigned integer types with guaranteed minimum length
+ * with otherwise minimal length.
+ * 
+ * `uint_least8_t`, `uint_least16_t`, `uint_least32_t`, and
+ * `uint_least64_t` are guaranteed to be defined.
+ */
+#if defined(__NEED_uint_leastN_t) && !defined(__DEFINED_uint_leastN_t)
+# define __DEFINED_uint_leastN_t
+typedef unsigned __INT8 uint_least8_t;
+typedef unsigned __INT16 uint_least16_t;
+typedef unsigned __INT32 uint_least32_t;
+typedef unsigned __INT64 uint_least64_t;
+#endif
+
+
+/**
+ * Signed integer types with guaranteed minimum length
+ * and are thought to be the fastest to in most use-cases.
+ * 
+ * `int_fast8_t`, `int_fast16_t`, `int_fast32_t`, and
+ * `int_fast64_t` are guaranteed to be defined.
+ * It is howevr strongly discouraged to uses this types
+ * in serialised/marshalled data, as they may depend
+ * on the C library the program is compiled against
+ * and the version of that library.
+ */
+#if defined(__NEED_int_fastN_t) && !defined(__DEFINED_int_fastN_t)
+# define __DEFINED_int_fastN_t
+typedef signed __INT_FAST8 int_fast8_t;
+typedef signed __INT_FAST16 int_fast16_t;
+typedef signed __INT_FAST32 int_fast32_t;
+typedef signed __INT_FAST64 int_fast64_t;
+#endif
+
+
+/**
+ * Ubsigned integer types with guaranteed minimum length
+ * and are thought to be the fastest to in most use-cases.
+ * 
+ * `uint_fast8_t`, `uint_fast16_t`, `uint_fast32_t`, and
+ * `uint_fast64_t` are guaranteed to be defined.
+ * It is howevr strongly discouraged to uses this types
+ * in serialised/marshalled data, as they may depend
+ * on the C library the program is compiled against
+ * and the version of that library.
+ */
+#if defined(__NEED_uint_fastN_t) && !defined(__DEFINED_uint_fastN_t)
+# define __DEFINED_uint_fastN_t
+typedef unsigned __INT_FAST8 uint_fast8_t;
+typedef unsigned __INT_FAST16 uint_fast16_t;
+typedef unsigned __INT_FAST32 uint_fast32_t;
+typedef unsigned __INT_FAST64 uint_fast64_t;
+#endif
+
+
+/**
+ * The widest signed integer type available.
+ */
+#if defined(__NEED_intmax_t) && !defined(__DEFINED_intmax_t)
+# define __DEFINED_intmax_t
+typedef signed __INT64 intmax_t;
+# define __INTMAX_MAX  INT64_MAX
+#endif
+
+
+/**
+ * The widest unsigned integer type available.
+ */
+#if defined(__NEED_uintmax_t) && !defined(__DEFINED_uintmax_t)
+# define __DEFINED_uintmax_t
+typedef unsigned __INT64 uintmax_t;
+# define __UINTMAX_MAX  UINT64_MAX
+#endif
+
+
+/**
+ * A integer type over which operations are atomic.
+ * It may be defined as volatile, slibc does not do
+ * this however because it is good practice to do
+ * so explcitily when using the `sig_atomic_t` type.
+ */
+#if defined(__NEED_sig_atomic_t) && !defined(__DEFINED_sig_atomic_t)
+# define __DEFINED_sig_atomic_t
+typedef int sig_atomic_t;
+# define __SIG_ATOMIC_BIT  __INT_BIT
+#endif
+