--- branches/dev-api-4/xvidcore/src/motion/x86_asm/sad_3dn.asm	2003/10/27 01:03:43	1191
+++ branches/dev-api-4/xvidcore/src/motion/x86_asm/sad_3dn.asm	2003/10/28 22:23:03	1192
@@ -1,208 +1,214 @@
-;/**************************************************************************
+;/****************************************************************************
 ; *
-; *	XVID MPEG-4 VIDEO CODEC
-; *	3dnow (*but without xmm*) sum of absolute difference
+; *  XVID MPEG-4 VIDEO CODEC
+; *  - 3DNow sad operators w/o XMM instructions -
 ; *
-; *	This program is free software; you can redistribute it and/or modify
-; *	it under the terms of the GNU General Public License as published by
-; *	the Free Software Foundation; either version 2 of the License, or
-; *	(at your option) any later version.
+; *  Copyright(C) 2002 Peter ross <pross@xvid.org>
 ; *
-; *	This program is distributed in the hope that it will be useful,
-; *	but WITHOUT ANY WARRANTY; without even the implied warranty of
-; *	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-; *	GNU General Public License for more details.
+; *  This program is free software; you can redistribute it and/or modify it
+; *  under the terms of the GNU General Public License as published by
+; *  the Free Software Foundation; either version 2 of the License, or
+; *  (at your option) any later version.
 ; *
-; *	You should have received a copy of the GNU General Public License
-; *	along with this program; if not, write to the Free Software
-; *	Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+; *  This program is distributed in the hope that it will be useful,
+; *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+; *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+; *  GNU General Public License for more details.
 ; *
-; *************************************************************************/
-
-;/**************************************************************************
-; *
-; *	History:
+; *  You should have received a copy of the GNU General Public License
+; *  along with this program; if not, write to the Free Software
+; *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 ; *
-; * 23.07.2002	sad[16,8]bi_3dn; <pross@xvid.org>
+; * $Id: sad_3dn.asm,v 1.5.2.1 2003-10-28 22:23:03 edgomez Exp $
 ; *
-; *************************************************************************/
+; ***************************************************************************/
 
-bits 32
+BITS 32
 
-%macro cglobal 1 
+%macro cglobal 1
 	%ifdef PREFIX
-		global _%1 
+		global _%1
 		%define %1 _%1
 	%else
 		global %1
 	%endif
 %endmacro
 
-section .data
+;=============================================================================
+; Read only data
+;=============================================================================
+
+SECTION .rodata
+
+ALIGN 16
+mmx_one:
+	times 4	dw 1
+
+;=============================================================================
+; Helper macros
+;=============================================================================
+%macro SADBI_16x16_3DN 0
+  movq mm0, [eax] ; src
+  movq mm2, [eax+8]
+
+  movq mm1, [edx] ; ref1
+  movq mm3, [edx+8]
+  pavgusb mm1, [ebx] ; ref2
+  lea edx, [edx+ecx]
+  pavgusb mm3, [ebx+8]
+  lea ebx, [ebx+ecx]
+
+  movq mm4, mm0
+  lea eax, [eax+ecx]
+  psubusb mm0, mm1
+  movq mm5, mm2
+  psubusb mm2, mm3
+
+  psubusb mm1, mm4
+  por mm0, mm1
+  psubusb mm3, mm5
+  por mm2, mm3
+
+  movq mm1, mm0
+  movq mm3, mm2
+
+  punpcklbw mm0,mm7
+  punpckhbw mm1,mm7
+  punpcklbw mm2,mm7
+  punpckhbw mm3,mm7
+
+  paddusw mm0,mm1
+  paddusw mm2,mm3
+  paddusw mm6,mm0
+  paddusw mm6,mm2
+%endmacro
+
+%macro SADBI_8x8_3DN 0
+  movq mm0, [eax] ; src
+  movq mm2, [eax+ecx]
+
+  movq mm1, [edx] ; ref1
+  movq mm3, [edx+ecx]
+  pavgusb mm1, [ebx] ; ref2
+  lea edx, [edx+2*ecx]
+  pavgusb mm3, [ebx+ecx]
+  lea ebx, [ebx+2*ecx]
+
+  movq mm4, mm0
+  lea eax, [eax+2*ecx]
+  psubusb mm0, mm1
+  movq mm5, mm2
+  psubusb mm2, mm3
+
+  psubusb mm1, mm4
+  por mm0, mm1
+  psubusb mm3, mm5
+  por mm2, mm3
+
+  movq mm1, mm0
+  movq mm3, mm2
+
+  punpcklbw mm0,mm7
+  punpckhbw mm1,mm7
+  punpcklbw mm2,mm7
+  punpckhbw mm3,mm7
+
+  paddusw mm0,mm1
+  paddusw mm2,mm3
+  paddusw mm6,mm0
+  paddusw mm6,mm2
+%endmacro
 
-align 16
-mmx_one	times 4	dw 1
+;=============================================================================
+; Code
+;=============================================================================
 
-section .text
+SECTION .text
 
 cglobal  sad16bi_3dn
 cglobal  sad8bi_3dn
 
-;=========================================================================== 
-; 
-; uint32_t sad16bi_3dn(const uint8_t * const cur, 
-; const uint8_t * const ref1, 
-; const uint8_t * const ref2, 
-; const uint32_t stride); 
-; 
-;=========================================================================== 
-
-%macro SADBI_16x16_3DN 0 
-   movq mm0, [eax] ; src 
-   movq mm2, [eax+8] 
-
-   movq mm1, [edx] ; ref1 
-   movq mm3, [edx+8] 
-   pavgusb mm1, [ebx] ; ref2 
-   lea edx,[edx+ecx] 
-   pavgusb mm3, [ebx+8] 
-   lea ebx,[ebx+ecx] 
-
-   movq mm4, mm0 
-   lea eax,[eax+ecx] 
-   psubusb mm0, mm1 
-   movq mm5, mm2 
-   psubusb mm2, mm3 
-
-   psubusb mm1, mm4 
-   por mm0, mm1 
-   psubusb mm3, mm5 
-   por mm2, mm3 
-
-   movq mm1,mm0 
-   movq mm3,mm2 
-
-   punpcklbw mm0,mm7 
-   punpckhbw mm1,mm7 
-   punpcklbw mm2,mm7 
-   punpckhbw mm3,mm7 
-
-   paddusw mm0,mm1 
-   paddusw mm2,mm3 
-   paddusw mm6,mm0 
-   paddusw mm6,mm2 
-%endmacro 
-
-align 16 
-sad16bi_3dn: 
-   push ebx 
-   mov eax, [esp+4+ 4] ; Src 
-   mov edx, [esp+4+ 8] ; Ref1 
-   mov ebx, [esp+4+12] ; Ref2 
-   mov ecx, [esp+4+16] ; Stride 
-
-   pxor mm6, mm6 ; accum2 
-pxor mm7, mm7 
-.Loop 
-   SADBI_16x16_3DN 
-   SADBI_16x16_3DN 
-   SADBI_16x16_3DN 
-   SADBI_16x16_3DN 
-   SADBI_16x16_3DN 
-   SADBI_16x16_3DN 
-   SADBI_16x16_3DN 
-   SADBI_16x16_3DN 
-
-   SADBI_16x16_3DN 
-   SADBI_16x16_3DN 
-   SADBI_16x16_3DN 
-   SADBI_16x16_3DN 
-   SADBI_16x16_3DN 
-   SADBI_16x16_3DN 
-   SADBI_16x16_3DN 
-   SADBI_16x16_3DN 
-
-   pmaddwd mm6, [mmx_one] ; collapse 
-   movq mm7, mm6 
-   psrlq mm7, 32 
-   paddd mm6, mm7 
-
-   movd eax, mm6 
-
-   pop ebx 
-
-   ret 
-
-
-
-;=========================================================================== 
-; 
-; uint32_t sad8bi_3dn(const uint8_t * const cur, 
-; const uint8_t * const ref1, 
-; const uint8_t * const ref2, 
-; const uint32_t stride); 
-; 
-;=========================================================================== 
-
-%macro SADBI_8x8_3DN 0 
-   movq mm0, [eax] ; src 
-   movq mm2, [eax+ecx] 
-
-   movq mm1, [edx] ; ref1 
-   movq mm3, [edx+ecx] 
-   pavgusb mm1, [ebx] ; ref2 
-   lea edx,[edx+2*ecx] 
-   pavgusb mm3, [ebx+ecx] 
-   lea ebx,[ebx+2*ecx] 
-
-   movq mm4, mm0 
-   lea eax,[eax+2*ecx] 
-   psubusb mm0, mm1 
-   movq mm5, mm2 
-   psubusb mm2, mm3 
-
-   psubusb mm1, mm4 
-   por mm0, mm1 
-   psubusb mm3, mm5 
-   por mm2, mm3 
-
-   movq mm1,mm0 
-   movq mm3,mm2 
-
-   punpcklbw mm0,mm7 
-   punpckhbw mm1,mm7 
-   punpcklbw mm2,mm7 
-   punpckhbw mm3,mm7 
-
-   paddusw mm0,mm1 
-   paddusw mm2,mm3 
-   paddusw mm6,mm0 
-   paddusw mm6,mm2 
-%endmacro 
-
-align 16 
-sad8bi_3dn: 
-   push ebx 
-   mov eax, [esp+4+ 4] ; Src 
-   mov edx, [esp+4+ 8] ; Ref1 
-   mov ebx, [esp+4+12] ; Ref2 
-   mov ecx, [esp+4+16] ; Stride 
-
-   pxor mm6, mm6 ; accum2 
-pxor mm7, mm7 
-.Loop 
-   SADBI_8x8_3DN 
-   SADBI_8x8_3DN 
-   SADBI_8x8_3DN 
-   SADBI_8x8_3DN 
-
-   pmaddwd mm6, [mmx_one] ; collapse 
-   movq mm7, mm6 
-   psrlq mm7, 32 
-   paddd mm6, mm7 
+;-----------------------------------------------------------------------------
+;
+; uint32_t sad16bi_3dn(const uint8_t * const cur,
+; const uint8_t * const ref1,
+; const uint8_t * const ref2,
+; const uint32_t stride);
+;
+;-----------------------------------------------------------------------------
+
+ALIGN 16
+sad16bi_3dn:
+  push ebx
+  mov eax, [esp+4+ 4] ; Src
+  mov edx, [esp+4+ 8] ; Ref1
+  mov ebx, [esp+4+12] ; Ref2
+  mov ecx, [esp+4+16] ; Stride
+
+  pxor mm6, mm6 ; accum2
+  pxor mm7, mm7
+.Loop
+  SADBI_16x16_3DN
+  SADBI_16x16_3DN
+  SADBI_16x16_3DN
+  SADBI_16x16_3DN
+  SADBI_16x16_3DN
+  SADBI_16x16_3DN
+  SADBI_16x16_3DN
+  SADBI_16x16_3DN
+
+  SADBI_16x16_3DN
+  SADBI_16x16_3DN
+  SADBI_16x16_3DN
+  SADBI_16x16_3DN
+  SADBI_16x16_3DN
+  SADBI_16x16_3DN
+  SADBI_16x16_3DN
+  SADBI_16x16_3DN
+
+  pmaddwd mm6, [mmx_one] ; collapse
+  movq mm7, mm6
+  psrlq mm7, 32
+  paddd mm6, mm7
+
+  movd eax, mm6
+
+  pop ebx
+
+  ret
+
+;-----------------------------------------------------------------------------
+;
+; uint32_t sad8bi_3dn(const uint8_t * const cur,
+; const uint8_t * const ref1,
+; const uint8_t * const ref2,
+; const uint32_t stride);
+;
+;-----------------------------------------------------------------------------
+
+ALIGN 16
+sad8bi_3dn:
+  push ebx
+  mov eax, [esp+4+ 4] ; Src
+  mov edx, [esp+4+ 8] ; Ref1
+  mov ebx, [esp+4+12] ; Ref2
+  mov ecx, [esp+4+16] ; Stride
+
+  pxor mm6, mm6 ; accum2
+  pxor mm7, mm7
+.Loop
+  SADBI_8x8_3DN
+  SADBI_8x8_3DN
+  SADBI_8x8_3DN
+  SADBI_8x8_3DN
+
+  pmaddwd mm6, [mmx_one] ; collapse
+  movq mm7, mm6
+  psrlq mm7, 32
+  paddd mm6, mm7
 
-   movd eax, mm6 
+  movd eax, mm6
 
-   pop ebx 
+  pop ebx
 
-   ret 
+  ret