virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

ARM: fix MUL64 inline asm for pre-armv6

Browse Source 
Prior to ARMv6, the destination registers of the SMULL instruction
must be distinct from the first source register.  Marking the
output early-clobber ensures it is allocated unique registers.

This restriction is dropped in ARMv6 and later, so allowing overlap
between input and output registers there might give better code.

Signed-off-by: Mans Rullgard <mans@mansr.com>
This commit is contained in:
Mans Rullgard 2011-05-31 21:04:01 +01:00
parent 5ac4952a58
commit c51695dbf6
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
libavcodec/arm/mathops.h
View File

@ -41,6 +41,8 @@ static inline av_const int MULL(int a, int b, unsigned shift)
} }
#define MULH MULH #define MULH MULH
#define MUL64 MUL64
#if HAVE_ARMV6 #if HAVE_ARMV6
static inline av_const int MULH(int a, int b) static inline av_const int MULH(int a, int b)
{ {
@ -48,6 +50,13 @@ static inline av_const int MULH(int a, int b)
__asm__ ("smmul %0, %1, %2" : "=r"(r) : "r"(a), "r"(b)); __asm__ ("smmul %0, %1, %2" : "=r"(r) : "r"(a), "r"(b));
return r; return r;
} }
static inline av_const int64_t MUL64(int a, int b)
{
int64_t x;
__asm__ ("smull %Q0, %R0, %1, %2" : "=r"(x) : "r"(a), "r"(b));
return x;
}
#else #else
static inline av_const int MULH(int a, int b) static inline av_const int MULH(int a, int b)
{ {
@ -55,15 +64,14 @@ static inline av_const int MULH(int a, int b)
__asm__ ("smull %0, %1, %2, %3" : "=&r"(lo), "=&r"(hi) : "r"(b), "r"(a)); __asm__ ("smull %0, %1, %2, %3" : "=&r"(lo), "=&r"(hi) : "r"(b), "r"(a));
return hi; return hi;
} }
#endif
static inline av_const int64_t MUL64(int a, int b) static inline av_const int64_t MUL64(int a, int b)
{ {
int64_t x; int64_t x;
__asm__ ("smull %Q0, %R0, %1, %2" : "=r"(x) : "r"(a), "r"(b)); __asm__ ("smull %Q0, %R0, %1, %2" : "=&r"(x) : "r"(a), "r"(b));
return x; return x;
} }
#define MUL64 MUL64 #endif
static inline av_const int64_t MAC64(int64_t d, int a, int b) static inline av_const int64_t MAC64(int64_t d, int a, int b)
{ {