From: Jaroslav Kysela <perex@perex.cz>
Date: Tue, 25 Feb 2003 12:45:25 +0000 (+0000)
Subject: Fixed wrong result problem in sum code
X-Git-Tag: v1.0.3~249
X-Git-Url: https://git.alsa-project.org/?a=commitdiff_plain;h=e873672469ab052e5d387237e40e502a10e506d4;p=alsa-lib.git

Fixed wrong result problem in sum code
---

diff --git a/src/pcm/pcm_dmix_i386.h b/src/pcm/pcm_dmix_i386.h
index d860f81a..9ff9067f 100644
--- a/src/pcm/pcm_dmix_i386.h
+++ b/src/pcm/pcm_dmix_i386.h
@@ -40,15 +40,14 @@ static void MIX_AREAS1(unsigned int size,
 	 *  EBX - sum
 	 *  ECX - old sample
 	 *  EAX - sample / temporary
-	 *  EDX - size
+	 *  EDX - temporary
 	 */
 	__asm__ __volatile__ (
 		"\n"
 
 		/*
-		 *  initialization, load EDX, ESI, EDI, EBX registers
+		 *  initialization, load ESI, EDI, EBX registers
 		 */
-		"\tmovl %0, %%edx\n"
 		"\tmovl %1, %%edi\n"
 		"\tmovl %2, %%esi\n"
 		"\tmovl %3, %%ebx\n"
@@ -65,16 +64,18 @@ static void MIX_AREAS1(unsigned int size,
 
 		/*
 		 *   sample = *src;
+		 *   sum_sample = *sum;
 		 *   if (cmpxchg(*dst, 0, 1) == 0)
-		 *     sample -= *sum;
+		 *     sample -= sum_sample;
 		 *   xadd(*sum, sample);
 		 */
 		"\tmovw $0, %%ax\n"
 		"\tmovw $1, %%cx\n"
+		"\tmovl (%%ebx), %%edx\n"
 		"\t" LOCK_PREFIX "cmpxchgw %%cx, (%%edi)\n"
 		"\tmovswl (%%esi), %%ecx\n"
 		"\tjnz 2f\n"
-		"\tsubl (%%ebx), %%ecx\n"
+		"\tsubl %%edx, %%ecx\n"
 		"2:"
 		"\t" LOCK_PREFIX "addl %%ecx, (%%ebx)\n"
 
@@ -102,7 +103,7 @@ static void MIX_AREAS1(unsigned int size,
 		"\tadd %4, %%edi\n"
 		"\tadd %5, %%esi\n"
 		"\tadd %6, %%ebx\n"
-		"\tdecl %%edx\n"
+		"\tdecl %0\n"
 		"\tjnz 1b\n"
 		"\tjmp 6f\n"
 
@@ -120,7 +121,7 @@ static void MIX_AREAS1(unsigned int size,
 		"\tadd %4, %%edi\n"
 		"\tadd %5, %%esi\n"
 		"\tadd %6, %%ebx\n"
-		"\tdecl %%edx\n"
+		"\tdecl %0\n"
 		"\tjnz 1b\n"
 		"\tjmp 6f\n"
 
@@ -138,7 +139,7 @@ static void MIX_AREAS1(unsigned int size,
 		"\tadd %4, %%edi\n"
 		"\tadd %5, %%esi\n"
 		"\tadd %6, %%ebx\n"
-		"\tdecl %%edx\n"
+		"\tdecl %0\n"
 		"\tjnz 1b\n"
 		// "\tjmp 6f\n"
 		
@@ -164,15 +165,14 @@ static void MIX_AREAS1_MMX(unsigned int size,
 	 *  EBX - sum
 	 *  ECX - old sample
 	 *  EAX - sample / temporary
-	 *  EDX - size
+	 *  EDX - temporary
 	 */
 	__asm__ __volatile__ (
 		"\n"
 
 		/*
-		 *  initialization, load EDX, ESI, EDI, EBX registers
+		 *  initialization, load ESI, EDI, EBX registers
 		 */
-		"\tmovl %0, %%edx\n"
 		"\tmovl %1, %%edi\n"
 		"\tmovl %2, %%esi\n"
 		"\tmovl %3, %%ebx\n"
@@ -189,16 +189,18 @@ static void MIX_AREAS1_MMX(unsigned int size,
 
 		/*
 		 *   sample = *src;
+		 *   sum_sample = *sum;
 		 *   if (cmpxchg(*dst, 0, 1) == 0)
-		 *     sample -= *sum;
+		 *     sample -= sum_sample;
 		 *   xadd(*sum, sample);
 		 */
 		"\tmovw $0, %%ax\n"
 		"\tmovw $1, %%cx\n"
+		"\tmovl (%%ebx), %%edx\n"
 		"\t" LOCK_PREFIX "cmpxchgw %%cx, (%%edi)\n"
 		"\tmovswl (%%esi), %%ecx\n"
 		"\tjnz 2f\n"
-		"\tsubl (%%ebx), %%ecx\n"
+		"\tsubl %%edx, %%ecx\n"
 		"2:"
 		"\t" LOCK_PREFIX "addl %%ecx, (%%ebx)\n"
 
@@ -225,7 +227,7 @@ static void MIX_AREAS1_MMX(unsigned int size,
 		"\tadd %4, %%edi\n"
 		"\tadd %5, %%esi\n"
 		"\tadd %6, %%ebx\n"
-		"\tdecl %%edx\n"
+		"\tdecl %0\n"
 		"\tjnz 1b\n"
 		"\tjmp 6f\n"