A very large patch from Miles Bader <miles@lsi.nec.co.jp> to bring

v850 back into working condition.  Thanks Miles!
 -Erik

1 files changed, 27 insertions, 23 deletions

diff --git a/libc/sysdeps/linux/v850/bits/byteswap.h b/libc/sysdeps/linux/v850/bits/byteswap.h
index b5b07209f..44fbee488 100644
--- a/libc/sysdeps/linux/v850/bits/byteswap.h
+++ b/libc/sysdeps/linux/v850/bits/byteswap.h
@@ -16,44 +16,48 @@
 #endif
 
 /* Swap bytes in 16 bit value.  */
+#define __bswap_constant_16(x) \
+  ((((x) >> 8) & 0xff) | (((x) & 0xff) << 8))
+
 #ifdef __GNUC__
 # define __bswap_16(x)							      \
     (__extension__							      \
-     ({ unsigned short int __bsh_val = (x);				      \
-        __asm__ ("bsh %1, %0" : "=r" (__bsh_val)  : "r" (__bsh_val));	      \
-	__bsh_val; }))
+     ({ unsigned long int __bswap_16_v;					      \
+        if (__builtin_constant_p (x))					      \
+          __bswap_16_v = __bswap_constant_16 (x);			      \
+        else								      \
+	  __asm__ ("bsh %1, %0" : "=r" (__bswap_16_v) : "r" (x));	      \
+	__bswap_16_v; }))
 #else
-static __inline unsigned short int
-__bswap_16 (unsigned short int __bsx)
-{
-  return ((((__bsx) >> 8) & 0xff) | (((__bsx) & 0xff) << 8));
-}
+# define __bswap_16(x) __bswap_constant_16 (x)
 #endif
 
 /* Swap bytes in 32 bit value.  */
+#define __bswap_constant_32(x) \
+  ((((x) & 0xff000000) >> 24) | (((x) & 0x00ff0000) >>  8) | \
+   (((x) & 0x0000ff00) <<  8) | (((x) & 0x000000ff) << 24))
+
 #ifdef __GNUC__
 # define __bswap_32(x)							      \
     (__extension__							      \
-     ({ unsigned short int __bsw_val = (x);				      \
-        __asm__ ("bsw %1, %0" : "=r" (__bsw_val)  : "r" (__bsw_val));	      \
-	__bsw_val; }))
+     ({ unsigned long int __bswap_32_v;					      \
+        if (__builtin_constant_p (x))					      \
+          __bswap_32_v = __bswap_constant_32 (x);			      \
+        else								      \
+	  __asm__ ("bsw %1, %0" : "=r" (__bswap_32_v) : "r" (x));	      \
+	__bswap_32_v; }))
 #else
-static __inline unsigned int
-__bswap_32 (unsigned int __bsx)
-{
-  return ((((__bsx) & 0xff000000) >> 24) | (((__bsx) & 0x00ff0000) >>  8) |
-	  (((__bsx) & 0x0000ff00) <<  8) | (((__bsx) & 0x000000ff) << 24));
-}
+# define __bswap_32(x) __bswap_constant_32 (x)
 #endif
 
 #if defined __GNUC__ && __GNUC__ >= 2
 /* Swap bytes in 64 bit value.  */
-# define __bswap_64(x) \
+# define __bswap_64(x)							      \
      (__extension__							      \
       ({ union { unsigned long long int __ll;				      \
-		 unsigned long int __l[2]; } __v, __r;			      \
-	 __v.__ll = (x);						      \
-	 __r.__l[0] = __bswap_32 (__v.__l[1]);				      \
-	 __r.__l[1] = __bswap_32 (__v.__l[0]);				      \
-	 __r.__ll; }))
+		 unsigned long int __l[2]; } __bswap_64_v, __bswap_64_r;      \
+	 __bswap_64_v.__ll = (x);					      \
+	 __bswap_64_r.__l[0] = __bswap_32 (__bswap_64_v.__l[1]);	      \
+	 __bswap_64_r.__l[1] = __bswap_32 (__bswap_64_v.__l[0]);	      \
+	 __bswap_64_r.__ll; }))
 #endif