xnu-4570.71.2.tar.gz

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

diff --git a/osfmk/i386/endian.h b/osfmk/i386/endian.h
index 62dedd9e982d9edeaf133d9d59e5084c997f00f5..d9bed4649eb9aef73866a254ca7d5d4932d234ff 100644 (file)
--- a/osfmk/i386/endian.h
+++ b/osfmk/i386/endian.h
@@ -55,9 +55,7 @@ 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
 
@@ -70,11 +68,15 @@ unsigned short      htons(unsigned short);
 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