Changeset 810a36f in mainline for abi/include/_bits/native.h

Timestamp:

2017-10-24T05:29:08Z (7 years ago)

Author:

jzr <zarevucky.jiri@…>

Branches:

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

Children:

b1eb7ef

Parents:

c8fbbe7 (diff), 673ea28 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'types'.

File:

• abi/include/_bits/native.h (moved) (moved from uspace/lib/c/arch/abs32le/include/libarch/stdint.h ) (2 diffs)

abi/include/_bits/native.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2006 Ondrej Palkovsky
+ * Copyright (c) 2017 CZ.NIC, z.s.p.o.
  * All rights reserved.
  *
@@ -27 +27 @@
  */
 
-/** @addtogroup libcabs32
+/* Authors:
+ *      Jiří Zárevúcky (jzr) <zarevucky.jiri@gmail.com>
+ */
+
+/** @addtogroup bits
  * @{
  */
 /** @file
+ * A bunch of type aliases HelenOS code uses.
+ *
+ * They were originally defined as either u/int32_t or u/int64_t,
+ * specifically for each architecture, but in practice they are
+ * currently assumed to be identical to u/intptr_t, so we do just that.
  */
 
-#ifndef LIBC_abs32_STDINT_H_
-#define LIBC_abs32_STDINT_H_
+#ifndef _BITS_NATIVE_H_
+#define _BITS_NATIVE_H_
 
-#include <libarch/common.h>
+#include <_bits/macros.h>
 
-#define SIZE_MAX UINT32_MAX
+#define ATOMIC_COUNT_MIN  __UINTPTR_MIN__
+#define ATOMIC_COUNT_MAX  __UINTPTR_MAX__
 
-#define UINTPTR_MAX UINT32_MAX
-typedef uint32_t uintptr_t;
+typedef __UINTPTR_TYPE__ pfn_t;
+typedef __UINTPTR_TYPE__ ipl_t;
+typedef __UINTPTR_TYPE__ sysarg_t;
+typedef __INTPTR_TYPE__  native_t;
+typedef __UINTPTR_TYPE__ atomic_count_t;
+typedef __INTPTR_TYPE__  atomic_signed_t;
 
-#define INTPTR_MIN INT32_MIN
-#define INTPTR_MAX INT32_MAX
-typedef int32_t intptr_t;
-
-#define UINTMAX_MAX UINT64_MAX
-typedef uint64_t uintmax_t;
-
-#define INTMAX_MAX INT64_MAX
-typedef int64_t intmax_t;
+#define PRIdn  __PRIdPTR__  /**< Format for native_t. */
+#define PRIun  __PRIuPTR__  /**< Format for sysarg_t. */
+#define PRIxn  __PRIxPTR__  /**< Format for hexadecimal sysarg_t. */
+#define PRIua  __PRIuPTR__  /**< Format for atomic_count_t. */
 
 #endif