diff options
author | mike <mike@FreeBSD.org> | 2002-03-09 21:02:16 +0000 |
---|---|---|
committer | mike <mike@FreeBSD.org> | 2002-03-09 21:02:16 +0000 |
commit | b8cc0d1207ca0471e0fc9e82c60e6e0c76b9dd98 (patch) | |
tree | 1d205aa43b36510bc014a26a35c058748d42812d /sys/powerpc | |
parent | d2f6ffc283d7b4755bbd498ac25b9dee0663b09e (diff) | |
download | FreeBSD-src-b8cc0d1207ca0471e0fc9e82c60e6e0c76b9dd98.zip FreeBSD-src-b8cc0d1207ca0471e0fc9e82c60e6e0c76b9dd98.tar.gz |
o Don't require long long support in bswap64() functions.
o In i386's <machine/endian.h>, macros have some advantages over
inlines, so change some inlines to macros.
o In i386's <machine/endian.h>, ungarbage collect word_swap_int()
(previously __uint16_swap_uint32), it has some uses on i386's with
PDP endianness.
Submitted by: bde
o Move a comment up in <machine/endian.h> that was accidentially moved
down a few revisions ago.
o Reenable userland's use of optimized inline-asm versions of
byteorder(3) functions.
o Fix ordering of prototypes vs. redefinition of byteorder(3)
functions, so that the non-GCC (libc asm) case has proper
prototypes.
o Add proper prototypes for byteorder(3) functions in <sys/param.h>.
o Prevent redundant duplicate prototypes by making use of the
_BYTEORDER_PROTOTYPED define.
o Move the bswap16(), bswap32(), bswap64() C functions into MD space
for platforms in which asm versions don't exist. This significantly
reduces the complexity of some things at the cost of duplicate code.
Reviewed by: bde
Diffstat (limited to 'sys/powerpc')
-rw-r--r-- | sys/powerpc/include/endian.h | 36 |
1 files changed, 33 insertions, 3 deletions
diff --git a/sys/powerpc/include/endian.h b/sys/powerpc/include/endian.h index 4acd586..4bccc4e 100644 --- a/sys/powerpc/include/endian.h +++ b/sys/powerpc/include/endian.h @@ -58,8 +58,38 @@ #define BYTE_ORDER BIG_ENDIAN #endif /* !_POSIX_SOURCE */ -#ifndef _KERNEL -#include <sys/cdefs.h> -#endif /* _KERNEL */ +#ifdef __GNUC__ + +static __inline __uint16_t +__bswap16(__uint16_t _x) +{ + + return ((_x >> 8) | ((_x << 8) & 0xff00)); +} + +static __inline __uint32_t +__bswap32(__uint32_t _x) +{ + + return ((_x >> 24) | ((_x >> 8) & 0xff00) | ((_x << 8) & 0xff0000) | + ((_x << 24) & 0xff000000)); +} + +static __inline __uint64_t +__bswap64(__uint64_t _x) +{ + + return ((_x >> 56) | ((_x >> 40) & 0xff00) | ((_x >> 24) & 0xff0000) | + ((_x >> 8) & 0xff000000) | ((_x << 8) & ((__uint64_t)0xff << 32)) | + ((_x << 24) & ((__uint64_t)0xff << 40)) | + ((_x << 40) & ((__uint64_t)0xff << 48)) | ((_x << 56))); +} + +#endif /* __GNUC__ */ + +#define __htonl(x) ((__uint32_t)(x)) +#define __htons(x) ((__uint16_t)(x)) +#define __ntohl(x) ((__uint32_t)(x)) +#define __ntohs(x) ((__uint16_t)(x)) #endif /* !_MACHINE_ENDIAN_H_ */ |