aboutsummaryrefslogtreecommitdiffstats
path: root/lib/libspl/include
diff options
context:
space:
mode:
Diffstat (limited to 'lib/libspl/include')
-rw-r--r--lib/libspl/include/os/freebsd/sys/byteorder.h127
-rw-r--r--lib/libspl/include/os/freebsd/sys/zfs_context_os.h4
-rw-r--r--lib/libspl/include/os/linux/sys/byteorder.h14
-rw-r--r--lib/libspl/include/sys/isa_defs.h50
4 files changed, 44 insertions, 151 deletions
diff --git a/lib/libspl/include/os/freebsd/sys/byteorder.h b/lib/libspl/include/os/freebsd/sys/byteorder.h
index 74649cc4e..cd692d361 100644
--- a/lib/libspl/include/os/freebsd/sys/byteorder.h
+++ b/lib/libspl/include/os/freebsd/sys/byteorder.h
@@ -40,91 +40,8 @@
#ifndef _SYS_BYTEORDER_H
#define _SYS_BYTEORDER_H
-/*
- * XXX FIXME
- * on FreeBSD _BIG_ENDIAN is defined on all architectures so we have
- * to exclude _MACHINE_ENDIAN_H_ and define the bulk of it here
- */
-
-#include <sys/cdefs.h>
-#include <sys/_types.h>
-
-/*
- * Define the order of 32-bit words in 64-bit words.
- */
-#define _QUAD_HIGHWORD 1
-#define _QUAD_LOWWORD 0
-
-/*
- * Definitions for byte order, according to byte significance from low
- * address to high.
- */
-#undef _LITTLE_ENDIAN
-/* LSB first: i386, vax */
-#define _LITTLE_ENDIAN 1234
-/* LSB first in word, MSW first in long */
-#define _PDP_ENDIAN 3412
-
-#define _BYTE_ORDER _LITTLE_ENDIAN
-
-/*
- * Deprecated variants that don't have enough underscores to be useful in more
- * strict namespaces.
- */
-#if __BSD_VISIBLE
-#define LITTLE_ENDIAN _LITTLE_ENDIAN
-#define PDP_ENDIAN _PDP_ENDIAN
-#define BYTE_ORDER _BYTE_ORDER
-#endif
-
-#define __bswap16_gen(x) (__uint16_t)((x) << 8 | (x) >> 8)
-#define __bswap32_gen(x) \
- (((__uint32_t)__bswap16((x) & 0xffff) << 16) | __bswap16((x) >> 16))
-#define __bswap64_gen(x) \
- (((__uint64_t)__bswap32((x) & 0xffffffff) << 32) | __bswap32((x) >> 32))
-
-#ifdef __GNUCLIKE_BUILTIN_CONSTANT_P
-#define __bswap16(x) \
- ((__uint16_t)(__builtin_constant_p(x) ? \
- __bswap16_gen((__uint16_t)(x)) : __bswap16_var(x)))
-#define __bswap32(x) \
- (__builtin_constant_p(x) ? \
- __bswap32_gen((__uint32_t)(x)) : __bswap32_var(x))
-#define __bswap64(x) \
- (__builtin_constant_p(x) ? \
- __bswap64_gen((__uint64_t)(x)) : __bswap64_var(x))
-#else
-/* XXX these are broken for use in static initializers. */
-#define __bswap16(x) __bswap16_var(x)
-#define __bswap32(x) __bswap32_var(x)
-#define __bswap64(x) __bswap64_var(x)
-#endif
-
-/* These are defined as functions to avoid multiple evaluation of x. */
-
-static __inline __uint16_t
-__bswap16_var(__uint16_t _x)
-{
-
- return (__bswap16_gen(_x));
-}
-
-static __inline __uint32_t
-__bswap32_var(__uint32_t _x)
-{
-
-#ifdef __GNUCLIKE_ASM
- __asm("bswap %0" : "+r" (_x));
- return (_x);
-#else
- return (__bswap32_gen(_x));
-#endif
-}
-#define __htonl(x) __bswap32(x)
-#define __htons(x) __bswap16(x)
-#define __ntohl(x) __bswap32(x)
-#define __ntohs(x) __bswap16(x)
-
+#include <sys/endian.h>
+#include <netinet/in.h>
#include <sys/isa_defs.h>
#include <sys/int_types.h>
@@ -140,42 +57,6 @@ extern "C" {
/*
* macros for conversion between host and (internet) network byte order
*/
-
-#if defined(_BIG_ENDIAN) && !defined(ntohl) && !defined(__lint)
-/* big-endian */
-#if defined(_BIG_ENDIAN) && (defined(__amd64__) || defined(__amd64))
-#error "incompatible ENDIAN / ARCH combination"
-#endif
-#define ntohl(x) (x)
-#define ntohs(x) (x)
-#define htonl(x) (x)
-#define htons(x) (x)
-
-#elif !defined(ntohl) /* little-endian */
-
-#ifndef _IN_PORT_T
-#define _IN_PORT_T
-typedef uint16_t in_port_t;
-#endif
-
-#ifndef _IN_ADDR_T
-#define _IN_ADDR_T
-typedef uint32_t in_addr_t;
-#endif
-
-#if !defined(_XPG4_2) || defined(__EXTENSIONS__) || defined(_XPG5)
-extern uint32_t htonl(uint32_t);
-extern uint16_t htons(uint16_t);
-extern uint32_t ntohl(uint32_t);
-extern uint16_t ntohs(uint16_t);
-#else
-extern in_addr_t htonl(in_addr_t);
-extern in_port_t htons(in_port_t);
-extern in_addr_t ntohl(in_addr_t);
-extern in_port_t ntohs(in_port_t);
-#endif /* !defined(_XPG4_2) || defined(__EXTENSIONS__) || defined(_XPG5) */
-#endif
-
#if !defined(_XPG4_2) || defined(__EXTENSIONS__)
/*
@@ -194,7 +75,7 @@ extern in_port_t ntohs(in_port_t);
/*
* Macros to convert from a specific byte order to/from native byte order
*/
-#ifdef _BIG_ENDIAN
+#ifdef _ZFS_BIG_ENDIAN
#define BE_8(x) BMASK_8(x)
#define BE_16(x) BMASK_16(x)
#define BE_32(x) BMASK_32(x)
@@ -214,7 +95,7 @@ extern in_port_t ntohs(in_port_t);
#define BE_64(x) BSWAP_64(x)
#endif
-#ifdef _BIG_ENDIAN
+#ifdef _ZFS_BIG_ENDIAN
static __inline__ uint64_t
htonll(uint64_t n)
{
diff --git a/lib/libspl/include/os/freebsd/sys/zfs_context_os.h b/lib/libspl/include/os/freebsd/sys/zfs_context_os.h
index 25b5a47df..f5a136d22 100644
--- a/lib/libspl/include/os/freebsd/sys/zfs_context_os.h
+++ b/lib/libspl/include/os/freebsd/sys/zfs_context_os.h
@@ -29,10 +29,6 @@
#ifndef ZFS_CONTEXT_OS_H_
#define ZFS_CONTEXT_OS_H_
-#if BYTE_ORDER != BIG_ENDIAN
-#undef _BIG_ENDIAN
-#endif
-
#define ZFS_EXPORTS_PATH "/etc/zfs/exports"
#endif
diff --git a/lib/libspl/include/os/linux/sys/byteorder.h b/lib/libspl/include/os/linux/sys/byteorder.h
index 72d40b164..d5ee3e26f 100644
--- a/lib/libspl/include/os/linux/sys/byteorder.h
+++ b/lib/libspl/include/os/linux/sys/byteorder.h
@@ -40,16 +40,14 @@
#ifndef _SYS_BYTEORDER_H
#define _SYS_BYTEORDER_H
-
-
-#include <sys/isa_defs.h>
-#include <sys/int_types.h>
-
#if defined(__GNUC__) && defined(_ASM_INLINES) && \
(defined(__i386) || defined(__amd64))
#include <asm/byteorder.h>
#endif
+#include <sys/isa_defs.h>
+#include <sys/int_types.h>
+
#ifdef __cplusplus
extern "C" {
#endif
@@ -58,7 +56,7 @@ extern "C" {
* macros for conversion between host and (internet) network byte order
*/
-#if defined(_BIG_ENDIAN) && !defined(ntohl) && !defined(__lint)
+#if defined(_ZFS_BIG_ENDIAN) && !defined(ntohl) && !defined(__lint)
/* big-endian */
#define ntohl(x) (x)
#define ntohs(x) (x)
@@ -108,7 +106,7 @@ extern in_port_t ntohs(in_port_t);
/*
* Macros to convert from a specific byte order to/from native byte order
*/
-#ifdef _BIG_ENDIAN
+#ifdef _ZFS_BIG_ENDIAN
#define BE_8(x) BMASK_8(x)
#define BE_16(x) BMASK_16(x)
#define BE_32(x) BMASK_32(x)
@@ -128,7 +126,7 @@ extern in_port_t ntohs(in_port_t);
#define BE_64(x) BSWAP_64(x)
#endif
-#ifdef _BIG_ENDIAN
+#ifdef _ZFS_BIG_ENDIAN
static __inline__ uint64_t
htonll(uint64_t n)
{
diff --git a/lib/libspl/include/sys/isa_defs.h b/lib/libspl/include/sys/isa_defs.h
index 4d2d909f3..6f242ea77 100644
--- a/lib/libspl/include/sys/isa_defs.h
+++ b/lib/libspl/include/sys/isa_defs.h
@@ -54,8 +54,8 @@ extern "C" {
#endif
#endif
-#if !defined(_LITTLE_ENDIAN)
-#define _LITTLE_ENDIAN
+#if !defined(_ZFS_LITTLE_ENDIAN)
+#define _ZFS_LITTLE_ENDIAN
#endif
#define _SUNOS_VTOC_16
@@ -76,8 +76,8 @@ extern "C" {
#define _ILP32
#endif
-#if !defined(_LITTLE_ENDIAN)
-#define _LITTLE_ENDIAN
+#if !defined(_ZFS_LITTLE_ENDIAN)
+#define _ZFS_LITTLE_ENDIAN
#endif
#define _SUNOS_VTOC_16
@@ -107,6 +107,24 @@ extern "C" {
#define _SUNOS_VTOC_16
#define HAVE_EFFICIENT_UNALIGNED_ACCESS
+#if defined(__BYTE_ORDER)
+#if defined(__BIG_ENDIAN) && __BYTE_ORDER == __BIG_ENDIAN
+#define _ZFS_BIG_ENDIAN
+#elif defined(__LITTLE_ENDIAN) && __BYTE_ORDER == __LITTLE_ENDIAN
+#define _ZFS_LITTLE_ENDIAN
+#endif
+#elif defined(_BYTE_ORDER)
+#if defined(_BIG_ENDIAN) && _BYTE_ORDER == _BIG_ENDIAN
+#define _ZFS_BIG_ENDIAN
+#elif defined(_LITTLE_ENDIAN) && _BYTE_ORDER == _LITTLE_ENDIAN
+#define _ZFS_LITTLE_ENDIAN
+#endif
+#elif defined(_BIG_ENDIAN) && !defined(_LITTLE_ENDIAN)
+#define _ZFS_BIG_ENDIAN
+#elif defined(_LITTLE_ENDIAN) && !defined(_BIG_ENDIAN)
+#define _ZFS_LITTLE_ENDIAN
+#endif
+
/* arm arch specific defines */
#elif defined(__arm) || defined(__arm__) || defined(__aarch64__)
@@ -129,9 +147,9 @@ extern "C" {
#endif
#if defined(__ARMEL__) || defined(__AARCH64EL__)
-#define _LITTLE_ENDIAN
+#define _ZFS_LITTLE_ENDIAN
#else
-#define _BIG_ENDIAN
+#define _ZFS_BIG_ENDIAN
#endif
#define _SUNOS_VTOC_16
@@ -151,7 +169,7 @@ extern "C" {
#define __sparc__
#endif
-#define _BIG_ENDIAN
+#define _ZFS_BIG_ENDIAN
#define _SUNOS_VTOC_16
#if defined(__arch64__)
@@ -176,16 +194,16 @@ extern "C" {
#endif
#endif
-#define _BIG_ENDIAN
+#define _ZFS_BIG_ENDIAN
#define _SUNOS_VTOC_16
/* MIPS arch specific defines */
#elif defined(__mips__)
#if defined(__MIPSEB__)
-#define _BIG_ENDIAN
+#define _ZFS_BIG_ENDIAN
#elif defined(__MIPSEL__)
-#define _LITTLE_ENDIAN
+#define _ZFS_LITTLE_ENDIAN
#else
#error MIPS no endian specified
#endif
@@ -198,7 +216,7 @@ extern "C" {
/*
* RISC-V arch specific defines
- * only RV64G (including atomic) LP64 is supported yetxi
+ * only RV64G (including atomic) LP64 is supported yet
*/
#elif defined(__riscv) && defined(_LP64) && _LP64 && \
defined(__riscv_atomic) && __riscv_atomic
@@ -211,7 +229,7 @@ extern "C" {
#define __rv64g__
#endif
-#define _LITTLE_ENDIAN
+#define _ZFS_LITTLE_ENDIAN
#define _SUNOS_VTOC_16
@@ -231,12 +249,12 @@ extern "C" {
#error "Neither _ILP32 or _LP64 are defined"
#endif
-#if defined(_LITTLE_ENDIAN) && defined(_BIG_ENDIAN)
-#error "Both _LITTLE_ENDIAN and _BIG_ENDIAN are defined"
+#if defined(_ZFS_LITTLE_ENDIAN) && defined(_ZFS_BIG_ENDIAN)
+#error "Both _ZFS_LITTLE_ENDIAN and _ZFS_BIG_ENDIAN are defined"
#endif
-#if !defined(_LITTLE_ENDIAN) && !defined(_BIG_ENDIAN)
-#error "Neither _LITTLE_ENDIAN nor _BIG_ENDIAN are defined"
+#if !defined(_ZFS_LITTLE_ENDIAN) && !defined(_ZFS_BIG_ENDIAN)
+#error "Neither _ZFS_LITTLE_ENDIAN nor _ZFS_BIG_ENDIAN are defined"
#endif
#ifdef __cplusplus
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-03 09:49:51 +0000