From: frederic.recoules@univ-grenoble-alpes.fr
To: alsa-devel@alsa-project.org
Cc: "Frédéric Recoules" <frederic.recoules@orange.fr>
Subject: [PATCH] [inline assembly] fix pcm_dmix_i386.h assembly chunk interfaces
Date: Mon, 27 Apr 2020 09:36:04 +0200 [thread overview]
Message-ID: <20200427073604.26662-1-frederic.recoules@univ-grenoble-alpes.fr> (raw)
From: Frédéric Recoules <frederic.recoules@orange.fr>
Main changes are:
- move 'size' and 'old_ebx' to the output list since they are clobbered
- add the "memory" keyword since input pointers are dereferenced
- add mmx registers in the clobber list and add an initialization for mm1
- add ebx in clobbers via a set of macro when GCC is newer than 5.0
(it will work for other compilers or non-PIC mode too)
Minor changes are:
- keep consistent the token numbering in the template
- remove the manual save/restore ebx when it is in the clobber list
- allows 'dst_step', 'src_step' and 'sum_step' to be given by immediates
- allows 'size' to be given by register (e.g. ebp)
- add "cc" keyword since the eflag register is clobbered
Signed-off-by: Frédéric Recoules <frederic.recoules@orange.fr>
---
src/pcm/pcm_dmix_i386.h | 168 ++++++++++++++++++++++------------------
1 file changed, 93 insertions(+), 75 deletions(-)
diff --git a/src/pcm/pcm_dmix_i386.h b/src/pcm/pcm_dmix_i386.h
index 2778cb1d..af2f4630 100644
--- a/src/pcm/pcm_dmix_i386.h
+++ b/src/pcm/pcm_dmix_i386.h
@@ -26,6 +26,13 @@
*
*/
+#define COMMA ,
+#if __GNUC__ < 5 && defined(__PIC__)
+# define GCC_PIC_SWITCH(before,after) before
+#else
+# define GCC_PIC_SWITCH(before,after) after
+#endif
+
/*
* for plain i386
*/
@@ -47,13 +54,14 @@ static void MIX_AREAS_16(unsigned int size,
__asm__ __volatile__ (
"\n"
- "\tmovl %%ebx, %7\n" /* ebx is GOT pointer (-fPIC) */
+ /* ebx is GOT pointer (-fPIC) */
+ GCC_PIC_SWITCH("\tmovl %%ebx, %1\n",)
/*
* initialization, load ESI, EDI, EBX registers
*/
- "\tmovl %1, %%edi\n"
- "\tmovl %2, %%esi\n"
- "\tmovl %3, %%ebx\n"
+ "\tmovl %2, %%edi\n"
+ "\tmovl %3, %%esi\n"
+ "\tmovl %4, %%ebx\n"
"\tcmpl $0, %0\n"
"\tjnz 2f\n"
"\tjmp 7f\n"
@@ -64,9 +72,9 @@ static void MIX_AREAS_16(unsigned int size,
*/
"\t.p2align 4,,15\n"
"1:"
- "\tadd %4, %%edi\n"
- "\tadd %5, %%esi\n"
- "\tadd %6, %%ebx\n"
+ "\tadd %5, %%edi\n"
+ "\tadd %6, %%esi\n"
+ "\tadd %7, %%ebx\n"
/*
* sample = *src;
@@ -138,15 +146,16 @@ static void MIX_AREAS_16(unsigned int size,
"\tjnz 4b\n"
"\tdecl %0\n"
"\tjnz 1b\n"
-
- "7:"
- "\tmovl %7, %%ebx\n" /* ebx is GOT pointer (-fPIC) */
- : /* no output regs */
- : "m" (size), "m" (dst), "m" (src),
- "m" (sum), "m" (dst_step), "m" (src_step),
- "m" (sum_step), "m" (old_ebx)
- : "esi", "edi", "edx", "ecx", "eax"
+ "7:"
+ /* ebx is GOT pointer (-fPIC) */
+ GCC_PIC_SWITCH("\tmovl %1, %%ebx\n",)
+
+ : "+&rm" (size), GCC_PIC_SWITCH("=m","=X") (old_ebx)
+ : "m" (dst), "m" (src), "m" (sum),
+ "im" (dst_step), "im" (src_step), "im" (sum_step)
+ : "esi", "edi", "edx", "ecx", GCC_PIC_SWITCH(,"ebx"COMMA) "eax",
+ "memory", "cc"
);
}
@@ -171,22 +180,24 @@ static void MIX_AREAS_16_MMX(unsigned int size,
__asm__ __volatile__ (
"\n"
- "\tmovl %%ebx, %7\n" /* ebx is GOT pointer (-fPIC) */
+ /* ebx is GOT pointer (-fPIC) */
+ GCC_PIC_SWITCH("\tmovl %%ebx, %1\n",)
/*
- * initialization, load ESI, EDI, EBX registers
+ * initialization, load ESI, EDI, EBX registers, clear MM1
*/
- "\tmovl %1, %%edi\n"
- "\tmovl %2, %%esi\n"
- "\tmovl %3, %%ebx\n"
+ "\tpxor %%mm1, %%mm1\n"
+ "\tmovl %2, %%edi\n"
+ "\tmovl %3, %%esi\n"
+ "\tmovl %4, %%ebx\n"
"\tcmpl $0, %0\n"
"\tjnz 2f\n"
"\tjmp 5f\n"
"\t.p2align 4,,15\n"
"1:"
- "\tadd %4, %%edi\n"
- "\tadd %5, %%esi\n"
- "\tadd %6, %%ebx\n"
+ "\tadd %5, %%edi\n"
+ "\tadd %6, %%esi\n"
+ "\tadd %7, %%ebx\n"
"2:"
/*
@@ -230,13 +241,14 @@ static void MIX_AREAS_16_MMX(unsigned int size,
"\tjnz 1b\n"
"\temms\n"
"5:"
- "\tmovl %7, %%ebx\n" /* ebx is GOT pointer (-fPIC) */
-
- : /* no output regs */
- : "m" (size), "m" (dst), "m" (src),
- "m" (sum), "m" (dst_step), "m" (src_step),
- "m" (sum_step), "m" (old_ebx)
- : "esi", "edi", "edx", "ecx", "eax"
+ /* ebx is GOT pointer (-fPIC) */
+ GCC_PIC_SWITCH("\tmovl %1, %%ebx\n",)
+
+ : "+&rm" (size), GCC_PIC_SWITCH("=m","=X") (old_ebx)
+ : "m" (dst), "m" (src), "m" (sum),
+ "im" (dst_step), "im" (src_step), "im" (sum_step)
+ : "esi", "edi", "edx", "ecx", GCC_PIC_SWITCH(,"ebx"COMMA) "eax",
+ "mm0", "mm1", "memory", "cc"
);
}
@@ -261,13 +273,14 @@ static void MIX_AREAS_32(unsigned int size,
__asm__ __volatile__ (
"\n"
- "\tmovl %%ebx, %7\n" /* ebx is GOT pointer (-fPIC) */
+ /* ebx is GOT pointer (-fPIC) */
+ GCC_PIC_SWITCH("\tmovl %%ebx, %1\n",)
/*
* initialization, load ESI, EDI, EBX registers
*/
- "\tmovl %1, %%edi\n"
- "\tmovl %2, %%esi\n"
- "\tmovl %3, %%ebx\n"
+ "\tmovl %2, %%edi\n"
+ "\tmovl %3, %%esi\n"
+ "\tmovl %4, %%ebx\n"
"\tcmpl $0, %0\n"
"\tjnz 1f\n"
"\tjmp 6f\n"
@@ -337,19 +350,20 @@ static void MIX_AREAS_32(unsigned int size,
*/
"\tdecl %0\n"
"\tjz 6f\n"
- "\tadd %4, %%edi\n"
- "\tadd %5, %%esi\n"
- "\tadd %6, %%ebx\n"
+ "\tadd %5, %%edi\n"
+ "\tadd %6, %%esi\n"
+ "\tadd %7, %%ebx\n"
"\tjmp 1b\n"
-
- "6:"
- "\tmovl %7, %%ebx\n" /* ebx is GOT pointer (-fPIC) */
- : /* no output regs */
- : "m" (size), "m" (dst), "m" (src),
- "m" (sum), "m" (dst_step), "m" (src_step),
- "m" (sum_step), "m" (old_ebx)
- : "esi", "edi", "edx", "ecx", "eax"
+ "6:"
+ /* ebx is GOT pointer (-fPIC) */
+ GCC_PIC_SWITCH("\tmovl %1, %%ebx\n",)
+
+ : "+&rm" (size), GCC_PIC_SWITCH("=m","=X") (old_ebx)
+ : "m" (dst), "m" (src), "m" (sum),
+ "im" (dst_step), "im" (src_step), "im" (sum_step)
+ : "esi", "edi", "edx", "ecx", GCC_PIC_SWITCH(,"ebx"COMMA) "eax",
+ "memory", "cc"
);
}
@@ -374,13 +388,14 @@ static void MIX_AREAS_24(unsigned int size,
__asm__ __volatile__ (
"\n"
- "\tmovl %%ebx, %7\n" /* ebx is GOT pointer (-fPIC) */
+ /* ebx is GOT pointer (-fPIC) */
+ GCC_PIC_SWITCH("\tmovl %%ebx, %1\n",)
/*
* initialization, load ESI, EDI, EBX registers
*/
- "\tmovl %1, %%edi\n"
- "\tmovl %2, %%esi\n"
- "\tmovl %3, %%ebx\n"
+ "\tmovl %2, %%edi\n"
+ "\tmovl %3, %%esi\n"
+ "\tmovl %4, %%ebx\n"
"\tcmpl $0, %0\n"
"\tjnz 1f\n"
"\tjmp 6f\n"
@@ -443,19 +458,20 @@ static void MIX_AREAS_24(unsigned int size,
*/
"\tdecl %0\n"
"\tjz 6f\n"
- "\tadd %4, %%edi\n"
- "\tadd %5, %%esi\n"
- "\tadd %6, %%ebx\n"
+ "\tadd %5, %%edi\n"
+ "\tadd %6, %%esi\n"
+ "\tadd %7, %%ebx\n"
"\tjmp 1b\n"
-
- "6:"
- "\tmovl %7, %%ebx\n" /* ebx is GOT pointer (-fPIC) */
- : /* no output regs */
- : "m" (size), "m" (dst), "m" (src),
- "m" (sum), "m" (dst_step), "m" (src_step),
- "m" (sum_step), "m" (old_ebx)
- : "esi", "edi", "edx", "ecx", "eax"
+ "6:"
+ /* ebx is GOT pointer (-fPIC) */
+ GCC_PIC_SWITCH("\tmovl %1, %%ebx\n",)
+
+ : "+&rm" (size), GCC_PIC_SWITCH("=m","=X") (old_ebx)
+ : "m" (dst), "m" (src), "m" (sum),
+ "im" (dst_step), "im" (src_step), "im" (sum_step)
+ : "esi", "edi", "edx", "ecx", GCC_PIC_SWITCH(,"ebx"COMMA) "eax",
+ "memory", "cc"
);
}
@@ -480,13 +496,14 @@ static void MIX_AREAS_24_CMOV(unsigned int size,
__asm__ __volatile__ (
"\n"
- "\tmovl %%ebx, %7\n" /* ebx is GOT pointer (-fPIC) */
+ /* ebx is GOT pointer (-fPIC) */
+ GCC_PIC_SWITCH("\tmovl %%ebx, %1\n",)
/*
* initialization, load ESI, EDI, EBX registers
*/
- "\tmovl %1, %%edi\n"
- "\tmovl %2, %%esi\n"
- "\tmovl %3, %%ebx\n"
+ "\tmovl %2, %%edi\n"
+ "\tmovl %3, %%esi\n"
+ "\tmovl %4, %%ebx\n"
"\tcmpl $0, %0\n"
"\tjz 6f\n"
@@ -541,19 +558,20 @@ static void MIX_AREAS_24_CMOV(unsigned int size,
/*
* while (size-- > 0)
*/
- "\tadd %4, %%edi\n"
- "\tadd %5, %%esi\n"
- "\tadd %6, %%ebx\n"
+ "\tadd %5, %%edi\n"
+ "\tadd %6, %%esi\n"
+ "\tadd %7, %%ebx\n"
"\tdecl %0\n"
"\tjnz 1b\n"
-
- "6:"
- "\tmovl %7, %%ebx\n" /* ebx is GOT pointer (-fPIC) */
- : /* no output regs */
- : "m" (size), "m" (dst), "m" (src),
- "m" (sum), "m" (dst_step), "m" (src_step),
- "m" (sum_step), "m" (old_ebx)
- : "esi", "edi", "edx", "ecx", "eax"
+ "6:"
+ /* ebx is GOT pointer (-fPIC) */
+ GCC_PIC_SWITCH("\tmovl %1, %%ebx\n",)
+
+ : "+&rm" (size), GCC_PIC_SWITCH("=m","=X") (old_ebx)
+ : "m" (dst), "m" (src), "m" (sum),
+ "im" (dst_step), "im" (src_step), "im" (sum_step)
+ : "esi", "edi", "edx", "ecx", GCC_PIC_SWITCH(,"ebx"COMMA) "eax",
+ "memory", "cc"
);
}
--
2.17.1
next reply other threads:[~2020-04-27 7:37 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-27 7:36 frederic.recoules [this message]
2020-04-27 13:47 ` [PATCH] [inline assembly] fix pcm_dmix_i386.h assembly chunk interfaces Takashi Iwai
[not found] ` <1871992915.6898305.1587998132827.JavaMail.zimbra@univ-grenoble-alpes.fr>
2020-04-27 15:12 ` Takashi Iwai
2020-04-27 16:00 ` FRÉDÉRIC RECOULES
2020-04-27 16:57 frederic.recoules
2020-04-29 8:19 ` Takashi Iwai
2020-04-30 9:41 ` FRÉDÉRIC RECOULES
2020-05-04 19:25 ` FRÉDÉRIC RECOULES
2020-05-05 13:52 ` Takashi Iwai
2020-05-06 18:07 ` FRÉDÉRIC RECOULES
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200427073604.26662-1-frederic.recoules@univ-grenoble-alpes.fr \
--to=frederic.recoules@univ-grenoble-alpes.fr \
--cc=alsa-devel@alsa-project.org \
--cc=frederic.recoules@orange.fr \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).