--- fdct_mmx_skal.asm	2004/07/24 11:46:08	1.3
+++ fdct_mmx_skal.asm	2008/11/11 20:46:24	1.9
@@ -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: fdct_mmx_skal.asm,v 1.3 2004/07/24 11:46:08 edgomez Exp $
+; * $Id: fdct_mmx_skal.asm,v 1.9 2008/11/11 20:46:24 Isibaar Exp $
 ; *
 ; ***************************************************************************/
 
@@ -27,10 +27,23 @@
 
 %macro cglobal 1
 	%ifdef PREFIX
-		global _%1
-		%define %1 _%1
+		%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
-		global %1
+		%ifdef MARK_FUNCS
+			global %1:function %1.endfunc-%1
+			%define ENDFUNC .endfunc
+		%else
+			global %1
+			%define ENDFUNC
+		%endif
 	%endif
 %endmacro
 
@@ -369,9 +382,9 @@
   paddd mm2, mm3               ;  [ out0 | out1 ]
   pmaddwd mm7, mm1             ;  [a0.M10+a1.M11 | b0.M26+b1.M27]
   psrad mm2, 16
-  pmaddwd mm0, qword [%3 + 48] ;  [a0.M12+a1.M13 | b0.M28+b1.M29]
+  pmaddwd mm0, [%3 + 48] ;  [a0.M12+a1.M13 | b0.M28+b1.M29]
   paddd mm4, mm5               ;  [ out2 | out3 ]
-  pmaddwd mm1, qword [%3 + 56] ;  [a0.M14+a1.M15 | b0.M30+b1.M31]
+  pmaddwd mm1, [%3 + 56] ;  [a0.M14+a1.M15 | b0.M30+b1.M31]
   psrad mm4, 16
 
   paddd mm6, mm7               ;  [ out4 | out5 ]
@@ -427,9 +440,9 @@
   paddd mm2, mm3               ;  [ out0 | out1 ]
   pmaddwd mm7, mm1             ;  [a0.M10+a1.M11 | b0.M26+b1.M27]
   psrad mm2, 16
-  pmaddwd mm0, qword [%3 + 48] ;  [a0.M12+a1.M13 | b0.M28+b1.M29]
+  pmaddwd mm0, [%3 + 48] ;  [a0.M12+a1.M13 | b0.M28+b1.M29]
   paddd mm4, mm5               ;  [ out2 | out3 ]
-  pmaddwd mm1, qword [%3 + 56] ;  [a0.M14+a1.M15 | b0.M30+b1.M31]
+  pmaddwd mm1, [%3 + 56] ;  [a0.M14+a1.M15 | b0.M30+b1.M31]
   psrad mm4, 16
 
   paddd mm6, mm7               ;  [ out4 | out5 ]
@@ -482,7 +495,7 @@
   mov edi, fdct_rounding_2
 .loop
   %2 ecx, ecx, edx, ebx, edi
-  add eax, 2*16
+  add ecx, 2*8
   add edx, 2*32
   add ebx, 2*4
   add edi, 2*4
@@ -494,6 +507,7 @@
 %endif
 
   ret
+ENDFUNC
 %endmacro
 
 ;=============================================================================
@@ -513,3 +527,8 @@
 ;-----------------------------------------------------------------------------
 
 MAKE_FDCT_FUNC fdct_xmm_skal, fMTX_MULT_XMM
+
+%ifidn __OUTPUT_FORMAT__,elf
+section ".note.GNU-stack" noalloc noexec nowrite progbits
+%endif
+