From bdd19e29dfb21ff09a23c07ad48bd12c5ef92ca8 Mon Sep 17 00:00:00 2001 From: Måns Rullgård Date: Mon, 18 Jan 2010 01:35:19 +0000 Subject: Mark all intreadwrite functions av_always_inline Originally committed as revision 21278 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavutil/arm/intreadwrite.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'libavutil/arm') diff --git a/libavutil/arm/intreadwrite.h b/libavutil/arm/intreadwrite.h index c0172ac16a..011694d711 100644 --- a/libavutil/arm/intreadwrite.h +++ b/libavutil/arm/intreadwrite.h @@ -25,7 +25,7 @@ #if HAVE_FAST_UNALIGNED && HAVE_INLINE_ASM #define AV_RN16 AV_RN16 -static inline uint16_t AV_RN16(const void *p) +static av_always_inline uint16_t AV_RN16(const void *p) { uint16_t v; __asm__ ("ldrh %0, %1" : "=r"(v) : "m"(*(const uint16_t *)p)); @@ -33,13 +33,13 @@ static inline uint16_t AV_RN16(const void *p) } #define AV_WN16 AV_WN16 -static inline void AV_WN16(void *p, uint16_t v) +static av_always_inline void AV_WN16(void *p, uint16_t v) { __asm__ ("strh %1, %0" : "=m"(*(uint16_t *)p) : "r"(v)); } #define AV_RN32 AV_RN32 -static inline uint32_t AV_RN32(const void *p) +static av_always_inline uint32_t AV_RN32(const void *p) { uint32_t v; __asm__ ("ldr %0, %1" : "=r"(v) : "m"(*(const uint32_t *)p)); @@ -47,13 +47,13 @@ static inline uint32_t AV_RN32(const void *p) } #define AV_WN32 AV_WN32 -static inline void AV_WN32(void *p, uint32_t v) +static av_always_inline void AV_WN32(void *p, uint32_t v) { __asm__ ("str %1, %0" : "=m"(*(uint32_t *)p) : "r"(v)); } #define AV_RN64 AV_RN64 -static inline uint64_t AV_RN64(const void *p) +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" @@ -64,7 +64,7 @@ static inline uint64_t AV_RN64(const void *p) } #define AV_WN64 AV_WN64 -static inline void AV_WN64(void *p, uint64_t v) +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" -- cgit v1.2.3