[binutils-gdb] x86-64: omit "default" segment prefixes from string insn disassembly
Jan Beulich
jbeulich@sourceware.org
Fri Jan 31 09:05:56 GMT 2025
https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=36fa5275c164c3eea585ff0a5aaefc235a18b298
commit 36fa5275c164c3eea585ff0a5aaefc235a18b298
Author: Jan Beulich <jbeulich@suse.com>
Date: Fri Jan 31 10:04:45 2025 +0100
x86-64: omit "default" segment prefixes from string insn disassembly
Printing implicit %ds: and %es: prefixes is pretty meaningless in 64-bit
mode. The SDM explicitly omits them for the 64-bit forms, and it
obviously has them for the other ones only to cover non-64-bit modes
(oddly enough the AMD PM has them present).
Diff:
---
gas/testsuite/gas/i386/ilp32/x86-64-io-intel.d | 22 +---
gas/testsuite/gas/i386/ilp32/x86-64-io-suffix.d | 1 +
gas/testsuite/gas/i386/ilp32/x86-64-io.d | 22 +---
gas/testsuite/gas/i386/ilp32/x86-64-rep.d | 60 +---------
gas/testsuite/gas/i386/ilp32/x86-64.d | 6 +-
gas/testsuite/gas/i386/intel-cmps64.d | 152 ++++++++++++------------
gas/testsuite/gas/i386/intel-movs64.d | 152 ++++++++++++------------
gas/testsuite/gas/i386/noreg64-data16.d | 28 ++---
gas/testsuite/gas/i386/noreg64-rex64.d | 28 ++---
gas/testsuite/gas/i386/noreg64.d | 28 ++---
gas/testsuite/gas/i386/x86-64-align-branch-5.d | 2 +-
gas/testsuite/gas/i386/x86-64-disassem.d | 94 +++++++--------
gas/testsuite/gas/i386/x86-64-io-intel.d | 8 +-
gas/testsuite/gas/i386/x86-64-io-suffix.d | 8 +-
gas/testsuite/gas/i386/x86-64-io.d | 8 +-
gas/testsuite/gas/i386/x86-64-lfence-byte.d | 2 +-
gas/testsuite/gas/i386/x86-64-lfence-load.d | 14 +--
gas/testsuite/gas/i386/x86-64-rep-suffix.d | 16 +--
gas/testsuite/gas/i386/x86-64-rep.d | 104 ++++++++--------
gas/testsuite/gas/i386/x86_64-intel.d | 6 +-
gas/testsuite/gas/i386/x86_64.d | 6 +-
opcodes/i386-dis.c | 13 +-
22 files changed, 343 insertions(+), 437 deletions(-)
diff --git a/gas/testsuite/gas/i386/ilp32/x86-64-io-intel.d b/gas/testsuite/gas/i386/ilp32/x86-64-io-intel.d
index 2cdcfded4b4..f8aa7d9c760 100644
--- a/gas/testsuite/gas/i386/ilp32/x86-64-io-intel.d
+++ b/gas/testsuite/gas/i386/ilp32/x86-64-io-intel.d
@@ -1,24 +1,4 @@
#source: ../x86-64-io.s
#objdump: -dwMintel
#name: x86-64 (ILP32) rex.W in/out (Intel disassembly)
-
-.*: +file format .*
-
-Disassembly of section .text:
-
-0+000 <_in>:
- 0: 48 ed rex.W in eax,dx
- 2: 66 48 ed data16 rex.W in eax,dx
-
-0+005 <_out>:
- 5: 48 ef rex.W out dx,eax
- 7: 66 48 ef data16 rex.W out dx,eax
-
-0+00a <_ins>:
- a: 48 6d rex.W ins DWORD PTR es:\[rdi\],dx
- c: 66 48 6d data16 rex.W ins DWORD PTR es:\[rdi\],dx
-
-0+00f <_outs>:
- f: 48 6f rex.W outs dx,DWORD PTR ds:\[rsi\]
- 11: 66 48 6f data16 rex.W outs dx,DWORD PTR ds:\[rsi\]
-#pass
+#dump: ../x86-64-io-intel.d
diff --git a/gas/testsuite/gas/i386/ilp32/x86-64-io-suffix.d b/gas/testsuite/gas/i386/ilp32/x86-64-io-suffix.d
index 4f4c9273282..ffc8c09046e 100644
--- a/gas/testsuite/gas/i386/ilp32/x86-64-io-suffix.d
+++ b/gas/testsuite/gas/i386/ilp32/x86-64-io-suffix.d
@@ -1,6 +1,7 @@
#source: ../x86-64-io.s
#objdump: -dwMsuffix
#name: x86-64 (ILP32) rex.W in/out w/ suffix
+#dump: ../x86-64-io-suffix.d
.*: +file format .*
diff --git a/gas/testsuite/gas/i386/ilp32/x86-64-io.d b/gas/testsuite/gas/i386/ilp32/x86-64-io.d
index 889e60e3c54..83a9518b447 100644
--- a/gas/testsuite/gas/i386/ilp32/x86-64-io.d
+++ b/gas/testsuite/gas/i386/ilp32/x86-64-io.d
@@ -1,24 +1,4 @@
#source: ../x86-64-io.s
#objdump: -dw
#name: x86-64 (ILP32) rex.W in/out
-
-.*: +file format .*
-
-Disassembly of section .text:
-
-0+000 <_in>:
- 0: 48 ed rex.W in \(%dx\),%eax
- 2: 66 48 ed data16 rex.W in \(%dx\),%eax
-
-0+005 <_out>:
- 5: 48 ef rex.W out %eax,\(%dx\)
- 7: 66 48 ef data16 rex.W out %eax,\(%dx\)
-
-0+00a <_ins>:
- a: 48 6d rex.W insl \(%dx\),%es:\(%rdi\)
- c: 66 48 6d data16 rex.W insl \(%dx\),%es:\(%rdi\)
-
-0+00f <_outs>:
- f: 48 6f rex.W outsl %ds:\(%rsi\),\(%dx\)
- 11: 66 48 6f data16 rex.W outsl %ds:\(%rsi\),\(%dx\)
-#pass
+#dump: ../x86-64-io.d
diff --git a/gas/testsuite/gas/i386/ilp32/x86-64-rep.d b/gas/testsuite/gas/i386/ilp32/x86-64-rep.d
index e76059762e6..373e543106a 100644
--- a/gas/testsuite/gas/i386/ilp32/x86-64-rep.d
+++ b/gas/testsuite/gas/i386/ilp32/x86-64-rep.d
@@ -1,62 +1,4 @@
#source: ../x86-64-rep.s
#objdump: -dw
#name: x86-64 (ILP32) rep prefix
-
-.*: +file format .*
-
-Disassembly of section .text:
-
-0+ <_start>:
- 0: f3 6c[ ]+rep insb \(%dx\),%es:\(%rdi\)
- 2: f3 6e[ ]+rep outsb %ds:\(%rsi\),\(%dx\)
- 4: f3 a4[ ]+rep movsb %ds:\(%rsi\),%es:\(%rdi\)
- 6: f3 ac[ ]+rep lods %ds:\(%rsi\),%al
- 8: f3 aa[ ]+rep stos %al,%es:\(%rdi\)
- a: f3 a6[ ]+repz cmpsb %es:\(%rdi\),%ds:\(%rsi\)
- c: f3 ae[ ]+repz scas %es:\(%rdi\),%al
- e: 66 f3 6d[ ]+rep insw \(%dx\),%es:\(%rdi\)
- 11: 66 f3 6f[ ]+rep outsw %ds:\(%rsi\),\(%dx\)
- 14: 66 f3 a5[ ]+rep movsw %ds:\(%rsi\),%es:\(%rdi\)
- 17: 66 f3 ad[ ]+rep lods %ds:\(%rsi\),%ax
- 1a: 66 f3 ab[ ]+rep stos %ax,%es:\(%rdi\)
- 1d: 66 f3 a7[ ]+repz cmpsw %es:\(%rdi\),%ds:\(%rsi\)
- 20: 66 f3 af[ ]+repz scas %es:\(%rdi\),%ax
- 23: f3 6d[ ]+rep insl \(%dx\),%es:\(%rdi\)
- 25: f3 6f[ ]+rep outsl %ds:\(%rsi\),\(%dx\)
- 27: f3 a5[ ]+rep movsl %ds:\(%rsi\),%es:\(%rdi\)
- 29: f3 ad[ ]+rep lods %ds:\(%rsi\),%eax
- 2b: f3 ab[ ]+rep stos %eax,%es:\(%rdi\)
- 2d: f3 a7[ ]+repz cmpsl %es:\(%rdi\),%ds:\(%rsi\)
- 2f: f3 af[ ]+repz scas %es:\(%rdi\),%eax
- 31: f3 48 a5[ ]+rep movsq %ds:\(%rsi\),%es:\(%rdi\)
- 34: f3 48 ad[ ]+rep lods %ds:\(%rsi\),%rax
- 37: f3 48 ab[ ]+rep stos %rax,%es:\(%rdi\)
- 3a: f3 48 a7[ ]+repz cmpsq %es:\(%rdi\),%ds:\(%rsi\)
- 3d: f3 48 af[ ]+repz scas %es:\(%rdi\),%rax
- 40: 67 f3 6c[ ]+rep insb \(%dx\),%es:\(%edi\)
- 43: 67 f3 6e[ ]+rep outsb %ds:\(%esi\),\(%dx\)
- 46: 67 f3 a4[ ]+rep movsb %ds:\(%esi\),%es:\(%edi\)
- 49: 67 f3 ac[ ]+rep lods %ds:\(%esi\),%al
- 4c: 67 f3 aa[ ]+rep stos %al,%es:\(%edi\)
- 4f: 67 f3 a6[ ]+repz cmpsb %es:\(%edi\),%ds:\(%esi\)
- 52: 67 f3 ae[ ]+repz scas %es:\(%edi\),%al
- 55: 67 66 f3 6d[ ]+rep insw \(%dx\),%es:\(%edi\)
- 59: 67 66 f3 6f[ ]+rep outsw %ds:\(%esi\),\(%dx\)
- 5d: 67 66 f3 a5[ ]+rep movsw %ds:\(%esi\),%es:\(%edi\)
- 61: 67 66 f3 ad[ ]+rep lods %ds:\(%esi\),%ax
- 65: 67 66 f3 ab[ ]+rep stos %ax,%es:\(%edi\)
- 69: 67 66 f3 a7[ ]+repz cmpsw %es:\(%edi\),%ds:\(%esi\)
- 6d: 67 66 f3 af[ ]+repz scas %es:\(%edi\),%ax
- 71: 67 f3 6d[ ]+rep insl \(%dx\),%es:\(%edi\)
- 74: 67 f3 6f[ ]+rep outsl %ds:\(%esi\),\(%dx\)
- 77: 67 f3 a5[ ]+rep movsl %ds:\(%esi\),%es:\(%edi\)
- 7a: 67 f3 ad[ ]+rep lods %ds:\(%esi\),%eax
- 7d: 67 f3 ab[ ]+rep stos %eax,%es:\(%edi\)
- 80: 67 f3 a7[ ]+repz cmpsl %es:\(%edi\),%ds:\(%esi\)
- 83: 67 f3 af[ ]+repz scas %es:\(%edi\),%eax
- 86: 67 f3 48 a5[ ]+rep movsq %ds:\(%esi\),%es:\(%edi\)
- 8a: 67 f3 48 ad[ ]+rep lods %ds:\(%esi\),%rax
- 8e: 67 f3 48 ab[ ]+rep stos %rax,%es:\(%edi\)
- 92: 67 f3 48 a7[ ]+repz cmpsq %es:\(%edi\),%ds:\(%esi\)
- 96: 67 f3 48 af[ ]+repz scas %es:\(%edi\),%rax
-#pass
+#dump: ../x86-64-rep.d
diff --git a/gas/testsuite/gas/i386/ilp32/x86-64.d b/gas/testsuite/gas/i386/ilp32/x86-64.d
index 9f7e7949389..17633971c20 100644
--- a/gas/testsuite/gas/i386/ilp32/x86-64.d
+++ b/gas/testsuite/gas/i386/ilp32/x86-64.d
@@ -37,9 +37,9 @@ Disassembly of section .text:
[ ]*[a-f0-9]+: 41 0f 20 c0 mov %cr0,%r8
[ ]*[a-f0-9]+: 44 0f 20 c0 mov %cr8,%rax
[ ]*[a-f0-9]+: 44 0f 22 c0 mov %rax,%cr8
-[ ]*[a-f0-9]+: f3 48 a5 rep movsq %ds:\(%rsi\),%es:\(%rdi\)
-[ ]*[a-f0-9]+: 66 f3 a5 rep movsw %ds:\(%rsi\),%es:\(%rdi\)
-[ ]*[a-f0-9]+: f3 48 a5 rep movsq %ds:\(%rsi\),%es:\(%rdi\)
+[ ]*[a-f0-9]+: f3 48 a5 rep movsq \(%rsi\),\(%rdi\)
+[ ]*[a-f0-9]+: 66 f3 a5 rep movsw \(%rsi\),\(%rdi\)
+[ ]*[a-f0-9]+: f3 48 a5 rep movsq \(%rsi\),\(%rdi\)
[ ]*[a-f0-9]+: b0 11 mov \$0x11,%al
[ ]*[a-f0-9]+: b4 11 mov \$0x11,%ah
[ ]*[a-f0-9]+: 40 b4 11 mov \$0x11,%spl
diff --git a/gas/testsuite/gas/i386/intel-cmps64.d b/gas/testsuite/gas/i386/intel-cmps64.d
index efd8839e11b..299edc9c474 100644
--- a/gas/testsuite/gas/i386/intel-cmps64.d
+++ b/gas/testsuite/gas/i386/intel-cmps64.d
@@ -7,80 +7,80 @@
Disassembly of section .text:
0+ <cmps>:
-[ ]*[a-f0-9]+: a6 * cmps(b *| +BYTE PTR (ds:)?\[rsi\],(BYTE PTR )?es:\[rdi\])
-[ ]*[a-f0-9]+: 67 a6 * cmps +BYTE PTR (ds:)?\[esi\],(BYTE PTR )?es:\[edi\]
-[ ]*[a-f0-9]+: 64 67 a6 * cmps +BYTE PTR fs:\[esi\],(BYTE PTR )?es:\[edi\]
-[ ]*[a-f0-9]+: 67 a6 * cmps +BYTE PTR (ds:)?\[esi\],(BYTE PTR )?es:\[edi\]
-[ ]*[a-f0-9]+: 67 a6 * cmps +BYTE PTR (ds:)?\[esi\],(BYTE PTR )?es:\[edi\]
-[ ]*[a-f0-9]+: 67 a6 * cmps +BYTE PTR (ds:)?\[esi\],(BYTE PTR )?es:\[edi\]
-[ ]*[a-f0-9]+: 67 a6 * cmps +BYTE PTR (ds:)?\[esi\],(BYTE PTR )?es:\[edi\]
-[ ]*[a-f0-9]+: 67 a6 * cmps +BYTE PTR (ds:)?\[esi\],(BYTE PTR )?es:\[edi\]
-[ ]*[a-f0-9]+: 67 a6 * cmps +BYTE PTR (ds:)?\[esi\],(BYTE PTR )?es:\[edi\]
-[ ]*[a-f0-9]+: 67 a6 * cmps +BYTE PTR (ds:)?\[esi\],(BYTE PTR )?es:\[edi\]
-[ ]*[a-f0-9]+: a6 * cmps(b *| +BYTE PTR (ds:)?\[rsi\],(BYTE PTR )?es:\[rdi\])
-[ ]*[a-f0-9]+: 64 a6 * cmps +BYTE PTR fs:\[rsi\],(BYTE PTR )?es:\[rdi\]
-[ ]*[a-f0-9]+: a6 * cmps(b *| +BYTE PTR (ds:)?\[rsi\],(BYTE PTR )?es:\[rdi\])
-[ ]*[a-f0-9]+: a6 * cmps(b *| +BYTE PTR (ds:)?\[rsi\],(BYTE PTR )?es:\[rdi\])
-[ ]*[a-f0-9]+: a6 * cmps(b *| +BYTE PTR (ds:)?\[rsi\],(BYTE PTR )?es:\[rdi\])
-[ ]*[a-f0-9]+: a6 * cmps(b *| +BYTE PTR (ds:)?\[rsi\],(BYTE PTR )?es:\[rdi\])
-[ ]*[a-f0-9]+: a6 * cmps(b *| +BYTE PTR (ds:)?\[rsi\],(BYTE PTR )?es:\[rdi\])
-[ ]*[a-f0-9]+: a6 * cmps(b *| +BYTE PTR (ds:)?\[rsi\],(BYTE PTR )?es:\[rdi\])
-[ ]*[a-f0-9]+: a6 * cmps(b *| +BYTE PTR (ds:)?\[rsi\],(BYTE PTR )?es:\[rdi\])
-[ ]*[a-f0-9]+: 66 a7 * cmps(w *| +WORD PTR (ds:)?\[rsi\],(WORD PTR )?es:\[rdi\])
-[ ]*[a-f0-9]+: 67 66 a7 * cmps +WORD PTR (ds:)?\[esi\],(WORD PTR )?es:\[edi\]
-[ ]*[a-f0-9]+: 64 67 66 a7 * cmps +WORD PTR fs:\[esi\],(WORD PTR )?es:\[edi\]
-[ ]*[a-f0-9]+: 67 66 a7 * cmps +WORD PTR (ds:)?\[esi\],(WORD PTR )?es:\[edi\]
-[ ]*[a-f0-9]+: 67 66 a7 * cmps +WORD PTR (ds:)?\[esi\],(WORD PTR )?es:\[edi\]
-[ ]*[a-f0-9]+: 67 66 a7 * cmps +WORD PTR (ds:)?\[esi\],(WORD PTR )?es:\[edi\]
-[ ]*[a-f0-9]+: 67 66 a7 * cmps +WORD PTR (ds:)?\[esi\],(WORD PTR )?es:\[edi\]
-[ ]*[a-f0-9]+: 67 66 a7 * cmps +WORD PTR (ds:)?\[esi\],(WORD PTR )?es:\[edi\]
-[ ]*[a-f0-9]+: 67 66 a7 * cmps +WORD PTR (ds:)?\[esi\],(WORD PTR )?es:\[edi\]
-[ ]*[a-f0-9]+: 67 66 a7 * cmps +WORD PTR (ds:)?\[esi\],(WORD PTR )?es:\[edi\]
-[ ]*[a-f0-9]+: 66 a7 * cmps(w *| +WORD PTR (ds:)?\[rsi\],(WORD PTR )?es:\[rdi\])
-[ ]*[a-f0-9]+: 64 66 a7 * cmps +WORD PTR fs:\[rsi\],(WORD PTR )?es:\[rdi\]
-[ ]*[a-f0-9]+: 66 a7 * cmps(w *| +WORD PTR (ds:)?\[rsi\],(WORD PTR )?es:\[rdi\])
-[ ]*[a-f0-9]+: 66 a7 * cmps(w *| +WORD PTR (ds:)?\[rsi\],(WORD PTR )?es:\[rdi\])
-[ ]*[a-f0-9]+: 66 a7 * cmps(w *| +WORD PTR (ds:)?\[rsi\],(WORD PTR )?es:\[rdi\])
-[ ]*[a-f0-9]+: 66 a7 * cmps(w *| +WORD PTR (ds:)?\[rsi\],(WORD PTR )?es:\[rdi\])
-[ ]*[a-f0-9]+: 66 a7 * cmps(w *| +WORD PTR (ds:)?\[rsi\],(WORD PTR )?es:\[rdi\])
-[ ]*[a-f0-9]+: 66 a7 * cmps(w *| +WORD PTR (ds:)?\[rsi\],(WORD PTR )?es:\[rdi\])
-[ ]*[a-f0-9]+: 66 a7 * cmps(w *| +WORD PTR (ds:)?\[rsi\],(WORD PTR )?es:\[rdi\])
-[ ]*[a-f0-9]+: a7 * cmps(d *| +DWORD PTR (ds:)?\[rsi\],(DWORD PTR )?es:\[rdi\])
-[ ]*[a-f0-9]+: 67 a7 * cmps +DWORD PTR (ds:)?\[esi\],(DWORD PTR )?es:\[edi\]
-[ ]*[a-f0-9]+: 64 67 a7 * cmps +DWORD PTR fs:\[esi\],(DWORD PTR )?es:\[edi\]
-[ ]*[a-f0-9]+: 67 a7 * cmps +DWORD PTR (ds:)?\[esi\],(DWORD PTR )?es:\[edi\]
-[ ]*[a-f0-9]+: 67 a7 * cmps +DWORD PTR (ds:)?\[esi\],(DWORD PTR )?es:\[edi\]
-[ ]*[a-f0-9]+: 67 a7 * cmps +DWORD PTR (ds:)?\[esi\],(DWORD PTR )?es:\[edi\]
-[ ]*[a-f0-9]+: 67 a7 * cmps +DWORD PTR (ds:)?\[esi\],(DWORD PTR )?es:\[edi\]
-[ ]*[a-f0-9]+: 67 a7 * cmps +DWORD PTR (ds:)?\[esi\],(DWORD PTR )?es:\[edi\]
-[ ]*[a-f0-9]+: 67 a7 * cmps +DWORD PTR (ds:)?\[esi\],(DWORD PTR )?es:\[edi\]
-[ ]*[a-f0-9]+: 67 a7 * cmps +DWORD PTR (ds:)?\[esi\],(DWORD PTR )?es:\[edi\]
-[ ]*[a-f0-9]+: a7 * cmps(d *| +DWORD PTR (ds:)?\[rsi\],(DWORD PTR )?es:\[rdi\])
-[ ]*[a-f0-9]+: 64 a7 * cmps +DWORD PTR fs:\[rsi\],(DWORD PTR )?es:\[rdi\]
-[ ]*[a-f0-9]+: a7 * cmps(d *| +DWORD PTR (ds:)?\[rsi\],(DWORD PTR )?es:\[rdi\])
-[ ]*[a-f0-9]+: a7 * cmps(d *| +DWORD PTR (ds:)?\[rsi\],(DWORD PTR )?es:\[rdi\])
-[ ]*[a-f0-9]+: a7 * cmps(d *| +DWORD PTR (ds:)?\[rsi\],(DWORD PTR )?es:\[rdi\])
-[ ]*[a-f0-9]+: a7 * cmps(d *| +DWORD PTR (ds:)?\[rsi\],(DWORD PTR )?es:\[rdi\])
-[ ]*[a-f0-9]+: a7 * cmps(d *| +DWORD PTR (ds:)?\[rsi\],(DWORD PTR )?es:\[rdi\])
-[ ]*[a-f0-9]+: a7 * cmps(d *| +DWORD PTR (ds:)?\[rsi\],(DWORD PTR )?es:\[rdi\])
-[ ]*[a-f0-9]+: a7 * cmps(d *| +DWORD PTR (ds:)?\[rsi\],(DWORD PTR )?es:\[rdi\])
-[ ]*[a-f0-9]+: 48 a7 * cmps(q *| +QWORD PTR (ds:)?\[rsi\],(QWORD PTR )?es:\[rdi\])
-[ ]*[a-f0-9]+: 48 a7 * cmps(q *| +QWORD PTR (ds:)?\[rsi\],(QWORD PTR )?es:\[rdi\])
-[ ]*[a-f0-9]+: 64 48 a7 * cmps +QWORD PTR fs:?\[rsi\],(QWORD PTR )?es:\[rdi\]
-[ ]*[a-f0-9]+: 48 a7 * cmps(q *| +QWORD PTR (ds:)?\[rsi\],(QWORD PTR )?es:\[rdi\])
-[ ]*[a-f0-9]+: 48 a7 * cmps(q *| +QWORD PTR (ds:)?\[rsi\],(QWORD PTR )?es:\[rdi\])
-[ ]*[a-f0-9]+: 48 a7 * cmps(q *| +QWORD PTR (ds:)?\[rsi\],(QWORD PTR )?es:\[rdi\])
-[ ]*[a-f0-9]+: 48 a7 * cmps(q *| +QWORD PTR (ds:)?\[rsi\],(QWORD PTR )?es:\[rdi\])
-[ ]*[a-f0-9]+: 48 a7 * cmps(q *| +QWORD PTR (ds:)?\[rsi\],(QWORD PTR )?es:\[rdi\])
-[ ]*[a-f0-9]+: 48 a7 * cmps(q *| +QWORD PTR (ds:)?\[rsi\],(QWORD PTR )?es:\[rdi\])
-[ ]*[a-f0-9]+: 48 a7 * cmps(q *| +QWORD PTR (ds:)?\[rsi\],(QWORD PTR )?es:\[rdi\])
-[ ]*[a-f0-9]+: 67 48 a7 * cmps +QWORD PTR (ds:)?\[esi\],(QWORD PTR )?es:\[edi\]
-[ ]*[a-f0-9]+: 64 67 48 a7 * cmps +QWORD PTR fs:?\[esi\],(QWORD PTR )?es:\[edi\]
-[ ]*[a-f0-9]+: 67 48 a7 * cmps +QWORD PTR (ds:)?\[esi\],(QWORD PTR )?es:\[edi\]
-[ ]*[a-f0-9]+: 67 48 a7 * cmps +QWORD PTR (ds:)?\[esi\],(QWORD PTR )?es:\[edi\]
-[ ]*[a-f0-9]+: 67 48 a7 * cmps +QWORD PTR (ds:)?\[esi\],(QWORD PTR )?es:\[edi\]
-[ ]*[a-f0-9]+: 67 48 a7 * cmps +QWORD PTR (ds:)?\[esi\],(QWORD PTR )?es:\[edi\]
-[ ]*[a-f0-9]+: 67 48 a7 * cmps +QWORD PTR (ds:)?\[esi\],(QWORD PTR )?es:\[edi\]
-[ ]*[a-f0-9]+: 67 48 a7 * cmps +QWORD PTR (ds:)?\[esi\],(QWORD PTR )?es:\[edi\]
-[ ]*[a-f0-9]+: 67 48 a7 * cmps +QWORD PTR (ds:)?\[esi\],(QWORD PTR )?es:\[edi\]
+[ ]*[a-f0-9]+: a6 * cmps(b *| +BYTE PTR \[rsi\],(BYTE PTR )?\[rdi\])
+[ ]*[a-f0-9]+: 67 a6 * cmps +BYTE PTR \[esi\],(BYTE PTR )?\[edi\]
+[ ]*[a-f0-9]+: 64 67 a6 * cmps +BYTE PTR fs:\[esi\],(BYTE PTR )?\[edi\]
+[ ]*[a-f0-9]+: 67 a6 * cmps +BYTE PTR \[esi\],(BYTE PTR )?\[edi\]
+[ ]*[a-f0-9]+: 67 a6 * cmps +BYTE PTR \[esi\],(BYTE PTR )?\[edi\]
+[ ]*[a-f0-9]+: 67 a6 * cmps +BYTE PTR \[esi\],(BYTE PTR )?\[edi\]
+[ ]*[a-f0-9]+: 67 a6 * cmps +BYTE PTR \[esi\],(BYTE PTR )?\[edi\]
+[ ]*[a-f0-9]+: 67 a6 * cmps +BYTE PTR \[esi\],(BYTE PTR )?\[edi\]
+[ ]*[a-f0-9]+: 67 a6 * cmps +BYTE PTR \[esi\],(BYTE PTR )?\[edi\]
+[ ]*[a-f0-9]+: 67 a6 * cmps +BYTE PTR \[esi\],(BYTE PTR )?\[edi\]
+[ ]*[a-f0-9]+: a6 * cmps(b *| +BYTE PTR \[rsi\],(BYTE PTR )?\[rdi\])
+[ ]*[a-f0-9]+: 64 a6 * cmps +BYTE PTR fs:\[rsi\],(BYTE PTR )?\[rdi\]
+[ ]*[a-f0-9]+: a6 * cmps(b *| +BYTE PTR \[rsi\],(BYTE PTR )?\[rdi\])
+[ ]*[a-f0-9]+: a6 * cmps(b *| +BYTE PTR \[rsi\],(BYTE PTR )?\[rdi\])
+[ ]*[a-f0-9]+: a6 * cmps(b *| +BYTE PTR \[rsi\],(BYTE PTR )?\[rdi\])
+[ ]*[a-f0-9]+: a6 * cmps(b *| +BYTE PTR \[rsi\],(BYTE PTR )?\[rdi\])
+[ ]*[a-f0-9]+: a6 * cmps(b *| +BYTE PTR \[rsi\],(BYTE PTR )?\[rdi\])
+[ ]*[a-f0-9]+: a6 * cmps(b *| +BYTE PTR \[rsi\],(BYTE PTR )?\[rdi\])
+[ ]*[a-f0-9]+: a6 * cmps(b *| +BYTE PTR \[rsi\],(BYTE PTR )?\[rdi\])
+[ ]*[a-f0-9]+: 66 a7 * cmps(w *| +WORD PTR \[rsi\],(WORD PTR )?\[rdi\])
+[ ]*[a-f0-9]+: 67 66 a7 * cmps +WORD PTR \[esi\],(WORD PTR )?\[edi\]
+[ ]*[a-f0-9]+: 64 67 66 a7 * cmps +WORD PTR fs:\[esi\],(WORD PTR )?\[edi\]
+[ ]*[a-f0-9]+: 67 66 a7 * cmps +WORD PTR \[esi\],(WORD PTR )?\[edi\]
+[ ]*[a-f0-9]+: 67 66 a7 * cmps +WORD PTR \[esi\],(WORD PTR )?\[edi\]
+[ ]*[a-f0-9]+: 67 66 a7 * cmps +WORD PTR \[esi\],(WORD PTR )?\[edi\]
+[ ]*[a-f0-9]+: 67 66 a7 * cmps +WORD PTR \[esi\],(WORD PTR )?\[edi\]
+[ ]*[a-f0-9]+: 67 66 a7 * cmps +WORD PTR \[esi\],(WORD PTR )?\[edi\]
+[ ]*[a-f0-9]+: 67 66 a7 * cmps +WORD PTR \[esi\],(WORD PTR )?\[edi\]
+[ ]*[a-f0-9]+: 67 66 a7 * cmps +WORD PTR \[esi\],(WORD PTR )?\[edi\]
+[ ]*[a-f0-9]+: 66 a7 * cmps(w *| +WORD PTR \[rsi\],(WORD PTR )?\[rdi\])
+[ ]*[a-f0-9]+: 64 66 a7 * cmps +WORD PTR fs:\[rsi\],(WORD PTR )?\[rdi\]
+[ ]*[a-f0-9]+: 66 a7 * cmps(w *| +WORD PTR \[rsi\],(WORD PTR )?\[rdi\])
+[ ]*[a-f0-9]+: 66 a7 * cmps(w *| +WORD PTR \[rsi\],(WORD PTR )?\[rdi\])
+[ ]*[a-f0-9]+: 66 a7 * cmps(w *| +WORD PTR \[rsi\],(WORD PTR )?\[rdi\])
+[ ]*[a-f0-9]+: 66 a7 * cmps(w *| +WORD PTR \[rsi\],(WORD PTR )?\[rdi\])
+[ ]*[a-f0-9]+: 66 a7 * cmps(w *| +WORD PTR \[rsi\],(WORD PTR )?\[rdi\])
+[ ]*[a-f0-9]+: 66 a7 * cmps(w *| +WORD PTR \[rsi\],(WORD PTR )?\[rdi\])
+[ ]*[a-f0-9]+: 66 a7 * cmps(w *| +WORD PTR \[rsi\],(WORD PTR )?\[rdi\])
+[ ]*[a-f0-9]+: a7 * cmps(d *| +DWORD PTR \[rsi\],(DWORD PTR )?\[rdi\])
+[ ]*[a-f0-9]+: 67 a7 * cmps +DWORD PTR \[esi\],(DWORD PTR )?\[edi\]
+[ ]*[a-f0-9]+: 64 67 a7 * cmps +DWORD PTR fs:\[esi\],(DWORD PTR )?\[edi\]
+[ ]*[a-f0-9]+: 67 a7 * cmps +DWORD PTR \[esi\],(DWORD PTR )?\[edi\]
+[ ]*[a-f0-9]+: 67 a7 * cmps +DWORD PTR \[esi\],(DWORD PTR )?\[edi\]
+[ ]*[a-f0-9]+: 67 a7 * cmps +DWORD PTR \[esi\],(DWORD PTR )?\[edi\]
+[ ]*[a-f0-9]+: 67 a7 * cmps +DWORD PTR \[esi\],(DWORD PTR )?\[edi\]
+[ ]*[a-f0-9]+: 67 a7 * cmps +DWORD PTR \[esi\],(DWORD PTR )?\[edi\]
+[ ]*[a-f0-9]+: 67 a7 * cmps +DWORD PTR \[esi\],(DWORD PTR )?\[edi\]
+[ ]*[a-f0-9]+: 67 a7 * cmps +DWORD PTR \[esi\],(DWORD PTR )?\[edi\]
+[ ]*[a-f0-9]+: a7 * cmps(d *| +DWORD PTR \[rsi\],(DWORD PTR )?\[rdi\])
+[ ]*[a-f0-9]+: 64 a7 * cmps +DWORD PTR fs:\[rsi\],(DWORD PTR )?\[rdi\]
+[ ]*[a-f0-9]+: a7 * cmps(d *| +DWORD PTR \[rsi\],(DWORD PTR )?\[rdi\])
+[ ]*[a-f0-9]+: a7 * cmps(d *| +DWORD PTR \[rsi\],(DWORD PTR )?\[rdi\])
+[ ]*[a-f0-9]+: a7 * cmps(d *| +DWORD PTR \[rsi\],(DWORD PTR )?\[rdi\])
+[ ]*[a-f0-9]+: a7 * cmps(d *| +DWORD PTR \[rsi\],(DWORD PTR )?\[rdi\])
+[ ]*[a-f0-9]+: a7 * cmps(d *| +DWORD PTR \[rsi\],(DWORD PTR )?\[rdi\])
+[ ]*[a-f0-9]+: a7 * cmps(d *| +DWORD PTR \[rsi\],(DWORD PTR )?\[rdi\])
+[ ]*[a-f0-9]+: a7 * cmps(d *| +DWORD PTR \[rsi\],(DWORD PTR )?\[rdi\])
+[ ]*[a-f0-9]+: 48 a7 * cmps(q *| +QWORD PTR \[rsi\],(QWORD PTR )?\[rdi\])
+[ ]*[a-f0-9]+: 48 a7 * cmps(q *| +QWORD PTR \[rsi\],(QWORD PTR )?\[rdi\])
+[ ]*[a-f0-9]+: 64 48 a7 * cmps +QWORD PTR fs:?\[rsi\],(QWORD PTR )?\[rdi\]
+[ ]*[a-f0-9]+: 48 a7 * cmps(q *| +QWORD PTR \[rsi\],(QWORD PTR )?\[rdi\])
+[ ]*[a-f0-9]+: 48 a7 * cmps(q *| +QWORD PTR \[rsi\],(QWORD PTR )?\[rdi\])
+[ ]*[a-f0-9]+: 48 a7 * cmps(q *| +QWORD PTR \[rsi\],(QWORD PTR )?\[rdi\])
+[ ]*[a-f0-9]+: 48 a7 * cmps(q *| +QWORD PTR \[rsi\],(QWORD PTR )?\[rdi\])
+[ ]*[a-f0-9]+: 48 a7 * cmps(q *| +QWORD PTR \[rsi\],(QWORD PTR )?\[rdi\])
+[ ]*[a-f0-9]+: 48 a7 * cmps(q *| +QWORD PTR \[rsi\],(QWORD PTR )?\[rdi\])
+[ ]*[a-f0-9]+: 48 a7 * cmps(q *| +QWORD PTR \[rsi\],(QWORD PTR )?\[rdi\])
+[ ]*[a-f0-9]+: 67 48 a7 * cmps +QWORD PTR \[esi\],(QWORD PTR )?\[edi\]
+[ ]*[a-f0-9]+: 64 67 48 a7 * cmps +QWORD PTR fs:?\[esi\],(QWORD PTR )?\[edi\]
+[ ]*[a-f0-9]+: 67 48 a7 * cmps +QWORD PTR \[esi\],(QWORD PTR )?\[edi\]
+[ ]*[a-f0-9]+: 67 48 a7 * cmps +QWORD PTR \[esi\],(QWORD PTR )?\[edi\]
+[ ]*[a-f0-9]+: 67 48 a7 * cmps +QWORD PTR \[esi\],(QWORD PTR )?\[edi\]
+[ ]*[a-f0-9]+: 67 48 a7 * cmps +QWORD PTR \[esi\],(QWORD PTR )?\[edi\]
+[ ]*[a-f0-9]+: 67 48 a7 * cmps +QWORD PTR \[esi\],(QWORD PTR )?\[edi\]
+[ ]*[a-f0-9]+: 67 48 a7 * cmps +QWORD PTR \[esi\],(QWORD PTR )?\[edi\]
+[ ]*[a-f0-9]+: 67 48 a7 * cmps +QWORD PTR \[esi\],(QWORD PTR )?\[edi\]
#pass
diff --git a/gas/testsuite/gas/i386/intel-movs64.d b/gas/testsuite/gas/i386/intel-movs64.d
index d62ae07838e..6131666f2eb 100644
--- a/gas/testsuite/gas/i386/intel-movs64.d
+++ b/gas/testsuite/gas/i386/intel-movs64.d
@@ -7,80 +7,80 @@
Disassembly of section .text:
0+ <movs>:
-[ ]*[a-f0-9]+: a4 * movs(b *| +BYTE PTR es:\[rdi\],(BYTE PTR )?(ds:)?\[rsi\])
-[ ]*[a-f0-9]+: 67 a4 * movs +BYTE PTR es:\[edi\],(BYTE PTR )?(ds:)?\[esi\]
-[ ]*[a-f0-9]+: 64 67 a4 * movs +BYTE PTR es:\[edi\],(BYTE PTR )?fs:\[esi\]
-[ ]*[a-f0-9]+: 67 a4 * movs +BYTE PTR es:\[edi\],(BYTE PTR )?(ds:)?\[esi\]
-[ ]*[a-f0-9]+: 67 a4 * movs +BYTE PTR es:\[edi\],(BYTE PTR )?(ds:)?\[esi\]
-[ ]*[a-f0-9]+: 67 a4 * movs +BYTE PTR es:\[edi\],(BYTE PTR )?(ds:)?\[esi\]
-[ ]*[a-f0-9]+: 67 a4 * movs +BYTE PTR es:\[edi\],(BYTE PTR )?(ds:)?\[esi\]
-[ ]*[a-f0-9]+: 67 a4 * movs +BYTE PTR es:\[edi\],(BYTE PTR )?(ds:)?\[esi\]
-[ ]*[a-f0-9]+: 67 a4 * movs +BYTE PTR es:\[edi\],(BYTE PTR )?(ds:)?\[esi\]
-[ ]*[a-f0-9]+: 67 a4 * movs +BYTE PTR es:\[edi\],(BYTE PTR )?(ds:)?\[esi\]
-[ ]*[a-f0-9]+: a4 * movs(b *| +BYTE PTR es:\[rdi\],(BYTE PTR )?(ds:)?\[rsi\])
-[ ]*[a-f0-9]+: 64 a4 * movs +BYTE PTR es:\[rdi\],(BYTE PTR )?fs:\[rsi\]
-[ ]*[a-f0-9]+: a4 * movs(b *| +BYTE PTR es:\[rdi\],(BYTE PTR )?(ds:)?\[rsi\])
-[ ]*[a-f0-9]+: a4 * movs(b *| +BYTE PTR es:\[rdi\],(BYTE PTR )?(ds:)?\[rsi\])
-[ ]*[a-f0-9]+: a4 * movs(b *| +BYTE PTR es:\[rdi\],(BYTE PTR )?(ds:)?\[rsi\])
-[ ]*[a-f0-9]+: a4 * movs(b *| +BYTE PTR es:\[rdi\],(BYTE PTR )?(ds:)?\[rsi\])
-[ ]*[a-f0-9]+: a4 * movs(b *| +BYTE PTR es:\[rdi\],(BYTE PTR )?(ds:)?\[rsi\])
-[ ]*[a-f0-9]+: a4 * movs(b *| +BYTE PTR es:\[rdi\],(BYTE PTR )?(ds:)?\[rsi\])
-[ ]*[a-f0-9]+: a4 * movs(b *| +BYTE PTR es:\[rdi\],(BYTE PTR )?(ds:)?\[rsi\])
-[ ]*[a-f0-9]+: 66 a5 * movs(w *| +WORD PTR es:\[rdi\],(WORD PTR )?(ds:)?\[rsi\])
-[ ]*[a-f0-9]+: 67 66 a5 * movs +WORD PTR es:\[edi\],(WORD PTR )?(ds:)?\[esi\]
-[ ]*[a-f0-9]+: 64 67 66 a5 * movs +WORD PTR es:\[edi\],(WORD PTR )?fs:\[esi\]
-[ ]*[a-f0-9]+: 67 66 a5 * movs +WORD PTR es:\[edi\],(WORD PTR )?(ds:)?\[esi\]
-[ ]*[a-f0-9]+: 67 66 a5 * movs +WORD PTR es:\[edi\],(WORD PTR )?(ds:)?\[esi\]
-[ ]*[a-f0-9]+: 67 66 a5 * movs +WORD PTR es:\[edi\],(WORD PTR )?(ds:)?\[esi\]
-[ ]*[a-f0-9]+: 67 66 a5 * movs +WORD PTR es:\[edi\],(WORD PTR )?(ds:)?\[esi\]
-[ ]*[a-f0-9]+: 67 66 a5 * movs +WORD PTR es:\[edi\],(WORD PTR )?(ds:)?\[esi\]
-[ ]*[a-f0-9]+: 67 66 a5 * movs +WORD PTR es:\[edi\],(WORD PTR )?(ds:)?\[esi\]
-[ ]*[a-f0-9]+: 67 66 a5 * movs +WORD PTR es:\[edi\],(WORD PTR )?(ds:)?\[esi\]
-[ ]*[a-f0-9]+: 66 a5 * movs(w *| +WORD PTR es:\[rdi\],(WORD PTR )?(ds:)?\[rsi\])
-[ ]*[a-f0-9]+: 64 66 a5 * movs +WORD PTR es:\[rdi\],(WORD PTR )?fs:\[rsi\]
-[ ]*[a-f0-9]+: 66 a5 * movs(w *| +WORD PTR es:\[rdi\],(WORD PTR )?(ds:)?\[rsi\])
-[ ]*[a-f0-9]+: 66 a5 * movs(w *| +WORD PTR es:\[rdi\],(WORD PTR )?(ds:)?\[rsi\])
-[ ]*[a-f0-9]+: 66 a5 * movs(w *| +WORD PTR es:\[rdi\],(WORD PTR )?(ds:)?\[rsi\])
-[ ]*[a-f0-9]+: 66 a5 * movs(w *| +WORD PTR es:\[rdi\],(WORD PTR )?(ds:)?\[rsi\])
-[ ]*[a-f0-9]+: 66 a5 * movs(w *| +WORD PTR es:\[rdi\],(WORD PTR )?(ds:)?\[rsi\])
-[ ]*[a-f0-9]+: 66 a5 * movs(w *| +WORD PTR es:\[rdi\],(WORD PTR )?(ds:)?\[rsi\])
-[ ]*[a-f0-9]+: 66 a5 * movs(w *| +WORD PTR es:\[rdi\],(WORD PTR )?(ds:)?\[rsi\])
-[ ]*[a-f0-9]+: a5 * movs(d *| +DWORD PTR es:\[rdi\],(DWORD PTR )?(ds:)?\[rsi\])
-[ ]*[a-f0-9]+: 67 a5 * movs +DWORD PTR es:\[edi\],(DWORD PTR )?(ds:)?\[esi\]
-[ ]*[a-f0-9]+: 64 67 a5 * movs +DWORD PTR es:\[edi\],(DWORD PTR )?fs:\[esi\]
-[ ]*[a-f0-9]+: 67 a5 * movs +DWORD PTR es:\[edi\],(DWORD PTR )?(ds:)?\[esi\]
-[ ]*[a-f0-9]+: 67 a5 * movs +DWORD PTR es:\[edi\],(DWORD PTR )?(ds:)?\[esi\]
-[ ]*[a-f0-9]+: 67 a5 * movs +DWORD PTR es:\[edi\],(DWORD PTR )?(ds:)?\[esi\]
-[ ]*[a-f0-9]+: 67 a5 * movs +DWORD PTR es:\[edi\],(DWORD PTR )?(ds:)?\[esi\]
-[ ]*[a-f0-9]+: 67 a5 * movs +DWORD PTR es:\[edi\],(DWORD PTR )?(ds:)?\[esi\]
-[ ]*[a-f0-9]+: 67 a5 * movs +DWORD PTR es:\[edi\],(DWORD PTR )?(ds:)?\[esi\]
-[ ]*[a-f0-9]+: 67 a5 * movs +DWORD PTR es:\[edi\],(DWORD PTR )?(ds:)?\[esi\]
-[ ]*[a-f0-9]+: a5 * movs(d *| +DWORD PTR es:\[rdi\],(DWORD PTR )?(ds:)?\[rsi\])
-[ ]*[a-f0-9]+: 64 a5 * movs +DWORD PTR es:\[rdi\],(DWORD PTR )?fs:\[rsi\]
-[ ]*[a-f0-9]+: a5 * movs(d *| +DWORD PTR es:\[rdi\],(DWORD PTR )?(ds:)?\[rsi\])
-[ ]*[a-f0-9]+: a5 * movs(d *| +DWORD PTR es:\[rdi\],(DWORD PTR )?(ds:)?\[rsi\])
-[ ]*[a-f0-9]+: a5 * movs(d *| +DWORD PTR es:\[rdi\],(DWORD PTR )?(ds:)?\[rsi\])
-[ ]*[a-f0-9]+: a5 * movs(d *| +DWORD PTR es:\[rdi\],(DWORD PTR )?(ds:)?\[rsi\])
-[ ]*[a-f0-9]+: a5 * movs(d *| +DWORD PTR es:\[rdi\],(DWORD PTR )?(ds:)?\[rsi\])
-[ ]*[a-f0-9]+: a5 * movs(d *| +DWORD PTR es:\[rdi\],(DWORD PTR )?(ds:)?\[rsi\])
-[ ]*[a-f0-9]+: a5 * movs(d *| +DWORD PTR es:\[rdi\],(DWORD PTR )?(ds:)?\[rsi\])
-[ ]*[a-f0-9]+: 48 a5 * movs(q *| +QWORD PTR es:\[rdi\],(QWORD PTR )?(ds:)?\[rsi\])
-[ ]*[a-f0-9]+: 48 a5 * movs(q *| +QWORD PTR es:\[rdi\],(QWORD PTR )?(ds:)?\[rsi\])
-[ ]*[a-f0-9]+: 64 48 a5 * movs +QWORD PTR es:\[rdi\],(QWORD PTR )?fs:?\[rsi\]
-[ ]*[a-f0-9]+: 48 a5 * movs(q *| +QWORD PTR es:\[rdi\],(QWORD PTR )?(ds:)?\[rsi\])
-[ ]*[a-f0-9]+: 48 a5 * movs(q *| +QWORD PTR es:\[rdi\],(QWORD PTR )?(ds:)?\[rsi\])
-[ ]*[a-f0-9]+: 48 a5 * movs(q *| +QWORD PTR es:\[rdi\],(QWORD PTR )?(ds:)?\[rsi\])
-[ ]*[a-f0-9]+: 48 a5 * movs(q *| +QWORD PTR es:\[rdi\],(QWORD PTR )?(ds:)?\[rsi\])
-[ ]*[a-f0-9]+: 48 a5 * movs(q *| +QWORD PTR es:\[rdi\],(QWORD PTR )?(ds:)?\[rsi\])
-[ ]*[a-f0-9]+: 48 a5 * movs(q *| +QWORD PTR es:\[rdi\],(QWORD PTR )?(ds:)?\[rsi\])
-[ ]*[a-f0-9]+: 48 a5 * movs(q *| +QWORD PTR es:\[rdi\],(QWORD PTR )?(ds:)?\[rsi\])
-[ ]*[a-f0-9]+: 67 48 a5 * movs +QWORD PTR es:\[edi\],(QWORD PTR )?(ds:)?\[esi\]
-[ ]*[a-f0-9]+: 64 67 48 a5 * movs +QWORD PTR es:\[edi\],(QWORD PTR )?fs:?\[esi\]
-[ ]*[a-f0-9]+: 67 48 a5 * movs +QWORD PTR es:\[edi\],(QWORD PTR )?(ds:)?\[esi\]
-[ ]*[a-f0-9]+: 67 48 a5 * movs +QWORD PTR es:\[edi\],(QWORD PTR )?(ds:)?\[esi\]
-[ ]*[a-f0-9]+: 67 48 a5 * movs +QWORD PTR es:\[edi\],(QWORD PTR )?(ds:)?\[esi\]
-[ ]*[a-f0-9]+: 67 48 a5 * movs +QWORD PTR es:\[edi\],(QWORD PTR )?(ds:)?\[esi\]
-[ ]*[a-f0-9]+: 67 48 a5 * movs +QWORD PTR es:\[edi\],(QWORD PTR )?(ds:)?\[esi\]
-[ ]*[a-f0-9]+: 67 48 a5 * movs +QWORD PTR es:\[edi\],(QWORD PTR )?(ds:)?\[esi\]
-[ ]*[a-f0-9]+: 67 48 a5 * movs +QWORD PTR es:\[edi\],(QWORD PTR )?(ds:)?\[esi\]
+[ ]*[a-f0-9]+: a4 * movs(b *| +BYTE PTR \[rdi\],(BYTE PTR )?\[rsi\])
+[ ]*[a-f0-9]+: 67 a4 * movs +BYTE PTR \[edi\],(BYTE PTR )?\[esi\]
+[ ]*[a-f0-9]+: 64 67 a4 * movs +BYTE PTR \[edi\],(BYTE PTR )?fs:\[esi\]
+[ ]*[a-f0-9]+: 67 a4 * movs +BYTE PTR \[edi\],(BYTE PTR )?\[esi\]
+[ ]*[a-f0-9]+: 67 a4 * movs +BYTE PTR \[edi\],(BYTE PTR )?\[esi\]
+[ ]*[a-f0-9]+: 67 a4 * movs +BYTE PTR \[edi\],(BYTE PTR )?\[esi\]
+[ ]*[a-f0-9]+: 67 a4 * movs +BYTE PTR \[edi\],(BYTE PTR )?\[esi\]
+[ ]*[a-f0-9]+: 67 a4 * movs +BYTE PTR \[edi\],(BYTE PTR )?\[esi\]
+[ ]*[a-f0-9]+: 67 a4 * movs +BYTE PTR \[edi\],(BYTE PTR )?\[esi\]
+[ ]*[a-f0-9]+: 67 a4 * movs +BYTE PTR \[edi\],(BYTE PTR )?\[esi\]
+[ ]*[a-f0-9]+: a4 * movs(b *| +BYTE PTR \[rdi\],(BYTE PTR )?\[rsi\])
+[ ]*[a-f0-9]+: 64 a4 * movs +BYTE PTR \[rdi\],(BYTE PTR )?fs:\[rsi\]
+[ ]*[a-f0-9]+: a4 * movs(b *| +BYTE PTR \[rdi\],(BYTE PTR )?\[rsi\])
+[ ]*[a-f0-9]+: a4 * movs(b *| +BYTE PTR \[rdi\],(BYTE PTR )?\[rsi\])
+[ ]*[a-f0-9]+: a4 * movs(b *| +BYTE PTR \[rdi\],(BYTE PTR )?\[rsi\])
+[ ]*[a-f0-9]+: a4 * movs(b *| +BYTE PTR \[rdi\],(BYTE PTR )?\[rsi\])
+[ ]*[a-f0-9]+: a4 * movs(b *| +BYTE PTR \[rdi\],(BYTE PTR )?\[rsi\])
+[ ]*[a-f0-9]+: a4 * movs(b *| +BYTE PTR \[rdi\],(BYTE PTR )?\[rsi\])
+[ ]*[a-f0-9]+: a4 * movs(b *| +BYTE PTR \[rdi\],(BYTE PTR )?\[rsi\])
+[ ]*[a-f0-9]+: 66 a5 * movs(w *| +WORD PTR \[rdi\],(WORD PTR )?\[rsi\])
+[ ]*[a-f0-9]+: 67 66 a5 * movs +WORD PTR \[edi\],(WORD PTR )?\[esi\]
+[ ]*[a-f0-9]+: 64 67 66 a5 * movs +WORD PTR \[edi\],(WORD PTR )?fs:\[esi\]
+[ ]*[a-f0-9]+: 67 66 a5 * movs +WORD PTR \[edi\],(WORD PTR )?\[esi\]
+[ ]*[a-f0-9]+: 67 66 a5 * movs +WORD PTR \[edi\],(WORD PTR )?\[esi\]
+[ ]*[a-f0-9]+: 67 66 a5 * movs +WORD PTR \[edi\],(WORD PTR )?\[esi\]
+[ ]*[a-f0-9]+: 67 66 a5 * movs +WORD PTR \[edi\],(WORD PTR )?\[esi\]
+[ ]*[a-f0-9]+: 67 66 a5 * movs +WORD PTR \[edi\],(WORD PTR )?\[esi\]
+[ ]*[a-f0-9]+: 67 66 a5 * movs +WORD PTR \[edi\],(WORD PTR )?\[esi\]
+[ ]*[a-f0-9]+: 67 66 a5 * movs +WORD PTR \[edi\],(WORD PTR )?\[esi\]
+[ ]*[a-f0-9]+: 66 a5 * movs(w *| +WORD PTR \[rdi\],(WORD PTR )?\[rsi\])
+[ ]*[a-f0-9]+: 64 66 a5 * movs +WORD PTR \[rdi\],(WORD PTR )?fs:\[rsi\]
+[ ]*[a-f0-9]+: 66 a5 * movs(w *| +WORD PTR \[rdi\],(WORD PTR )?\[rsi\])
+[ ]*[a-f0-9]+: 66 a5 * movs(w *| +WORD PTR \[rdi\],(WORD PTR )?\[rsi\])
+[ ]*[a-f0-9]+: 66 a5 * movs(w *| +WORD PTR \[rdi\],(WORD PTR )?\[rsi\])
+[ ]*[a-f0-9]+: 66 a5 * movs(w *| +WORD PTR \[rdi\],(WORD PTR )?\[rsi\])
+[ ]*[a-f0-9]+: 66 a5 * movs(w *| +WORD PTR \[rdi\],(WORD PTR )?\[rsi\])
+[ ]*[a-f0-9]+: 66 a5 * movs(w *| +WORD PTR \[rdi\],(WORD PTR )?\[rsi\])
+[ ]*[a-f0-9]+: 66 a5 * movs(w *| +WORD PTR \[rdi\],(WORD PTR )?\[rsi\])
+[ ]*[a-f0-9]+: a5 * movs(d *| +DWORD PTR \[rdi\],(DWORD PTR )?\[rsi\])
+[ ]*[a-f0-9]+: 67 a5 * movs +DWORD PTR \[edi\],(DWORD PTR )?\[esi\]
+[ ]*[a-f0-9]+: 64 67 a5 * movs +DWORD PTR \[edi\],(DWORD PTR )?fs:\[esi\]
+[ ]*[a-f0-9]+: 67 a5 * movs +DWORD PTR \[edi\],(DWORD PTR )?\[esi\]
+[ ]*[a-f0-9]+: 67 a5 * movs +DWORD PTR \[edi\],(DWORD PTR )?\[esi\]
+[ ]*[a-f0-9]+: 67 a5 * movs +DWORD PTR \[edi\],(DWORD PTR )?\[esi\]
+[ ]*[a-f0-9]+: 67 a5 * movs +DWORD PTR \[edi\],(DWORD PTR )?\[esi\]
+[ ]*[a-f0-9]+: 67 a5 * movs +DWORD PTR \[edi\],(DWORD PTR )?\[esi\]
+[ ]*[a-f0-9]+: 67 a5 * movs +DWORD PTR \[edi\],(DWORD PTR )?\[esi\]
+[ ]*[a-f0-9]+: 67 a5 * movs +DWORD PTR \[edi\],(DWORD PTR )?\[esi\]
+[ ]*[a-f0-9]+: a5 * movs(d *| +DWORD PTR \[rdi\],(DWORD PTR )?\[rsi\])
+[ ]*[a-f0-9]+: 64 a5 * movs +DWORD PTR \[rdi\],(DWORD PTR )?fs:\[rsi\]
+[ ]*[a-f0-9]+: a5 * movs(d *| +DWORD PTR \[rdi\],(DWORD PTR )?\[rsi\])
+[ ]*[a-f0-9]+: a5 * movs(d *| +DWORD PTR \[rdi\],(DWORD PTR )?\[rsi\])
+[ ]*[a-f0-9]+: a5 * movs(d *| +DWORD PTR \[rdi\],(DWORD PTR )?\[rsi\])
+[ ]*[a-f0-9]+: a5 * movs(d *| +DWORD PTR \[rdi\],(DWORD PTR )?\[rsi\])
+[ ]*[a-f0-9]+: a5 * movs(d *| +DWORD PTR \[rdi\],(DWORD PTR )?\[rsi\])
+[ ]*[a-f0-9]+: a5 * movs(d *| +DWORD PTR \[rdi\],(DWORD PTR )?\[rsi\])
+[ ]*[a-f0-9]+: a5 * movs(d *| +DWORD PTR \[rdi\],(DWORD PTR )?\[rsi\])
+[ ]*[a-f0-9]+: 48 a5 * movs(q *| +QWORD PTR \[rdi\],(QWORD PTR )?\[rsi\])
+[ ]*[a-f0-9]+: 48 a5 * movs(q *| +QWORD PTR \[rdi\],(QWORD PTR )?\[rsi\])
+[ ]*[a-f0-9]+: 64 48 a5 * movs +QWORD PTR \[rdi\],(QWORD PTR )?fs:?\[rsi\]
+[ ]*[a-f0-9]+: 48 a5 * movs(q *| +QWORD PTR \[rdi\],(QWORD PTR )?\[rsi\])
+[ ]*[a-f0-9]+: 48 a5 * movs(q *| +QWORD PTR \[rdi\],(QWORD PTR )?\[rsi\])
+[ ]*[a-f0-9]+: 48 a5 * movs(q *| +QWORD PTR \[rdi\],(QWORD PTR )?\[rsi\])
+[ ]*[a-f0-9]+: 48 a5 * movs(q *| +QWORD PTR \[rdi\],(QWORD PTR )?\[rsi\])
+[ ]*[a-f0-9]+: 48 a5 * movs(q *| +QWORD PTR \[rdi\],(QWORD PTR )?\[rsi\])
+[ ]*[a-f0-9]+: 48 a5 * movs(q *| +QWORD PTR \[rdi\],(QWORD PTR )?\[rsi\])
+[ ]*[a-f0-9]+: 48 a5 * movs(q *| +QWORD PTR \[rdi\],(QWORD PTR )?\[rsi\])
+[ ]*[a-f0-9]+: 67 48 a5 * movs +QWORD PTR \[edi\],(QWORD PTR )?\[esi\]
+[ ]*[a-f0-9]+: 64 67 48 a5 * movs +QWORD PTR \[edi\],(QWORD PTR )?fs:?\[esi\]
+[ ]*[a-f0-9]+: 67 48 a5 * movs +QWORD PTR \[edi\],(QWORD PTR )?\[esi\]
+[ ]*[a-f0-9]+: 67 48 a5 * movs +QWORD PTR \[edi\],(QWORD PTR )?\[esi\]
+[ ]*[a-f0-9]+: 67 48 a5 * movs +QWORD PTR \[edi\],(QWORD PTR )?\[esi\]
+[ ]*[a-f0-9]+: 67 48 a5 * movs +QWORD PTR \[edi\],(QWORD PTR )?\[esi\]
+[ ]*[a-f0-9]+: 67 48 a5 * movs +QWORD PTR \[edi\],(QWORD PTR )?\[esi\]
+[ ]*[a-f0-9]+: 67 48 a5 * movs +QWORD PTR \[edi\],(QWORD PTR )?\[esi\]
+[ ]*[a-f0-9]+: 67 48 a5 * movs +QWORD PTR \[edi\],(QWORD PTR )?\[esi\]
#pass
diff --git a/gas/testsuite/gas/i386/noreg64-data16.d b/gas/testsuite/gas/i386/noreg64-data16.d
index 358271b77e0..76c16a119d7 100644
--- a/gas/testsuite/gas/i386/noreg64-data16.d
+++ b/gas/testsuite/gas/i386/noreg64-data16.d
@@ -34,8 +34,8 @@ Disassembly of section .text:
*[a-f0-9]+: 66 81 38 89 00 cmpw \$0x89,\(%rax\)
*[a-f0-9]+: 66 81 38 34 12 cmpw \$0x1234,\(%rax\)
*[a-f0-9]+: 66 81 38 78 56 cmpw \$0x5678,\(%rax\)
- *[a-f0-9]+: 66 a7 cmpsw %es:\(%rdi\),%ds:\(%rsi\)
- *[a-f0-9]+: 66 a7 cmpsw %es:\(%rdi\),%ds:\(%rsi\)
+ *[a-f0-9]+: 66 a7 cmpsw \(%rdi\),\(%rsi\)
+ *[a-f0-9]+: 66 a7 cmpsw \(%rdi\),\(%rsi\)
*[a-f0-9]+: 66 f2 0f 38 f1 00 crc32w \(%rax\),%eax
*[a-f0-9]+: 66 f2 48 0f 38 f1 00 data16 crc32q \(%rax\),%rax
*[a-f0-9]+: 62 f4 05 07 f7 00 89 00[ ]+ctestaw \{dfv=\} \$0x89,\(%rax\)
@@ -71,8 +71,8 @@ Disassembly of section .text:
*[a-f0-9]+: 66 e5 00 in \$0x0,%ax
*[a-f0-9]+: 66 ed in \(%dx\),%ax
*[a-f0-9]+: 66 ff 00 incw \(%rax\)
- *[a-f0-9]+: 66 6d insw \(%dx\),%es:\(%rdi\)
- *[a-f0-9]+: 66 6d insw \(%dx\),%es:\(%rdi\)
+ *[a-f0-9]+: 66 6d insw \(%dx\),\(%rdi\)
+ *[a-f0-9]+: 66 6d insw \(%dx\),\(%rdi\)
*[a-f0-9]+: 66 cf iretw
*[a-f0-9]+: 66 ff 20 jmpw \*\(%rax\)
*[a-f0-9]+: 66 ff 18 lcallw \*\(%rax\)
@@ -81,8 +81,8 @@ Disassembly of section .text:
*[a-f0-9]+: 66 ff 28 ljmpw \*\(%rax\)
*[a-f0-9]+: 66 0f 00 10 data16 lldt \(%rax\)
*[a-f0-9]+: 66 0f 01 30 data16 lmsw \(%rax\)
- *[a-f0-9]+: 66 ad lods %ds:\(%rsi\),%ax
- *[a-f0-9]+: 66 ad lods %ds:\(%rsi\),%ax
+ *[a-f0-9]+: 66 ad lods \(%rsi\),%ax
+ *[a-f0-9]+: 66 ad lods \(%rsi\),%ax
*[a-f0-9]+: 66 cb lretw
*[a-f0-9]+: 66 ca 04 00 lretw \$0x4
*[a-f0-9]+: 66 0f 00 18 data16 ltr \(%rax\)
@@ -91,8 +91,8 @@ Disassembly of section .text:
*[a-f0-9]+: 66 c7 00 78 56 movw \$0x5678,\(%rax\)
*[a-f0-9]+: 66 8c 00 data16 mov %es,\(%rax\)
*[a-f0-9]+: 66 8e 00 data16 mov \(%rax\),%es
- *[a-f0-9]+: 66 a5 movsw %ds:\(%rsi\),%es:\(%rdi\)
- *[a-f0-9]+: 66 a5 movsw %ds:\(%rsi\),%es:\(%rdi\)
+ *[a-f0-9]+: 66 a5 movsw \(%rsi\),\(%rdi\)
+ *[a-f0-9]+: 66 a5 movsw \(%rsi\),\(%rdi\)
*[a-f0-9]+: 66 0f be 00 movsbw \(%rax\),%ax
*[a-f0-9]+: 66 48 0f be 00 data16 movsbq \(%rax\),%rax
*[a-f0-9]+: 66 0f b6 00 movzbw \(%rax\),%ax
@@ -107,8 +107,8 @@ Disassembly of section .text:
*[a-f0-9]+: 66 81 08 78 56 orw \$0x5678,\(%rax\)
*[a-f0-9]+: 66 e7 00 out %ax,\$0x0
*[a-f0-9]+: 66 ef out %ax,\(%dx\)
- *[a-f0-9]+: 66 6f outsw %ds:\(%rsi\),\(%dx\)
- *[a-f0-9]+: 66 6f outsw %ds:\(%rsi\),\(%dx\)
+ *[a-f0-9]+: 66 6f outsw \(%rsi\),\(%dx\)
+ *[a-f0-9]+: 66 6f outsw \(%rsi\),\(%dx\)
*[a-f0-9]+: 66 8f 00 popw \(%rax\)
*[a-f0-9]+: 66 0f a1 popw %fs
*[a-f0-9]+: 66 ff 30 pushw \(%rax\)
@@ -133,8 +133,8 @@ Disassembly of section .text:
*[a-f0-9]+: 66 81 18 89 00 sbbw \$0x89,\(%rax\)
*[a-f0-9]+: 66 81 18 34 12 sbbw \$0x1234,\(%rax\)
*[a-f0-9]+: 66 81 18 78 56 sbbw \$0x5678,\(%rax\)
- *[a-f0-9]+: 66 af scas %es:\(%rdi\),%ax
- *[a-f0-9]+: 66 af scas %es:\(%rdi\),%ax
+ *[a-f0-9]+: 66 af scas \(%rdi\),%ax
+ *[a-f0-9]+: 66 af scas \(%rdi\),%ax
*[a-f0-9]+: 66 d1 20 shlw \$1,\(%rax\)
*[a-f0-9]+: 66 c1 20 02 shlw \$0x2,\(%rax\)
*[a-f0-9]+: 66 d3 20 shlw %cl,\(%rax\)
@@ -151,8 +151,8 @@ Disassembly of section .text:
*[a-f0-9]+: 66 c1 28 02 shrw \$0x2,\(%rax\)
*[a-f0-9]+: 66 d3 28 shrw %cl,\(%rax\)
*[a-f0-9]+: 66 d1 28 shrw \$1,\(%rax\)
- *[a-f0-9]+: 66 ab stos %ax,%es:\(%rdi\)
- *[a-f0-9]+: 66 ab stos %ax,%es:\(%rdi\)
+ *[a-f0-9]+: 66 ab stos %ax,\(%rdi\)
+ *[a-f0-9]+: 66 ab stos %ax,\(%rdi\)
*[a-f0-9]+: 66 83 28 01 subw \$0x1,\(%rax\)
*[a-f0-9]+: 66 81 28 89 00 subw \$0x89,\(%rax\)
*[a-f0-9]+: 66 81 28 34 12 subw \$0x1234,\(%rax\)
diff --git a/gas/testsuite/gas/i386/noreg64-rex64.d b/gas/testsuite/gas/i386/noreg64-rex64.d
index 1f6757b16f0..b910ef19aa9 100644
--- a/gas/testsuite/gas/i386/noreg64-rex64.d
+++ b/gas/testsuite/gas/i386/noreg64-rex64.d
@@ -33,8 +33,8 @@ Disassembly of section .text:
*[a-f0-9]+: 48 81 38 89 00 00 00 cmpq \$0x89,\(%rax\)
*[a-f0-9]+: 48 81 38 34 12 00 00 cmpq \$0x1234,\(%rax\)
*[a-f0-9]+: 48 81 38 78 56 34 12 cmpq \$0x12345678,\(%rax\)
- *[a-f0-9]+: 48 a7 cmpsq %es:\(%rdi\),%ds:\(%rsi\)
- *[a-f0-9]+: 48 a7 cmpsq %es:\(%rdi\),%ds:\(%rsi\)
+ *[a-f0-9]+: 48 a7 cmpsq \(%rdi\),\(%rsi\)
+ *[a-f0-9]+: 48 a7 cmpsq \(%rdi\),\(%rsi\)
*[a-f0-9]+: f2 48 0f 38 f1 00 crc32q \(%rax\),%rax
*[a-f0-9]+: 62 f4 84 07 f7 00 89 00 00 00[ ]+ctestaq \{dfv=\} \$0x89,\(%rax\)
*[a-f0-9]+: 62 f4 84 07 f7 00 34 12 00 00[ ]+ctestaq \{dfv=\} \$0x1234,\(%rax\)
@@ -69,8 +69,8 @@ Disassembly of section .text:
*[a-f0-9]+: 48 e5 00 rex\.W in \$0x0,%eax
*[a-f0-9]+: 48 ed rex\.W in \(%dx\),%eax
*[a-f0-9]+: 48 ff 00 incq \(%rax\)
- *[a-f0-9]+: 48 6d rex\.W insl \(%dx\),%es:\(%rdi\)
- *[a-f0-9]+: 48 6d rex\.W insl \(%dx\),%es:\(%rdi\)
+ *[a-f0-9]+: 48 6d rex\.W insl \(%dx\),\(%rdi\)
+ *[a-f0-9]+: 48 6d rex\.W insl \(%dx\),\(%rdi\)
*[a-f0-9]+: 48 cf iretq
*[a-f0-9]+: 48 ff 20 rex\.W jmp \*\(%rax\)
*[a-f0-9]+: 48 ff 18 rex\.W lcall \*\(%rax\)
@@ -79,8 +79,8 @@ Disassembly of section .text:
*[a-f0-9]+: 48 ff 28 rex\.W ljmp \*\(%rax\)
*[a-f0-9]+: 48 0f 00 10 rex\.W lldt \(%rax\)
*[a-f0-9]+: 48 0f 01 30 rex\.W lmsw \(%rax\)
- *[a-f0-9]+: 48 ad lods %ds:\(%rsi\),%rax
- *[a-f0-9]+: 48 ad lods %ds:\(%rsi\),%rax
+ *[a-f0-9]+: 48 ad lods \(%rsi\),%rax
+ *[a-f0-9]+: 48 ad lods \(%rsi\),%rax
*[a-f0-9]+: 48 cb lretq
*[a-f0-9]+: 48 ca 04 00 lretq \$0x4
*[a-f0-9]+: 48 0f 00 18 rex\.W ltr \(%rax\)
@@ -89,8 +89,8 @@ Disassembly of section .text:
*[a-f0-9]+: 48 c7 00 78 56 34 12 movq \$0x12345678,\(%rax\)
*[a-f0-9]+: 48 8c 00 rex\.W mov %es,\(%rax\)
*[a-f0-9]+: 48 8e 00 rex\.W mov \(%rax\),%es
- *[a-f0-9]+: 48 a5 movsq %ds:\(%rsi\),%es:\(%rdi\)
- *[a-f0-9]+: 48 a5 movsq %ds:\(%rsi\),%es:\(%rdi\)
+ *[a-f0-9]+: 48 a5 movsq \(%rsi\),\(%rdi\)
+ *[a-f0-9]+: 48 a5 movsq \(%rsi\),\(%rdi\)
*[a-f0-9]+: 66 48 0f be 00 data16 movsbq \(%rax\),%rax
*[a-f0-9]+: 48 0f be 00 movsbq \(%rax\),%rax
*[a-f0-9]+: 66 48 0f b6 00 data16 movzbq \(%rax\),%rax
@@ -105,8 +105,8 @@ Disassembly of section .text:
*[a-f0-9]+: 48 81 08 78 56 34 12 orq \$0x12345678,\(%rax\)
*[a-f0-9]+: 48 e7 00 rex\.W out %eax,\$0x0
*[a-f0-9]+: 48 ef rex\.W out %eax,\(%dx\)
- *[a-f0-9]+: 48 6f rex\.W outsl %ds:\(%rsi\),\(%dx\)
- *[a-f0-9]+: 48 6f rex\.W outsl %ds:\(%rsi\),\(%dx\)
+ *[a-f0-9]+: 48 6f rex\.W outsl \(%rsi\),\(%dx\)
+ *[a-f0-9]+: 48 6f rex\.W outsl \(%rsi\),\(%dx\)
*[a-f0-9]+: 48 8f 00 rex\.W pop \(%rax\)
*[a-f0-9]+: 48 0f a1 rex\.W pop %fs
*[a-f0-9]+: f3 48 0f ae 20 ptwriteq \(%rax\)
@@ -132,8 +132,8 @@ Disassembly of section .text:
*[a-f0-9]+: 48 81 18 89 00 00 00 sbbq \$0x89,\(%rax\)
*[a-f0-9]+: 48 81 18 34 12 00 00 sbbq \$0x1234,\(%rax\)
*[a-f0-9]+: 48 81 18 78 56 34 12 sbbq \$0x12345678,\(%rax\)
- *[a-f0-9]+: 48 af scas %es:\(%rdi\),%rax
- *[a-f0-9]+: 48 af scas %es:\(%rdi\),%rax
+ *[a-f0-9]+: 48 af scas \(%rdi\),%rax
+ *[a-f0-9]+: 48 af scas \(%rdi\),%rax
*[a-f0-9]+: 48 d1 20 shlq \$1,\(%rax\)
*[a-f0-9]+: 48 c1 20 02 shlq \$0x2,\(%rax\)
*[a-f0-9]+: 48 d3 20 shlq %cl,\(%rax\)
@@ -150,8 +150,8 @@ Disassembly of section .text:
*[a-f0-9]+: 48 c1 28 02 shrq \$0x2,\(%rax\)
*[a-f0-9]+: 48 d3 28 shrq %cl,\(%rax\)
*[a-f0-9]+: 48 d1 28 shrq \$1,\(%rax\)
- *[a-f0-9]+: 48 ab stos %rax,%es:\(%rdi\)
- *[a-f0-9]+: 48 ab stos %rax,%es:\(%rdi\)
+ *[a-f0-9]+: 48 ab stos %rax,\(%rdi\)
+ *[a-f0-9]+: 48 ab stos %rax,\(%rdi\)
*[a-f0-9]+: 48 83 28 01 subq \$0x1,\(%rax\)
*[a-f0-9]+: 48 81 28 89 00 00 00 subq \$0x89,\(%rax\)
*[a-f0-9]+: 48 81 28 34 12 00 00 subq \$0x1234,\(%rax\)
diff --git a/gas/testsuite/gas/i386/noreg64.d b/gas/testsuite/gas/i386/noreg64.d
index 3cf3baf4fcd..1ef4e94b791 100644
--- a/gas/testsuite/gas/i386/noreg64.d
+++ b/gas/testsuite/gas/i386/noreg64.d
@@ -32,8 +32,8 @@ Disassembly of section .text:
*[a-f0-9]+: 81 38 89 00 00 00 cmpl \$0x89,\(%rax\)
*[a-f0-9]+: 81 38 34 12 00 00 cmpl \$0x1234,\(%rax\)
*[a-f0-9]+: 81 38 78 56 34 12 cmpl \$0x12345678,\(%rax\)
- *[a-f0-9]+: a7 cmpsl %es:\(%rdi\),%ds:\(%rsi\)
- *[a-f0-9]+: a7 cmpsl %es:\(%rdi\),%ds:\(%rsi\)
+ *[a-f0-9]+: a7 cmpsl \(%rdi\),\(%rsi\)
+ *[a-f0-9]+: a7 cmpsl \(%rdi\),\(%rsi\)
*[a-f0-9]+: f2 0f 38 f1 00 crc32l \(%rax\),%eax
*[a-f0-9]+: f2 48 0f 38 f1 00 crc32q \(%rax\),%rax
*[a-f0-9]+: 62 f4 04 07 f7 00 89 00 00 00 ctestal \{dfv=\} \$0x89,\(%rax\)
@@ -69,8 +69,8 @@ Disassembly of section .text:
*[a-f0-9]+: e5 00 in \$0x0,%eax
*[a-f0-9]+: ed in \(%dx\),%eax
*[a-f0-9]+: ff 00 incl \(%rax\)
- *[a-f0-9]+: 6d insl \(%dx\),%es:\(%rdi\)
- *[a-f0-9]+: 6d insl \(%dx\),%es:\(%rdi\)
+ *[a-f0-9]+: 6d insl \(%dx\),\(%rdi\)
+ *[a-f0-9]+: 6d insl \(%dx\),\(%rdi\)
*[a-f0-9]+: cf iret
*[a-f0-9]+: ff 20 jmp \*\(%rax\)
*[a-f0-9]+: ff 18 lcall \*\(%rax\)
@@ -79,8 +79,8 @@ Disassembly of section .text:
*[a-f0-9]+: ff 28 ljmp \*\(%rax\)
*[a-f0-9]+: 0f 00 10 lldt \(%rax\)
*[a-f0-9]+: 0f 01 30 lmsw \(%rax\)
- *[a-f0-9]+: ad lods %ds:\(%rsi\),%eax
- *[a-f0-9]+: ad lods %ds:\(%rsi\),%eax
+ *[a-f0-9]+: ad lods \(%rsi\),%eax
+ *[a-f0-9]+: ad lods \(%rsi\),%eax
*[a-f0-9]+: cb lret
*[a-f0-9]+: ca 04 00 lret \$0x4
*[a-f0-9]+: 0f 00 18 ltr \(%rax\)
@@ -89,8 +89,8 @@ Disassembly of section .text:
*[a-f0-9]+: c7 00 78 56 34 12 movl \$0x12345678,\(%rax\)
*[a-f0-9]+: 8c 00 mov %es,\(%rax\)
*[a-f0-9]+: 8e 00 mov \(%rax\),%es
- *[a-f0-9]+: a5 movsl %ds:\(%rsi\),%es:\(%rdi\)
- *[a-f0-9]+: a5 movsl %ds:\(%rsi\),%es:\(%rdi\)
+ *[a-f0-9]+: a5 movsl \(%rsi\),\(%rdi\)
+ *[a-f0-9]+: a5 movsl \(%rsi\),\(%rdi\)
*[a-f0-9]+: 66 0f be 00 movsbw \(%rax\),%ax
*[a-f0-9]+: 0f be 00 movsbl \(%rax\),%eax
*[a-f0-9]+: 48 0f be 00 movsbq \(%rax\),%rax
@@ -107,8 +107,8 @@ Disassembly of section .text:
*[a-f0-9]+: 81 08 78 56 34 12 orl \$0x12345678,\(%rax\)
*[a-f0-9]+: e7 00 out %eax,\$0x0
*[a-f0-9]+: ef out %eax,\(%dx\)
- *[a-f0-9]+: 6f outsl %ds:\(%rsi\),\(%dx\)
- *[a-f0-9]+: 6f outsl %ds:\(%rsi\),\(%dx\)
+ *[a-f0-9]+: 6f outsl \(%rsi\),\(%dx\)
+ *[a-f0-9]+: 6f outsl \(%rsi\),\(%dx\)
*[a-f0-9]+: 8f 00 pop \(%rax\)
*[a-f0-9]+: 0f a1 pop %fs
*[a-f0-9]+: f3 0f ae 20 ptwritel \(%rax\)
@@ -134,8 +134,8 @@ Disassembly of section .text:
*[a-f0-9]+: 81 18 89 00 00 00 sbbl \$0x89,\(%rax\)
*[a-f0-9]+: 81 18 34 12 00 00 sbbl \$0x1234,\(%rax\)
*[a-f0-9]+: 81 18 78 56 34 12 sbbl \$0x12345678,\(%rax\)
- *[a-f0-9]+: af scas %es:\(%rdi\),%eax
- *[a-f0-9]+: af scas %es:\(%rdi\),%eax
+ *[a-f0-9]+: af scas \(%rdi\),%eax
+ *[a-f0-9]+: af scas \(%rdi\),%eax
*[a-f0-9]+: d1 20 shll \$1,\(%rax\)
*[a-f0-9]+: c1 20 02 shll \$0x2,\(%rax\)
*[a-f0-9]+: d3 20 shll %cl,\(%rax\)
@@ -152,8 +152,8 @@ Disassembly of section .text:
*[a-f0-9]+: c1 28 02 shrl \$0x2,\(%rax\)
*[a-f0-9]+: d3 28 shrl %cl,\(%rax\)
*[a-f0-9]+: d1 28 shrl \$1,\(%rax\)
- *[a-f0-9]+: ab stos %eax,%es:\(%rdi\)
- *[a-f0-9]+: ab stos %eax,%es:\(%rdi\)
+ *[a-f0-9]+: ab stos %eax,\(%rdi\)
+ *[a-f0-9]+: ab stos %eax,\(%rdi\)
*[a-f0-9]+: 83 28 01 subl \$0x1,\(%rax\)
*[a-f0-9]+: 81 28 89 00 00 00 subl \$0x89,\(%rax\)
*[a-f0-9]+: 81 28 34 12 00 00 subl \$0x1234,\(%rax\)
diff --git a/gas/testsuite/gas/i386/x86-64-align-branch-5.d b/gas/testsuite/gas/i386/x86-64-align-branch-5.d
index fd3fe605e78..2296dc161e1 100644
--- a/gas/testsuite/gas/i386/x86-64-align-branch-5.d
+++ b/gas/testsuite/gas/i386/x86-64-align-branch-5.d
@@ -20,7 +20,7 @@ Disassembly of section .text:
19: c1 e9 02 shr \$0x2,%ecx
1c: c1 e9 02 shr \$0x2,%ecx
1f: f6 c2 02 test \$0x2,%dl
- 22: f3 ab rep stos %eax,%es:\(%rdi\)
+ 22: f3 ab rep stos %eax,\(%rdi\)
24: 75 dd jne (0x)?3( .*)?
26: 31 c0 xor %eax,%eax
28: c1 e9 02 shr \$0x2,%ecx
diff --git a/gas/testsuite/gas/i386/x86-64-disassem.d b/gas/testsuite/gas/i386/x86-64-disassem.d
index 2de30e295b6..d2966c72c53 100644
--- a/gas/testsuite/gas/i386/x86-64-disassem.d
+++ b/gas/testsuite/gas/i386/x86-64-disassem.d
@@ -15,235 +15,235 @@ Disassembly of section \.text:
[ ]*[a-f0-9]+:[ ]*c5 ec 4a[ ]+kaddw[ ]*\(bad\),.*
[ ]*[a-f0-9]+:[ ]*9b[ ]*fwait
[ ]*[a-f0-9]+:[ ]*c5 ec 4a[ ]+kaddw[ ]*\(bad\),.*
-[ ]*[a-f0-9]+:[ ]*6f[ ]*outsl %ds:\(%rsi\),\(%dx\)
+[ ]*[a-f0-9]+:[ ]*6f[ ]*outsl .*
[ ]*[a-f0-9]+:[ ]*c5 ec 4a[ ]+kaddw[ ]*\(bad\),.*
[ ]*[a-f0-9]+:[ ]*3f[ ]*\(bad\)
[ ]*[a-f0-9]+:[ ]*c5 ed 4a[ ]+kaddb[ ]*\(bad\),.*
[ ]*[a-f0-9]+:[ ]*9b[ ]*fwait
[ ]*[a-f0-9]+:[ ]*c5 ed 4a[ ]+kaddb[ ]*\(bad\),.*
-[ ]*[a-f0-9]+:[ ]*6f[ ]*outsl %ds:\(%rsi\),\(%dx\)
+[ ]*[a-f0-9]+:[ ]*6f[ ]*outsl .*
[ ]*[a-f0-9]+:[ ]*c5 ed 4a[ ]+kaddb[ ]*\(bad\),.*
[ ]*[a-f0-9]+:[ ]*3f[ ]*\(bad\)
[ ]*[a-f0-9]+:[ ]*c4 e1 ec 4a[ ]+kaddq[ ]*\(bad\),.*
[ ]*[a-f0-9]+:[ ]*9b[ ]*fwait
[ ]*[a-f0-9]+:[ ]*c4 e1 ec 4a[ ]+kaddq[ ]*\(bad\),.*
-[ ]*[a-f0-9]+:[ ]*6f[ ]*outsl %ds:\(%rsi\),\(%dx\)
+[ ]*[a-f0-9]+:[ ]*6f[ ]*outsl .*
[ ]*[a-f0-9]+:[ ]*c4 e1 ec 4a[ ]+kaddq[ ]*\(bad\),.*
[ ]*[a-f0-9]+:[ ]*3f[ ]*\(bad\)
[ ]*[a-f0-9]+:[ ]*c4 e1 ed 4a[ ]+kaddd[ ]*\(bad\),.*
[ ]*[a-f0-9]+:[ ]*9b[ ]*fwait
[ ]*[a-f0-9]+:[ ]*c4 e1 ed 4a[ ]+kaddd[ ]*\(bad\),.*
-[ ]*[a-f0-9]+:[ ]*6f[ ]*outsl %ds:\(%rsi\),\(%dx\)
+[ ]*[a-f0-9]+:[ ]*6f[ ]*outsl .*
[ ]*[a-f0-9]+:[ ]*c4 e1 ed 4a[ ]+kaddd[ ]*\(bad\),.*
[ ]*[a-f0-9]+:[ ]*3f[ ]*\(bad\)
[ ]*[a-f0-9]+:[ ]*c5 ec 41[ ]+kandw[ ]*\(bad\),.*
[ ]*[a-f0-9]+:[ ]*9b[ ]*fwait
[ ]*[a-f0-9]+:[ ]*c5 ec 41[ ]+kandw[ ]*\(bad\),.*
-[ ]*[a-f0-9]+:[ ]*6f[ ]*outsl %ds:\(%rsi\),\(%dx\)
+[ ]*[a-f0-9]+:[ ]*6f[ ]*outsl .*
[ ]*[a-f0-9]+:[ ]*c5 ec 41[ ]+kandw[ ]*\(bad\),.*
[ ]*[a-f0-9]+:[ ]*3f[ ]*\(bad\)
[ ]*[a-f0-9]+:[ ]*c5 ed 41[ ]+kandb[ ]*\(bad\),.*
[ ]*[a-f0-9]+:[ ]*9b[ ]*fwait
[ ]*[a-f0-9]+:[ ]*c5 ed 41[ ]+kandb[ ]*\(bad\),.*
-[ ]*[a-f0-9]+:[ ]*6f[ ]*outsl %ds:\(%rsi\),\(%dx\)
+[ ]*[a-f0-9]+:[ ]*6f[ ]*outsl .*
[ ]*[a-f0-9]+:[ ]*c5 ed 41[ ]+kandb[ ]*\(bad\),.*
[ ]*[a-f0-9]+:[ ]*3f[ ]*\(bad\)
[ ]*[a-f0-9]+:[ ]*c4 e1 ec 41[ ]+kandq[ ]*\(bad\),.*
[ ]*[a-f0-9]+:[ ]*9b[ ]*fwait
[ ]*[a-f0-9]+:[ ]*c4 e1 ec 41[ ]+kandq[ ]*\(bad\),.*
-[ ]*[a-f0-9]+:[ ]*6f[ ]*outsl %ds:\(%rsi\),\(%dx\)
+[ ]*[a-f0-9]+:[ ]*6f[ ]*outsl .*
[ ]*[a-f0-9]+:[ ]*c4 e1 ec 41[ ]+kandq[ ]*\(bad\),.*
[ ]*[a-f0-9]+:[ ]*3f[ ]*\(bad\)
[ ]*[a-f0-9]+:[ ]*c4 e1 ed 41[ ]+kandd[ ]*\(bad\),.*
[ ]*[a-f0-9]+:[ ]*9b[ ]*fwait
[ ]*[a-f0-9]+:[ ]*c4 e1 ed 41[ ]+kandd[ ]*\(bad\),.*
-[ ]*[a-f0-9]+:[ ]*6f[ ]*outsl %ds:\(%rsi\),\(%dx\)
+[ ]*[a-f0-9]+:[ ]*6f[ ]*outsl .*
[ ]*[a-f0-9]+:[ ]*c4 e1 ed 41[ ]+kandd[ ]*\(bad\),.*
[ ]*[a-f0-9]+:[ ]*3f[ ]*\(bad\)
[ ]*[a-f0-9]+:[ ]*c5 ec 42[ ]+kandnw[ ]*\(bad\),.*
[ ]*[a-f0-9]+:[ ]*9b[ ]*fwait
[ ]*[a-f0-9]+:[ ]*c5 ec 42[ ]+kandnw[ ]*\(bad\),.*
-[ ]*[a-f0-9]+:[ ]*6f[ ]*outsl %ds:\(%rsi\),\(%dx\)
+[ ]*[a-f0-9]+:[ ]*6f[ ]*outsl .*
[ ]*[a-f0-9]+:[ ]*c5 ec 42[ ]+kandnw[ ]*\(bad\),.*
[ ]*[a-f0-9]+:[ ]*3f[ ]*\(bad\)
[ ]*[a-f0-9]+:[ ]*c5 ed 42[ ]+kandnb[ ]*\(bad\),.*
[ ]*[a-f0-9]+:[ ]*9b[ ]*fwait
[ ]*[a-f0-9]+:[ ]*c5 ed 42[ ]+kandnb[ ]*\(bad\),.*
-[ ]*[a-f0-9]+:[ ]*6f[ ]*outsl %ds:\(%rsi\),\(%dx\)
+[ ]*[a-f0-9]+:[ ]*6f[ ]*outsl .*
[ ]*[a-f0-9]+:[ ]*c5 ed 42[ ]+kandnb[ ]*\(bad\),.*
[ ]*[a-f0-9]+:[ ]*3f[ ]*\(bad\)
[ ]*[a-f0-9]+:[ ]*c4 e1 ec 42[ ]+kandnq[ ]*\(bad\),.*
[ ]*[a-f0-9]+:[ ]*9b[ ]*fwait
[ ]*[a-f0-9]+:[ ]*c4 e1 ec 42[ ]+kandnq[ ]*\(bad\),.*
-[ ]*[a-f0-9]+:[ ]*6f[ ]*outsl %ds:\(%rsi\),\(%dx\)
+[ ]*[a-f0-9]+:[ ]*6f[ ]*outsl .*
[ ]*[a-f0-9]+:[ ]*c4 e1 ec 42[ ]+kandnq[ ]*\(bad\),.*
[ ]*[a-f0-9]+:[ ]*3f[ ]*\(bad\)
[ ]*[a-f0-9]+:[ ]*c4 e1 ed 42[ ]+kandnd[ ]*\(bad\),.*
[ ]*[a-f0-9]+:[ ]*9b[ ]*fwait
[ ]*[a-f0-9]+:[ ]*c4 e1 ed 42[ ]+kandnd[ ]*\(bad\),.*
-[ ]*[a-f0-9]+:[ ]*6f[ ]*outsl %ds:\(%rsi\),\(%dx\)
+[ ]*[a-f0-9]+:[ ]*6f[ ]*outsl .*
[ ]*[a-f0-9]+:[ ]*c4 e1 ed 42[ ]+kandnd[ ]*\(bad\),.*
[ ]*[a-f0-9]+:[ ]*3f[ ]*\(bad\)
[ ]*[a-f0-9]+:[ ]*c5 ec 4b[ ]+kunpckwd[ ]*\(bad\),.*
[ ]*[a-f0-9]+:[ ]*9b[ ]*fwait
[ ]*[a-f0-9]+:[ ]*c5 ec 4b[ ]+kunpckwd[ ]*\(bad\),.*
-[ ]*[a-f0-9]+:[ ]*6f[ ]*outsl %ds:\(%rsi\),\(%dx\)
+[ ]*[a-f0-9]+:[ ]*6f[ ]*outsl .*
[ ]*[a-f0-9]+:[ ]*c5 ec 4b[ ]+kunpckwd[ ]*\(bad\),.*
[ ]*[a-f0-9]+:[ ]*3f[ ]*\(bad\)
[ ]*[a-f0-9]+:[ ]*c5 ed 4b[ ]+kunpckbw[ ]*\(bad\),.*
[ ]*[a-f0-9]+:[ ]*9b[ ]*fwait
[ ]*[a-f0-9]+:[ ]*c5 ed 4b[ ]+kunpckbw[ ]*\(bad\),.*
-[ ]*[a-f0-9]+:[ ]*6f[ ]*outsl %ds:\(%rsi\),\(%dx\)
+[ ]*[a-f0-9]+:[ ]*6f[ ]*outsl .*
[ ]*[a-f0-9]+:[ ]*c5 ed 4b[ ]+kunpckbw[ ]*\(bad\),.*
[ ]*[a-f0-9]+:[ ]*3f[ ]*\(bad\)
[ ]*[a-f0-9]+:[ ]*c4 e1 ec 4b[ ]+kunpckdq[ ]*\(bad\),.*
[ ]*[a-f0-9]+:[ ]*9b[ ]*fwait
[ ]*[a-f0-9]+:[ ]*c4 e1 ec 4b[ ]+kunpckdq[ ]*\(bad\),.*
-[ ]*[a-f0-9]+:[ ]*6f[ ]*outsl %ds:\(%rsi\),\(%dx\)
+[ ]*[a-f0-9]+:[ ]*6f[ ]*outsl .*
[ ]*[a-f0-9]+:[ ]*c4 e1 ec 4b[ ]+kunpckdq[ ]*\(bad\),.*
[ ]*[a-f0-9]+:[ ]*3f[ ]*\(bad\)
[ ]*[a-f0-9]+:[ ]*c5 f8 44[ ]+knotw[ ]*\(bad\),.*
[ ]*[a-f0-9]+:[ ]*9b[ ]*fwait
[ ]*[a-f0-9]+:[ ]*c5 f8 44[ ]+knotw[ ]*\(bad\),.*
-[ ]*[a-f0-9]+:[ ]*6f[ ]*outsl %ds:\(%rsi\),\(%dx\)
+[ ]*[a-f0-9]+:[ ]*6f[ ]*outsl .*
[ ]*[a-f0-9]+:[ ]*c5 f8 44[ ]+knotw[ ]*\(bad\),.*
[ ]*[a-f0-9]+:[ ]*3f[ ]*\(bad\)
[ ]*[a-f0-9]+:[ ]*c5 f9 44[ ]+knotb[ ]*\(bad\),.*
[ ]*[a-f0-9]+:[ ]*9b[ ]*fwait
[ ]*[a-f0-9]+:[ ]*c5 f9 44[ ]+knotb[ ]*\(bad\),.*
-[ ]*[a-f0-9]+:[ ]*6f[ ]*outsl %ds:\(%rsi\),\(%dx\)
+[ ]*[a-f0-9]+:[ ]*6f[ ]*outsl .*
[ ]*[a-f0-9]+:[ ]*c5 f9 44[ ]+knotb[ ]*\(bad\),.*
[ ]*[a-f0-9]+:[ ]*3f[ ]*\(bad\)
[ ]*[a-f0-9]+:[ ]*c4 e1 f8 44[ ]+knotq[ ]*\(bad\),.*
[ ]*[a-f0-9]+:[ ]*9b[ ]*fwait
[ ]*[a-f0-9]+:[ ]*c4 e1 f8 44[ ]+knotq[ ]*\(bad\),.*
-[ ]*[a-f0-9]+:[ ]*6f[ ]*outsl %ds:\(%rsi\),\(%dx\)
+[ ]*[a-f0-9]+:[ ]*6f[ ]*outsl .*
[ ]*[a-f0-9]+:[ ]*c4 e1 f8 44[ ]+knotq[ ]*\(bad\),.*
[ ]*[a-f0-9]+:[ ]*3f[ ]*\(bad\)
[ ]*[a-f0-9]+:[ ]*c4 e1 f9 44[ ]+knotd[ ]*\(bad\),.*
[ ]*[a-f0-9]+:[ ]*9b[ ]*fwait
[ ]*[a-f0-9]+:[ ]*c4 e1 f9 44[ ]+knotd[ ]*\(bad\),.*
-[ ]*[a-f0-9]+:[ ]*6f[ ]*outsl %ds:\(%rsi\),\(%dx\)
+[ ]*[a-f0-9]+:[ ]*6f[ ]*outsl .*
[ ]*[a-f0-9]+:[ ]*c4 e1 f9 44[ ]+knotd[ ]*\(bad\),.*
[ ]*[a-f0-9]+:[ ]*3f[ ]*\(bad\)
[ ]*[a-f0-9]+:[ ]*c5 ec 45[ ]+korw[ ]*\(bad\),.*
[ ]*[a-f0-9]+:[ ]*9b[ ]*fwait
[ ]*[a-f0-9]+:[ ]*c5 ec 45[ ]+korw[ ]*\(bad\),.*
-[ ]*[a-f0-9]+:[ ]*6f[ ]*outsl %ds:\(%rsi\),\(%dx\)
+[ ]*[a-f0-9]+:[ ]*6f[ ]*outsl .*
[ ]*[a-f0-9]+:[ ]*c5 ec 45[ ]+korw[ ]*\(bad\),.*
[ ]*[a-f0-9]+:[ ]*3f[ ]*\(bad\)
[ ]*[a-f0-9]+:[ ]*c5 ed 45[ ]+korb[ ]*\(bad\),.*
[ ]*[a-f0-9]+:[ ]*9b[ ]*fwait
[ ]*[a-f0-9]+:[ ]*c5 ed 45[ ]+korb[ ]*\(bad\),.*
-[ ]*[a-f0-9]+:[ ]*6f[ ]*outsl %ds:\(%rsi\),\(%dx\)
+[ ]*[a-f0-9]+:[ ]*6f[ ]*outsl .*
[ ]*[a-f0-9]+:[ ]*c5 ed 45[ ]+korb[ ]*\(bad\),.*
[ ]*[a-f0-9]+:[ ]*3f[ ]*\(bad\)
[ ]*[a-f0-9]+:[ ]*c4 e1 ec 45[ ]+korq[ ]*\(bad\),.*
[ ]*[a-f0-9]+:[ ]*9b[ ]*fwait
[ ]*[a-f0-9]+:[ ]*c4 e1 ec 45[ ]+korq[ ]*\(bad\),.*
-[ ]*[a-f0-9]+:[ ]*6f[ ]*outsl %ds:\(%rsi\),\(%dx\)
+[ ]*[a-f0-9]+:[ ]*6f[ ]*outsl .*
[ ]*[a-f0-9]+:[ ]*c4 e1 ec 45[ ]+korq[ ]*\(bad\),.*
[ ]*[a-f0-9]+:[ ]*3f[ ]*\(bad\)
[ ]*[a-f0-9]+:[ ]*c4 e1 ed 45[ ]+kord[ ]*\(bad\),.*
[ ]*[a-f0-9]+:[ ]*9b[ ]*fwait
[ ]*[a-f0-9]+:[ ]*c4 e1 ed 45[ ]+kord[ ]*\(bad\),.*
-[ ]*[a-f0-9]+:[ ]*6f[ ]*outsl %ds:\(%rsi\),\(%dx\)
+[ ]*[a-f0-9]+:[ ]*6f[ ]*outsl .*
[ ]*[a-f0-9]+:[ ]*c4 e1 ed 45[ ]+kord[ ]*\(bad\),.*
[ ]*[a-f0-9]+:[ ]*3f[ ]*\(bad\)
[ ]*[a-f0-9]+:[ ]*c5 f8 98[ ]+kortestw[ ]*\(bad\),.*
[ ]*[a-f0-9]+:[ ]*9b[ ]*fwait
[ ]*[a-f0-9]+:[ ]*c5 f8 98[ ]+kortestw[ ]*\(bad\),.*
-[ ]*[a-f0-9]+:[ ]*6f[ ]*outsl %ds:\(%rsi\),\(%dx\)
+[ ]*[a-f0-9]+:[ ]*6f[ ]*outsl .*
[ ]*[a-f0-9]+:[ ]*c5 f8 98[ ]+kortestw[ ]*\(bad\),.*
[ ]*[a-f0-9]+:[ ]*3f[ ]*\(bad\)
[ ]*[a-f0-9]+:[ ]*c5 f9 98[ ]+kortestb[ ]*\(bad\),.*
[ ]*[a-f0-9]+:[ ]*9b[ ]*fwait
[ ]*[a-f0-9]+:[ ]*c5 f9 98[ ]+kortestb[ ]*\(bad\),.*
-[ ]*[a-f0-9]+:[ ]*6f[ ]*outsl %ds:\(%rsi\),\(%dx\)
+[ ]*[a-f0-9]+:[ ]*6f[ ]*outsl .*
[ ]*[a-f0-9]+:[ ]*c5 f9 98[ ]+kortestb[ ]*\(bad\),.*
[ ]*[a-f0-9]+:[ ]*3f[ ]*\(bad\)
[ ]*[a-f0-9]+:[ ]*c4 e1 f8 98[ ]+kortestq[ ]*\(bad\),.*
[ ]*[a-f0-9]+:[ ]*9b[ ]*fwait
[ ]*[a-f0-9]+:[ ]*c4 e1 f8 98[ ]+kortestq[ ]*\(bad\),.*
-[ ]*[a-f0-9]+:[ ]*6f[ ]*outsl %ds:\(%rsi\),\(%dx\)
+[ ]*[a-f0-9]+:[ ]*6f[ ]*outsl .*
[ ]*[a-f0-9]+:[ ]*c4 e1 f8 98[ ]+kortestq[ ]*\(bad\),.*
[ ]*[a-f0-9]+:[ ]*3f[ ]*\(bad\)
[ ]*[a-f0-9]+:[ ]*c4 e1 f9 98[ ]+kortestd[ ]*\(bad\),.*
[ ]*[a-f0-9]+:[ ]*9b[ ]*fwait
[ ]*[a-f0-9]+:[ ]*c4 e1 f9 98[ ]+kortestd[ ]*\(bad\),.*
-[ ]*[a-f0-9]+:[ ]*6f[ ]*outsl %ds:\(%rsi\),\(%dx\)
+[ ]*[a-f0-9]+:[ ]*6f[ ]*outsl .*
[ ]*[a-f0-9]+:[ ]*c4 e1 f9 98[ ]+kortestd[ ]*\(bad\),.*
[ ]*[a-f0-9]+:[ ]*3f[ ]*\(bad\)
[ ]*[a-f0-9]+:[ ]*c5 ec 46[ ]+kxnorw[ ]*\(bad\),.*
[ ]*[a-f0-9]+:[ ]*9b[ ]*fwait
[ ]*[a-f0-9]+:[ ]*c5 ec 46[ ]+kxnorw[ ]*\(bad\),.*
-[ ]*[a-f0-9]+:[ ]*6f[ ]*outsl %ds:\(%rsi\),\(%dx\)
+[ ]*[a-f0-9]+:[ ]*6f[ ]*outsl .*
[ ]*[a-f0-9]+:[ ]*c5 ec 46[ ]+kxnorw[ ]*\(bad\),.*
[ ]*[a-f0-9]+:[ ]*3f[ ]*\(bad\)
[ ]*[a-f0-9]+:[ ]*c5 ed 46[ ]+kxnorb[ ]*\(bad\),.*
[ ]*[a-f0-9]+:[ ]*9b[ ]*fwait
[ ]*[a-f0-9]+:[ ]*c5 ed 46[ ]+kxnorb[ ]*\(bad\),.*
-[ ]*[a-f0-9]+:[ ]*6f[ ]*outsl %ds:\(%rsi\),\(%dx\)
+[ ]*[a-f0-9]+:[ ]*6f[ ]*outsl .*
[ ]*[a-f0-9]+:[ ]*c5 ed 46[ ]+kxnorb[ ]*\(bad\),.*
[ ]*[a-f0-9]+:[ ]*3f[ ]*\(bad\)
[ ]*[a-f0-9]+:[ ]*c4 e1 ec 46[ ]+kxnorq[ ]*\(bad\),.*
[ ]*[a-f0-9]+:[ ]*9b[ ]*fwait
[ ]*[a-f0-9]+:[ ]*c4 e1 ec 46[ ]+kxnorq[ ]*\(bad\),.*
-[ ]*[a-f0-9]+:[ ]*6f[ ]*outsl %ds:\(%rsi\),\(%dx\)
+[ ]*[a-f0-9]+:[ ]*6f[ ]*outsl .*
[ ]*[a-f0-9]+:[ ]*c4 e1 ec 46[ ]+kxnorq[ ]*\(bad\),.*
[ ]*[a-f0-9]+:[ ]*3f[ ]*\(bad\)
[ ]*[a-f0-9]+:[ ]*c4 e1 ed 46[ ]+kxnord[ ]*\(bad\),.*
[ ]*[a-f0-9]+:[ ]*9b[ ]*fwait
[ ]*[a-f0-9]+:[ ]*c4 e1 ed 46[ ]+kxnord[ ]*\(bad\),.*
-[ ]*[a-f0-9]+:[ ]*6f[ ]*outsl %ds:\(%rsi\),\(%dx\)
+[ ]*[a-f0-9]+:[ ]*6f[ ]*outsl .*
[ ]*[a-f0-9]+:[ ]*c4 e1 ed 46[ ]+kxnord[ ]*\(bad\),.*
[ ]*[a-f0-9]+:[ ]*3f[ ]*\(bad\)
[ ]*[a-f0-9]+:[ ]*c5 ec 47[ ]+kxorw[ ]*\(bad\),.*
[ ]*[a-f0-9]+:[ ]*9b[ ]*fwait
[ ]*[a-f0-9]+:[ ]*c5 ec 47[ ]+kxorw[ ]*\(bad\),.*
-[ ]*[a-f0-9]+:[ ]*6f[ ]*outsl %ds:\(%rsi\),\(%dx\)
+[ ]*[a-f0-9]+:[ ]*6f[ ]*outsl .*
[ ]*[a-f0-9]+:[ ]*c5 ec 47[ ]+kxorw[ ]*\(bad\),.*
[ ]*[a-f0-9]+:[ ]*3f[ ]*\(bad\)
[ ]*[a-f0-9]+:[ ]*c5 ed 47[ ]+kxorb[ ]*\(bad\),.*
[ ]*[a-f0-9]+:[ ]*9b[ ]*fwait
[ ]*[a-f0-9]+:[ ]*c5 ed 47[ ]+kxorb[ ]*\(bad\),.*
-[ ]*[a-f0-9]+:[ ]*6f[ ]*outsl %ds:\(%rsi\),\(%dx\)
+[ ]*[a-f0-9]+:[ ]*6f[ ]*outsl .*
[ ]*[a-f0-9]+:[ ]*c5 ed 47[ ]+kxorb[ ]*\(bad\),.*
[ ]*[a-f0-9]+:[ ]*3f[ ]*\(bad\)
[ ]*[a-f0-9]+:[ ]*c4 e1 ec 47[ ]+kxorq[ ]*\(bad\),.*
[ ]*[a-f0-9]+:[ ]*9b[ ]*fwait
[ ]*[a-f0-9]+:[ ]*c4 e1 ec 47[ ]+kxorq[ ]*\(bad\),.*
-[ ]*[a-f0-9]+:[ ]*6f[ ]*outsl %ds:\(%rsi\),\(%dx\)
+[ ]*[a-f0-9]+:[ ]*6f[ ]*outsl .*
[ ]*[a-f0-9]+:[ ]*c4 e1 ec 47[ ]+kxorq[ ]*\(bad\),.*
[ ]*[a-f0-9]+:[ ]*3f[ ]*\(bad\)
[ ]*[a-f0-9]+:[ ]*c4 e1 ed 47[ ]+kxord[ ]*\(bad\),.*
[ ]*[a-f0-9]+:[ ]*9b[ ]*fwait
[ ]*[a-f0-9]+:[ ]*c4 e1 ed 47[ ]+kxord[ ]*\(bad\),.*
-[ ]*[a-f0-9]+:[ ]*6f[ ]*outsl %ds:\(%rsi\),\(%dx\)
+[ ]*[a-f0-9]+:[ ]*6f[ ]*outsl .*
[ ]*[a-f0-9]+:[ ]*c4 e1 ed 47[ ]+kxord[ ]*\(bad\),.*
[ ]*[a-f0-9]+:[ ]*3f[ ]*\(bad\)
[ ]*[a-f0-9]+:[ ]*c5 f8 99[ ]+ktestw[ ]*\(bad\),.*
[ ]*[a-f0-9]+:[ ]*9b[ ]*fwait
[ ]*[a-f0-9]+:[ ]*c5 f8 99[ ]+ktestw[ ]*\(bad\),.*
-[ ]*[a-f0-9]+:[ ]*6f[ ]*outsl %ds:\(%rsi\),\(%dx\)
+[ ]*[a-f0-9]+:[ ]*6f[ ]*outsl .*
[ ]*[a-f0-9]+:[ ]*c5 f8 99[ ]+ktestw[ ]*\(bad\),.*
[ ]*[a-f0-9]+:[ ]*3f[ ]*\(bad\)
[ ]*[a-f0-9]+:[ ]*c5 f9 99[ ]+ktestb[ ]*\(bad\),.*
[ ]*[a-f0-9]+:[ ]*9b[ ]*fwait
[ ]*[a-f0-9]+:[ ]*c5 f9 99[ ]+ktestb[ ]*\(bad\),.*
-[ ]*[a-f0-9]+:[ ]*6f[ ]*outsl %ds:\(%rsi\),\(%dx\)
+[ ]*[a-f0-9]+:[ ]*6f[ ]*outsl .*
[ ]*[a-f0-9]+:[ ]*c5 f9 99[ ]+ktestb[ ]*\(bad\),.*
[ ]*[a-f0-9]+:[ ]*3f[ ]*\(bad\)
[ ]*[a-f0-9]+:[ ]*c4 e1 f8 99[ ]+ktestq[ ]*\(bad\),.*
[ ]*[a-f0-9]+:[ ]*9b[ ]*fwait
[ ]*[a-f0-9]+:[ ]*c4 e1 f8 99[ ]+ktestq[ ]*\(bad\),.*
-[ ]*[a-f0-9]+:[ ]*6f[ ]*outsl %ds:\(%rsi\),\(%dx\)
+[ ]*[a-f0-9]+:[ ]*6f[ ]*outsl .*
[ ]*[a-f0-9]+:[ ]*c4 e1 f8 99[ ]+ktestq[ ]*\(bad\),.*
[ ]*[a-f0-9]+:[ ]*3f[ ]*\(bad\)
[ ]*[a-f0-9]+:[ ]*c4 e1 f9 99[ ]+ktestd[ ]*\(bad\),.*
[ ]*[a-f0-9]+:[ ]*9b[ ]*fwait
[ ]*[a-f0-9]+:[ ]*c4 e1 f9 99[ ]+ktestd[ ]*\(bad\),.*
-[ ]*[a-f0-9]+:[ ]*6f[ ]*outsl %ds:\(%rsi\),\(%dx\)
+[ ]*[a-f0-9]+:[ ]*6f[ ]*outsl .*
[ ]*[a-f0-9]+:[ ]*c4 e1 f9 99[ ]+ktestd[ ]*\(bad\),.*
[ ]*[a-f0-9]+:[ ]*3f[ ]*\(bad\)
[ ]*[a-f0-9]+:[ ]*c4 e3 f9 30 8f[ ]+kshiftrw[ ]*\$0x[0-9a-f]*,\(bad\),.*
@@ -297,49 +297,49 @@ Disassembly of section \.text:
[ ]*[a-f0-9]+:[ ]*c5 f8 92[ ]+kmovw[ ]*\(bad\),.*
[ ]*[a-f0-9]+:[ ]*9b[ ]*fwait
[ ]*[a-f0-9]+:[ ]*c5 f8 92[ ]+kmovw[ ]*\(bad\),.*
-[ ]*[a-f0-9]+:[ ]*6f[ ]*outsl %ds:\(%rsi\),\(%dx\)
+[ ]*[a-f0-9]+:[ ]*6f[ ]*outsl .*
[ ]*[a-f0-9]+:[ ]*c5 f8 92[ ]+kmovw[ ]*\(bad\),.*
[ ]*[a-f0-9]+:[ ]*3f[ ]*\(bad\)
[ ]*[a-f0-9]+:[ ]*c5 f9 92[ ]+kmovb[ ]*\(bad\),.*
[ ]*[a-f0-9]+:[ ]*9b[ ]*fwait
[ ]*[a-f0-9]+:[ ]*c5 f9 92[ ]+kmovb[ ]*\(bad\),.*
-[ ]*[a-f0-9]+:[ ]*6f[ ]*outsl %ds:\(%rsi\),\(%dx\)
+[ ]*[a-f0-9]+:[ ]*6f[ ]*outsl .*
[ ]*[a-f0-9]+:[ ]*c5 f9 92[ ]+kmovb[ ]*\(bad\),.*
[ ]*[a-f0-9]+:[ ]*3f[ ]*\(bad\)
[ ]*[a-f0-9]+:[ ]*c5 fb 92[ ]+kmovd[ ]*\(bad\),.*
[ ]*[a-f0-9]+:[ ]*9b[ ]*fwait
[ ]*[a-f0-9]+:[ ]*c5 fb 92[ ]+kmovd[ ]*\(bad\),.*
-[ ]*[a-f0-9]+:[ ]*6f[ ]*outsl %ds:\(%rsi\),\(%dx\)
+[ ]*[a-f0-9]+:[ ]*6f[ ]*outsl .*
[ ]*[a-f0-9]+:[ ]*c5 fb 92[ ]+kmovd[ ]*\(bad\),.*
[ ]*[a-f0-9]+:[ ]*3f[ ]*\(bad\)
[ ]*[a-f0-9]+:[ ]*c4 e1 f9 92[ ]*\(bad\)
[ ]*[a-f0-9]+:[ ]*9b[ ]*fwait
[ ]*[a-f0-9]+:[ ]*c4 e1 f9 92[ ]*\(bad\)
-[ ]*[a-f0-9]+:[ ]*6f[ ]*outsl %ds:\(%rsi\),\(%dx\)
+[ ]*[a-f0-9]+:[ ]*6f[ ]*outsl .*
[ ]*[a-f0-9]+:[ ]*c4 e1 f9 92[ ]*\(bad\)
[ ]*[a-f0-9]+:[ ]*3f[ ]*\(bad\)
[ ]*[a-f0-9]+:[ ]*c5 f8 93[ ]+kmovw[ ]*\(bad\),.*
[ ]*[a-f0-9]+:[ ]*9b[ ]*fwait
[ ]*[a-f0-9]+:[ ]*c5 f8 93[ ]+kmovw[ ]*\(bad\),.*
-[ ]*[a-f0-9]+:[ ]*6f[ ]*outsl %ds:\(%rsi\),\(%dx\)
+[ ]*[a-f0-9]+:[ ]*6f[ ]*outsl .*
[ ]*[a-f0-9]+:[ ]*c5 f8 93[ ]+kmovw[ ]*\(bad\),.*
[ ]*[a-f0-9]+:[ ]*3f[ ]*\(bad\)
[ ]*[a-f0-9]+:[ ]*c5 f9 93[ ]+kmovb[ ]*\(bad\),.*
[ ]*[a-f0-9]+:[ ]*9b[ ]*fwait
[ ]*[a-f0-9]+:[ ]*c5 f9 93[ ]+kmovb[ ]*\(bad\),.*
-[ ]*[a-f0-9]+:[ ]*6f[ ]*outsl %ds:\(%rsi\),\(%dx\)
+[ ]*[a-f0-9]+:[ ]*6f[ ]*outsl .*
[ ]*[a-f0-9]+:[ ]*c5 f9 93[ ]+kmovb[ ]*\(bad\),.*
[ ]*[a-f0-9]+:[ ]*3f[ ]*\(bad\)
[ ]*[a-f0-9]+:[ ]*c5 fb 93[ ]+kmovd[ ]*\(bad\),.*
[ ]*[a-f0-9]+:[ ]*9b[ ]*fwait
[ ]*[a-f0-9]+:[ ]*c5 fb 93[ ]+kmovd[ ]*\(bad\),.*
-[ ]*[a-f0-9]+:[ ]*6f[ ]*outsl %ds:\(%rsi\),\(%dx\)
+[ ]*[a-f0-9]+:[ ]*6f[ ]*outsl .*
[ ]*[a-f0-9]+:[ ]*c5 fb 93[ ]+kmovd[ ]*\(bad\),.*
[ ]*[a-f0-9]+:[ ]*3f[ ]*\(bad\)
[ ]*[a-f0-9]+:[ ]*c4 e1 f9 93[ ]*\(bad\)
[ ]*[a-f0-9]+:[ ]*9b[ ]*fwait
[ ]*[a-f0-9]+:[ ]*c4 e1 f9 93[ ]*\(bad\)
-[ ]*[a-f0-9]+:[ ]*6f[ ]*outsl %ds:\(%rsi\),\(%dx\)
+[ ]*[a-f0-9]+:[ ]*6f[ ]*outsl .*
[ ]*[a-f0-9]+:[ ]*c4 e1 f9 93[ ]*\(bad\)
[ ]*[a-f0-9]+:[ ]*3f[ ]*\(bad\)
[ ]*[a-f0-9]+:[ ]*c4 62 01 1c[ ]*\(bad\)
diff --git a/gas/testsuite/gas/i386/x86-64-io-intel.d b/gas/testsuite/gas/i386/x86-64-io-intel.d
index 0555a47cf97..db470591908 100644
--- a/gas/testsuite/gas/i386/x86-64-io-intel.d
+++ b/gas/testsuite/gas/i386/x86-64-io-intel.d
@@ -15,10 +15,10 @@ Disassembly of section .text:
7: 66 48 ef data16 rex.W out dx,eax
0+00a <_ins>:
- a: 48 6d rex.W ins DWORD PTR es:\[rdi\],dx
- c: 66 48 6d data16 rex.W ins DWORD PTR es:\[rdi\],dx
+ a: 48 6d rex.W ins DWORD PTR \[rdi\],dx
+ c: 66 48 6d data16 rex.W ins DWORD PTR \[rdi\],dx
0+00f <_outs>:
- f: 48 6f rex.W outs dx,DWORD PTR ds:\[rsi\]
- 11: 66 48 6f data16 rex.W outs dx,DWORD PTR ds:\[rsi\]
+ f: 48 6f rex.W outs dx,DWORD PTR \[rsi\]
+ 11: 66 48 6f data16 rex.W outs dx,DWORD PTR \[rsi\]
#pass
diff --git a/gas/testsuite/gas/i386/x86-64-io-suffix.d b/gas/testsuite/gas/i386/x86-64-io-suffix.d
index 121a9ba56c3..57f98f94307 100644
--- a/gas/testsuite/gas/i386/x86-64-io-suffix.d
+++ b/gas/testsuite/gas/i386/x86-64-io-suffix.d
@@ -15,10 +15,10 @@ Disassembly of section .text:
7: 66 48 ef data16 rex.W outl %eax,\(%dx\)
0+00a <_ins>:
- a: 48 6d rex.W insl \(%dx\),%es:\(%rdi\)
- c: 66 48 6d data16 rex.W insl \(%dx\),%es:\(%rdi\)
+ a: 48 6d rex.W insl \(%dx\),\(%rdi\)
+ c: 66 48 6d data16 rex.W insl \(%dx\),\(%rdi\)
0+00f <_outs>:
- f: 48 6f rex.W outsl %ds:\(%rsi\),\(%dx\)
- 11: 66 48 6f data16 rex.W outsl %ds:\(%rsi\),\(%dx\)
+ f: 48 6f rex.W outsl \(%rsi\),\(%dx\)
+ 11: 66 48 6f data16 rex.W outsl \(%rsi\),\(%dx\)
#pass
diff --git a/gas/testsuite/gas/i386/x86-64-io.d b/gas/testsuite/gas/i386/x86-64-io.d
index 7056ac09e52..c6fa25b2841 100644
--- a/gas/testsuite/gas/i386/x86-64-io.d
+++ b/gas/testsuite/gas/i386/x86-64-io.d
@@ -14,10 +14,10 @@ Disassembly of section .text:
7: 66 48 ef data16 rex.W out %eax,\(%dx\)
0+00a <_ins>:
- a: 48 6d rex.W insl \(%dx\),%es:\(%rdi\)
- c: 66 48 6d data16 rex.W insl \(%dx\),%es:\(%rdi\)
+ a: 48 6d rex.W insl \(%dx\),\(%rdi\)
+ c: 66 48 6d data16 rex.W insl \(%dx\),\(%rdi\)
0+00f <_outs>:
- f: 48 6f rex.W outsl %ds:\(%rsi\),\(%dx\)
- 11: 66 48 6f data16 rex.W outsl %ds:\(%rsi\),\(%dx\)
+ f: 48 6f rex.W outsl \(%rsi\),\(%dx\)
+ 11: 66 48 6f data16 rex.W outsl \(%rsi\),\(%dx\)
#pass
diff --git a/gas/testsuite/gas/i386/x86-64-lfence-byte.d b/gas/testsuite/gas/i386/x86-64-lfence-byte.d
index ddc64230899..b2a4da0444d 100644
--- a/gas/testsuite/gas/i386/x86-64-lfence-byte.d
+++ b/gas/testsuite/gas/i386/x86-64-lfence-byte.d
@@ -9,7 +9,7 @@
Disassembly of section .text:
0+ <_start>:
- +[a-f0-9]+: f3 aa rep stos %al,%es:\(%rdi\)
+ +[a-f0-9]+: f3 aa rep stos %al,\(%rdi\)
+[a-f0-9]+: 48 83 0c 24 00 orq \$0x0,\(%rsp\)
+[a-f0-9]+: 0f ae e8 lfence
+[a-f0-9]+: f3 c3 repz ret
diff --git a/gas/testsuite/gas/i386/x86-64-lfence-load.d b/gas/testsuite/gas/i386/x86-64-lfence-load.d
index c86155ec516..5c8ae326292 100644
--- a/gas/testsuite/gas/i386/x86-64-lfence-load.d
+++ b/gas/testsuite/gas/i386/x86-64-lfence-load.d
@@ -40,7 +40,7 @@ Disassembly of section .text:
+[a-f0-9]+: 0f ae e8 lfence
+[a-f0-9]+: 9d popf
+[a-f0-9]+: 0f ae e8 lfence
- +[a-f0-9]+: d7 xlat %ds:\(%rbx\)
+ +[a-f0-9]+: d7 xlat \(%rbx\)
+[a-f0-9]+: 0f ae e8 lfence
+[a-f0-9]+: d9 55 00 fsts 0x0\(%rbp\)
+[a-f0-9]+: d9 45 00 flds 0x0\(%rbp\)
@@ -109,17 +109,17 @@ Disassembly of section .text:
+[a-f0-9]+: 0f ae e8 lfence
+[a-f0-9]+: 48 8d 04 40 lea \(%rax,%rax,2\),%rax
+[a-f0-9]+: c9 leave
- +[a-f0-9]+: 6e outsb %ds:\(%rsi\),\(%dx\)
+ +[a-f0-9]+: 6e outsb \(%rsi\),\(%dx\)
+[a-f0-9]+: 0f ae e8 lfence
- +[a-f0-9]+: ac lods %ds:\(%rsi\),%al
+ +[a-f0-9]+: ac lods \(%rsi\),%al
+[a-f0-9]+: 0f ae e8 lfence
- +[a-f0-9]+: f3 a5 rep movsl %ds:\(%rsi\),%es:\(%rdi\)
+ +[a-f0-9]+: f3 a5 rep movsl \(%rsi\),\(%rdi\)
+[a-f0-9]+: 0f ae e8 lfence
- +[a-f0-9]+: f3 af repz scas %es:\(%rdi\),%eax
+ +[a-f0-9]+: f3 af repz scas \(%rdi\),%eax
+[a-f0-9]+: 0f ae e8 lfence
- +[a-f0-9]+: f3 a7 repz cmpsl %es:\(%rdi\),%ds:\(%rsi\)
+ +[a-f0-9]+: f3 a7 repz cmpsl \(%rdi\),\(%rsi\)
+[a-f0-9]+: 0f ae e8 lfence
- +[a-f0-9]+: f3 ad rep lods %ds:\(%rsi\),%eax
+ +[a-f0-9]+: f3 ad rep lods \(%rsi\),%eax
+[a-f0-9]+: 0f ae e8 lfence
+[a-f0-9]+: 41 83 03 01 addl \$0x1,\(%r11\)
+[a-f0-9]+: 0f ae e8 lfence
diff --git a/gas/testsuite/gas/i386/x86-64-rep-suffix.d b/gas/testsuite/gas/i386/x86-64-rep-suffix.d
index bc6346db22a..867c6001d8d 100644
--- a/gas/testsuite/gas/i386/x86-64-rep-suffix.d
+++ b/gas/testsuite/gas/i386/x86-64-rep-suffix.d
@@ -6,14 +6,14 @@
Disassembly of section .text:
0+000 <_start>:
- 0: f3 ac[ ]+rep lodsb %ds:\(%rsi\),%al
- 2: f3 aa[ ]+rep stosb %al,%es:\(%rdi\)
- 4: 66 f3 ad[ ]+rep lodsw %ds:\(%rsi\),%ax
- 7: 66 f3 ab[ ]+rep stosw %ax,%es:\(%rdi\)
- a: f3 ad[ ]+rep lodsl %ds:\(%rsi\),%eax
- c: f3 ab[ ]+rep stosl %eax,%es:\(%rdi\)
- e: f3 48 ad[ ]+rep lodsq %ds:\(%rsi\),%rax
- 11: f3 48 ab[ ]+rep stosq %rax,%es:\(%rdi\)
+ 0: f3 ac[ ]+rep lodsb \(%rsi\),%al
+ 2: f3 aa[ ]+rep stosb %al,\(%rdi\)
+ 4: 66 f3 ad[ ]+rep lodsw \(%rsi\),%ax
+ 7: 66 f3 ab[ ]+rep stosw %ax,\(%rdi\)
+ a: f3 ad[ ]+rep lodsl \(%rsi\),%eax
+ c: f3 ab[ ]+rep stosl %eax,\(%rdi\)
+ e: f3 48 ad[ ]+rep lodsq \(%rsi\),%rax
+ 11: f3 48 ab[ ]+rep stosq %rax,\(%rdi\)
14: f3 0f bc c1[ ]+tzcntl %ecx,%eax
18: f3 0f bd c1[ ]+lzcntl %ecx,%eax
1c: f3 c3[ ]+repz retq\s*
diff --git a/gas/testsuite/gas/i386/x86-64-rep.d b/gas/testsuite/gas/i386/x86-64-rep.d
index cafb9c70720..93591d192da 100644
--- a/gas/testsuite/gas/i386/x86-64-rep.d
+++ b/gas/testsuite/gas/i386/x86-64-rep.d
@@ -6,56 +6,56 @@
Disassembly of section .text:
0+ <_start>:
- 0: f3 6c[ ]+rep insb \(%dx\),%es:\(%rdi\)
- 2: f3 6e[ ]+rep outsb %ds:\(%rsi\),\(%dx\)
- 4: f3 a4[ ]+rep movsb %ds:\(%rsi\),%es:\(%rdi\)
- 6: f3 ac[ ]+rep lods %ds:\(%rsi\),%al
- 8: f3 aa[ ]+rep stos %al,%es:\(%rdi\)
- a: f3 a6[ ]+repz cmpsb %es:\(%rdi\),%ds:\(%rsi\)
- c: f3 ae[ ]+repz scas %es:\(%rdi\),%al
- e: 66 f3 6d[ ]+rep insw \(%dx\),%es:\(%rdi\)
- 11: 66 f3 6f[ ]+rep outsw %ds:\(%rsi\),\(%dx\)
- 14: 66 f3 a5[ ]+rep movsw %ds:\(%rsi\),%es:\(%rdi\)
- 17: 66 f3 ad[ ]+rep lods %ds:\(%rsi\),%ax
- 1a: 66 f3 ab[ ]+rep stos %ax,%es:\(%rdi\)
- 1d: 66 f3 a7[ ]+repz cmpsw %es:\(%rdi\),%ds:\(%rsi\)
- 20: 66 f3 af[ ]+repz scas %es:\(%rdi\),%ax
- 23: f3 6d[ ]+rep insl \(%dx\),%es:\(%rdi\)
- 25: f3 6f[ ]+rep outsl %ds:\(%rsi\),\(%dx\)
- 27: f3 a5[ ]+rep movsl %ds:\(%rsi\),%es:\(%rdi\)
- 29: f3 ad[ ]+rep lods %ds:\(%rsi\),%eax
- 2b: f3 ab[ ]+rep stos %eax,%es:\(%rdi\)
- 2d: f3 a7[ ]+repz cmpsl %es:\(%rdi\),%ds:\(%rsi\)
- 2f: f3 af[ ]+repz scas %es:\(%rdi\),%eax
- 31: f3 48 a5[ ]+rep movsq %ds:\(%rsi\),%es:\(%rdi\)
- 34: f3 48 ad[ ]+rep lods %ds:\(%rsi\),%rax
- 37: f3 48 ab[ ]+rep stos %rax,%es:\(%rdi\)
- 3a: f3 48 a7[ ]+repz cmpsq %es:\(%rdi\),%ds:\(%rsi\)
- 3d: f3 48 af[ ]+repz scas %es:\(%rdi\),%rax
- 40: 67 f3 6c[ ]+rep insb \(%dx\),%es:\(%edi\)
- 43: 67 f3 6e[ ]+rep outsb %ds:\(%esi\),\(%dx\)
- 46: 67 f3 a4[ ]+rep movsb %ds:\(%esi\),%es:\(%edi\)
- 49: 67 f3 ac[ ]+rep lods %ds:\(%esi\),%al
- 4c: 67 f3 aa[ ]+rep stos %al,%es:\(%edi\)
- 4f: 67 f3 a6[ ]+repz cmpsb %es:\(%edi\),%ds:\(%esi\)
- 52: 67 f3 ae[ ]+repz scas %es:\(%edi\),%al
- 55: 67 66 f3 6d[ ]+rep insw \(%dx\),%es:\(%edi\)
- 59: 67 66 f3 6f[ ]+rep outsw %ds:\(%esi\),\(%dx\)
- 5d: 67 66 f3 a5[ ]+rep movsw %ds:\(%esi\),%es:\(%edi\)
- 61: 67 66 f3 ad[ ]+rep lods %ds:\(%esi\),%ax
- 65: 67 66 f3 ab[ ]+rep stos %ax,%es:\(%edi\)
- 69: 67 66 f3 a7[ ]+repz cmpsw %es:\(%edi\),%ds:\(%esi\)
- 6d: 67 66 f3 af[ ]+repz scas %es:\(%edi\),%ax
- 71: 67 f3 6d[ ]+rep insl \(%dx\),%es:\(%edi\)
- 74: 67 f3 6f[ ]+rep outsl %ds:\(%esi\),\(%dx\)
- 77: 67 f3 a5[ ]+rep movsl %ds:\(%esi\),%es:\(%edi\)
- 7a: 67 f3 ad[ ]+rep lods %ds:\(%esi\),%eax
- 7d: 67 f3 ab[ ]+rep stos %eax,%es:\(%edi\)
- 80: 67 f3 a7[ ]+repz cmpsl %es:\(%edi\),%ds:\(%esi\)
- 83: 67 f3 af[ ]+repz scas %es:\(%edi\),%eax
- 86: 67 f3 48 a5[ ]+rep movsq %ds:\(%esi\),%es:\(%edi\)
- 8a: 67 f3 48 ad[ ]+rep lods %ds:\(%esi\),%rax
- 8e: 67 f3 48 ab[ ]+rep stos %rax,%es:\(%edi\)
- 92: 67 f3 48 a7[ ]+repz cmpsq %es:\(%edi\),%ds:\(%esi\)
- 96: 67 f3 48 af[ ]+repz scas %es:\(%edi\),%rax
+ 0: f3 6c[ ]+rep insb \(%dx\),\(%rdi\)
+ 2: f3 6e[ ]+rep outsb \(%rsi\),\(%dx\)
+ 4: f3 a4[ ]+rep movsb \(%rsi\),\(%rdi\)
+ 6: f3 ac[ ]+rep lods \(%rsi\),%al
+ 8: f3 aa[ ]+rep stos %al,\(%rdi\)
+ a: f3 a6[ ]+repz cmpsb \(%rdi\),\(%rsi\)
+ c: f3 ae[ ]+repz scas \(%rdi\),%al
+ e: 66 f3 6d[ ]+rep insw \(%dx\),\(%rdi\)
+ 11: 66 f3 6f[ ]+rep outsw \(%rsi\),\(%dx\)
+ 14: 66 f3 a5[ ]+rep movsw \(%rsi\),\(%rdi\)
+ 17: 66 f3 ad[ ]+rep lods \(%rsi\),%ax
+ 1a: 66 f3 ab[ ]+rep stos %ax,\(%rdi\)
+ 1d: 66 f3 a7[ ]+repz cmpsw \(%rdi\),\(%rsi\)
+ 20: 66 f3 af[ ]+repz scas \(%rdi\),%ax
+ 23: f3 6d[ ]+rep insl \(%dx\),\(%rdi\)
+ 25: f3 6f[ ]+rep outsl \(%rsi\),\(%dx\)
+ 27: f3 a5[ ]+rep movsl \(%rsi\),\(%rdi\)
+ 29: f3 ad[ ]+rep lods \(%rsi\),%eax
+ 2b: f3 ab[ ]+rep stos %eax,\(%rdi\)
+ 2d: f3 a7[ ]+repz cmpsl \(%rdi\),\(%rsi\)
+ 2f: f3 af[ ]+repz scas \(%rdi\),%eax
+ 31: f3 48 a5[ ]+rep movsq \(%rsi\),\(%rdi\)
+ 34: f3 48 ad[ ]+rep lods \(%rsi\),%rax
+ 37: f3 48 ab[ ]+rep stos %rax,\(%rdi\)
+ 3a: f3 48 a7[ ]+repz cmpsq \(%rdi\),\(%rsi\)
+ 3d: f3 48 af[ ]+repz scas \(%rdi\),%rax
+ 40: 67 f3 6c[ ]+rep insb \(%dx\),\(%edi\)
+ 43: 67 f3 6e[ ]+rep outsb \(%esi\),\(%dx\)
+ 46: 67 f3 a4[ ]+rep movsb \(%esi\),\(%edi\)
+ 49: 67 f3 ac[ ]+rep lods \(%esi\),%al
+ 4c: 67 f3 aa[ ]+rep stos %al,\(%edi\)
+ 4f: 67 f3 a6[ ]+repz cmpsb \(%edi\),\(%esi\)
+ 52: 67 f3 ae[ ]+repz scas \(%edi\),%al
+ 55: 67 66 f3 6d[ ]+rep insw \(%dx\),\(%edi\)
+ 59: 67 66 f3 6f[ ]+rep outsw \(%esi\),\(%dx\)
+ 5d: 67 66 f3 a5[ ]+rep movsw \(%esi\),\(%edi\)
+ 61: 67 66 f3 ad[ ]+rep lods \(%esi\),%ax
+ 65: 67 66 f3 ab[ ]+rep stos %ax,\(%edi\)
+ 69: 67 66 f3 a7[ ]+repz cmpsw \(%edi\),\(%esi\)
+ 6d: 67 66 f3 af[ ]+repz scas \(%edi\),%ax
+ 71: 67 f3 6d[ ]+rep insl \(%dx\),\(%edi\)
+ 74: 67 f3 6f[ ]+rep outsl \(%esi\),\(%dx\)
+ 77: 67 f3 a5[ ]+rep movsl \(%esi\),\(%edi\)
+ 7a: 67 f3 ad[ ]+rep lods \(%esi\),%eax
+ 7d: 67 f3 ab[ ]+rep stos %eax,\(%edi\)
+ 80: 67 f3 a7[ ]+repz cmpsl \(%edi\),\(%esi\)
+ 83: 67 f3 af[ ]+repz scas \(%edi\),%eax
+ 86: 67 f3 48 a5[ ]+rep movsq \(%esi\),\(%edi\)
+ 8a: 67 f3 48 ad[ ]+rep lods \(%esi\),%rax
+ 8e: 67 f3 48 ab[ ]+rep stos %rax,\(%edi\)
+ 92: 67 f3 48 a7[ ]+repz cmpsq \(%edi\),\(%esi\)
+ 96: 67 f3 48 af[ ]+repz scas \(%edi\),%rax
#pass
diff --git a/gas/testsuite/gas/i386/x86_64-intel.d b/gas/testsuite/gas/i386/x86_64-intel.d
index 2a9b7d422ac..ee1a76b0c3d 100644
--- a/gas/testsuite/gas/i386/x86_64-intel.d
+++ b/gas/testsuite/gas/i386/x86_64-intel.d
@@ -38,9 +38,9 @@ Disassembly of section .text:
[ ]*[a-f0-9]+: 41 0f 20 c0 mov r8,cr0
[ ]*[a-f0-9]+: 44 0f 20 c0 mov rax,cr8
[ ]*[a-f0-9]+: 44 0f 22 c0 mov cr8,rax
-[ ]*[a-f0-9]+: f3 48 a5 rep movs QWORD PTR es:\[rdi\],QWORD PTR ds:\[rsi\]
-[ ]*[a-f0-9]+: 66 f3 a5 rep movs WORD PTR es:\[rdi\],WORD PTR ds:\[rsi\]
-[ ]*[a-f0-9]+: f3 48 a5 rep movs QWORD PTR es:\[rdi\],QWORD PTR ds:\[rsi\]
+[ ]*[a-f0-9]+: f3 48 a5 rep movs QWORD PTR \[rdi\],QWORD PTR \[rsi\]
+[ ]*[a-f0-9]+: 66 f3 a5 rep movs WORD PTR \[rdi\],WORD PTR \[rsi\]
+[ ]*[a-f0-9]+: f3 48 a5 rep movs QWORD PTR \[rdi\],QWORD PTR \[rsi\]
[ ]*[a-f0-9]+: b0 11 mov al,0x11
[ ]*[a-f0-9]+: b4 11 mov ah,0x11
[ ]*[a-f0-9]+: 40 b4 11 mov spl,0x11
diff --git a/gas/testsuite/gas/i386/x86_64.d b/gas/testsuite/gas/i386/x86_64.d
index aa3866191ba..5a9652eeeb7 100644
--- a/gas/testsuite/gas/i386/x86_64.d
+++ b/gas/testsuite/gas/i386/x86_64.d
@@ -38,9 +38,9 @@ Disassembly of section .text:
[ ]*[a-f0-9]+: 41 0f 20 c0 mov %cr0,%r8
[ ]*[a-f0-9]+: 44 0f 20 c0 mov %cr8,%rax
[ ]*[a-f0-9]+: 44 0f 22 c0 mov %rax,%cr8
-[ ]*[a-f0-9]+: f3 48 a5 rep movsq %ds:\(%rsi\),%es:\(%rdi\)
-[ ]*[a-f0-9]+: 66 f3 a5 rep movsw %ds:\(%rsi\),%es:\(%rdi\)
-[ ]*[a-f0-9]+: f3 48 a5 rep movsq %ds:\(%rsi\),%es:\(%rdi\)
+[ ]*[a-f0-9]+: f3 48 a5 rep movsq \(%rsi\),\(%rdi\)
+[ ]*[a-f0-9]+: 66 f3 a5 rep movsw \(%rsi\),\(%rdi\)
+[ ]*[a-f0-9]+: f3 48 a5 rep movsq \(%rsi\),\(%rdi\)
[ ]*[a-f0-9]+: b0 11 mov \$0x11,%al
[ ]*[a-f0-9]+: b4 11 mov \$0x11,%ah
[ ]*[a-f0-9]+: 40 b4 11 mov \$0x11,%spl
diff --git a/opcodes/i386-dis.c b/opcodes/i386-dis.c
index 2eb2c42629d..8059f437d9f 100644
--- a/opcodes/i386-dis.c
+++ b/opcodes/i386-dis.c
@@ -13126,8 +13126,11 @@ OP_ESreg (instr_info *ins, int code, int sizeflag)
intel_operand_size (ins, b_mode, sizeflag);
}
}
- oappend_register (ins, att_names_seg[0]);
- oappend_char (ins, ':');
+ if (ins->address_mode != mode_64bit)
+ {
+ oappend_register (ins, att_names_seg[0]);
+ oappend_char (ins, ':');
+ }
ptr_reg (ins, code, sizeflag);
return true;
}
@@ -13151,9 +13154,9 @@ OP_DSreg (instr_info *ins, int code, int sizeflag)
intel_operand_size (ins, b_mode, sizeflag);
}
}
- /* Set ins->active_seg_prefix to PREFIX_DS if it is unset so that the
- default segment register DS is printed. */
- if (!ins->active_seg_prefix)
+ /* Outside of 64-bit mode set ins->active_seg_prefix to PREFIX_DS if it
+ is unset, so that the default segment register DS is printed. */
+ if (ins->address_mode != mode_64bit && !ins->active_seg_prefix)
ins->active_seg_prefix = PREFIX_DS;
append_seg (ins);
ptr_reg (ins, code, sizeflag);
More information about the Binutils-cvs
mailing list