xnu-3247.1.106.tar.gz

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

diff --git a/osfmk/i386/endian.h b/osfmk/i386/endian.h
index 88fbc2cd5f3d7699533798105525cf315eef2046..24851958871eafbb0d7eefd9f61ce57c2cc1c1d9 100644 (file)
--- a/osfmk/i386/endian.h
+++ b/osfmk/i386/endian.h
@@ -50,14 +50,12 @@
  */
 
 #if !defined(ntohs)
  */
 
 #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)
 {
 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
 
 }
 #endif
 


@@ -67,14 +65,18 @@ unsigned short      htons(unsigned short);
 #endif
 
 #if !defined(ntohl)
 #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)
 {
 unsigned long
 ntohl(register unsigned long value)
 {

+#if defined(__clang__)
+       return (unsigned long)__builtin_bswap32((unsigned int)value);
+#else

        register unsigned long l = value;
        __asm__ volatile("bswap %0" : "=r" (l) : "0" (l));
        return l;
        register unsigned long l = value;
        __asm__ volatile("bswap %0" : "=r" (l) : "0" (l));
        return l;

+#endif

 }
 #endif
 
 }
 #endif