xnu-7195.50.7.100.1.tar.gz

[apple/xnu.git] / osfmk / i386 / endian.h

diff --git a/osfmk/i386/endian.h b/osfmk/i386/endian.h
index 224546ced6ef8f52e90f5dab274251dd6fc2d0a0..487b3ed855ab354e3c7a738b59b4c5765ce42560 100644 (file)
--- a/osfmk/i386/endian.h
+++ b/osfmk/i386/endian.h
@@ -1,35 +1,33 @@
 /*
  * Copyright (c) 2000-2004 Apple Computer, Inc. All rights reserved.
  *
- * @APPLE_LICENSE_OSREFERENCE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code 
- * as defined in and that are subject to the Apple Public Source License 
- * Version 2.0 (the 'License'). You may not use this file except in 
- * compliance with the License.  The rights granted to you under the 
- * License may not be used to create, or enable the creation or 
- * redistribution of, unlawful or unlicensed copies of an Apple operating 
- * system, or to circumvent, violate, or enable the circumvention or 
- * violation of, any terms of an Apple operating system software license 
- * agreement.
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  *
- * Please obtain a copy of the License at 
- * http://www.opensource.apple.com/apsl/ and read it before using this 
- * file.
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
  *
- * The Original Code and all software distributed under the License are 
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER 
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES, 
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY, 
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT. 
- * Please see the License for the specific language governing rights and 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ *
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
  * limitations under the License.
  *
- * @APPLE_LICENSE_OSREFERENCE_HEADER_END@
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
  */
 /*
  * @OSF_COPYRIGHT@
- * 
+ *
  */
 
 #ifndef _MACHINE_ENDIAN_H_
@@ -39,12 +37,12 @@
  * Definitions for byte order,
  * according to byte significance from low address to high.
  */
-#define        LITTLE_ENDIAN   1234    /* least-significant byte first (vax) */
-#define        BIG_ENDIAN      4321    /* most-significant byte first (IBM, net) */
-#define        PDP_ENDIAN      3412    /* LSB first in word, MSW first in long (pdp) */
+#define LITTLE_ENDIAN   1234    /* least-significant byte first (vax) */
+#define BIG_ENDIAN      4321    /* most-significant byte first (IBM, net) */
+#define PDP_ENDIAN      3412    /* LSB first in word, MSW first in long (pdp) */
 
-#define        BYTE_ORDER      LITTLE_ENDIAN   /* byte order on i386 */
-#define ENDIAN         LITTLE
+#define BYTE_ORDER      LITTLE_ENDIAN   /* byte order on i386 */
+#define ENDIAN          LITTLE
 
 /*
  * Macros for network/external number representation conversion.
@@ -52,42 +50,44 @@
  */
 
 #if !defined(ntohs)
-unsigned short ntohs(unsigned short);
-extern __inline__
+static __inline__ unsigned short        ntohs(unsigned short);
+static __inline__
 unsigned short
 ntohs(unsigned short w_int)
 {
-       register unsigned short w = w_int;
-       __asm__ volatile("xchgb %h1,%b1" : "=q" (w) : "0" (w));
-       return (w);     /* zero-extend for compat */
+       return (unsigned short)((w_int << 8) | (w_int >> 8));
 }
 #endif
 
 #if !defined(htons)
-unsigned short htons(unsigned short);
-#define        htons   ntohs
+unsigned short  htons(unsigned short);
+#define htons   ntohs
 #endif
 
 #if !defined(ntohl)
-unsigned long  ntohl(unsigned long);
-extern __inline__
+static __inline__ unsigned long ntohl(unsigned long);
+static __inline__
 unsigned long
-ntohl(register unsigned long value)
+ntohl(unsigned long value)
 {
-       register unsigned long l = value;
-       __asm__ volatile("bswap %0" : "=r" (l) : "0" (l));
+#if defined(__clang__)
+       return (unsigned long)__builtin_bswap32((unsigned int)value);
+#else
+       unsigned long l = value;
+       __asm__ volatile ("bswap %0" : "=r" (l) : "0" (l));
        return l;
+#endif
 }
 #endif
 
 #if !defined(htonl)
-unsigned long  htonl(unsigned long);
-#define htonl  ntohl
+unsigned long   htonl(unsigned long);
+#define htonl   ntohl
 #endif
 
-#define NTOHL(x)       (x) = ntohl((unsigned long)x)
-#define NTOHS(x)       (x) = ntohs((unsigned short)x)
-#define HTONL(x)       (x) = htonl((unsigned long)x)
-#define HTONS(x)       (x) = htons((unsigned short)x)
+#define NTOHL(x)        (x) = ntohl((unsigned long)x)
+#define NTOHS(x)        (x) = ntohs((unsigned short)x)
+#define HTONL(x)        (x) = htonl((unsigned long)x)
+#define HTONS(x)        (x) = htons((unsigned short)x)
 
 #endif