split bswap.h into per-arch files

Originally committed as revision 15663 to svn://svn.ffmpeg.org/ffmpeg/trunk

5 files changed, 221 insertions, 43 deletions

diff --git a/libavutil/arm/bswap.h b/libavutil/arm/bswap.h
new file mode 100644
index 0000000000..deb739407b
--- /dev/null
+++ b/libavutil/arm/bswap.h
@@ -0,0 +1,51 @@
+/*
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVUTIL_ARM_BSWAP_H
+#define AVUTIL_ARM_BSWAP_H
+
+#include <stdint.h>
+#include "config.h"
+#include "libavutil/common.h"
+
+#ifdef HAVE_ARMV6
+#define bswap_16 bswap_16
+static av_always_inline av_const uint16_t bswap_16(uint16_t x)
+{
+    __asm__("rev16 %0, %0" : "+r"(x));
+    return x;
+}
+#endif
+
+#define bswap_32 bswap_32
+static av_always_inline av_const uint32_t bswap_32(uint32_t x)
+{
+#ifdef HAVE_ARMV6
+    __asm__("rev %0, %0" : "+r"(x));
+#else
+    uint32_t t;
+    __asm__ ("eor %1, %0, %0, ror #16 \n\t"
+             "bic %1, %1, #0xFF0000   \n\t"
+             "mov %0, %0, ror #8      \n\t"
+             "eor %0, %0, %1, lsr #8  \n\t"
+             : "+r"(x), "=&r"(t));
+#endif /* HAVE_ARMV6 */
+    return x;
+}
+
+#endif /* AVUTIL_ARM_BSWAP_H */
diff --git a/libavutil/bfin/bswap.h b/libavutil/bfin/bswap.h
new file mode 100644
index 0000000000..bfd850e294
--- /dev/null
+++ b/libavutil/bfin/bswap.h
@@ -0,0 +1,45 @@
+/*
+ * Copyright (C) 2007 Marc Hoffman
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+/**
+ * @file bswap.h
+ * byte swapping routines
+ */
+
+#ifndef AVUTIL_BFIN_BSWAP_H
+#define AVUTIL_BFIN_BSWAP_H
+
+#include <stdint.h>
+#include "config.h"
+#include "libavutil/common.h"
+
+#define bswap_32 bswap_32
+static av_always_inline av_const uint32_t bswap_32(uint32_t x)
+{
+    unsigned tmp;
+    __asm__("%1 = %0 >> 8 (V);      \n\t"
+            "%0 = %0 << 8 (V);      \n\t"
+            "%0 = %0 | %1;          \n\t"
+            "%0 = PACK(%0.L, %0.H); \n\t"
+            : "+d"(x), "=&d"(tmp));
+    return x;
+}
+
+#endif /* AVUTIL_BFIN_BSWAP_H */
diff --git a/libavutil/bswap.h b/libavutil/bswap.h
index 3d0a2a7c8d..c14676e6ab 100644
--- a/libavutil/bswap.h
+++ b/libavutil/bswap.h
@@ -30,68 +30,40 @@
 #include "config.h"
 #include "common.h"
 
+#if defined(ARCH_ARMV4L)
+#   include "arm/bswap.h"
+#elif defined(ARCH_BFIN)
+#   include "bfin/bswap.h"
+#elif defined(ARCH_SH4)
+#   include "sh4/bswap.h"
+#elif defined(ARCH_X86)
+#   include "x86/bswap.h"
+#endif
+
+#ifndef bswap_16
 static av_always_inline av_const uint16_t bswap_16(uint16_t x)
 {
-#if defined(ARCH_X86)
-    __asm__("rorw $8, %0" : "+r"(x));
-#elif defined(ARCH_SH4)
-    __asm__("swap.b %0,%0" : "=r"(x) : "0"(x));
-#elif defined(HAVE_ARMV6)
-    __asm__("rev16 %0, %0" : "+r"(x));
-#else
     x= (x>>8) | (x<<8);
-#endif
     return x;
 }
+#endif
 
+#ifndef bswap_32
 static av_always_inline av_const uint32_t bswap_32(uint32_t x)
 {
-#if defined(ARCH_X86)
-#ifdef HAVE_BSWAP
-    __asm__("bswap   %0" : "+r" (x));
-#else
-    __asm__("rorw    $8,  %w0 \n\t"
-        "rorl    $16, %0  \n\t"
-        "rorw    $8,  %w0"
-        : "+r"(x));
-#endif
-#elif defined(ARCH_SH4)
-    __asm__("swap.b %0,%0\n"
-        "swap.w %0,%0\n"
-        "swap.b %0,%0\n"
-        : "=r"(x) : "0"(x));
-#elif defined(HAVE_ARMV6)
-    __asm__("rev %0, %0" : "+r"(x));
-#elif defined(ARCH_ARMV4L)
-    uint32_t t;
-    __asm__ ("eor %1, %0, %0, ror #16 \n\t"
-         "bic %1, %1, #0xFF0000   \n\t"
-         "mov %0, %0, ror #8      \n\t"
-         "eor %0, %0, %1, lsr #8  \n\t"
-         : "+r"(x), "=&r"(t));
-#elif defined(ARCH_BFIN)
-    unsigned tmp;
-    __asm__("%1 = %0 >> 8 (V);      \n\t"
-        "%0 = %0 << 8 (V);      \n\t"
-        "%0 = %0 | %1;          \n\t"
-        "%0 = PACK(%0.L, %0.H); \n\t"
-        : "+d"(x), "=&d"(tmp));
-#else
     x= ((x<<8)&0xFF00FF00) | ((x>>8)&0x00FF00FF);
     x= (x>>16) | (x<<16);
-#endif
     return x;
 }
+#endif
 
+#ifndef bswap_64
 static inline uint64_t av_const bswap_64(uint64_t x)
 {
 #if 0
     x= ((x<< 8)&0xFF00FF00FF00FF00ULL) | ((x>> 8)&0x00FF00FF00FF00FFULL);
     x= ((x<<16)&0xFFFF0000FFFF0000ULL) | ((x>>16)&0x0000FFFF0000FFFFULL);
     return (x>>32) | (x<<32);
-#elif defined(ARCH_X86_64)
-  __asm__("bswap  %0": "=r" (x) : "0" (x));
-  return x;
 #else
     union {
         uint64_t ll;
@@ -103,6 +75,7 @@ static inline uint64_t av_const bswap_64(uint64_t x)
     return r.ll;
 #endif
 }
+#endif
 
 // be2me ... BigEndian to MachineEndian
 // le2me ... LittleEndian to MachineEndian
diff --git a/libavutil/sh4/bswap.h b/libavutil/sh4/bswap.h
new file mode 100644
index 0000000000..8e3c346a2b
--- /dev/null
+++ b/libavutil/sh4/bswap.h
@@ -0,0 +1,48 @@
+/*
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+/**
+ * @file bswap.h
+ * byte swapping routines
+ */
+
+#ifndef AVUTIL_SH4_BSWAP_H
+#define AVUTIL_SH4_BSWAP_H
+
+#include <stdint.h>
+#include "config.h"
+#include "libavutil/common.h"
+
+#define bswap_16 bswap_16
+static av_always_inline av_const uint16_t bswap_16(uint16_t x)
+{
+    __asm__("swap.b %0,%0" : "+r"(x));
+    return x;
+}
+
+#define bswap_32 bswap_32
+static av_always_inline av_const uint32_t bswap_32(uint32_t x)
+{
+    __asm__("swap.b %0,%0\n"
+            "swap.w %0,%0\n"
+            "swap.b %0,%0\n"
+            : "+r"(x));
+    return x;
+}
+
+#endif /* AVUTIL_SH4_BSWAP_H */
diff --git a/libavutil/x86/bswap.h b/libavutil/x86/bswap.h
new file mode 100644
index 0000000000..c52b5290e1
--- /dev/null
+++ b/libavutil/x86/bswap.h
@@ -0,0 +1,61 @@
+/*
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+/**
+ * @file bswap.h
+ * byte swapping routines
+ */
+
+#ifndef AVUTIL_X86_BSWAP_H
+#define AVUTIL_X86_BSWAP_H
+
+#include <stdint.h>
+#include "config.h"
+#include "libavutil/common.h"
+
+#define bswap_16 bswap_16
+static av_always_inline av_const uint16_t bswap_16(uint16_t x)
+{
+    __asm__("rorw $8, %0" : "+r"(x));
+    return x;
+}
+
+#define bswap_32 bswap_32
+static av_always_inline av_const uint32_t bswap_32(uint32_t x)
+{
+#ifdef HAVE_BSWAP
+    __asm__("bswap   %0" : "+r" (x));
+#else
+    __asm__("rorw    $8,  %w0 \n\t"
+            "rorl    $16, %0  \n\t"
+            "rorw    $8,  %w0"
+            : "+r"(x));
+#endif
+    return x;
+}
+
+#ifdef ARCH_X86_64
+#define bswap_64 bswap_64
+static inline uint64_t av_const bswap_64(uint64_t x)
+{
+    __asm__("bswap  %0": "=r" (x) : "0" (x));
+    return x;
+}
+#endif
+
+#endif /* AVUTIL_X86_BSWAP_H */