[FFmpeg-cvslog] avutil/ppc/intreadwrite: try to fix intreadwrite for ppc64le

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Jun  5 03:21:32 2014 +0200| [d37c620c84e28400ad071d1c75cc81445b4acb29] | committer: Michael Niedermayer

avutil/ppc/intreadwrite: try to fix intreadwrite for ppc64le

Untested due to lack of hardware

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d37c620c84e28400ad071d1c75cc81445b4acb29
---

 libavutil/ppc/intreadwrite.h |   40 ++++++++++++++++++++++++++++------------
 1 file changed, 28 insertions(+), 12 deletions(-)

diff --git a/libavutil/ppc/intreadwrite.h b/libavutil/ppc/intreadwrite.h
index 3667703..733c01e 100644
--- a/libavutil/ppc/intreadwrite.h
+++ b/libavutil/ppc/intreadwrite.h
@@ -26,46 +26,60 @@
 
 #if HAVE_XFORM_ASM
 
-#define AV_RL16 AV_RL16
-static av_always_inline uint16_t AV_RL16(const void *p)
+#if HAVE_BIGENDIAN
+#define AV_RL16 AV_RX16
+#define AV_WL16 AV_WX16
+#define AV_RL32 AV_RX32
+#define AV_WL32 AV_WX32
+#else
+#define AV_RB16 AV_RX16
+#define AV_WB16 AV_WX16
+#define AV_RB32 AV_RX32
+#define AV_WB32 AV_WX32
+#endif
+
+static av_always_inline uint16_t AV_RX16(const void *p)
 {
     uint16_t v;
     __asm__ ("lhbrx   %0, %y1" : "=r"(v) : "Z"(*(const uint16_t*)p));
     return v;
 }
 
-#define AV_WL16 AV_WL16
-static av_always_inline void AV_WL16(void *p, uint16_t v)
+static av_always_inline void AV_WX16(void *p, uint16_t v)
 {
     __asm__ ("sthbrx  %1, %y0" : "=Z"(*(uint16_t*)p) : "r"(v));
 }
 
-#define AV_RL32 AV_RL32
-static av_always_inline uint32_t AV_RL32(const void *p)
+static av_always_inline uint32_t AV_RX32(const void *p)
 {
     uint32_t v;
     __asm__ ("lwbrx   %0, %y1" : "=r"(v) : "Z"(*(const uint32_t*)p));
     return v;
 }
 
-#define AV_WL32 AV_WL32
-static av_always_inline void AV_WL32(void *p, uint32_t v)
+static av_always_inline void AV_WX32(void *p, uint32_t v)
 {
     __asm__ ("stwbrx  %1, %y0" : "=Z"(*(uint32_t*)p) : "r"(v));
 }
 
 #if HAVE_LDBRX
 
-#define AV_RL64 AV_RL64
-static av_always_inline uint64_t AV_RL64(const void *p)
+#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)
 {
     uint64_t v;
     __asm__ ("ldbrx   %0, %y1" : "=r"(v) : "Z"(*(const uint64_t*)p));
     return v;
 }
 
-#define AV_WL64 AV_WL64
-static av_always_inline void AV_WL64(void *p, uint64_t v)
+static av_always_inline void AV_WX64(void *p, uint64_t v)
 {
     __asm__ ("stdbrx  %1, %y0" : "=Z"(*(uint64_t*)p) : "r"(v));
 }
@@ -102,7 +116,9 @@ static av_always_inline void AV_WL64(void *p, uint64_t v)
  * 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 */