diff options
| author | Jason Garrett-Glaser <darkshikari@gmail.com> | 2008-12-19 03:01:08 +0000 |
|---|---|---|
| committer | Jason Garrett-Glaser <darkshikari@gmail.com> | 2008-12-19 03:01:08 +0000 |
| commit | 40c7d0ae3c093413bb3970b69f68958ac7e21380 (patch) | |
| tree | ce697d6d91302160c3702a1fb2958e33b28ff5b2 /libavcodec | |
| parent | a5b807a6c181090b65b06ddc714f74cc1605c5bd (diff) | |
| download | ffmpeg-40c7d0ae3c093413bb3970b69f68958ac7e21380.tar.gz | |
Add automatic prefix handling to yasm functions. Does nothing now, but will
be useful for porting x264 asm in the future.
Originally committed as revision 16234 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/i386/dsputil_yasm.asm | 2 | ||||
| -rw-r--r-- | libavcodec/i386/fft_mmx.asm | 2 | ||||
| -rw-r--r-- | libavcodec/i386/x86inc.asm | 18 |
3 files changed, 8 insertions, 14 deletions
diff --git a/libavcodec/i386/dsputil_yasm.asm b/libavcodec/i386/dsputil_yasm.asm index 09beb5cf42..91165f2fb7 100644 --- a/libavcodec/i386/dsputil_yasm.asm +++ b/libavcodec/i386/dsputil_yasm.asm @@ -34,7 +34,7 @@ section .text align=16 %macro FLOAT_TO_INT16_INTERLEAVE6 1 ; void ff_float_to_int16_interleave6_sse(int16_t *dst, const float **src, int len) -cglobal ff_float_to_int16_interleave6_%1, 2,7,0, dst, src, src1, src2, src3, src4, src5 +cglobal float_to_int16_interleave6_%1, 2,7,0, dst, src, src1, src2, src3, src4, src5 %ifdef ARCH_X86_64 %define lend r10d mov lend, r2d diff --git a/libavcodec/i386/fft_mmx.asm b/libavcodec/i386/fft_mmx.asm index c0a9bd5b6b..39718677ae 100644 --- a/libavcodec/i386/fft_mmx.asm +++ b/libavcodec/i386/fft_mmx.asm @@ -451,7 +451,7 @@ dispatch_tab%3%2: pointer list_of_fft ; On x86_32, this function does the register saving and restoring for all of fft. ; The others pass args in registers and don't spill anything. -cglobal ff_fft_dispatch%3%2, 2,5,0, z, nbits +cglobal fft_dispatch%3%2, 2,5,0, z, nbits lea r2, [dispatch_tab%3%2 GLOBAL] mov r2, [r2 + (nbitsq-2)*gprsize] call r2 diff --git a/libavcodec/i386/x86inc.asm b/libavcodec/i386/x86inc.asm index 54c4679669..3729b5b101 100644 --- a/libavcodec/i386/x86inc.asm +++ b/libavcodec/i386/x86inc.asm @@ -370,20 +370,14 @@ DECLARE_REG 6, ebp, ebp, bp, null, [esp + stack_offset + 28] ; Symbol prefix for C linkage %macro cglobal 1-2+ + %xdefine %1 ff_%1 + %ifdef PREFIX + %xdefine %1 _ %+ %1 + %endif %ifidn __OUTPUT_FORMAT__,elf - %ifdef PREFIX - global _%1:function hidden - %define %1 _%1 - %else - global %1:function hidden - %endif + global %1:function hidden %else - %ifdef PREFIX - global _%1 - %define %1 _%1 - %else - global %1 - %endif + global %1 %endif align function_align %1: |