RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-02-08 23:58:51 +00:00
Code Issues Projects Releases Wiki Activity

don't use inttypes.h - use inline function for bswap_64()

Browse Source 
Originally committed as revision 608 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Fabrice Bellard 2002-05-26 15:24:32 +00:00
parent b13788c53f
commit 74fc99894b
1 changed files with 15 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
libavcodec/bswap.h
View File

@ -5,7 +5,6 @@
#include <byteswap.h> #include <byteswap.h>
#else #else
#include <inttypes.h> /* for __WORDSIZE */
#ifdef ARCH_X86 #ifdef ARCH_X86
inline static unsigned short ByteSwap16(unsigned short x) inline static unsigned short ByteSwap16(unsigned short x)
{ {
@ -34,8 +33,8 @@ inline static unsigned int ByteSwap32(unsigned int x)
inline static unsigned long long int ByteSwap64(unsigned long long int x) inline static unsigned long long int ByteSwap64(unsigned long long int x)
{ {
register union { __extension__ unsigned long long int __ll; register union { __extension__ uint64_t __ll;
unsigned long int __l[2]; } __x; uint32_t __l[2]; } __x;
asm("xchgl %0,%1": asm("xchgl %0,%1":
"=r"(__x.__l[0]),"=r"(__x.__l[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((unsigned long)x)),"1"(bswap_32((unsigned long)(x>>32))));
@ -53,26 +52,19 @@ inline static unsigned long long int ByteSwap64(unsigned long long int x)
((((x) & 0xff000000) >> 24) | (((x) & 0x00ff0000) >> 8) | \ ((((x) & 0xff000000) >> 24) | (((x) & 0x00ff0000) >> 8) | \
(((x) & 0x0000ff00) << 8) | (((x) & 0x000000ff) << 24)) (((x) & 0x0000ff00) << 8) | (((x) & 0x000000ff) << 24))
#if __WORDSIZE >= 64 inline static uint64_t ByteSwap64(uint64_t x)
# define bswap_64(x) \ {
((((x) & 0xff00000000000000ull) >> 56) \ union {
| (((x) & 0x00ff000000000000ull) >> 40) \ uint64_t ll;
| (((x) & 0x0000ff0000000000ull) >> 24) \ uint32_t l[2];
| (((x) & 0x000000ff00000000ull) >> 8) \ } w, r;
| (((x) & 0x00000000ff000000ull) << 8) \ w.ll = x;
| (((x) & 0x0000000000ff0000ull) << 24) \ r.l[0] = bswap_32 (w.l[1]);
| (((x) & 0x000000000000ff00ull) << 40) \ r.l[1] = bswap_32 (w.l[0]);
| (((x) & 0x00000000000000ffull) << 56)) return r.ll;
#else }
#define bswap_64(x) \ #define bswap_64(x) ByteSwap64(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
#endif /* !ARCH_X86 */ #endif /* !ARCH_X86 */
#endif /* !HAVE_BYTESWAP_H */ #endif /* !HAVE_BYTESWAP_H */