pcm dmix plugin: fix MIX_AREAS_24 routine for i386 & x86_64 platforms

The code was copied from ALSA bug#4577 from CannibalZerg.

Signed-off-by: Jaroslav Kysela <perex@perex.cz>

diff --git a/src/pcm/pcm_dmix_i386.h b/src/pcm/pcm_dmix_i386.h
index 9ea155d9c245ac6b2c64fa8a88d613ea5e6f8a6e..462371a59eade387d0983e43aae03ebb700dab60 100644 (file)
--- a/src/pcm/pcm_dmix_i386.h
+++ b/src/pcm/pcm_dmix_i386.h
@@ -400,8 +400,8 @@ static void MIX_AREAS_24(unsigned int size,
                "\tmovzwl (%%esi), %%ecx\n"
                "\tmovl (%%ebx), %%edx\n"
                "\tsall $16, %%eax\n"
+               "\torl %%eax, %%ecx\n"
                "\t" LOCK_PREFIX "btsw $0, (%%edi)\n"
-               "\tleal (%%ecx,%%eax,1), %%ecx\n"
                "\tjc 2f\n"
                "\t" XSUB " %%edx, %%ecx\n"
                "2:"

diff --git a/src/pcm/pcm_dmix_x86_64.h b/src/pcm/pcm_dmix_x86_64.h
index b4d0a412db6393df795be4eb64c0747b32a75482..ab40f50a61b7214fa7665b241c0ccabebdfe77ae 100644 (file)
--- a/src/pcm/pcm_dmix_x86_64.h
+++ b/src/pcm/pcm_dmix_x86_64.h
@@ -284,11 +284,11 @@ static void MIX_AREAS_24(unsigned int size,
                 *   *sum += sample;
                 */
                "\tmovsbl 2(%%rsi), %%eax\n"
-               "\tmovswl (%%rsi), %%ecx\n"
+               "\tmovzwl (%%rsi), %%ecx\n"
                "\tmovl (%%rbx), %%edx\n"
                "\tsall $16, %%eax\n"
+               "\torl %%eax, %%ecx\n"
                "\t" LOCK_PREFIX "btsw $0, (%%rdi)\n"
-               "\t.byte 0x67, 0x8d, 0x0c, 0x01\n"
                "\tjc 2f\n"
                "\t" XSUB " %%edx, %%ecx\n"
                "2:"