Remove DECLARE_ALIGNED_{8,16} macros

[ffmpeg] / libavutil / bswap.h

diff --git a/libavutil/bswap.h b/libavutil/bswap.h
index beaec232f78b0f8b10a34807b292caca6267aa1c..52811e74a376f4eec7b94d03c7921b567f8e758f 100644 (file)
--- a/libavutil/bswap.h
+++ b/libavutil/bswap.h
@@ -1,118 +1,66 @@
-/**
- * @file bswap.h
- * byte swap.
+/*
+ * copyright (c) 2006 Michael Niedermayer <michaelni@gmx.at>
+ *
+ * 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 __BSWAP_H__
-#define __BSWAP_H__
-
-#ifdef HAVE_BYTESWAP_H
-#include <byteswap.h>
-#else
+/**
+ * @file libavutil/bswap.h
+ * byte swapping routines
+ */
 
-#ifdef ARCH_X86_64
-#  define LEGACY_REGS "=Q"
-#else
-#  define LEGACY_REGS "=q"
+#ifndef AVUTIL_BSWAP_H
+#define AVUTIL_BSWAP_H
+
+#include <stdint.h>
+#include "config.h"
+#include "common.h"
+
+#if   ARCH_ARM
+#   include "arm/bswap.h"
+#elif ARCH_AVR32
+#   include "avr32/bswap.h"
+#elif ARCH_BFIN
+#   include "bfin/bswap.h"
+#elif ARCH_SH4
+#   include "sh4/bswap.h"
+#elif ARCH_X86
+#   include "x86/bswap.h"
 #endif
 
-#if defined(ARCH_X86) || defined(ARCH_X86_64)
-static always_inline uint16_t bswap_16(uint16_t x)
+#ifndef bswap_16
+static av_always_inline av_const uint16_t bswap_16(uint16_t x)
 {
-  __asm("rorw $8, %0"  :
-        LEGACY_REGS (x)        :
-        "0" (x));
+    x= (x>>8) | (x<<8);
     return x;
 }
-
-static always_inline uint32_t bswap_32(uint32_t x)
-{
-#if __CPU__ > 386
- __asm("bswap  %0":
-      "=r" (x)     :
-#else
- __asm("xchgb  %b0,%h0\n"
-      "        rorl    $16,%0\n"
-      "        xchgb   %b0,%h0":
-      LEGACY_REGS (x)          :
 #endif
-      "0" (x));
-  return x;
-}
 
-static inline uint64_t bswap_64(uint64_t x)
+#ifndef bswap_32
+static av_always_inline av_const uint32_t bswap_32(uint32_t x)
 {
-#ifdef ARCH_X86_64
-  __asm("bswap %0":
-        "=r" (x)     :
-        "0" (x));
-  return x;
-#else
-    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;
-#endif
-}
-
-#elif defined(ARCH_SH4)
-
-static always_inline uint16_t bswap_16(uint16_t x) {
-       __asm__("swap.b %0,%0":"=r"(x):"0"(x));
-       return x;
-}
-
-static always_inline 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):"0"(x));
-       return x;
-}
-
-static inline uint64_t bswap_64(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;
-}
-#else
-
-static always_inline uint16_t bswap_16(uint16_t x){
-    return (x>>8) | (x<<8);
-}
-
-#ifdef ARCH_ARM
-static always_inline uint32_t bswap_32(uint32_t x){
-    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));
-    return x;
-}
-#else
-static always_inline uint32_t bswap_32(uint32_t x){
     x= ((x<<8)&0xFF00FF00) | ((x>>8)&0x00FF00FF);
-    return (x>>16) | (x<<16);
+    x= (x>>16) | (x<<16);
+    return x;
 }
 #endif
 
-static inline uint64_t bswap_64(uint64_t x)
+#ifndef bswap_64
+static inline uint64_t av_const bswap_64(uint64_t x)
 {
 #if 0
     x= ((x<< 8)&0xFF00FF00FF00FF00ULL) | ((x>> 8)&0x00FF00FF00FF00FFULL);
@@ -129,14 +77,12 @@ static inline uint64_t bswap_64(uint64_t x)
     return r.ll;
 #endif
 }
-#endif /* !ARCH_X86 */
-
-#endif /* !HAVE_BYTESWAP_H */
+#endif
 
-// be2me ... BigEndian to MachineEndian
-// le2me ... LittleEndian to MachineEndian
+// be2me ... big-endian to machine-endian
+// le2me ... little-endian to machine-endian
 
-#ifdef WORDS_BIGENDIAN
+#if HAVE_BIGENDIAN
 #define be2me_16(x) (x)
 #define be2me_32(x) (x)
 #define be2me_64(x) (x)
@@ -152,4 +98,4 @@ static inline uint64_t bswap_64(uint64_t x)
 #define le2me_64(x) (x)
 #endif
 
-#endif /* __BSWAP_H__ */
+#endif /* AVUTIL_BSWAP_H */