x86: PMINUB: port to cpuflags

26f01bd1 · Diego Biurrun · 9ce02e14 · 26f01bd1 · 26f01bd1
Commit 26f01bd1 authored Jul 15, 2012 by Diego Biurrun
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 8 deletions

libavcodec/x86/ac3dsp.asm libavcodec/x86/ac3dsp.asm +0 -3

libavutil/x86/x86util.asm libavutil/x86/x86util.asm +5 -5

No files found.
--- a/libavcodec/x86/ac3dsp.asm
+++ b/libavcodec/x86/ac3dsp.asm
@@ -63,12 +63,10 @@ cglobal ac3_exponent_min, 3, 4, 2, exp, reuse_blks, expn, offset
    REP_RET
 %endmacro

-%define PMINUB PMINUB_MMX
 %define LOOP_ALIGN
 INIT_MMX mmx
 AC3_EXPONENT_MIN
 %if HAVE_MMXEXT
-%define PMINUB PMINUB_MMXEXT
 %define LOOP_ALIGN ALIGN 16
 INIT_MMX mmxext
 AC3_EXPONENT_MIN
@@ -77,7 +75,6 @@ AC3_EXPONENT_MIN
 INIT_XMM sse2
 AC3_EXPONENT_MIN
 %endif
-%undef PMINUB
 %undef LOOP_ALIGN

 ;-----------------------------------------------------------------------------

--- a/libavutil/x86/x86util.asm
+++ b/libavutil/x86/x86util.asm
@@ -530,14 +530,14 @@
    movh  [%7+%8], %4
 %endmacro

-%macro PMINUB_MMX 3 ; dst, src, tmp
+%macro PMINUB 3 ; dst, src, ignored
+%if cpuflag(mmxext)
+    pminub   %1, %2
+%else ; dst, src, tmp
    mova     %3, %1
    psubusb  %3, %2
    psubb    %1, %3
-%endmacro
-
-%macro PMINUB_MMXEXT 3 ; dst, src, ignored
-    pminub   %1, %2
+%endif
 %endmacro

 %macro SPLATW 2-3 0