Switch x86 and x86-64 to __builtin_bswap*.
authorElliott Hughes <enh@google.com>
Wed, 3 Dec 2014 04:16:05 +0000 (20:16 -0800)
committerElliott Hughes <enh@google.com>
Wed, 3 Dec 2014 04:16:05 +0000 (20:16 -0800)
Bug: 18597513
Change-Id: I0781208efb3b560d7c6fa48f41be7bc6fc83521e

libc/arch-x86/include/machine/endian.h
libc/arch-x86_64/include/machine/endian.h

index e1506b1102ae7b4e592eec92cee2bb3519a7b9eb..5feebd8d24c7d721196059b8481e34acfca01a0b 100644 (file)
 #ifndef _MACHINE_ENDIAN_H_
 #define _MACHINE_ENDIAN_H_
 
-#ifdef __GNUC__
-
-#define        __swap32md(x) __statement({                                     \
-       uint32_t __swap32md_x = (x);                                    \
-                                                                       \
-       __asm ("bswap %0" : "+r" (__swap32md_x));                       \
-       __swap32md_x;                                                   \
-})
-
-#define        __swap64md(x) __statement({                                     \
-       uint64_t __swap64md_x = (x);                                    \
-                                                                       \
-       (uint64_t)__swap32md(__swap64md_x >> 32) |                      \
-           (uint64_t)__swap32md(__swap64md_x & 0xffffffff) << 32;      \
-})
-#define        __swap16md(x) __statement({                                     \
-       uint16_t __swap16md_x = (x);                                    \
-                                                                       \
-       __asm ("rorw $8, %w0" : "+r" (__swap16md_x));                   \
-       __swap16md_x;                                                   \
-})
+/* Use GCC builtins */
+#define __swap16md(x) __builtin_bswap16(x)
+#define __swap32md(x) __builtin_bswap32(x)
+#define __swap64md(x) __builtin_bswap64(x)
 
 /* Tell sys/endian.h we have MD variants of the swap macros.  */
 #define MD_SWAP
 
-#endif /* __GNUC__ */
-
 #define _BYTE_ORDER _LITTLE_ENDIAN
 #include <sys/types.h>
 #include <sys/endian.h>
index 8a3b0c583fa18e8f22a21c0dcb24e1b92e36ce8e..2c493b278ec1d63dd661ef5c2b8febdb34fb24ab 100644 (file)
 #ifndef _MACHINE_ENDIAN_H_
 #define _MACHINE_ENDIAN_H_
 
-#ifdef __GNUC__
-
-#define        __swap32md(x) __statement({                                     \
-       u_int32_t __swap32md_x = (x);                                   \
-                                                                       \
-       __asm ("bswap %0" : "+r" (__swap32md_x));                       \
-       __swap32md_x;                                                   \
-})
-
-#define        __swap64md(x) __statement({                                     \
-       u_int64_t __swap64md_x = (x);                                   \
-                                                                       \
-       __asm ("bswapq %0" : "+r" (__swap64md_x));                      \
-       __swap64md_x;                                                   \
-})
-
-#define        __swap16md(x) __statement({                                     \
-       u_int16_t __swap16md_x = (x);                                   \
-                                                                       \
-       __asm ("rorw $8, %w0" : "+r" (__swap16md_x));                   \
-       __swap16md_x;                                                   \
-})
+/* Use GCC builtins */
+#define __swap16md(x) __builtin_bswap16(x)
+#define __swap32md(x) __builtin_bswap32(x)
+#define __swap64md(x) __builtin_bswap64(x)
 
 /* Tell sys/endian.h we have MD variants of the swap macros.  */
 #define MD_SWAP
 
-#endif /* __GNUC__ */
-
 #define _BYTE_ORDER _LITTLE_ENDIAN
 #include <sys/types.h>
 #include <sys/endian.h>