diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-05-31 02:08:13 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-05-31 02:08:20 +0200 |
| commit | 40c29d42cfe5615b9e382b89f5bcba7a2d62cd29 (patch) | |
| tree | 8ccd01ce4ee2252abdb96388dff9ea71e9c4ff72 /libavutil/arm | |
| parent | 3d0424f2ff3ae774d4237954186e4113976827e5 (diff) | |
| parent | f635a233e377bedc6a39c9d8923ee3039fa5319f (diff) | |
| download | ffmpeg-40c29d42cfe5615b9e382b89f5bcba7a2d62cd29.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
swscale: Remove unused variable.
ARM: simplify inline asm with 64-bit operands
Merged-by: Michael Niedermayer <michaelni@gmx.at>
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 339f8856fa..0292aabafd 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 */ |