[PATCH 4/5] x86: adjust register names printed for MONITOR/MWAIT
Jan Beulich
jbeulich@suse.com
Mon Nov 4 15:06:00 GMT 2019
As the comments (here: almost, in the opcode table: fully) correctly
state - all register operands except MONITOR's address one are fixed
at 32 bit size. Don't print 64-bit registers there.
Also adjust x86-64-suffix.d's name such that it wouldn't be identical to
x86-64-rep-suffix.d's, but instead resemble that of its sibling
x86-64-suffix-intel.d.
gas/
2019-11-XX Jan Beulich <jbeulich@suse.com>
* testsuite/gas/i386/x86-64-arch-3.s: Add monitorx/mwaitx cases
with canonical operand sizes.
* testsuite/gas/i386/x86-64-sse3.s: Add monitor/mwait cases with
canonical operand sizes.
* testsuite/gas/i386/ilp32/x86-64-sse-noavx.d: Redirect
expectations to parent dir's x86-64-sse-noavx.d.
* testsuite/gas/i386/ilp32/x86-64-sse3.d: Redirect expectations
to to parent dir's x86-64-sse3.d.
* testsuite/gas/i386/x86-64-arch-3.d,
testsuite/gas/i386/x86-64-mwaitx-bdver4.d,
testsuite/gas/i386/x86-64-sse-noavx.d,
testsuite/gas/i386/x86-64-sse3.d,
testsuite/gas/i386/x86-64-suffix.d: Adjust expectations.
opcodes/
2019-11-XX Jan Beulich <jbeulich@suse.com>
* i386-dis.c (OP_Mwait): Drop local variable "names", use
"names32" instead.
(OP_Monitor): Drop local variable "op1_names", re-purpose
"names" for it instead, and replace former "names" uses by
"names32" ones.
Note: Depends on "x86: eliminate ImmExt abuse"
(gas/testsuite/gas/i386/arch-13-znver?.d and
gas/testsuite/gas/i386/x86-64-arch-3-znver?.d)! Output expectation
folding would need to be moved here if this series is to be
committed ahead of the other one.
--- a/gas/testsuite/gas/i386/ilp32/x86-64-sse-noavx.d
+++ b/gas/testsuite/gas/i386/ilp32/x86-64-sse-noavx.d
@@ -2,67 +2,4 @@
#as: -msse-check=error
#objdump: -dw
#name: x86-64 (ILP32) SSE without AVX equivalent
-
-.*: file format .*
-
-Disassembly of section .text:
-
-0+ <_start>:
-[ ]*[a-f0-9]+: 48 0f c7 08 cmpxchg16b \(%rax\)
-[ ]*[a-f0-9]+: f2 0f 38 f0 d9 crc32b %cl,%ebx
-[ ]*[a-f0-9]+: 66 0f 2d d3 cvtpd2pi %xmm3,%mm2
-[ ]*[a-f0-9]+: 66 0f 2a d3 cvtpi2pd %mm3,%xmm2
-[ ]*[a-f0-9]+: 0f 2a d3 cvtpi2ps %mm3,%xmm2
-[ ]*[a-f0-9]+: 0f 2d f7 cvtps2pi %xmm7,%mm6
-[ ]*[a-f0-9]+: 66 0f 2c dc cvttpd2pi %xmm4,%mm3
-[ ]*[a-f0-9]+: 0f 2c dc cvttps2pi %xmm4,%mm3
-[ ]*[a-f0-9]+: df 08 fisttps \(%rax\)
-[ ]*[a-f0-9]+: db 08 fisttpl \(%rax\)
-[ ]*[a-f0-9]+: dd 08 fisttpll \(%rax\)
-[ ]*[a-f0-9]+: 0f ae e8 lfence
-[ ]*[a-f0-9]+: 0f f7 c7 maskmovq %mm7,%mm0
-[ ]*[a-f0-9]+: 0f ae f0 mfence
-[ ]*[a-f0-9]+: 0f 01 c8 monitor %rax,%rcx,%rdx
-[ ]*[a-f0-9]+: f2 0f d6 c8 movdq2q %xmm0,%mm1
-[ ]*[a-f0-9]+: 0f c3 00 movnti %eax,\(%rax\)
-[ ]*[a-f0-9]+: 0f e7 10 movntq %mm2,\(%rax\)
-[ ]*[a-f0-9]+: f3 0f d6 c8 movq2dq %mm0,%xmm1
-[ ]*[a-f0-9]+: 0f 01 c9 mwait %rax,%rcx
-[ ]*[a-f0-9]+: 0f 38 1c c1 pabsb %mm1,%mm0
-[ ]*[a-f0-9]+: 0f 38 1e c1 pabsd %mm1,%mm0
-[ ]*[a-f0-9]+: 0f 38 1d c1 pabsw %mm1,%mm0
-[ ]*[a-f0-9]+: 0f d4 c1 paddq %mm1,%mm0
-[ ]*[a-f0-9]+: 0f 3a 0f c1 02 palignr \$0x2,%mm1,%mm0
-[ ]*[a-f0-9]+: 0f e0 c1 pavgb %mm1,%mm0
-[ ]*[a-f0-9]+: 0f e3 d3 pavgw %mm3,%mm2
-[ ]*[a-f0-9]+: 0f c5 c1 00 pextrw \$0x0,%mm1,%eax
-[ ]*[a-f0-9]+: 0f 38 02 c1 phaddd %mm1,%mm0
-[ ]*[a-f0-9]+: 0f 38 03 c1 phaddsw %mm1,%mm0
-[ ]*[a-f0-9]+: 0f 38 01 c1 phaddw %mm1,%mm0
-[ ]*[a-f0-9]+: 0f 38 06 c1 phsubd %mm1,%mm0
-[ ]*[a-f0-9]+: 0f 38 07 c1 phsubsw %mm1,%mm0
-[ ]*[a-f0-9]+: 0f 38 05 c1 phsubw %mm1,%mm0
-[ ]*[a-f0-9]+: 0f c4 d2 02 pinsrw \$0x2,%edx,%mm2
-[ ]*[a-f0-9]+: 0f 38 04 c1 pmaddubsw %mm1,%mm0
-[ ]*[a-f0-9]+: 0f ee c1 pmaxsw %mm1,%mm0
-[ ]*[a-f0-9]+: 0f de d2 pmaxub %mm2,%mm2
-[ ]*[a-f0-9]+: 0f ea e5 pminsw %mm5,%mm4
-[ ]*[a-f0-9]+: 0f da f7 pminub %mm7,%mm6
-[ ]*[a-f0-9]+: 0f d7 c5 pmovmskb %mm5,%eax
-[ ]*[a-f0-9]+: 0f 38 0b c1 pmulhrsw %mm1,%mm0
-[ ]*[a-f0-9]+: 0f e4 e5 pmulhuw %mm5,%mm4
-[ ]*[a-f0-9]+: 0f f4 c8 pmuludq %mm0,%mm1
-[ ]*[a-f0-9]+: f3 0f b8 cb popcnt %ebx,%ecx
-[ ]*[a-f0-9]+: 0f 18 00 prefetchnta \(%rax\)
-[ ]*[a-f0-9]+: 0f 18 08 prefetcht0 \(%rax\)
-[ ]*[a-f0-9]+: 0f 18 10 prefetcht1 \(%rax\)
-[ ]*[a-f0-9]+: 0f 18 18 prefetcht2 \(%rax\)
-[ ]*[a-f0-9]+: 0f f6 f7 psadbw %mm7,%mm6
-[ ]*[a-f0-9]+: 0f 38 00 c1 pshufb %mm1,%mm0
-[ ]*[a-f0-9]+: 0f 70 da 01 pshufw \$0x1,%mm2,%mm3
-[ ]*[a-f0-9]+: 0f 38 08 c1 psignb %mm1,%mm0
-[ ]*[a-f0-9]+: 0f 38 0a c1 psignd %mm1,%mm0
-[ ]*[a-f0-9]+: 0f 38 09 c1 psignw %mm1,%mm0
-[ ]*[a-f0-9]+: 0f fb c1 psubq %mm1,%mm0
-[ ]*[a-f0-9]+: 0f ae f8 sfence
-#pass
+#dump: ../x86-64-sse-noavx.d
--- a/gas/testsuite/gas/i386/ilp32/x86-64-sse3.d
+++ b/gas/testsuite/gas/i386/ilp32/x86-64-sse3.d
@@ -1,40 +1,4 @@
#source: ../x86-64-sse3.s
#objdump: -dw
#name: x86-64 (ILP32) SSE3
-
-.*: +file format .*
-
-Disassembly of section .text:
-
-0+000 <foo>:
- 0: 66 0f d0 01 [ ]*addsubpd \(%rcx\),%xmm0
- 4: 66 0f d0 ca [ ]*addsubpd %xmm2,%xmm1
- 8: f2 0f d0 13 [ ]*addsubps \(%rbx\),%xmm2
- c: f2 0f d0 dc [ ]*addsubps %xmm4,%xmm3
- 10: df 88 90 90 90 00 [ ]*fisttps 0x909090\(%rax\)
- 16: db 88 90 90 90 00 [ ]*fisttpl 0x909090\(%rax\)
- 1c: dd 88 90 90 90 00 [ ]*fisttpll 0x909090\(%rax\)
- 22: 66 0f 7c 65 00 [ ]*haddpd 0x0\(%rbp\),%xmm4
- 27: 66 0f 7c ee [ ]*haddpd %xmm6,%xmm5
- 2b: f2 0f 7c 37 [ ]*haddps \(%rdi\),%xmm6
- 2f: f2 0f 7c f8 [ ]*haddps %xmm0,%xmm7
- 33: 66 0f 7d c1 [ ]*hsubpd %xmm1,%xmm0
- 37: 66 0f 7d 0a [ ]*hsubpd \(%rdx\),%xmm1
- 3b: f2 0f 7d d2 [ ]*hsubps %xmm2,%xmm2
- 3f: f2 0f 7d 1c 24 [ ]*hsubps \(%rsp\),%xmm3
- 44: f2 0f f0 2e [ ]*lddqu \(%rsi\),%xmm5
- 48: 0f 01 c8 [ ]*monitor %rax,%rcx,%rdx
- 4b: 0f 01 c8 [ ]*monitor %rax,%rcx,%rdx
- 4e: f2 0f 12 f7 [ ]*movddup %xmm7,%xmm6
- 52: f2 0f 12 38 [ ]*movddup \(%rax\),%xmm7
- 56: f3 0f 16 01 [ ]*movshdup \(%rcx\),%xmm0
- 5a: f3 0f 16 ca [ ]*movshdup %xmm2,%xmm1
- 5e: f3 0f 12 13 [ ]*movsldup \(%rbx\),%xmm2
- 62: f3 0f 12 dc [ ]*movsldup %xmm4,%xmm3
- 66: 0f 01 c9 [ ]*mwait %rax,%rcx
- 69: 0f 01 c9 [ ]*mwait %rax,%rcx
- 6c: 67 0f 01 c8 [ ]*monitor %eax,%rcx,%rdx
- 70: 67 0f 01 c8 [ ]*monitor %eax,%rcx,%rdx
- 74: f2 0f 12 38 [ ]*movddup \(%rax\),%xmm7
- 78: f2 0f 12 38 [ ]*movddup \(%rax\),%xmm7
-#pass
+#dump: ../x86-64-sse3.d
--- a/gas/testsuite/gas/i386/x86-64-arch-3.d
+++ b/gas/testsuite/gas/i386/x86-64-arch-3.d
@@ -19,11 +19,14 @@ Disassembly of section .text:
[ ]*[a-f0-9]+: 48 0f c7 21 xsavec64 \(%rcx\)
[ ]*[a-f0-9]+: 48 0f c7 29 xsaves64 \(%rcx\)
[ ]*[a-f0-9]+: 66 0f ae 39 clflushopt \(%rcx\)
-[ ]*[a-f0-9]+: 0f 01 fa monitorx %rax,%rcx,%rdx
-[ ]*[a-f0-9]+: 67 0f 01 fa monitorx %eax,%rcx,%rdx
-[ ]*[a-f0-9]+: 0f 01 fa monitorx %rax,%rcx,%rdx
-[ ]*[a-f0-9]+: 0f 01 fb mwaitx %rax,%rcx,%rbx
-[ ]*[a-f0-9]+: 0f 01 fb mwaitx %rax,%rcx,%rbx
+[ ]*[a-f0-9]+: 0f 01 fa monitorx %rax,%ecx,%edx
+[ ]*[a-f0-9]+: 67 0f 01 fa monitorx %eax,%ecx,%edx
+[ ]*[a-f0-9]+: 0f 01 fa monitorx %rax,%ecx,%edx
+[ ]*[a-f0-9]+: 67 0f 01 fa monitorx %eax,%ecx,%edx
+[ ]*[a-f0-9]+: 0f 01 fa monitorx %rax,%ecx,%edx
+[ ]*[a-f0-9]+: 0f 01 fb mwaitx %eax,%ecx,%ebx
+[ ]*[a-f0-9]+: 0f 01 fb mwaitx %eax,%ecx,%ebx
+[ ]*[a-f0-9]+: 0f 01 fb mwaitx %eax,%ecx,%ebx
[ ]*[a-f0-9]+:[ ]*66 0f ae 31[ ]*clwb \(%rcx\)
[ ]*[a-f0-9]+:[ ]*66 42 0f ae b4 f0 23 01 00 00[ ]*clwb 0x123\(%rax,%r14,8\)
[ ]*[a-f0-9]+:[ ]*f3 0f c7 f8[ ]*rdpid %rax
--- a/gas/testsuite/gas/i386/x86-64-arch-3.s
+++ b/gas/testsuite/gas/i386/x86-64-arch-3.s
@@ -20,9 +20,12 @@
xsaves64 (%rcx)
#CLFLUSHOPT
clflushopt (%rcx)
+ monitorx %rax,%ecx,%edx
+ monitorx %eax,%ecx,%edx
monitorx %rax,%rcx,%rdx
monitorx %eax,%rcx,%rdx
monitorx
+ mwaitx %eax,%ecx,%ebx
mwaitx %rax,%rcx,%rbx
mwaitx
# clwb instruction
--- a/gas/testsuite/gas/i386/x86-64-mwaitx-bdver4.d
+++ b/gas/testsuite/gas/i386/x86-64-mwaitx-bdver4.d
@@ -9,9 +9,9 @@
Disassembly of section \.text:
0000000000000000 <_start>:
-[ ]*[a-f0-9]+: 0f 01 fa monitorx %rax,%rcx,%rdx
-[ ]*[a-f0-9]+: 67 0f 01 fa monitorx %eax,%rcx,%rdx
-[ ]*[a-f0-9]+: 0f 01 fa monitorx %rax,%rcx,%rdx
-[ ]*[a-f0-9]+: 0f 01 fb mwaitx %rax,%rcx,%rbx
-[ ]*[a-f0-9]+: 0f 01 fb mwaitx %rax,%rcx,%rbx
+[ ]*[a-f0-9]+: 0f 01 fa monitorx %rax,%ecx,%edx
+[ ]*[a-f0-9]+: 67 0f 01 fa monitorx %eax,%ecx,%edx
+[ ]*[a-f0-9]+: 0f 01 fa monitorx %rax,%ecx,%edx
+[ ]*[a-f0-9]+: 0f 01 fb mwaitx %eax,%ecx,%ebx
+[ ]*[a-f0-9]+: 0f 01 fb mwaitx %eax,%ecx,%ebx
#pass
--- a/gas/testsuite/gas/i386/x86-64-sse-noavx.d
+++ b/gas/testsuite/gas/i386/x86-64-sse-noavx.d
@@ -21,12 +21,12 @@ Disassembly of section .text:
[ ]*[a-f0-9]+: 0f ae e8 lfence
[ ]*[a-f0-9]+: 0f f7 c7 maskmovq %mm7,%mm0
[ ]*[a-f0-9]+: 0f ae f0 mfence
-[ ]*[a-f0-9]+: 0f 01 c8 monitor %rax,%rcx,%rdx
+[ ]*[a-f0-9]+: 0f 01 c8 monitor %rax,%ecx,%edx
[ ]*[a-f0-9]+: f2 0f d6 c8 movdq2q %xmm0,%mm1
[ ]*[a-f0-9]+: 0f c3 00 movnti %eax,\(%rax\)
[ ]*[a-f0-9]+: 0f e7 10 movntq %mm2,\(%rax\)
[ ]*[a-f0-9]+: f3 0f d6 c8 movq2dq %mm0,%xmm1
-[ ]*[a-f0-9]+: 0f 01 c9 mwait %rax,%rcx
+[ ]*[a-f0-9]+: 0f 01 c9 mwait %eax,%ecx
[ ]*[a-f0-9]+: 0f 38 1c c1 pabsb %mm1,%mm0
[ ]*[a-f0-9]+: 0f 38 1e c1 pabsd %mm1,%mm0
[ ]*[a-f0-9]+: 0f 38 1d c1 pabsw %mm1,%mm0
--- a/gas/testsuite/gas/i386/x86-64-sse3.d
+++ b/gas/testsuite/gas/i386/x86-64-sse3.d
@@ -6,34 +6,37 @@
Disassembly of section .text:
0+000 <foo>:
- 0: 66 0f d0 01 [ ]*addsubpd \(%rcx\),%xmm0
- 4: 66 0f d0 ca [ ]*addsubpd %xmm2,%xmm1
- 8: f2 0f d0 13 [ ]*addsubps \(%rbx\),%xmm2
- c: f2 0f d0 dc [ ]*addsubps %xmm4,%xmm3
- 10: df 88 90 90 90 00 [ ]*fisttps 0x909090\(%rax\)
- 16: db 88 90 90 90 00 [ ]*fisttpl 0x909090\(%rax\)
- 1c: dd 88 90 90 90 00 [ ]*fisttpll 0x909090\(%rax\)
- 22: 66 0f 7c 65 00 [ ]*haddpd 0x0\(%rbp\),%xmm4
- 27: 66 0f 7c ee [ ]*haddpd %xmm6,%xmm5
- 2b: f2 0f 7c 37 [ ]*haddps \(%rdi\),%xmm6
- 2f: f2 0f 7c f8 [ ]*haddps %xmm0,%xmm7
- 33: 66 0f 7d c1 [ ]*hsubpd %xmm1,%xmm0
- 37: 66 0f 7d 0a [ ]*hsubpd \(%rdx\),%xmm1
- 3b: f2 0f 7d d2 [ ]*hsubps %xmm2,%xmm2
- 3f: f2 0f 7d 1c 24 [ ]*hsubps \(%rsp\),%xmm3
- 44: f2 0f f0 2e [ ]*lddqu \(%rsi\),%xmm5
- 48: 0f 01 c8 [ ]*monitor %rax,%rcx,%rdx
- 4b: 0f 01 c8 [ ]*monitor %rax,%rcx,%rdx
- 4e: f2 0f 12 f7 [ ]*movddup %xmm7,%xmm6
- 52: f2 0f 12 38 [ ]*movddup \(%rax\),%xmm7
- 56: f3 0f 16 01 [ ]*movshdup \(%rcx\),%xmm0
- 5a: f3 0f 16 ca [ ]*movshdup %xmm2,%xmm1
- 5e: f3 0f 12 13 [ ]*movsldup \(%rbx\),%xmm2
- 62: f3 0f 12 dc [ ]*movsldup %xmm4,%xmm3
- 66: 0f 01 c9 [ ]*mwait %rax,%rcx
- 69: 0f 01 c9 [ ]*mwait %rax,%rcx
- 6c: 67 0f 01 c8 [ ]*monitor %eax,%rcx,%rdx
- 70: 67 0f 01 c8 [ ]*monitor %eax,%rcx,%rdx
- 74: f2 0f 12 38 [ ]*movddup \(%rax\),%xmm7
- 78: f2 0f 12 38 [ ]*movddup \(%rax\),%xmm7
+[ ]*[a-f0-9]+: 66 0f d0 01 [ ]*addsubpd \(%rcx\),%xmm0
+[ ]*[a-f0-9]+: 66 0f d0 ca [ ]*addsubpd %xmm2,%xmm1
+[ ]*[a-f0-9]+: f2 0f d0 13 [ ]*addsubps \(%rbx\),%xmm2
+[ ]*[a-f0-9]+: f2 0f d0 dc [ ]*addsubps %xmm4,%xmm3
+[ ]*[a-f0-9]+: df 88 90 90 90 00 [ ]*fisttps 0x909090\(%rax\)
+[ ]*[a-f0-9]+: db 88 90 90 90 00 [ ]*fisttpl 0x909090\(%rax\)
+[ ]*[a-f0-9]+: dd 88 90 90 90 00 [ ]*fisttpll 0x909090\(%rax\)
+[ ]*[a-f0-9]+: 66 0f 7c 65 00 [ ]*haddpd 0x0\(%rbp\),%xmm4
+[ ]*[a-f0-9]+: 66 0f 7c ee [ ]*haddpd %xmm6,%xmm5
+[ ]*[a-f0-9]+: f2 0f 7c 37 [ ]*haddps \(%rdi\),%xmm6
+[ ]*[a-f0-9]+: f2 0f 7c f8 [ ]*haddps %xmm0,%xmm7
+[ ]*[a-f0-9]+: 66 0f 7d c1 [ ]*hsubpd %xmm1,%xmm0
+[ ]*[a-f0-9]+: 66 0f 7d 0a [ ]*hsubpd \(%rdx\),%xmm1
+[ ]*[a-f0-9]+: f2 0f 7d d2 [ ]*hsubps %xmm2,%xmm2
+[ ]*[a-f0-9]+: f2 0f 7d 1c 24 [ ]*hsubps \(%rsp\),%xmm3
+[ ]*[a-f0-9]+: f2 0f f0 2e [ ]*lddqu \(%rsi\),%xmm5
+[ ]*[a-f0-9]+: 0f 01 c8 [ ]*monitor %rax,%ecx,%edx
+[ ]*[a-f0-9]+: 0f 01 c8 [ ]*monitor %rax,%ecx,%edx
+[ ]*[a-f0-9]+: 0f 01 c8 [ ]*monitor %rax,%ecx,%edx
+[ ]*[a-f0-9]+: f2 0f 12 f7 [ ]*movddup %xmm7,%xmm6
+[ ]*[a-f0-9]+: f2 0f 12 38 [ ]*movddup \(%rax\),%xmm7
+[ ]*[a-f0-9]+: f3 0f 16 01 [ ]*movshdup \(%rcx\),%xmm0
+[ ]*[a-f0-9]+: f3 0f 16 ca [ ]*movshdup %xmm2,%xmm1
+[ ]*[a-f0-9]+: f3 0f 12 13 [ ]*movsldup \(%rbx\),%xmm2
+[ ]*[a-f0-9]+: f3 0f 12 dc [ ]*movsldup %xmm4,%xmm3
+[ ]*[a-f0-9]+: 0f 01 c9 [ ]*mwait %eax,%ecx
+[ ]*[a-f0-9]+: 0f 01 c9 [ ]*mwait %eax,%ecx
+[ ]*[a-f0-9]+: 0f 01 c9 [ ]*mwait %eax,%ecx
+[ ]*[a-f0-9]+: 67 0f 01 c8 [ ]*monitor %eax,%ecx,%edx
+[ ]*[a-f0-9]+: 67 0f 01 c8 [ ]*monitor %eax,%ecx,%edx
+[ ]*[a-f0-9]+: 67 0f 01 c8 [ ]*monitor %eax,%ecx,%edx
+[ ]*[a-f0-9]+: f2 0f 12 38 [ ]*movddup \(%rax\),%xmm7
+[ ]*[a-f0-9]+: f2 0f 12 38 [ ]*movddup \(%rax\),%xmm7
#pass
--- a/gas/testsuite/gas/i386/x86-64-sse3.s
+++ b/gas/testsuite/gas/i386/x86-64-sse3.s
@@ -19,6 +19,7 @@ foo:
hsubps (%rsp,1),%xmm3
lddqu (%rsi),%xmm5
monitor
+ monitor %rax,%ecx,%edx
monitor %rax,%rcx,%rdx
movddup %xmm7,%xmm6
movddup (%rax),%xmm7
@@ -27,8 +28,10 @@ foo:
movsldup (%rbx),%xmm2
movsldup %xmm4,%xmm3
mwait
+ mwait %eax,%ecx
mwait %rax,%rcx
+ monitor %eax,%ecx,%edx
monitor %eax,%rcx,%rdx
addr32 monitor
--- a/gas/testsuite/gas/i386/x86-64-suffix.d
+++ b/gas/testsuite/gas/i386/x86-64-suffix.d
@@ -1,13 +1,13 @@
#objdump: -dwMsuffix
-#name: x86-64 rep prefix (with suffixes)
+#name: x86-64 suffix (AT&T mode)
.*: +file format .*
Disassembly of section .text:
0+ <foo>:
-[ ]*[a-f0-9]+: 0f 01 c8 monitor %rax,%rcx,%rdx
-[ ]*[a-f0-9]+: 0f 01 c9 mwait %rax,%rcx
+[ ]*[a-f0-9]+: 0f 01 c8 monitor %rax,%ecx,%edx
+[ ]*[a-f0-9]+: 0f 01 c9 mwait %eax,%ecx
[ ]*[a-f0-9]+: 0f 01 c1 vmcall
[ ]*[a-f0-9]+: 0f 01 c2 vmlaunch
[ ]*[a-f0-9]+: 0f 01 c3 vmresume
--- a/opcodes/i386-dis.c
+++ b/opcodes/i386-dis.c
@@ -15520,12 +15520,10 @@ OP_Mwait (int bytemode, int sizeflag ATT
/* 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]);
+ strcpy (op_out[0], names32[0]);
+ strcpy (op_out[1], names32[1]);
if (bytemode == eBX_reg)
- strcpy (op_out[2], names[3]);
+ strcpy (op_out[2], names32[3]);
two_source_ops = 1;
}
/* Skip mod/rm byte. */
@@ -15537,27 +15535,25 @@ static void
OP_Monitor (int bytemode ATTRIBUTE_UNUSED,
int sizeflag ATTRIBUTE_UNUSED)
{
- /* monitor %eax,%ecx,%edx" */
+ /* monitor %{e,r,}ax,%ecx,%edx" */
if (!intel_syntax)
{
- const char **op1_names;
const char **names = (address_mode == mode_64bit
? names64 : names32);
- if (!(prefixes & PREFIX_ADDR))
- op1_names = (address_mode == mode_16bit
- ? names16 : names);
- else
+ if (prefixes & PREFIX_ADDR)
{
/* Remove "addr16/addr32". */
all_prefixes[last_addr_prefix] = 0;
- op1_names = (address_mode != mode_32bit
- ? names32 : names16);
+ names = (address_mode != mode_32bit
+ ? names32 : names16);
used_prefixes |= PREFIX_ADDR;
}
- strcpy (op_out[0], op1_names[0]);
- strcpy (op_out[1], names[1]);
- strcpy (op_out[2], names[2]);
+ else if (address_mode == mode_16bit)
+ names = names16;
+ strcpy (op_out[0], names[0]);
+ strcpy (op_out[1], names32[1]);
+ strcpy (op_out[2], names32[2]);
two_source_ops = 1;
}
/* Skip mod/rm byte. */
More information about the Binutils
mailing list