generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

change macros to inline functions

Browse Source 
remove redundant operations
remove silly 2 layer bswap_XX/ByteSwapXX system

Originally committed as revision 4211 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Michael Niedermayer 2005-05-10 10:05:44 +00:00
parent efe419837f
commit 24dea064cc
1 changed files with 13 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
libavcodec/bswap.h
View File

@ -17,16 +17,15 @@
#endif #endif
#if defined(ARCH_X86) || defined(ARCH_X86_64) #if defined(ARCH_X86) || defined(ARCH_X86_64)
static inline uint16_t ByteSwap16(uint16_t x) static always_inline uint16_t bswap_16(uint16_t x)
{ {
__asm("xchgb %b0,%h0" : __asm("xchgb %b0,%h0" :
LEGACY_REGS (x) : LEGACY_REGS (x) :
"0" (x)); "0" (x));
return x; return x;
} }
#define bswap_16(x) ByteSwap16(x)
static inline uint32_t ByteSwap32(uint32_t x) static always_inline uint32_t bswap_32(uint32_t x)
{ {
#if __CPU__ > 386 #if __CPU__ > 386
__asm("bswap %0": __asm("bswap %0":
@ -40,9 +39,8 @@ static inline uint32_t ByteSwap32(uint32_t x)
"0" (x)); "0" (x));
return x; return x;
} }
#define bswap_32(x) ByteSwap32(x)
static inline uint64_t ByteSwap64(uint64_t x) static inline uint64_t bswap_64(uint64_t x)
{ {
#ifdef ARCH_X86_64 #ifdef ARCH_X86_64
__asm("bswap %0": __asm("bswap %0":
@ -58,16 +56,15 @@ static inline uint64_t ByteSwap64(uint64_t x)
return __x.__ll; return __x.__ll;
#endif #endif
} }
#define bswap_64(x) ByteSwap64(x)
#elif defined(ARCH_SH4) #elif defined(ARCH_SH4)
static inline uint16_t ByteSwap16(uint16_t x) { static always_inline uint16_t bswap_16(uint16_t x) {
__asm__("swap.b %0,%0":"=r"(x):"0"(x)); __asm__("swap.b %0,%0":"=r"(x):"0"(x));
return x; return x;
} }
static inline uint32_t ByteSwap32(uint32_t x) { static always_inline uint32_t bswap_32(uint32_t x) {
__asm__( __asm__(
"swap.b %0,%0\n" "swap.b %0,%0\n"
"swap.w %0,%0\n" "swap.w %0,%0\n"
@ -76,10 +73,7 @@ static inline uint32_t ByteSwap32(uint32_t x) {
return x; return x;
} }
#define bswap_16(x) ByteSwap16(x) static inline uint64_t bswap_64(uint64_t x)
#define bswap_32(x) ByteSwap32(x)
static inline uint64_t ByteSwap64(uint64_t x)
{ {
union { union {
uint64_t ll; uint64_t ll;
@ -91,19 +85,17 @@ static inline uint64_t ByteSwap64(uint64_t x)
r.l.h = bswap_32 (x>>32); r.l.h = bswap_32 (x>>32);
return r.ll; return r.ll;
} }
#define bswap_64(x) ByteSwap64(x)
#else #else
#define bswap_16(x) (((x) & 0x00ff) << 8 | ((x) & 0xff00) >> 8) static always_inline uint16_t bswap_16(uint16_t x){
return (x>>8) | (x<<8);
}
static always_inline uint32_t bswap_32(uint32_t x){
return (x >> 24) | ((x & 0x00ff0000) >> 8) | ((x & 0x0000ff00) << 8) | (x << 24);
}
// code from bits/byteswap.h (C) 1997, 1998 Free Software Foundation, Inc. static inline uint64_t bswap_64(uint64_t x)
#define bswap_32(x) \
((((x) & 0xff000000) >> 24) | (((x) & 0x00ff0000) >> 8) | \
(((x) & 0x0000ff00) << 8) | (((x) & 0x000000ff) << 24))
static inline uint64_t ByteSwap64(uint64_t x)
{ {
union { union {
uint64_t ll; uint64_t ll;
@ -114,8 +106,6 @@ static inline uint64_t ByteSwap64(uint64_t x)
r.l[1] = bswap_32 (w.l[0]); r.l[1] = bswap_32 (w.l[0]);
return r.ll; return r.ll;
} }
#define bswap_64(x) ByteSwap64(x)
#endif /* !ARCH_X86 */ #endif /* !ARCH_X86 */
#endif /* !HAVE_BYTESWAP_H */ #endif /* !HAVE_BYTESWAP_H */