aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--gas/ChangeLog12
-rw-r--r--gas/config/tc-i386.c11
-rw-r--r--gas/testsuite/gas/i386/waitpkg-intel.d12
-rw-r--r--gas/testsuite/gas/i386/waitpkg.d12
-rw-r--r--gas/testsuite/gas/i386/waitpkg.s12
-rw-r--r--gas/testsuite/gas/i386/x86-64-waitpkg-intel.d8
-rw-r--r--gas/testsuite/gas/i386/x86-64-waitpkg.d8
-rw-r--r--gas/testsuite/gas/i386/x86-64-waitpkg.s11
-rw-r--r--opcodes/ChangeLog6
-rw-r--r--opcodes/i386-opc.tbl8
-rw-r--r--opcodes/i386-tbl.h44
11 files changed, 118 insertions, 26 deletions
diff --git a/gas/ChangeLog b/gas/ChangeLog
index 859f01f..e82aef3 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,15 @@
+2020-03-06 Jan Beulich <jbeulich@suse.com>
+
+ * config/tc-i386.c (md_assemble): Also exclude tpause and umwait
+ from having their operands swapped.
+ * testsuite/gas/i386/waitpkg.s,
+ testsuite/gas/i386/x86-64-waitpkg.s: Add tpause and umwait
+ 3-operand cases as well as testing of 16-bit code generation.
+ * testsuite/gas/i386/waitpkg.d,
+ testsuite/gas/i386/waitpkg-intel.d,
+ testsuite/gas/i386/x86-64-waitpkg.d,
+ testsuite/gas/i386/x86-64-waitpkg-intel.d: Adjust expectations.
+
2020-03-04 Nelson Chu <nelson.chu@sifive.com>
* config/tc-riscv.c (percent_op_utype): Support the modifier
diff --git a/gas/config/tc-i386.c b/gas/config/tc-i386.c
index 7117aeb..e36afa8 100644
--- a/gas/config/tc-i386.c
+++ b/gas/config/tc-i386.c
@@ -4349,16 +4349,19 @@ md_assemble (char *line)
/* Now we've parsed the mnemonic into a set of templates, and have the
operands at hand. */
- /* All Intel opcodes have reversed operands except for "bound", "enter"
- "monitor*", and "mwait*". We also don't reverse intersegment "jmp"
- and "call" instructions with 2 immediate operands so that the immediate
- segment precedes the offset, as it does when in AT&T mode. */
+ /* All Intel opcodes have reversed operands except for "bound", "enter",
+ "monitor*", "mwait*", "tpause", and "umwait". We also don't reverse
+ intersegment "jmp" and "call" instructions with 2 immediate operands so
+ that the immediate segment precedes the offset, as it does when in AT&T
+ mode. */
if (intel_syntax
&& i.operands > 1
&& (strcmp (mnemonic, "bound") != 0)
&& (strcmp (mnemonic, "invlpga") != 0)
&& (strncmp (mnemonic, "monitor", 7) != 0)
&& (strncmp (mnemonic, "mwait", 5) != 0)
+ && (strcmp (mnemonic, "tpause") != 0)
+ && (strcmp (mnemonic, "umwait") != 0)
&& !(operand_type_check (i.types[0], imm)
&& operand_type_check (i.types[1], imm)))
swap_operands ();
diff --git a/gas/testsuite/gas/i386/waitpkg-intel.d b/gas/testsuite/gas/i386/waitpkg-intel.d
index 7930f50..e7a79c8 100644
--- a/gas/testsuite/gas/i386/waitpkg-intel.d
+++ b/gas/testsuite/gas/i386/waitpkg-intel.d
@@ -12,5 +12,17 @@ Disassembly of section \.text:
[ ]*[a-f0-9]+:[ ]*f3 0f ae f0[ ]*umonitor eax
[ ]*[a-f0-9]+:[ ]*67 f3 0f ae f1[ ]*umonitor cx
[ ]*[a-f0-9]+:[ ]*f2 0f ae f1[ ]*umwait ecx
+[ ]*[a-f0-9]+:[ ]*f2 0f ae f3[ ]*umwait ebx
[ ]*[a-f0-9]+:[ ]*66 0f ae f1[ ]*tpause ecx
+[ ]*[a-f0-9]+:[ ]*66 0f ae f3[ ]*tpause ebx
+[ ]*[a-f0-9]+:[ ]*f2 0f ae f7[ ]*umwait edi
+[ ]*[a-f0-9]+:[ ]*66 0f ae f7[ ]*tpause edi
+[ ]*[a-f0-9]+:[ ]*67 f3 0f ae f0[ ]*umonitor ax
+[ ]*[a-f0-9]+:[ ]*f3 0f ae f1[ ]*umonitor ecx
+[ ]*[a-f0-9]+:[ ]*f2 0f ae f1[ ]*umwait ecx
+[ ]*[a-f0-9]+:[ ]*f2 0f ae f3[ ]*umwait ebx
+[ ]*[a-f0-9]+:[ ]*66 0f ae f1[ ]*tpause ecx
+[ ]*[a-f0-9]+:[ ]*66 0f ae f3[ ]*tpause ebx
+[ ]*[a-f0-9]+:[ ]*f2 0f ae f7[ ]*umwait edi
+[ ]*[a-f0-9]+:[ ]*66 0f ae f7[ ]*tpause edi
#pass
diff --git a/gas/testsuite/gas/i386/waitpkg.d b/gas/testsuite/gas/i386/waitpkg.d
index ec3b9ea..33ac8e1 100644
--- a/gas/testsuite/gas/i386/waitpkg.d
+++ b/gas/testsuite/gas/i386/waitpkg.d
@@ -12,5 +12,17 @@ Disassembly of section \.text:
[ ]*[a-f0-9]+:[ ]*f3 0f ae f0[ ]*umonitor %eax
[ ]*[a-f0-9]+:[ ]*67 f3 0f ae f1[ ]*umonitor %cx
[ ]*[a-f0-9]+:[ ]*f2 0f ae f1[ ]*umwait %ecx
+[ ]*[a-f0-9]+:[ ]*f2 0f ae f3[ ]*umwait %ebx
[ ]*[a-f0-9]+:[ ]*66 0f ae f1[ ]*tpause %ecx
+[ ]*[a-f0-9]+:[ ]*66 0f ae f3[ ]*tpause %ebx
+[ ]*[a-f0-9]+:[ ]*f2 0f ae f7[ ]*umwait %edi
+[ ]*[a-f0-9]+:[ ]*66 0f ae f7[ ]*tpause %edi
+[ ]*[a-f0-9]+:[ ]*67 f3 0f ae f0[ ]*umonitor %ax
+[ ]*[a-f0-9]+:[ ]*f3 0f ae f1[ ]*umonitor %ecx
+[ ]*[a-f0-9]+:[ ]*f2 0f ae f1[ ]*umwait %ecx
+[ ]*[a-f0-9]+:[ ]*f2 0f ae f3[ ]*umwait %ebx
+[ ]*[a-f0-9]+:[ ]*66 0f ae f1[ ]*tpause %ecx
+[ ]*[a-f0-9]+:[ ]*66 0f ae f3[ ]*tpause %ebx
+[ ]*[a-f0-9]+:[ ]*f2 0f ae f7[ ]*umwait %edi
+[ ]*[a-f0-9]+:[ ]*66 0f ae f7[ ]*tpause %edi
#pass
diff --git a/gas/testsuite/gas/i386/waitpkg.s b/gas/testsuite/gas/i386/waitpkg.s
index f18229e..a75351d 100644
--- a/gas/testsuite/gas/i386/waitpkg.s
+++ b/gas/testsuite/gas/i386/waitpkg.s
@@ -2,7 +2,19 @@
.text
_start:
+ .rept 2
umonitor %eax
umonitor %cx
umwait %ecx
+ umwait %ebx, %edx, %eax
tpause %ecx
+ tpause %ebx, %edx, %eax
+
+ .intel_syntax noprefix
+
+ umwait edi, edx, eax
+ tpause edi, edx, eax
+
+ .att_syntax prefix
+ .code16
+ .endr
diff --git a/gas/testsuite/gas/i386/x86-64-waitpkg-intel.d b/gas/testsuite/gas/i386/x86-64-waitpkg-intel.d
index e0387dd..3076505 100644
--- a/gas/testsuite/gas/i386/x86-64-waitpkg-intel.d
+++ b/gas/testsuite/gas/i386/x86-64-waitpkg-intel.d
@@ -13,11 +13,11 @@ Disassembly of section \.text:
[ ]*[a-f0-9]+:[ ]*f3 41 0f ae f2[ ]*umonitor r10
[ ]*[a-f0-9]+:[ ]*67 f3 41 0f ae f2[ ]*umonitor r10d
[ ]*[a-f0-9]+:[ ]*f2 0f ae f1[ ]*umwait ecx
-[ ]*[a-f0-9]+:[ ]*f2 0f ae f1[ ]*umwait ecx
-[ ]*[a-f0-9]+:[ ]*f2 41 0f ae f2[ ]*umwait r10d
[ ]*[a-f0-9]+:[ ]*f2 41 0f ae f2[ ]*umwait r10d
+[ ]*[a-f0-9]+:[ ]*f2 0f ae f7[ ]*umwait edi
[ ]*[a-f0-9]+:[ ]*66 0f ae f1[ ]*tpause ecx
-[ ]*[a-f0-9]+:[ ]*66 0f ae f1[ ]*tpause ecx
-[ ]*[a-f0-9]+:[ ]*66 41 0f ae f2[ ]*tpause r10d
[ ]*[a-f0-9]+:[ ]*66 41 0f ae f2[ ]*tpause r10d
+[ ]*[a-f0-9]+:[ ]*66 0f ae f7[ ]*tpause edi
+[ ]*[a-f0-9]+:[ ]*f2 0f ae f6[ ]*umwait esi
+[ ]*[a-f0-9]+:[ ]*66 0f ae f6[ ]*tpause esi
#pass
diff --git a/gas/testsuite/gas/i386/x86-64-waitpkg.d b/gas/testsuite/gas/i386/x86-64-waitpkg.d
index a10a8cd..8217de0 100644
--- a/gas/testsuite/gas/i386/x86-64-waitpkg.d
+++ b/gas/testsuite/gas/i386/x86-64-waitpkg.d
@@ -13,11 +13,11 @@ Disassembly of section \.text:
[ ]*[a-f0-9]+:[ ]*f3 41 0f ae f2[ ]*umonitor %r10
[ ]*[a-f0-9]+:[ ]*67 f3 41 0f ae f2[ ]*umonitor %r10d
[ ]*[a-f0-9]+:[ ]*f2 0f ae f1[ ]*umwait %ecx
-[ ]*[a-f0-9]+:[ ]*f2 0f ae f1[ ]*umwait %ecx
-[ ]*[a-f0-9]+:[ ]*f2 41 0f ae f2[ ]*umwait %r10d
[ ]*[a-f0-9]+:[ ]*f2 41 0f ae f2[ ]*umwait %r10d
+[ ]*[a-f0-9]+:[ ]*f2 0f ae f7[ ]*umwait %edi
[ ]*[a-f0-9]+:[ ]*66 0f ae f1[ ]*tpause %ecx
-[ ]*[a-f0-9]+:[ ]*66 0f ae f1[ ]*tpause %ecx
-[ ]*[a-f0-9]+:[ ]*66 41 0f ae f2[ ]*tpause %r10d
[ ]*[a-f0-9]+:[ ]*66 41 0f ae f2[ ]*tpause %r10d
+[ ]*[a-f0-9]+:[ ]*66 0f ae f7[ ]*tpause %edi
+[ ]*[a-f0-9]+:[ ]*f2 0f ae f6[ ]*umwait %esi
+[ ]*[a-f0-9]+:[ ]*66 0f ae f6[ ]*tpause %esi
#pass
diff --git a/gas/testsuite/gas/i386/x86-64-waitpkg.s b/gas/testsuite/gas/i386/x86-64-waitpkg.s
index 9c64848..8a173c2 100644
--- a/gas/testsuite/gas/i386/x86-64-waitpkg.s
+++ b/gas/testsuite/gas/i386/x86-64-waitpkg.s
@@ -6,10 +6,13 @@ _start:
umonitor %r10
umonitor %r10d
umwait %ecx
- umwait %rcx
- umwait %r10
umwait %r10d
+ umwait %edi, %edx, %eax
tpause %ecx
- tpause %rcx
- tpause %r10
tpause %r10d
+ tpause %edi, %edx, %eax
+
+ .intel_syntax noprefix
+
+ umwait esi, edx, eax
+ tpause esi, edx, eax
diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog
index 99958a1..0b0a121 100644
--- a/opcodes/ChangeLog
+++ b/opcodes/ChangeLog
@@ -1,3 +1,9 @@
+2020-03-06 Jan Beulich <jbeulich@suse.com>
+
+ * i386-opc.tbl (tpause, umwait): Add IgnoreSize. Add 3-operand
+ template.
+ * i386-tbl.h: Re-generate.
+
2020-03-04 Jan Beulich <jbeulich@suse.com>
* i386-dis.c (PREFIX_0F01_REG_3_RM_1): New.
diff --git a/opcodes/i386-opc.tbl b/opcodes/i386-opc.tbl
index 4162734..c79ff5a 100644
--- a/opcodes/i386-opc.tbl
+++ b/opcodes/i386-opc.tbl
@@ -4763,10 +4763,10 @@ pconfig, 0, 0x0f01c5, None, 3, CpuPCONFIG, No_bSuf|No_wSuf|No_lSuf|No_sSuf|No_qS
// WAITPKG instructions.
umonitor, 1, 0xf30fae, 0x6, 2, CpuWAITPKG, Modrm|AddrPrefixOpReg, { Reg16|Reg32|Reg64 }
-
-tpause, 1, 0x660fae, 0x6, 2, CpuWAITPKG, Modrm|No_bSuf|No_wSuf|No_lSuf|No_sSuf|No_qSuf|No_ldSuf|NoRex64, { Reg32|Reg64 }
-
-umwait, 1, 0xf20fae, 0x6, 2, CpuWAITPKG, Modrm|No_bSuf|No_wSuf|No_lSuf|No_sSuf|No_qSuf|No_ldSuf|NoRex64, { Reg32|Reg64 }
+tpause, 1, 0x660fae, 0x6, 2, CpuWAITPKG, Modrm|IgnoreSize|No_bSuf|No_wSuf|No_lSuf|No_sSuf|No_qSuf|No_ldSuf, { Reg32 }
+tpause, 3, 0x660fae, 0x6, 2, CpuWAITPKG, Modrm|IgnoreSize|No_bSuf|No_wSuf|No_lSuf|No_sSuf|No_qSuf|No_ldSuf, { Reg32, RegD|Dword, Acc|Dword }
+umwait, 1, 0xf20fae, 0x6, 2, CpuWAITPKG, Modrm|IgnoreSize|No_bSuf|No_wSuf|No_lSuf|No_sSuf|No_qSuf|No_ldSuf, { Reg32 }
+umwait, 3, 0xf20fae, 0x6, 2, CpuWAITPKG, Modrm|IgnoreSize|No_bSuf|No_wSuf|No_lSuf|No_sSuf|No_qSuf|No_ldSuf, { Reg32, RegD|Dword, Acc|Dword }
// WAITPKG instructions end.
diff --git a/opcodes/i386-tbl.h b/opcodes/i386-tbl.h
index 92b70f7..e08f374 100644
--- a/opcodes/i386-tbl.h
+++ b/opcodes/i386-tbl.h
@@ -58351,10 +58351,26 @@ const insn_template i386_optab[] =
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
- { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0,
+ { 0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 1, 1, 1, 1, 1, 1, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
- { { { 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1,
+ { { { 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0,
+ 0, 0, 0, 0, 0, 0 } } } },
+ { "tpause", 0x660fae, 0x6, 2, 3,
+ { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+ { 0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 1, 1, 1, 1, 1, 1, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+ { { { 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0,
+ 0, 0, 0, 0, 0, 0 } },
+ { { 0, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0,
+ 0, 0, 0, 0, 0, 0 } },
+ { { 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0,
0, 0, 0, 0, 0, 0 } } } },
{ "umwait", 0xf20fae, 0x6, 2, 1,
{ { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -58363,10 +58379,26 @@ const insn_template i386_optab[] =
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
- { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0,
+ { 0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 1, 1, 1, 1, 1, 1, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
- { { { 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1,
+ { { { 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0,
+ 0, 0, 0, 0, 0, 0 } } } },
+ { "umwait", 0xf20fae, 0x6, 2, 3,
+ { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+ { 0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 1, 1, 1, 1, 1, 1, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+ { { { 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0,
+ 0, 0, 0, 0, 0, 0 } },
+ { { 0, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0,
+ 0, 0, 0, 0, 0, 0 } },
+ { { 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0,
0, 0, 0, 0, 0, 0 } } } },
{ "cldemote", 0x0f1c, 0x0, 2, 1,
{ { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
generated by cgit v1.1 at 2024-10-15 01:23:17 +0000