diff options
| author | Matt Oliver <protogonoi@gmail.com> | 2014-05-07 14:16:26 +1000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-05-07 15:02:45 +0200 |
| commit | 1898c2f49da3151fbce04ecf35971005707a609d (patch) | |
| tree | 8a34d0bdd66b30c062c1a24d8bdf7b9759d40d2a /libavcodec | |
| parent | 134206ca7a3d395c827e6a041f7f01e5fb9e1693 (diff) | |
| download | ffmpeg-1898c2f49da3151fbce04ecf35971005707a609d.tar.gz | |
inline asm: fix arrays as named constraints.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/x86/cabac.h | 4 | ||||
| -rw-r--r-- | libavcodec/x86/h264_i386.h | 4 | ||||
| -rw-r--r-- | libavcodec/x86/idct_sse2_xvid.c | 2 | ||||
| -rw-r--r-- | libavcodec/x86/lpc.c | 6 |
4 files changed, 8 insertions, 8 deletions
diff --git a/libavcodec/x86/cabac.h b/libavcodec/x86/cabac.h index 7c816dfd79..3510336f95 100644 --- a/libavcodec/x86/cabac.h +++ b/libavcodec/x86/cabac.h @@ -111,7 +111,7 @@ "2: \n\t" #else /* BROKEN_RELOCATIONS */ -#define TABLES_ARG NAMED_CONSTRAINTS_ADD(ff_h264_cabac_tables) +#define TABLES_ARG NAMED_CONSTRAINTS_ARRAY_ADD(ff_h264_cabac_tables) #define RIP_ARG #if HAVE_FAST_CMOV @@ -185,7 +185,7 @@ static av_always_inline int get_cabac_inline_x86(CABACContext *c, __asm__ volatile( "lea "MANGLE(ff_h264_cabac_tables)", %0 \n\t" : "=&r"(tables) - : NAMED_CONSTRAINTS(ff_h264_cabac_tables) + : NAMED_CONSTRAINTS_ARRAY(ff_h264_cabac_tables) ); #endif diff --git a/libavcodec/x86/h264_i386.h b/libavcodec/x86/h264_i386.h index 92c4b09dec..ef65cf86b7 100644 --- a/libavcodec/x86/h264_i386.h +++ b/libavcodec/x86/h264_i386.h @@ -55,7 +55,7 @@ static int decode_significance_x86(CABACContext *c, int max_coeff, __asm__ volatile( "lea "MANGLE(ff_h264_cabac_tables)", %0 \n\t" : "=&r"(tables) - : NAMED_CONSTRAINTS(ff_h264_cabac_tables) + : NAMED_CONSTRAINTS_ARRAY(ff_h264_cabac_tables) ); #endif @@ -131,7 +131,7 @@ static int decode_significance_8x8_x86(CABACContext *c, __asm__ volatile( "lea "MANGLE(ff_h264_cabac_tables)", %0 \n\t" : "=&r"(tables) - : NAMED_CONSTRAINTS(ff_h264_cabac_tables) + : NAMED_CONSTRAINTS_ARRAY(ff_h264_cabac_tables) ); #endif diff --git a/libavcodec/x86/idct_sse2_xvid.c b/libavcodec/x86/idct_sse2_xvid.c index 6dd2cb2168..a1810990cc 100644 --- a/libavcodec/x86/idct_sse2_xvid.c +++ b/libavcodec/x86/idct_sse2_xvid.c @@ -381,7 +381,7 @@ av_extern_inline void ff_idct_xvid_sse2(short *block) iLLM_PASS("%0") "6: \n\t" : "+r"(block) - : NAMED_CONSTRAINTS(m127,iTab1,walkenIdctRounders,iTab2,iTab3,iTab4,tan3,tan1,tan2,sqrt2) + : NAMED_CONSTRAINTS_ARRAY(m127,iTab1,walkenIdctRounders,iTab2,iTab3,iTab4,tan3,tan1,tan2,sqrt2) : XMM_CLOBBERS("%xmm0" , "%xmm1" , "%xmm2" , "%xmm3" , "%xmm4" , "%xmm5" , "%xmm6" , "%xmm7" ,) #if ARCH_X86_64 diff --git a/libavcodec/x86/lpc.c b/libavcodec/x86/lpc.c index bff26359f4..3a9493f728 100644 --- a/libavcodec/x86/lpc.c +++ b/libavcodec/x86/lpc.c @@ -72,7 +72,7 @@ static void lpc_apply_welch_window_sse2(const int32_t *data, int len, "3: \n\t" :"+&r"(i), "+&r"(j) :"r"(w_data+n2), "r"(data+n2), "m"(c), "r"(len) - NAMED_CONSTRAINTS_ADD(pd_1,pd_2) + NAMED_CONSTRAINTS_ARRAY_ADD(pd_1,pd_2) XMM_CLOBBERS_ONLY("%xmm0", "%xmm1", "%xmm2", "%xmm3", "%xmm5", "%xmm6", "%xmm7") ); @@ -117,7 +117,7 @@ static void lpc_compute_autocorr_sse2(const double *data, int len, int lag, "movsd %%xmm2, 16(%1) \n\t" :"+&r"(i) :"r"(autoc+j), "r"(data+len), "r"(data+len-j) - NAMED_CONSTRAINTS_ADD(pd_1) + NAMED_CONSTRAINTS_ARRAY_ADD(pd_1) :"memory" ); } else { @@ -141,7 +141,7 @@ static void lpc_compute_autocorr_sse2(const double *data, int len, int lag, "movsd %%xmm1, %2 \n\t" :"+&r"(i), "=m"(autoc[j]), "=m"(autoc[j+1]) :"r"(data+len), "r"(data+len-j) - NAMED_CONSTRAINTS_ADD(pd_1) + NAMED_CONSTRAINTS_ARRAY_ADD(pd_1) ); } } |