This is the mail archive of the
binutils@sourceware.org
mailing list for the binutils project.
[PATCH 3/5] x86: fold OP_Mwaitx() into OP_Mwait()
- From: Jan Beulich <jbeulich at suse dot com>
- To: "binutils at sourceware dot org" <binutils at sourceware dot org>
- Cc: "H.J. Lu" <hjl dot tools at gmail dot com>
- Date: Mon, 4 Nov 2019 16:05:23 +0100
- Subject: [PATCH 3/5] x86: fold OP_Mwaitx() into OP_Mwait()
- References: <93fcaa53-113b-d240-4c34-7dd4944cbe98@suse.com>
There's no need to have separate functions, the difference can easily be
expressed using the function arguments.
opcodes/
2019-11-XX Jan Beulich <jbeulich@suse.com>
* i386-dis.c (OP_Mwaitx): Delete.
(prefix_table): Use OP_Mwait for mwaitx entry.
(OP_Mwait): Also handle mwaitx.
--- a/opcodes/i386-dis.c
+++ b/opcodes/i386-dis.c
@@ -101,7 +101,6 @@ static void VPCOM_Fixup (int, int);
static void OP_0f07 (int, int);
static void OP_Monitor (int, int);
static void OP_Mwait (int, int);
-static void OP_Mwaitx (int, int);
static void NOP_Fixup1 (int, int);
static void NOP_Fixup2 (int, int);
static void OP_3DNowSuffix (int, int);
@@ -3652,7 +3651,7 @@ static const struct dis386 prefix_table[
/* PREFIX_0F01_REG_7_MOD_3_RM_3 */
{
- { "mwaitx", { { OP_Mwaitx, 0 } }, 0 },
+ { "mwaitx", { { OP_Mwait, eBX_reg } }, 0 },
},
/* PREFIX_0F09 */
@@ -15516,35 +15515,17 @@ CMP_Fixup (int bytemode ATTRIBUTE_UNUSED
}
static void
-OP_Mwaitx (int bytemode ATTRIBUTE_UNUSED,
- int sizeflag ATTRIBUTE_UNUSED)
+OP_Mwait (int bytemode, int sizeflag ATTRIBUTE_UNUSED)
{
- /* mwaitx %eax,%ecx,%ebx */
- if (!intel_syntax)
- {
- const char **names = (address_mode == mode_64bit
- ? names64 : names32);
- strcpy (op_out[0], names[0]);
- strcpy (op_out[1], names[1]);
- strcpy (op_out[2], names[3]);
- two_source_ops = 1;
- }
- /* Skip mod/rm byte. */
- MODRM_CHECK;
- codep++;
-}
-
-static void
-OP_Mwait (int bytemode ATTRIBUTE_UNUSED,
- int sizeflag ATTRIBUTE_UNUSED)
-{
- /* mwait %eax,%ecx */
+ /* mwait %eax,%ecx / mwaitx %eax,%ecx,%ebx */
if (!intel_syntax)
{
const char **names = (address_mode == mode_64bit
? names64 : names32);
strcpy (op_out[0], names[0]);
strcpy (op_out[1], names[1]);
+ if (bytemode == eBX_reg)
+ strcpy (op_out[2], names[3]);
two_source_ops = 1;
}
/* Skip mod/rm byte. */