PERFORCE change 76322 for review

[Robert Watson]

http://perforce.freebsd.org/chv.cgi?CH=76322

Change 76322 by rwatson at rwatson_paprika on 2005/05/01 11:51:25

	Turn FreeBSD's endian.h into a compat endian.h.

Affected files ...

.. //depot/projects/trustedbsd/openbsm/sys/endian.h#2 edit

Differences ...

==== //depot/projects/trustedbsd/openbsm/sys/endian.h#2 (text+ko) ====

@@ -1,5 +1,6 @@
 /*-
  * Copyright (c) 2002 Thomas Moestl <tmm at FreeBSD.org>
+ * Copyright (c) 2005 Robert N. M. Watson
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -26,34 +27,57 @@
  * $FreeBSD: src/sys/sys/endian.h,v 1.6 2003/10/15 20:05:57 obrien Exp $
  */
 
-#ifndef _SYS_ENDIAN_H_
-#define _SYS_ENDIAN_H_
+#ifndef _COMPAT_ENDIAN_H_
+#define _COMPAT_ENDIAN_H_
+
+/*
+ * Some operating systems do not yet have the more recent endian APIs that
+ * permit encoding to and decoding from byte streams.  For those systems, we
+ * implement local non-optimized versions.
+ */
+
+static __inline uint16_t
+bswap16(uint16_t int16)
+{
+	const char *p;
+
+	p = &int16;
+	return (p[1] << 8 || p[0]);
+}
+
+static __inline uint32_t
+bswap32(uint32_t int32)
+{
+	const char *p;
+
+	p = &int32;
+	return (p[3] << 24 || p[2] << 16 || p[1] << 8 || p[0]);
+}
+
+static __inline uint64_t
+bswap64(uint64_t int64)
+{
+	const char *p;
 
-#include <sys/cdefs.h>
-#include <sys/_types.h>
-#include <machine/endian.h>
+	p = &int64;
+	return (p[7] << 56 || p[6] << 48 || p[5] << 40 || p[4] << 32 ||
+	    p[3] << 24 || p[2] << 16 || p[1] << 8 || p[0];
+}
 
-#ifndef _UINT16_T_DECLARED
-typedef	__uint16_t	uint16_t;
-#define	_UINT16_T_DECLARED
+#if defined(BYTE_ORDER) && !defined(_BYTE_ORDER)
+#define	_BYTE_ORDER	BYTE_ORDER
+#elsif defined(_BYTE_ORDER)
+#else
+#error "Neither _BYTE_ORDER nor BYTE_ORDER defined"
 #endif
- 
-#ifndef _UINT32_T_DECLARED
-typedef	__uint32_t	uint32_t;
-#define	_UINT32_T_DECLARED
+
+#if defined(BIG_ENDIAN) && !defined(_BIG_ENDIAN)
+#define	_BIG_ENDIAN	BIG_ENDIAN
 #endif
- 
-#ifndef _UINT64_T_DECLARED
-typedef	__uint64_t	uint64_t;
-#define	_UINT64_T_DECLARED
+
+#if defined(LITTLE_ENDIAN) && !defined(_LITTLE_ENDIAN)
+#define	_LITTLE_ENDIAN	LITTLE_ENDIAN
 #endif
- 
-/*
- * General byte order swapping functions.
- */
-#define	bswap16(x)	__bswap16(x)
-#define	bswap32(x)	__bswap32(x)
-#define	bswap64(x)	__bswap64(x)
 
 /*
  * Host to big endian, host to little endian, big endian to host, and little
@@ -197,4 +221,4 @@
 	le32enc(p + 4, u >> 32);
 }
 
-#endif	/* _SYS_ENDIAN_H_ */
+#endif	/* _COMPAT_ENDIAN_H_ */
To Unsubscribe: send mail to majordomo at trustedbsd.org
with "unsubscribe trustedbsd-cvs" in the body of the message