# HG changeset patch # User darkshikari # Date 1229655668 0 # Node ID 4877d4c6d8aef7555b83942020383b09216d83e4 # Parent 3019af3f98fa77f7600da169b428627445f31725 Add automatic prefix handling to yasm functions. Does nothing now, but will be useful for porting x264 asm in the future. diff -r 3019af3f98fa -r 4877d4c6d8ae i386/dsputil_yasm.asm --- a/i386/dsputil_yasm.asm Fri Dec 19 02:28:51 2008 +0000 +++ b/i386/dsputil_yasm.asm Fri Dec 19 03:01:08 2008 +0000 @@ -34,7 +34,7 @@ %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 -r 3019af3f98fa -r 4877d4c6d8ae i386/fft_mmx.asm --- a/i386/fft_mmx.asm Fri Dec 19 02:28:51 2008 +0000 +++ b/i386/fft_mmx.asm Fri Dec 19 03:01:08 2008 +0000 @@ -451,7 +451,7 @@ ; 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 -r 3019af3f98fa -r 4877d4c6d8ae i386/x86inc.asm --- a/i386/x86inc.asm Fri Dec 19 02:28:51 2008 +0000 +++ b/i386/x86inc.asm Fri Dec 19 03:01:08 2008 +0000 @@ -370,20 +370,14 @@ ; 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: