From 081e283fafb415b4e37f2ac1d5f945ad0b61e282 Mon Sep 17 00:00:00 2001 From: Jan Beulich Date: Thu, 7 Nov 2019 09:28:20 +0100 Subject: [PATCH] x86: adjust register names printed for MONITOR/MWAIT 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/ChangeLog | 19 ++++++ .../gas/i386/ilp32/x86-64-sse-noavx.d | 66 +------------------ gas/testsuite/gas/i386/ilp32/x86-64-sse3.d | 38 +---------- gas/testsuite/gas/i386/x86-64-arch-3-znver1.d | 28 +------- gas/testsuite/gas/i386/x86-64-arch-3-znver2.d | 28 +------- gas/testsuite/gas/i386/x86-64-arch-3.d | 13 ++-- gas/testsuite/gas/i386/x86-64-arch-3.s | 3 + gas/testsuite/gas/i386/x86-64-mwaitx-bdver4.d | 10 +-- gas/testsuite/gas/i386/x86-64-sse-noavx.d | 4 +- gas/testsuite/gas/i386/x86-64-sse3.d | 63 +++++++++--------- gas/testsuite/gas/i386/x86-64-sse3.s | 3 + gas/testsuite/gas/i386/x86-64-suffix.d | 6 +- opcodes/ChangeLog | 8 +++ opcodes/i386-dis.c | 28 ++++---- 14 files changed, 100 insertions(+), 217 deletions(-) diff --git a/gas/ChangeLog b/gas/ChangeLog index 185469fbfaa..0a05d16b37d 100644 --- a/gas/ChangeLog +++ b/gas/ChangeLog @@ -1,3 +1,22 @@ +2019-11-07 Jan Beulich + + * 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/x86-64-arch-3-znver1.d, + testsuite/gas/i386/x86-64-arch-3-znver2.d: Redirect expectations + to x86-64-arch-3.d. + * 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. + 2019-11-04 Jan Beulich * config/tc-i386.c (process_operands): Handle ShortForm insns diff --git a/gas/testsuite/gas/i386/ilp32/x86-64-sse-noavx.d b/gas/testsuite/gas/i386/ilp32/x86-64-sse-noavx.d index 4a24c334435..1b2f099afce 100644 --- a/gas/testsuite/gas/i386/ilp32/x86-64-sse-noavx.d +++ b/gas/testsuite/gas/i386/ilp32/x86-64-sse-noavx.d @@ -2,68 +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]+: 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 diff --git a/gas/testsuite/gas/i386/ilp32/x86-64-sse3.d b/gas/testsuite/gas/i386/ilp32/x86-64-sse3.d index 77b24447d11..f6b56587b7a 100644 --- 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 : - 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 diff --git a/gas/testsuite/gas/i386/x86-64-arch-3-znver1.d b/gas/testsuite/gas/i386/x86-64-arch-3-znver1.d index 060ef612498..e5a622856a9 100644 --- a/gas/testsuite/gas/i386/x86-64-arch-3-znver1.d +++ b/gas/testsuite/gas/i386/x86-64-arch-3-znver1.d @@ -2,30 +2,4 @@ #as: -march=znver1+rdpid+clwb+wbnoinvd #objdump: -dw #name: x86-64 arch 3 (znver1) - -.*: file format .* - -Disassembly of section .text: - -0+ <.text>: -[ ]*[a-f0-9]+: 0f 01 ca clac -[ ]*[a-f0-9]+: 0f 01 cb stac -[ ]*[a-f0-9]+: 66 0f 38 f6 ca adcx %edx,%ecx -[ ]*[a-f0-9]+: f3 0f 38 f6 ca adox %edx,%ecx -[ ]*[a-f0-9]+: 0f c7 f8 rdseed %eax -[ ]*[a-f0-9]+: 0f 01 fc clzero -[ ]*[a-f0-9]+: 44 0f 38 c8 00 sha1nexte \(%rax\),%xmm8 -[ ]*[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]+:[ ]*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-f0-9]+:[ ]*f3 41 0f c7 fa[ ]*rdpid %r10 -[ ]*[a-f0-9]+:[ ]*f3 0f 09[ ]*wbnoinvd[ ]* -#pass +#dump: x86-64-arch-3.d diff --git a/gas/testsuite/gas/i386/x86-64-arch-3-znver2.d b/gas/testsuite/gas/i386/x86-64-arch-3-znver2.d index 07e6c02be29..6882da4faa1 100644 --- a/gas/testsuite/gas/i386/x86-64-arch-3-znver2.d +++ b/gas/testsuite/gas/i386/x86-64-arch-3-znver2.d @@ -2,30 +2,4 @@ #as: -march=znver2 #objdump: -dw #name: x86-64 arch 3 (znver2) - -.*: file format .* - -Disassembly of section .text: - -0+ <.text>: -[ ]*[a-f0-9]+: 0f 01 ca clac[ ]* -[ ]*[a-f0-9]+: 0f 01 cb stac[ ]* -[ ]*[a-f0-9]+: 66 0f 38 f6 ca adcx %edx,%ecx -[ ]*[a-f0-9]+: f3 0f 38 f6 ca adox %edx,%ecx -[ ]*[a-f0-9]+: 0f c7 f8 rdseed %eax -[ ]*[a-f0-9]+: 0f 01 fc clzero[ ]* -[ ]*[a-f0-9]+: 44 0f 38 c8 00 sha1nexte \(%rax\),%xmm8 -[ ]*[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]+:[ ]*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-f0-9]+:[ ]*f3 41 0f c7 fa[ ]*rdpid %r10 -[ ]*[a-f0-9]+:[ ]*f3 0f 09[ ]*wbnoinvd[ ]* -#pass +#dump: x86-64-arch-3.d diff --git a/gas/testsuite/gas/i386/x86-64-arch-3.d b/gas/testsuite/gas/i386/x86-64-arch-3.d index e6bbb4b837e..9f5bd612a24 100644 --- a/gas/testsuite/gas/i386/x86-64-arch-3.d +++ b/gas/testsuite/gas/i386/x86-64-arch-3.d @@ -17,11 +17,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 diff --git a/gas/testsuite/gas/i386/x86-64-arch-3.s b/gas/testsuite/gas/i386/x86-64-arch-3.s index 6ae75c3c46d..1f5a0e6be10 100644 --- a/gas/testsuite/gas/i386/x86-64-arch-3.s +++ b/gas/testsuite/gas/i386/x86-64-arch-3.s @@ -18,9 +18,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 diff --git a/gas/testsuite/gas/i386/x86-64-mwaitx-bdver4.d b/gas/testsuite/gas/i386/x86-64-mwaitx-bdver4.d index f35ad119edd..41f5d7b355a 100644 --- 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 diff --git a/gas/testsuite/gas/i386/x86-64-sse-noavx.d b/gas/testsuite/gas/i386/x86-64-sse-noavx.d index 4d75f246cc1..e15791642a7 100644 --- a/gas/testsuite/gas/i386/x86-64-sse-noavx.d +++ b/gas/testsuite/gas/i386/x86-64-sse-noavx.d @@ -22,12 +22,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 diff --git a/gas/testsuite/gas/i386/x86-64-sse3.d b/gas/testsuite/gas/i386/x86-64-sse3.d index e4bd3dfd018..5b8b37db260 100644 --- 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 : - 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 diff --git a/gas/testsuite/gas/i386/x86-64-sse3.s b/gas/testsuite/gas/i386/x86-64-sse3.s index 6d04afddb8c..60122832f54 100644 --- 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 diff --git a/gas/testsuite/gas/i386/x86-64-suffix.d b/gas/testsuite/gas/i386/x86-64-suffix.d index f0b645cfe75..749a300ff9a 100644 --- 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+ : -[ ]*[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 diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog index df2987ae797..1d4ca7934c9 100644 --- a/opcodes/ChangeLog +++ b/opcodes/ChangeLog @@ -1,3 +1,11 @@ +2019-11-07 Jan Beulich + + * 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. + 2019-11-07 Jan Beulich PR/gas 25167 diff --git a/opcodes/i386-dis.c b/opcodes/i386-dis.c index 0f4a844dce7..7f66b7f693e 100644 --- a/opcodes/i386-dis.c +++ b/opcodes/i386-dis.c @@ -15520,12 +15520,10 @@ OP_Mwait (int bytemode, int sizeflag ATTRIBUTE_UNUSED) /* 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. */ -- 2.30.2