--- mem_transfer_3dne.asm 2005/09/13 12:12:15 1.7 +++ mem_transfer_3dne.asm 2008/11/11 20:46:24 1.10 @@ -19,7 +19,7 @@ ; * along with this program ; if not, write to the Free Software ; * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ; * -; * $Id: mem_transfer_3dne.asm,v 1.7 2005/09/13 12:12:15 suxen_drol Exp $ +; * $Id: mem_transfer_3dne.asm,v 1.10 2008/11/11 20:46:24 Isibaar Exp $ ; * ; ***************************************************************************/ @@ -33,15 +33,19 @@ %ifdef MARK_FUNCS global _%1:function %1.endfunc-%1 %define %1 _%1:function %1.endfunc-%1 + %define ENDFUNC .endfunc %else global _%1 %define %1 _%1 + %define ENDFUNC %endif %else %ifdef MARK_FUNCS global %1:function %1.endfunc-%1 + %define ENDFUNC .endfunc %else global %1 + %define ENDFUNC %endif %endif %endmacro @@ -149,7 +153,7 @@ movq [byte ecx+1*64+48], mm6 movq [ecx+1*64+40], mm7 ret -.endfunc +ENDFUNC ;----------------------------------------------------------------------------- @@ -195,7 +199,7 @@ movq [eax+4*edx], mm7 movq [ecx+2*edx], mm6 ret -.endfunc +ENDFUNC ;----------------------------------------------------------------------------- ; @@ -254,7 +258,7 @@ mov eax, [esp + 8] ; Cur mov ecx, [esp +12] ; Ref push edi - mov edx, [dword esp+4+16] ; Stride + mov edx, [esp+4+16] ; Stride mov edi, [esp+4+ 4] ; Dst pxor mm7, mm7 nop @@ -265,14 +269,14 @@ COPY_8_TO_16_SUB 3, 1 mov edi, ecx ret -.endfunc +ENDFUNC ALIGN 16 transfer_8to16subro_3dne: mov eax, [esp + 8] ; Cur mov ecx, [esp +12] ; Ref push edi - mov edx, [dword esp+4+16] ; Stride + mov edx, [esp+4+16] ; Stride mov edi, [esp+4+ 4] ; Dst pxor mm7, mm7 nop @@ -283,7 +287,7 @@ COPY_8_TO_16_SUB 3, 0 mov edi, ecx ret -.endfunc +ENDFUNC ;----------------------------------------------------------------------------- @@ -355,7 +359,7 @@ COPY_8_TO_16_SUB2_SSE 3 ret -.endfunc +ENDFUNC ;----------------------------------------------------------------------------- @@ -403,7 +407,7 @@ lea ecx,[byte ecx+2*edx] COPY_16_TO_8_ADD 3 ret -.endfunc +ENDFUNC ;----------------------------------------------------------------------------- ; @@ -436,7 +440,7 @@ lea ecx,[byte ecx+2*edx] COPY_8_TO_8 ret -.endfunc +ENDFUNC ;----------------------------------------------------------------------------- ; @@ -457,5 +461,10 @@ lea ecx,[byte ecx+2*edx] COPY_8_TO_8 ret -.endfunc +ENDFUNC + + +%ifidn __OUTPUT_FORMAT__,elf +section ".note.GNU-stack" noalloc noexec nowrite progbits +%endif