diff options
| author | Mans Rullgard <mans@mansr.com> | 2011-05-30 16:37:06 +0100 |
|---|---|---|
| committer | Mans Rullgard <mans@mansr.com> | 2011-05-30 21:19:57 +0100 |
| commit | 6bb70dfd7466ff89259285d5714b5caa6ca954f9 (patch) | |
| tree | 1c0cb105fc7165f4c979c5fc3552850ea9fd9b97 /libavutil/arm | |
| parent | 371266daa3df35c424203fff0ce2e6de0e33a29d (diff) | |
| download | ffmpeg-6bb70dfd7466ff89259285d5714b5caa6ca954f9.tar.gz | |
ARM: simplify inline asm with 64-bit operands
Signed-off-by: Mans Rullgard <mans@mansr.com>
Diffstat (limited to 'libavutil/arm')
| -rw-r--r-- | libavutil/arm/intreadwrite.h | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/libavutil/arm/intreadwrite.h b/libavutil/arm/intreadwrite.h index a5ee14666a..613abe511c 100644 --- a/libavutil/arm/intreadwrite.h +++ b/libavutil/arm/intreadwrite.h @@ -55,22 +55,21 @@ static av_always_inline void AV_WN32(void *p, uint32_t v) #define AV_RN64 AV_RN64 static av_always_inline uint64_t AV_RN64(const void *p) { - union { uint64_t v; uint32_t hl[2]; } v; - __asm__ ("ldr %0, %2 \n\t" - "ldr %1, %3 \n\t" - : "=&r"(v.hl[0]), "=r"(v.hl[1]) + uint64_t v; + __asm__ ("ldr %Q0, %1 \n\t" + "ldr %R0, %2 \n\t" + : "=&r"(v) : "m"(*(const uint32_t*)p), "m"(*((const uint32_t*)p+1))); - return v.v; + return v; } #define AV_WN64 AV_WN64 static av_always_inline void AV_WN64(void *p, uint64_t v) { - union { uint64_t v; uint32_t hl[2]; } vv = { v }; - __asm__ ("str %2, %0 \n\t" - "str %3, %1 \n\t" + __asm__ ("str %Q2, %0 \n\t" + "str %R2, %1 \n\t" : "=m"(*(uint32_t*)p), "=m"(*((uint32_t*)p+1)) - : "r"(vv.hl[0]), "r"(vv.hl[1])); + : "r"(v)); } #endif /* HAVE_INLINE_ASM */ |