aboutsummaryrefslogtreecommitdiff
path: root/sys/sparc64/include/endian.h
diff options
context:
space:
mode:
authorMike Barcroft <mike@FreeBSD.org>2002-03-09 21:02:16 +0000
committerMike Barcroft <mike@FreeBSD.org>2002-03-09 21:02:16 +0000
commitd846855da8c8142a2f647f7a4c6949b341261297 (patch)
tree1d205aa43b36510bc014a26a35c058748d42812d /sys/sparc64/include/endian.h
parent95651ec70e9de909fe21953e81fcd778e9bae3a2 (diff)
downloadsrc-d846855da8c8142a2f647f7a4c6949b341261297.tar.gz
src-d846855da8c8142a2f647f7a4c6949b341261297.zip
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
Notes
Notes: svn path=/head/; revision=91959
Diffstat (limited to 'sys/sparc64/include/endian.h')
-rw-r--r--sys/sparc64/include/endian.h36
1 files changed, 35 insertions, 1 deletions
diff --git a/sys/sparc64/include/endian.h b/sys/sparc64/include/endian.h
index fc51c7ed7d71..b3f27d8bd604 100644
--- a/sys/sparc64/include/endian.h
+++ b/sys/sparc64/include/endian.h
@@ -45,11 +45,11 @@
#define _QUAD_HIGHWORD 0
#define _QUAD_LOWWORD 1
+#ifndef _POSIX_SOURCE
/*
* Definitions for byte order, according to byte significance from low
* address to high.
*/
-#ifndef _POSIX_SOURCE
#define LITTLE_ENDIAN 1234 /* LSB first: i386, vax */
#define BIG_ENDIAN 4321 /* MSB first: 68000, ibm, net */
#define PDP_ENDIAN 3412 /* LSB first in word, MSW first in long */
@@ -57,4 +57,38 @@
#define BYTE_ORDER BIG_ENDIAN
#endif /* !_POSIX_SOURCE */
+#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_ */