support BUILDSUF patch by <charles dot yates at pandora dot be>

[ffmpeg] / libavcodec / bswap.h

diff --git a/libavcodec/bswap.h b/libavcodec/bswap.h
index 767848e6148a3d7d335b5ed2b2f8dd7a81a403af..eb1d87a5515e73d821a51a9b9a0640bb20b912f3 100644 (file)
--- a/libavcodec/bswap.h
+++ b/libavcodec/bswap.h
@@ -1,3 +1,8 @@
+/**
+ * @file bswap.h
+ * byte swap.
+ */
+
 #ifndef __BSWAP_H__
 #define __BSWAP_H__
 
@@ -5,18 +10,23 @@
 #include <byteswap.h>
 #else
 
-#include <inttypes.h> /* for __WORDSIZE */
-#ifdef ARCH_X86
-inline static unsigned short ByteSwap16(unsigned short x)
+#ifdef ARCH_X86_64
+#  define LEGACY_REGS "=Q"
+#else
+#  define LEGACY_REGS "=q"
+#endif
+
+#if defined(ARCH_X86) || defined(ARCH_X86_64)
+static inline uint16_t ByteSwap16(uint16_t x)
 {
   __asm("xchgb %b0,%h0"        :
-        "=q" (x)       :
+        LEGACY_REGS (x)        :
         "0" (x));
     return x;
 }
 #define bswap_16(x) ByteSwap16(x)
 
-inline static unsigned int ByteSwap32(unsigned int x)
+static inline uint32_t ByteSwap32(uint32_t x)
 {
 #if __CPU__ > 386
  __asm("bswap  %0":
@@ -25,21 +35,61 @@ inline static unsigned int ByteSwap32(unsigned int x)
  __asm("xchgb  %b0,%h0\n"
       "        rorl    $16,%0\n"
       "        xchgb   %b0,%h0":
-      "=q" (x)         :
+      LEGACY_REGS (x)          :
 #endif
       "0" (x));
   return x;
 }
 #define bswap_32(x) ByteSwap32(x)
 
-inline static unsigned long long int ByteSwap64(unsigned long long int x)
+static inline uint64_t ByteSwap64(uint64_t x)
 {
-  register union { __extension__ unsigned long long int __ll;
-          unsigned long int __l[2]; } __x;
+#ifdef ARCH_X86_64
+  __asm("bswap %0":
+        "=r" (x)     :
+        "0" (x));
+  return x;
+#else
+  register union { __extension__ uint64_t __ll;
+          uint32_t __l[2]; } __x;
   asm("xchgl   %0,%1":
       "=r"(__x.__l[0]),"=r"(__x.__l[1]):
-      "0"(bswap_32((unsigned long)x)),"1"(bswap_32((unsigned long)(x>>32))));
+      "0"(bswap_32((uint32_t)x)),"1"(bswap_32((uint32_t)(x>>32))));
   return __x.__ll;
+#endif
+}
+#define bswap_64(x) ByteSwap64(x)
+
+#elif defined(ARCH_SH4)
+
+static inline uint16_t ByteSwap16(uint16_t x) {
+       __asm__("swap.b %0,%0":"=r"(x):"0"(x));
+       return x;
+}
+
+static inline uint32_t ByteSwap32(uint32_t x) {
+       __asm__(
+       "swap.b %0,%0\n"
+       "swap.w %0,%0\n"
+       "swap.b %0,%0\n"
+       :"=r"(x):"0"(x));
+       return x;
+}
+
+#define bswap_16(x) ByteSwap16(x)
+#define bswap_32(x) ByteSwap32(x)
+
+static inline uint64_t ByteSwap64(uint64_t x)
+{
+    union { 
+        uint64_t ll;
+        struct {
+           uint32_t l,h;
+        } l;
+    } r;
+    r.l.l = bswap_32 (x);
+    r.l.h = bswap_32 (x>>32);
+    return r.ll;
 }
 #define bswap_64(x) ByteSwap64(x)
 
@@ -53,26 +103,19 @@ inline static unsigned long long int ByteSwap64(unsigned long long int x)
      ((((x) & 0xff000000) >> 24) | (((x) & 0x00ff0000) >>  8) | \
       (((x) & 0x0000ff00) <<  8) | (((x) & 0x000000ff) << 24))
 
-#if __WORDSIZE >= 64
-# define bswap_64(x) \
-     ((((x) & 0xff00000000000000ull) >> 56)                                  \
-      | (((x) & 0x00ff000000000000ull) >> 40)                                \
-      | (((x) & 0x0000ff0000000000ull) >> 24)                                \
-      | (((x) & 0x000000ff00000000ull) >> 8)                                 \
-      | (((x) & 0x00000000ff000000ull) << 8)                                 \
-      | (((x) & 0x0000000000ff0000ull) << 24)                                \
-      | (((x) & 0x000000000000ff00ull) << 40)                                \
-      | (((x) & 0x00000000000000ffull) << 56))
-#else
-#define bswap_64(x) \
-     (__extension__                                            \
-      ({ union { __extension__ unsigned long long int __ll;    \
-                 unsigned long int __l[2]; } __w, __r;         \
-         __w.__ll = (x);                                       \
-         __r.__l[0] = bswap_32 (__w.__l[1]);                   \
-         __r.__l[1] = bswap_32 (__w.__l[0]);                   \
-         __r.__ll; }))
-#endif
+static inline uint64_t ByteSwap64(uint64_t x)
+{
+    union { 
+        uint64_t ll;
+        uint32_t l[2]; 
+    } w, r;
+    w.ll = x;
+    r.l[0] = bswap_32 (w.l[1]);
+    r.l[1] = bswap_32 (w.l[0]);
+    return r.ll;
+}
+#define bswap_64(x) ByteSwap64(x)
+
 #endif /* !ARCH_X86 */
 
 #endif /* !HAVE_BYTESWAP_H */