xnu-4903.221.2.tar.gz

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

diff --git a/osfmk/i386/endian.h b/osfmk/i386/endian.h
index 55de05e4d779791f52dd9b55d5865a6e30e8093b..d9bed4649eb9aef73866a254ca7d5d4932d234ff 100644 (file)
--- a/osfmk/i386/endian.h
+++ b/osfmk/i386/endian.h
@@ -1,23 +1,29 @@
 /*
- * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2000-2004 Apple Computer, Inc. All rights reserved.
  *
- * @APPLE_LICENSE_HEADER_START@
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  * 
- * The contents of this file constitute Original Code as defined in and
- * are subject to the Apple Public Source License Version 1.1 (the
- * "License").  You may not use this file except in compliance with the
- * License.  Please obtain a copy of the License at
- * http://www.apple.com/publicsource 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.
  * 
- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * 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 OR NON-INFRINGEMENT.  Please see the
- * License for the specific language governing rights and limitations
- * under the License.
+ * 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_HEADER_END@
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
  */
 /*
  * @OSF_COPYRIGHT@
@@ -40,36 +46,44 @@
 
 /*
  * Macros for network/external number representation conversion.
- */
-
-unsigned short ntohs(unsigned short), htons(unsigned short);
-unsigned long  ntohl(unsigned long), htonl(unsigned long);
-
-/*
  * Use GNUC support to inline the byteswappers.
  */
 
-extern __inline__
+#if !defined(ntohs)
+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 ((w_int << 8) | (w_int >> 8));
 }
+#endif
 
+#if !defined(htons)
+unsigned short htons(unsigned short);
 #define        htons   ntohs
+#endif
 
-extern __inline__
+#if !defined(ntohl)
+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;
+#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
+#endif
 
 #define NTOHL(x)       (x) = ntohl((unsigned long)x)
 #define NTOHS(x)       (x) = ntohs((unsigned short)x)