1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-24 13:56:33 +02:00

Merge commit 'c19a49e565bd06ea47947d50779ba236df9d4943'

* commit 'c19a49e565bd06ea47947d50779ba236df9d4943':
  ppc: Support little endian intreadwrite

Conflicts:
	libavutil/ppc/intreadwrite.h

See: d37c620c84e28400ad071d1c75cc81445b4acb29
Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-09-03 13:11:55 +02:00
commit 34e80af860

View File

@ -24,70 +24,81 @@
#include <stdint.h>
#include "config.h"
/*
* -O0 would compile the packed struct version, which is used by
* default, in an overly verbose fashion, so we override it here.
*/
#if HAVE_BIGENDIAN
#define AV_RB64(p) (*(const uint64_t *)(p))
#define AV_WB64(p, v) (*(uint64_t *)(p) = (v))
#else
#define AV_RL64(p) (*(const uint64_t *)(p))
#define AV_WL64(p, v) (*(uint64_t *)(p) = (v))
#endif
#if HAVE_XFORM_ASM
#if HAVE_BIGENDIAN
#define AV_RL16 AV_RX16
#define AV_WL16 AV_WX16
#define AV_RL32 AV_RX32
#define AV_WL32 AV_WX32
#define AV_RL16 av_read_bswap16
#define AV_WL16 av_write_bswap16
#define AV_RL32 av_read_bswap32
#define AV_WL32 av_write_bswap32
#define AV_RL64 av_read_bswap64
#define AV_WL64 av_write_bswap64
#else
#define AV_RB16 AV_RX16
#define AV_WB16 AV_WX16
#define AV_RB32 AV_RX32
#define AV_WB32 AV_WX32
#define AV_RB16 av_read_bswap16
#define AV_WB16 av_write_bswap16
#define AV_RB32 av_read_bswap32
#define AV_WB32 av_write_bswap32
#define AV_RB64 av_read_bswap64
#define AV_WB64 av_write_bswap64
#endif
static av_always_inline uint16_t AV_RX16(const void *p)
static av_always_inline uint16_t av_read_bswap16(const void *p)
{
uint16_t v;
__asm__ ("lhbrx %0, %y1" : "=r"(v) : "Z"(*(const uint16_t*)p));
return v;
}
static av_always_inline void AV_WX16(void *p, uint16_t v)
static av_always_inline void av_write_bswap16(void *p, uint16_t v)
{
__asm__ ("sthbrx %1, %y0" : "=Z"(*(uint16_t*)p) : "r"(v));
}
static av_always_inline uint32_t AV_RX32(const void *p)
static av_always_inline uint32_t av_read_bswap32(const void *p)
{
uint32_t v;
__asm__ ("lwbrx %0, %y1" : "=r"(v) : "Z"(*(const uint32_t*)p));
return v;
}
static av_always_inline void AV_WX32(void *p, uint32_t v)
static av_always_inline void av_write_bswap32(void *p, uint32_t v)
{
__asm__ ("stwbrx %1, %y0" : "=Z"(*(uint32_t*)p) : "r"(v));
}
#if HAVE_LDBRX
#if HAVE_BIGENDIAN
#define AV_RL64 AV_RX64
#define AV_WL64 AV_WX64
#else
#define AV_RB64 AV_RX64
#define AV_WB64 AV_WX64
#endif
static av_always_inline uint64_t AV_RX64(const void *p)
static av_always_inline uint64_t av_read_bswap64(const void *p)
{
uint64_t v;
__asm__ ("ldbrx %0, %y1" : "=r"(v) : "Z"(*(const uint64_t*)p));
return v;
}
static av_always_inline void AV_WX64(void *p, uint64_t v)
static av_always_inline void av_write_bswap64(void *p, uint64_t v)
{
__asm__ ("stdbrx %1, %y0" : "=Z"(*(uint64_t*)p) : "r"(v));
}
#else
#define AV_RL64 AV_RL64
static av_always_inline uint64_t AV_RL64(const void *p)
static av_always_inline uint64_t av_read_bswap64(const void *p)
{
union { uint64_t v; uint32_t hl[2]; } v;
__asm__ ("lwbrx %0, %y2 \n\t"
@ -97,8 +108,7 @@ static av_always_inline uint64_t AV_RL64(const void *p)
return v.v;
}
#define AV_WL64 AV_WL64
static av_always_inline void AV_WL64(void *p, uint64_t v)
static av_always_inline void av_write_bswap64(void *p, uint64_t v)
{
union { uint64_t v; uint32_t hl[2]; } vv = { v };
__asm__ ("stwbrx %2, %y0 \n\t"
@ -111,14 +121,4 @@ static av_always_inline void AV_WL64(void *p, uint64_t v)
#endif /* HAVE_XFORM_ASM */
/*
* GCC fails miserably on the packed struct version which is used by
* default, so we override it here.
*/
#if HAVE_BIGENDIAN
#define AV_RB64(p) (*(const uint64_t *)(p))
#define AV_WB64(p, v) (*(uint64_t *)(p) = (v))
#endif
#endif /* AVUTIL_PPC_INTREADWRITE_H */