sync with libavcodec (sh4 optim)

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10482 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
alex 2003-07-27 21:24:33 +00:00
parent 458adb4c84
commit 963437dc9d
1 changed files with 52 additions and 18 deletions

70
bswap.h
View File

@ -1,10 +1,6 @@
#ifndef __BSWAP_H__
#define __BSWAP_H__
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#ifdef HAVE_BYTESWAP_H
#include <byteswap.h>
#else
@ -12,7 +8,7 @@
#include <inttypes.h>
#ifdef ARCH_X86
inline static unsigned short ByteSwap16(unsigned short x)
static inline unsigned short ByteSwap16(unsigned short x)
{
__asm("xchgb %b0,%h0" :
"=q" (x) :
@ -21,7 +17,7 @@ inline static unsigned short ByteSwap16(unsigned short x)
}
#define bswap_16(x) ByteSwap16(x)
inline static unsigned int ByteSwap32(unsigned int x)
static inline unsigned int ByteSwap32(unsigned int x)
{
#if __CPU__ > 386
__asm("bswap %0":
@ -37,10 +33,10 @@ inline static unsigned int ByteSwap32(unsigned int x)
}
#define bswap_32(x) ByteSwap32(x)
inline static unsigned long long int ByteSwap64(unsigned long long int x)
static inline unsigned long long int ByteSwap64(unsigned long long int x)
{
register union { __extension__ unsigned long long int __ll;
unsigned int __l[2]; } __x;
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))));
@ -48,6 +44,39 @@ inline static unsigned long long int ByteSwap64(unsigned long long int x)
}
#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)
#else
#define bswap_16(x) (((x) & 0x00ff) << 8 | ((x) & 0xff00) >> 8)
@ -58,14 +87,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))
#define bswap_64(x) \
(__extension__ \
({ union { __extension__ unsigned long long int __ll; \
unsigned 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; }))
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 */
@ -89,4 +123,4 @@ inline static unsigned long long int ByteSwap64(unsigned long long int x)
#define le2me_64(x) (x)
#endif
#endif
#endif /* __BSWAP_H__ */