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

configure: Rename cmov processor capability to i686

Browse Source 
The goal is to make the capapility slightly more general and have it
cover the availability of the nopl instruction in addition to cmov.
This commit is contained in:
Diego Biurrun 2013-04-26 16:49:02 +02:00
parent e08c946c68
commit f54b55058a
2 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
configure vendored
View File

@ -1253,7 +1253,6 @@ HAVE_LIST="
cdio_paranoia_h cdio_paranoia_h
cdio_paranoia_paranoia_h cdio_paranoia_paranoia_h
closesocket closesocket
cmov
CommandLineToArgvW CommandLineToArgvW
cpunop cpunop
CryptGenRandom CryptGenRandom
@ -1287,6 +1286,7 @@ HAVE_LIST="
gettimeofday gettimeofday
gnu_as gnu_as
gsm_h gsm_h
i686
ibm_asm ibm_asm
inet_aton inet_aton
io_h io_h
@ -1470,7 +1470,7 @@ ppc4xx_deps="ppc"
vis_deps="sparc" vis_deps="sparc"
x86_64_suggest="cmov fast_cmov" x86_64_suggest="fast_cmov i686"
amd3dnow_deps="mmx" amd3dnow_deps="mmx"
amd3dnowext_deps="amd3dnow" amd3dnowext_deps="amd3dnow"
@ -2870,21 +2870,21 @@ elif enabled x86; then
cpuflags="-march=$cpu" cpuflags="-march=$cpu"
disable mmx disable mmx
;; ;;
# targets that do NOT support conditional mov (cmov) # targets that do NOT support nopl and conditional mov (cmov)
pentium-mmx|k6|k6-[23]|winchip-c6|winchip2|c3) pentium-mmx|k6|k6-[23]|winchip-c6|winchip2|c3)
cpuflags="-march=$cpu" cpuflags="-march=$cpu"
disable cmov disable i686
;; ;;
# targets that do support conditional mov (cmov) # targets that do support nopl and conditional mov (cmov)
i686|pentiumpro|pentium[23]|pentium-m|athlon|athlon-tbird|athlon-4|athlon-[mx]p|athlon64*|k8*|opteron*|athlon-fx|core2|corei7*|amdfam10|barcelona|atom|bdver*) i686|pentiumpro|pentium[23]|pentium-m|athlon|athlon-tbird|athlon-4|athlon-[mx]p|athlon64*|k8*|opteron*|athlon-fx|core2|corei7*|amdfam10|barcelona|atom|bdver*)
cpuflags="-march=$cpu" cpuflags="-march=$cpu"
enable cmov enable i686
enable fast_cmov enable fast_cmov
;; ;;
# targets that do support conditional mov but on which it's slow # targets that do support conditional mov but on which it's slow
pentium4|pentium4m|prescott|nocona) pentium4|pentium4m|prescott|nocona)
cpuflags="-march=$cpu" cpuflags="-march=$cpu"
enable cmov enable i686
disable fast_cmov disable fast_cmov
;; ;;
esac esac
@ -3895,7 +3895,7 @@ if enabled x86; then
echo "SSSE3 enabled ${ssse3-no}" echo "SSSE3 enabled ${ssse3-no}"
echo "AVX enabled ${avx-no}" echo "AVX enabled ${avx-no}"
echo "FMA4 enabled ${fma4-no}" echo "FMA4 enabled ${fma4-no}"
echo "CMOV enabled ${cmov-no}" echo "i686 features enabled ${i686-no}"
echo "CMOV is fast ${fast_cmov-no}" echo "CMOV is fast ${fast_cmov-no}"
echo "EBX available ${ebx_available-no}" echo "EBX available ${ebx_available-no}"
echo "EBP available ${ebp_available-no}" echo "EBP available ${ebp_available-no}"

6
libavcodec/x86/mathops.h
View File

@ -68,7 +68,7 @@ static av_always_inline av_const int64_t MUL64(int a, int b)
#endif /* ARCH_X86_32 */ #endif /* ARCH_X86_32 */
#if HAVE_CMOV #if HAVE_I686
/* median of 3 */ /* median of 3 */
#define mid_pred mid_pred #define mid_pred mid_pred
static inline av_const int mid_pred(int a, int b, int c) static inline av_const int mid_pred(int a, int b, int c)
@ -87,9 +87,7 @@ static inline av_const int mid_pred(int a, int b, int c)
); );
return i; return i;
} }
#endif
#if HAVE_CMOV
#define COPY3_IF_LT(x, y, a, b, c, d)\ #define COPY3_IF_LT(x, y, a, b, c, d)\
__asm__ volatile(\ __asm__ volatile(\
"cmpl %0, %3 \n\t"\ "cmpl %0, %3 \n\t"\
@ -99,7 +97,7 @@ __asm__ volatile(\
: "+&r" (x), "+&r" (a), "+r" (c)\ : "+&r" (x), "+&r" (a), "+r" (c)\
: "r" (y), "r" (b), "r" (d)\ : "r" (y), "r" (b), "r" (d)\
); );
#endif #endif /* HAVE_I686 */
#define MASK_ABS(mask, level) \ #define MASK_ABS(mask, level) \
__asm__ ("cltd \n\t" \ __asm__ ("cltd \n\t" \