summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLoren Merritt <lorenm@u.washington.edu>2009-10-18 21:42:28 +0000
committerLoren Merritt <lorenm@u.washington.edu>2009-10-18 21:42:28 +0000
commit29e4edbbe7066c25563eef7705ba05cd8ae9166d (patch)
tree6995b3aba3858d07f0d56ec7d96e409c97710b4a
parent807e4e81a8496d707dde0600db410731ba4c6edb (diff)
sync yasm macros to x264
Originally committed as revision 20293 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r--libavcodec/x86/x86inc.asm8
1 files changed, 3 insertions, 5 deletions
diff --git a/libavcodec/x86/x86inc.asm b/libavcodec/x86/x86inc.asm
index e49c34f1b1..c29ef3ee34 100644
--- a/libavcodec/x86/x86inc.asm
+++ b/libavcodec/x86/x86inc.asm
@@ -53,7 +53,7 @@
; in memory) must use an address mode that does fit.
; So all accesses to global variables must use this macro, e.g.
; mov eax, [foo GLOBAL]
-; instead of
+; instead of
; mov eax, [foo]
;
; x86_32 doesn't require PIC.
@@ -84,7 +84,7 @@
; PROLOGUE can also be invoked by adding the same options to cglobal
; e.g.
-; cglobal foo, 2,3, dst, src, tmp
+; cglobal foo, 2,3,0, dst, src, tmp
; declares a function (foo), taking two args (dst and src) and one local variable (tmp)
; TODO Some functions can use some args directly from the stack. If they're the
@@ -438,6 +438,7 @@ DECLARE_REG 6, ebp, ebp, bp, null, [esp + stack_offset + 28]
%ifdef PREFIX
%xdefine %1 _ %+ %1
%endif
+ %xdefine %1.skip_prologue %1 %+ .skip_prologue
%ifidn __OUTPUT_FORMAT__,elf
global %1:function hidden
%else
@@ -599,9 +600,6 @@ INIT_MMX
%endmacro
;Substitutions that reduce instruction size but are functionally equivalent
-%define movdqa movaps
-%define movdqu movups
-
%macro add 2
%ifnum %2
%if %2==128