Reverted to 1.3 version (race window is smaller)

This commit is contained in:
Jaroslav Kysela 2003-03-01 14:23:29 +00:00
parent 0b3b4b912d
commit 6ed583287a

View file

@ -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"
@ -56,7 +55,7 @@ static void MIX_AREAS1(unsigned int size,
/*
* while (size-- > 0) {
*/
"\tcmp $0, %%edx\n"
"\tcmp $0, %0\n"
"jz 6f\n"
"\t.p2align 4,,15\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"
@ -180,7 +180,7 @@ static void MIX_AREAS1_MMX(unsigned int size,
/*
* while (size-- > 0) {
*/
"\tcmp $0, %%edx\n"
"\tcmp $0, %0\n"
"jz 6f\n"
"\t.p2align 4,,15\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"