x86: Ignore CS/DS/ES/SS segment-override prefixes in 64-bit mode

"In 64-bit mode, the CS, DS, ES, and SS segment-override prefixes have
no effect. These four prefixes are not treated as segment-override
prefixes for the purposes of multiple-prefix rules. Instead, they are
treated as null prefixes." (AMD APM v2).

However, objdump disassembles instructions containing those ignored
prefixes by still generating that segment override:

  66 66 2e 0f 1f 84 00 	data16 nopw %cs:0x0(%rax,%rax,1)
  00 00 00 00

Print those segment override prefixes as excessive ones:

  66 66 2e 0f 1f 84 00    data16 cs nopw 0x0(%rax,%rax,1)
  00 00 00 00

which is what they actually are - they have no effect and the decoding
hardware ignores them.

gas/

2020-11-14  Borislav Petkov  <bp@suse.de>

	* testsuite/gas/i386/x86-64-segovr.d: Adjust regexes.
	* testsuite/gas/i386/x86-64-nops.d: Likewise.
	* testsuite/gas/i386/x86-64-nops-1.d: Likewise.
	* testsuite/gas/i386/x86-64-nops-1-g64.d: Likewise.
	* testsuite/gas/i386/x86-64-nops-1-core2.d: Likewise.
	* testsuite/gas/i386/x86-64-nops-1-k8.d: Likewise.
	* testsuite/gas/i386/x86-64-nops-2.d: Likewise.
	* testsuite/gas/i386/x86-64-nops-3.d: Likewise.
	* testsuite/gas/i386/x86-64-nops-4.d: Likewise.
	* testsuite/gas/i386/x86-64-nops-4-core2.d: Likewise.
	* testsuite/gas/i386/x86-64-nops-4-k8.d: Likewise.
	* testsuite/gas/i386/x86-64-nops-5.d: Likewise.
	* testsuite/gas/i386/x86-64-nops-5-k8.d: Likewise.
	* testsuite/gas/i386/x86-64-nops-7.d: Likewise.
	* testsuite/gas/i386/x86-64-nop-1.d: Likewise.
	* testsuite/gas/i386/x86-64-align-branch-1a.d: Likewise.
	* testsuite/gas/i386/x86-64-align-branch-1b.d: Likewise.
	* testsuite/gas/i386/x86-64-align-branch-1c.d: Likewise.
	* testsuite/gas/i386/x86-64-align-branch-1d.d: Likewise.
	* testsuite/gas/i386/x86-64-align-branch-1g.d: Likewise.
	* testsuite/gas/i386/x86-64-align-branch-2c.d: Likewise.
	* testsuite/gas/i386/x86-64-align-branch-6.d: Likewise.
	* testsuite/gas/i386/x86-64-align-branch-7.d: Likewise.
	* testsuite/gas/i386/x86-64-align-branch-8.d: Likewise.
	* testsuite/gas/i386/ilp32/x86-64-nops-1-core2.d: Likewise.
	* testsuite/gas/i386/ilp32/x86-64-nops-1-k8.d: Likewise.
	* testsuite/gas/i386/ilp32/x86-64-nops-1.d: Likewise.
	* testsuite/gas/i386/ilp32/x86-64-nops-2.d: Likewise.
	* testsuite/gas/i386/ilp32/x86-64-nops-3.d: Likewise.
	* testsuite/gas/i386/ilp32/x86-64-nops-4-core2.d: Likewise.
	* testsuite/gas/i386/ilp32/x86-64-nops-4-k8.d: Likewise.
	* testsuite/gas/i386/ilp32/x86-64-nops-4.d: Likewise.
	* testsuite/gas/i386/ilp32/x86-64-nops-5-k8.d: Likewise.
	* testsuite/gas/i386/ilp32/x86-64-nops-5.d: Likewise.
	* testsuite/gas/i386/ilp32/x86-64-nops.d:: Likewise.

ld/

2020-11-14  Borislav Petkov  <bp@suse.de>

	* testsuite/ld-x86-64/pe-x86-64-4.od: Adjust regexes.
	* testsuite/ld-x86-64/tlsld3.dd: Likewise.
	* testsuite/ld-x86-64/tlsld4.dd: Likewise.

opcodes/

2020-11-14  Borislav Petkov  <bp@suse.de>

	* i386-dis.c (ckprefix): Do not assign active_seg_prefix in
	64-bit addressing mode.
	(NOTRACK_Fixup): Test prefixes for PREFIX_DS, instead of
	active_seg_prefix.

diff --git a/gas/ChangeLog b/gas/ChangeLog
index 8976025a4623a6e7328e1dababea56f4e35a17dd..f047e8d16ab0e5f523f42c34f8d9efbfbcac0971 100644 (file)
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,41 @@
+2020-11-14  Borislav Petkov  <bp@suse.de>
+
+       * testsuite/gas/i386/x86-64-segovr.d: Adjust regexes.
+       * testsuite/gas/i386/x86-64-nops.d: Likewise.
+       * testsuite/gas/i386/x86-64-nops-1.d: Likewise.
+       * testsuite/gas/i386/x86-64-nops-1-g64.d: Likewise.
+       * testsuite/gas/i386/x86-64-nops-1-core2.d: Likewise.
+       * testsuite/gas/i386/x86-64-nops-1-k8.d: Likewise.
+       * testsuite/gas/i386/x86-64-nops-2.d: Likewise.
+       * testsuite/gas/i386/x86-64-nops-3.d: Likewise.
+       * testsuite/gas/i386/x86-64-nops-4.d: Likewise.
+       * testsuite/gas/i386/x86-64-nops-4-core2.d: Likewise.
+       * testsuite/gas/i386/x86-64-nops-4-k8.d: Likewise.
+       * testsuite/gas/i386/x86-64-nops-5.d: Likewise.
+       * testsuite/gas/i386/x86-64-nops-5-k8.d: Likewise.
+       * testsuite/gas/i386/x86-64-nops-7.d: Likewise.
+       * testsuite/gas/i386/x86-64-nop-1.d: Likewise.
+       * testsuite/gas/i386/x86-64-align-branch-1a.d: Likewise.
+       * testsuite/gas/i386/x86-64-align-branch-1b.d: Likewise.
+       * testsuite/gas/i386/x86-64-align-branch-1c.d: Likewise.
+       * testsuite/gas/i386/x86-64-align-branch-1d.d: Likewise.
+       * testsuite/gas/i386/x86-64-align-branch-1g.d: Likewise.
+       * testsuite/gas/i386/x86-64-align-branch-2c.d: Likewise.
+       * testsuite/gas/i386/x86-64-align-branch-6.d: Likewise.
+       * testsuite/gas/i386/x86-64-align-branch-7.d: Likewise.
+       * testsuite/gas/i386/x86-64-align-branch-8.d: Likewise.
+       * testsuite/gas/i386/ilp32/x86-64-nops-1-core2.d: Likewise.
+       * testsuite/gas/i386/ilp32/x86-64-nops-1-k8.d: Likewise.
+       * testsuite/gas/i386/ilp32/x86-64-nops-1.d: Likewise.
+       * testsuite/gas/i386/ilp32/x86-64-nops-2.d: Likewise.
+       * testsuite/gas/i386/ilp32/x86-64-nops-3.d: Likewise.
+       * testsuite/gas/i386/ilp32/x86-64-nops-4-core2.d: Likewise.
+       * testsuite/gas/i386/ilp32/x86-64-nops-4-k8.d: Likewise.
+       * testsuite/gas/i386/ilp32/x86-64-nops-4.d: Likewise.
+       * testsuite/gas/i386/ilp32/x86-64-nops-5-k8.d: Likewise.
+       * testsuite/gas/i386/ilp32/x86-64-nops-5.d: Likewise.
+       * testsuite/gas/i386/ilp32/x86-64-nops.d:: Likewise.
+
 2020-11-12  Jozef Lawrynowicz  <jozef.l@mittosystems.com>
 
        * config/tc-msp430.c (OPTION_MOVE_DATA): Define.

diff --git a/gas/testsuite/gas/i386/ilp32/x86-64-nops-1-core2.d b/gas/testsuite/gas/i386/ilp32/x86-64-nops-1-core2.d
index 2495cf8b1c11f99a2a935d551c51c5837643df10..8539447130561c033a5120ef906f60e857fef423 100644 (file)
--- a/gas/testsuite/gas/i386/ilp32/x86-64-nops-1-core2.d
+++ b/gas/testsuite/gas/i386/ilp32/x86-64-nops-1-core2.d
@@ -9,20 +9,20 @@ Disassembly of section .text:
 
 0+ <nop15>:
 [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
 [      ]*[a-f0-9]+:    0f 1f 40 00             nopl   0x0\(%rax\)
 
 0+10 <nop14>:
 [      ]*[a-f0-9]+:    90                      nop
 [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
 [      ]*[a-f0-9]+:    0f 1f 00                nopl   \(%rax\)
 
 0+20 <nop13>:
 [      ]*[a-f0-9]+:    90                      nop
 [      ]*[a-f0-9]+:    90                      nop
 [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
 [      ]*[a-f0-9]+:    66 90                   xchg   %ax,%ax
 
 0+30 <nop12>:
@@ -30,7 +30,7 @@ Disassembly of section .text:
 [      ]*[a-f0-9]+:    90                      nop
 [      ]*[a-f0-9]+:    90                      nop
 [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
 [      ]*[a-f0-9]+:    90                      nop
 
 0+40 <nop11>:
@@ -39,7 +39,7 @@ Disassembly of section .text:
 [      ]*[a-f0-9]+:    90                      nop
 [      ]*[a-f0-9]+:    90                      nop
 [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
 
 0+50 <nop10>:
 [      ]*[a-f0-9]+:    90                      nop
@@ -48,7 +48,7 @@ Disassembly of section .text:
 [      ]*[a-f0-9]+:    90                      nop
 [      ]*[a-f0-9]+:    90                      nop
 [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   cs nopw 0x0\(%rax,%rax,1\)
 
 0+60 <nop9>:
 [      ]*[a-f0-9]+:    90                      nop

diff --git a/gas/testsuite/gas/i386/ilp32/x86-64-nops-1-k8.d b/gas/testsuite/gas/i386/ilp32/x86-64-nops-1-k8.d
index 857fb0af9c43e7a69583ecee9289512d7a640303..f8b729dd035e2c2f50d3c2c8d4af5c6e0231e909 100644 (file)
--- a/gas/testsuite/gas/i386/ilp32/x86-64-nops-1-k8.d
+++ b/gas/testsuite/gas/i386/ilp32/x86-64-nops-1-k8.d
@@ -9,20 +9,20 @@ Disassembly of section .text:
 
 0+ <nop15>:
 [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
 [      ]*[a-f0-9]+:    0f 1f 40 00             nopl   0x0\(%rax\)
 
 0+10 <nop14>:
 [      ]*[a-f0-9]+:    90                      nop
 [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
 [      ]*[a-f0-9]+:    0f 1f 00                nopl   \(%rax\)
 
 0+20 <nop13>:
 [      ]*[a-f0-9]+:    90                      nop
 [      ]*[a-f0-9]+:    90                      nop
 [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
 [      ]*[a-f0-9]+:    66 90                   xchg   %ax,%ax
 
 0+30 <nop12>:
@@ -30,7 +30,7 @@ Disassembly of section .text:
 [      ]*[a-f0-9]+:    90                      nop
 [      ]*[a-f0-9]+:    90                      nop
 [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
 [      ]*[a-f0-9]+:    90                      nop
 
 0+40 <nop11>:
@@ -39,7 +39,7 @@ Disassembly of section .text:
 [      ]*[a-f0-9]+:    90                      nop
 [      ]*[a-f0-9]+:    90                      nop
 [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
 
 0+50 <nop10>:
 [      ]*[a-f0-9]+:    90                      nop
@@ -48,7 +48,7 @@ Disassembly of section .text:
 [      ]*[a-f0-9]+:    90                      nop
 [      ]*[a-f0-9]+:    90                      nop
 [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   cs nopw 0x0\(%rax,%rax,1\)
 
 0+60 <nop9>:
 [      ]*[a-f0-9]+:    90                      nop

diff --git a/gas/testsuite/gas/i386/ilp32/x86-64-nops-1.d b/gas/testsuite/gas/i386/ilp32/x86-64-nops-1.d
index 2363abc209c028fd84c91c7c1e1f69e46b1b2345..2d4784b7c1e8b17acce869fb703581d33750caba 100644 (file)
--- a/gas/testsuite/gas/i386/ilp32/x86-64-nops-1.d
+++ b/gas/testsuite/gas/i386/ilp32/x86-64-nops-1.d
@@ -9,20 +9,20 @@ Disassembly of section .text:
 
 0+ <nop15>:
 [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
 [      ]*[a-f0-9]+:    0f 1f 40 00             nopl   0x0\(%rax\)
 
 0+10 <nop14>:
 [      ]*[a-f0-9]+:    90                      nop
 [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
 [      ]*[a-f0-9]+:    0f 1f 00                nopl   \(%rax\)
 
 0+20 <nop13>:
 [      ]*[a-f0-9]+:    90                      nop
 [      ]*[a-f0-9]+:    90                      nop
 [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
 [      ]*[a-f0-9]+:    66 90                   xchg   %ax,%ax
 
 0+30 <nop12>:
@@ -30,7 +30,7 @@ Disassembly of section .text:
 [      ]*[a-f0-9]+:    90                      nop
 [      ]*[a-f0-9]+:    90                      nop
 [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
 [      ]*[a-f0-9]+:    90                      nop
 
 0+40 <nop11>:
@@ -39,7 +39,7 @@ Disassembly of section .text:
 [      ]*[a-f0-9]+:    90                      nop
 [      ]*[a-f0-9]+:    90                      nop
 [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
 
 0+50 <nop10>:
 [      ]*[a-f0-9]+:    90                      nop
@@ -48,7 +48,7 @@ Disassembly of section .text:
 [      ]*[a-f0-9]+:    90                      nop
 [      ]*[a-f0-9]+:    90                      nop
 [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   cs nopw 0x0\(%rax,%rax,1\)
 
 0+60 <nop9>:
 [      ]*[a-f0-9]+:    90                      nop

diff --git a/gas/testsuite/gas/i386/ilp32/x86-64-nops-2.d b/gas/testsuite/gas/i386/ilp32/x86-64-nops-2.d
index 89017a2dcf5892dea4efe68c5a78fb5c39e819ad..b4bb8f235e991d52697dfb0dcd050e92679cae45 100644 (file)
--- a/gas/testsuite/gas/i386/ilp32/x86-64-nops-2.d
+++ b/gas/testsuite/gas/i386/ilp32/x86-64-nops-2.d
@@ -9,25 +9,25 @@ Disassembly of section .text:
 
 0+ <nop>:
 [      ]*[a-f0-9]+:    0f be f0                movsbl %al,%esi
-[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
 [      ]*[a-f0-9]+:    66 90                   xchg   %ax,%ax
 
 0+10 <nop15>:
 [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
 [      ]*[a-f0-9]+:    0f 1f 40 00             nopl   0x0\(%rax\)
 
 0+20 <nop14>:
 [      ]*[a-f0-9]+:    90                      nop
 [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
 [      ]*[a-f0-9]+:    0f 1f 00                nopl   \(%rax\)
 
 0+30 <nop13>:
 [      ]*[a-f0-9]+:    90                      nop
 [      ]*[a-f0-9]+:    90                      nop
 [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
 [      ]*[a-f0-9]+:    66 90                   xchg   %ax,%ax
 
 0+40 <nop12>:
@@ -35,7 +35,7 @@ Disassembly of section .text:
 [      ]*[a-f0-9]+:    90                      nop
 [      ]*[a-f0-9]+:    90                      nop
 [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
 [      ]*[a-f0-9]+:    90                      nop
 
 0+50 <nop11>:
@@ -44,7 +44,7 @@ Disassembly of section .text:
 [      ]*[a-f0-9]+:    90                      nop
 [      ]*[a-f0-9]+:    90                      nop
 [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
 
 0+60 <nop10>:
 [      ]*[a-f0-9]+:    90                      nop
@@ -53,7 +53,7 @@ Disassembly of section .text:
 [      ]*[a-f0-9]+:    90                      nop
 [      ]*[a-f0-9]+:    90                      nop
 [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   cs nopw 0x0\(%rax,%rax,1\)
 
 0+70 <nop9>:
 [      ]*[a-f0-9]+:    90                      nop

diff --git a/gas/testsuite/gas/i386/ilp32/x86-64-nops-3.d b/gas/testsuite/gas/i386/ilp32/x86-64-nops-3.d
index c03b9baa58b30a258cbd1a86ceffc9992f880a22..6645c902025bfdcf69f04768f8968f268a590c4c 100644 (file)
--- a/gas/testsuite/gas/i386/ilp32/x86-64-nops-3.d
+++ b/gas/testsuite/gas/i386/ilp32/x86-64-nops-3.d
@@ -9,10 +9,10 @@ Disassembly of section .text:
 
 0+ <nop>:
 [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
-[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
 [      ]*[a-f0-9]+:    66 0f 1f 84 00 00 00 00 00      nopw   0x0\(%rax,%rax,1\)
 [      ]*[a-f0-9]+:    89 c3                   mov    %eax,%ebx
-[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
 [      ]*[a-f0-9]+:    0f 1f 00                nopl   \(%rax\)
 #pass

diff --git a/gas/testsuite/gas/i386/ilp32/x86-64-nops-4-core2.d b/gas/testsuite/gas/i386/ilp32/x86-64-nops-4-core2.d
index 92bd5a3b28478930529d87f4019a8753150b5202..1fac9febad297ad9863953273d57b755cb93d470 100644 (file)
--- a/gas/testsuite/gas/i386/ilp32/x86-64-nops-4-core2.d
+++ b/gas/testsuite/gas/i386/ilp32/x86-64-nops-4-core2.d
@@ -9,23 +9,23 @@ Disassembly of section .text:
 
 0+ <nop31>:
 [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
-[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
 [      ]*[a-f0-9]+:    66 0f 1f 84 00 00 00 00 00      nopw   0x0\(%rax,%rax,1\)
 
 0+20 <nop30>:
 [      ]*[a-f0-9]+:    90                      nop
 [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
-[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
 [      ]*[a-f0-9]+:    0f 1f 84 00 00 00 00 00         nopl   0x0\(%rax,%rax,1\)
 
 0+40 <nop29>:
 [      ]*[a-f0-9]+:    90                      nop
 [      ]*[a-f0-9]+:    90                      nop
 [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
-[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
 [      ]*[a-f0-9]+:    0f 1f 80 00 00 00 00    nopl   0x0\(%rax\)
 
 0+60 <nop28>:
@@ -33,8 +33,8 @@ Disassembly of section .text:
 [      ]*[a-f0-9]+:    90                      nop
 [      ]*[a-f0-9]+:    90                      nop
 [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
-[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
 [      ]*[a-f0-9]+:    66 0f 1f 44 00 00       nopw   0x0\(%rax,%rax,1\)
 
 0+80 <nop27>:
@@ -43,8 +43,8 @@ Disassembly of section .text:
 [      ]*[a-f0-9]+:    90                      nop
 [      ]*[a-f0-9]+:    90                      nop
 [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
-[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
 [      ]*[a-f0-9]+:    0f 1f 44 00 00          nopl   0x0\(%rax,%rax,1\)
 
 0+a0 <nop26>:
@@ -54,8 +54,8 @@ Disassembly of section .text:
 [      ]*[a-f0-9]+:    90                      nop
 [      ]*[a-f0-9]+:    90                      nop
 [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
-[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
 [      ]*[a-f0-9]+:    0f 1f 40 00             nopl   0x0\(%rax\)
 
 0+c0 <nop25>:
@@ -66,8 +66,8 @@ Disassembly of section .text:
 [      ]*[a-f0-9]+:    90                      nop
 [      ]*[a-f0-9]+:    90                      nop
 [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
-[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
 [      ]*[a-f0-9]+:    0f 1f 00                nopl   \(%rax\)
 
 0+e0 <nop24>:
@@ -79,8 +79,8 @@ Disassembly of section .text:
 [      ]*[a-f0-9]+:    90                      nop
 [      ]*[a-f0-9]+:    90                      nop
 [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
-[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
 [      ]*[a-f0-9]+:    66 90                   xchg   %ax,%ax
 
 0+100 <nop23>:
@@ -93,8 +93,8 @@ Disassembly of section .text:
 [      ]*[a-f0-9]+:    90                      nop
 [      ]*[a-f0-9]+:    90                      nop
 [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
-[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
 [      ]*[a-f0-9]+:    90                      nop
 
 0+120 <nop22>:
@@ -108,8 +108,8 @@ Disassembly of section .text:
 [      ]*[a-f0-9]+:    90                      nop
 [      ]*[a-f0-9]+:    90                      nop
 [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
-[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
 
 0+140 <nop21>:
 [      ]*[a-f0-9]+:    90                      nop
@@ -123,8 +123,8 @@ Disassembly of section .text:
 [      ]*[a-f0-9]+:    90                      nop
 [      ]*[a-f0-9]+:    90                      nop
 [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
-[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   cs nopw 0x0\(%rax,%rax,1\)
 
 0+160 <nop20>:
 [      ]*[a-f0-9]+:    90                      nop
@@ -139,7 +139,7 @@ Disassembly of section .text:
 [      ]*[a-f0-9]+:    90                      nop
 [      ]*[a-f0-9]+:    90                      nop
 [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
 [      ]*[a-f0-9]+:    66 0f 1f 84 00 00 00 00 00      nopw   0x0\(%rax,%rax,1\)
 
 0+180 <nop19>:
@@ -156,7 +156,7 @@ Disassembly of section .text:
 [      ]*[a-f0-9]+:    90                      nop
 [      ]*[a-f0-9]+:    90                      nop
 [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
 [      ]*[a-f0-9]+:    0f 1f 84 00 00 00 00 00         nopl   0x0\(%rax,%rax,1\)
 
 0+1a0 <nop18>:
@@ -174,7 +174,7 @@ Disassembly of section .text:
 [      ]*[a-f0-9]+:    90                      nop
 [      ]*[a-f0-9]+:    90                      nop
 [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
 [      ]*[a-f0-9]+:    0f 1f 80 00 00 00 00    nopl   0x0\(%rax\)
 
 0+1c0 <nop17>:
@@ -193,7 +193,7 @@ Disassembly of section .text:
 [      ]*[a-f0-9]+:    90                      nop
 [      ]*[a-f0-9]+:    90                      nop
 [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
 [      ]*[a-f0-9]+:    66 0f 1f 44 00 00       nopw   0x0\(%rax,%rax,1\)
 
 0+1e0 <nop16>:
@@ -213,6 +213,6 @@ Disassembly of section .text:
 [      ]*[a-f0-9]+:    90                      nop
 [      ]*[a-f0-9]+:    90                      nop
 [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
 [      ]*[a-f0-9]+:    0f 1f 44 00 00          nopl   0x0\(%rax,%rax,1\)
 #pass

diff --git a/gas/testsuite/gas/i386/ilp32/x86-64-nops-4-k8.d b/gas/testsuite/gas/i386/ilp32/x86-64-nops-4-k8.d
index 49de05870c19623376aa5dc10d91d7a87246746f..68cb105b552b3742c173bd96094981d0f13de9b0 100644 (file)
--- a/gas/testsuite/gas/i386/ilp32/x86-64-nops-4-k8.d
+++ b/gas/testsuite/gas/i386/ilp32/x86-64-nops-4-k8.d
@@ -9,23 +9,23 @@ Disassembly of section .text:
 
 0+ <nop31>:
 [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
-[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
 [      ]*[a-f0-9]+:    66 0f 1f 84 00 00 00 00 00      nopw   0x0\(%rax,%rax,1\)
 
 0+20 <nop30>:
 [      ]*[a-f0-9]+:    90                      nop
 [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
-[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
 [      ]*[a-f0-9]+:    0f 1f 84 00 00 00 00 00         nopl   0x0\(%rax,%rax,1\)
 
 0+40 <nop29>:
 [      ]*[a-f0-9]+:    90                      nop
 [      ]*[a-f0-9]+:    90                      nop
 [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
-[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
 [      ]*[a-f0-9]+:    0f 1f 80 00 00 00 00    nopl   0x0\(%rax\)
 
 0+60 <nop28>:
@@ -33,8 +33,8 @@ Disassembly of section .text:
 [      ]*[a-f0-9]+:    90                      nop
 [      ]*[a-f0-9]+:    90                      nop
 [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
-[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
 [      ]*[a-f0-9]+:    66 0f 1f 44 00 00       nopw   0x0\(%rax,%rax,1\)
 
 0+80 <nop27>:
@@ -43,8 +43,8 @@ Disassembly of section .text:
 [      ]*[a-f0-9]+:    90                      nop
 [      ]*[a-f0-9]+:    90                      nop
 [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
-[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
 [      ]*[a-f0-9]+:    0f 1f 44 00 00          nopl   0x0\(%rax,%rax,1\)
 
 0+a0 <nop26>:
@@ -54,8 +54,8 @@ Disassembly of section .text:
 [      ]*[a-f0-9]+:    90                      nop
 [      ]*[a-f0-9]+:    90                      nop
 [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
-[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
 [      ]*[a-f0-9]+:    0f 1f 40 00             nopl   0x0\(%rax\)
 
 0+c0 <nop25>:
@@ -66,8 +66,8 @@ Disassembly of section .text:
 [      ]*[a-f0-9]+:    90                      nop
 [      ]*[a-f0-9]+:    90                      nop
 [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
-[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
 [      ]*[a-f0-9]+:    0f 1f 00                nopl   \(%rax\)
 
 0+e0 <nop24>:
@@ -79,8 +79,8 @@ Disassembly of section .text:
 [      ]*[a-f0-9]+:    90                      nop
 [      ]*[a-f0-9]+:    90                      nop
 [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
-[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
 [      ]*[a-f0-9]+:    66 90                   xchg   %ax,%ax
 
 0+100 <nop23>:
@@ -93,8 +93,8 @@ Disassembly of section .text:
 [      ]*[a-f0-9]+:    90                      nop
 [      ]*[a-f0-9]+:    90                      nop
 [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
-[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
 [      ]*[a-f0-9]+:    90                      nop
 
 0+120 <nop22>:
@@ -108,8 +108,8 @@ Disassembly of section .text:
 [      ]*[a-f0-9]+:    90                      nop
 [      ]*[a-f0-9]+:    90                      nop
 [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
-[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
 
 0+140 <nop21>:
 [      ]*[a-f0-9]+:    90                      nop
@@ -123,8 +123,8 @@ Disassembly of section .text:
 [      ]*[a-f0-9]+:    90                      nop
 [      ]*[a-f0-9]+:    90                      nop
 [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
-[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   cs nopw 0x0\(%rax,%rax,1\)
 
 0+160 <nop20>:
 [      ]*[a-f0-9]+:    90                      nop
@@ -139,7 +139,7 @@ Disassembly of section .text:
 [      ]*[a-f0-9]+:    90                      nop
 [      ]*[a-f0-9]+:    90                      nop
 [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
 [      ]*[a-f0-9]+:    66 0f 1f 84 00 00 00 00 00      nopw   0x0\(%rax,%rax,1\)
 
 0+180 <nop19>:
@@ -156,7 +156,7 @@ Disassembly of section .text:
 [      ]*[a-f0-9]+:    90                      nop
 [      ]*[a-f0-9]+:    90                      nop
 [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
 [      ]*[a-f0-9]+:    0f 1f 84 00 00 00 00 00         nopl   0x0\(%rax,%rax,1\)
 
 0+1a0 <nop18>:
@@ -174,7 +174,7 @@ Disassembly of section .text:
 [      ]*[a-f0-9]+:    90                      nop
 [      ]*[a-f0-9]+:    90                      nop
 [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
 [      ]*[a-f0-9]+:    0f 1f 80 00 00 00 00    nopl   0x0\(%rax\)
 
 0+1c0 <nop17>:
@@ -193,7 +193,7 @@ Disassembly of section .text:
 [      ]*[a-f0-9]+:    90                      nop
 [      ]*[a-f0-9]+:    90                      nop
 [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
 [      ]*[a-f0-9]+:    66 0f 1f 44 00 00       nopw   0x0\(%rax,%rax,1\)
 
 0+1e0 <nop16>:
@@ -213,6 +213,6 @@ Disassembly of section .text:
 [      ]*[a-f0-9]+:    90                      nop
 [      ]*[a-f0-9]+:    90                      nop
 [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
 [      ]*[a-f0-9]+:    0f 1f 44 00 00          nopl   0x0\(%rax,%rax,1\)
 #pass

diff --git a/gas/testsuite/gas/i386/ilp32/x86-64-nops-4.d b/gas/testsuite/gas/i386/ilp32/x86-64-nops-4.d
index f47499c7122d29746456747494c441e7be7dfd35..4d82cdf9e8632a2bd14f11c8a0d147db0e738d6f 100644 (file)
--- a/gas/testsuite/gas/i386/ilp32/x86-64-nops-4.d
+++ b/gas/testsuite/gas/i386/ilp32/x86-64-nops-4.d
@@ -9,23 +9,23 @@ Disassembly of section .text:
 
 0+ <nop31>:
 [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
-[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
 [      ]*[a-f0-9]+:    66 0f 1f 84 00 00 00 00 00      nopw   0x0\(%rax,%rax,1\)
 
 0+20 <nop30>:
 [      ]*[a-f0-9]+:    90                      nop
 [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
-[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
 [      ]*[a-f0-9]+:    0f 1f 84 00 00 00 00 00         nopl   0x0\(%rax,%rax,1\)
 
 0+40 <nop29>:
 [      ]*[a-f0-9]+:    90                      nop
 [      ]*[a-f0-9]+:    90                      nop
 [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
-[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
 [      ]*[a-f0-9]+:    0f 1f 80 00 00 00 00    nopl   0x0\(%rax\)
 
 0+60 <nop28>:
@@ -33,8 +33,8 @@ Disassembly of section .text:
 [      ]*[a-f0-9]+:    90                      nop
 [      ]*[a-f0-9]+:    90                      nop
 [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
-[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
 [      ]*[a-f0-9]+:    66 0f 1f 44 00 00       nopw   0x0\(%rax,%rax,1\)
 
 0+80 <nop27>:
@@ -43,8 +43,8 @@ Disassembly of section .text:
 [      ]*[a-f0-9]+:    90                      nop
 [      ]*[a-f0-9]+:    90                      nop
 [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
-[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
 [      ]*[a-f0-9]+:    0f 1f 44 00 00          nopl   0x0\(%rax,%rax,1\)
 
 0+a0 <nop26>:
@@ -54,8 +54,8 @@ Disassembly of section .text:
 [      ]*[a-f0-9]+:    90                      nop
 [      ]*[a-f0-9]+:    90                      nop
 [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
-[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
 [      ]*[a-f0-9]+:    0f 1f 40 00             nopl   0x0\(%rax\)
 
 0+c0 <nop25>:
@@ -66,8 +66,8 @@ Disassembly of section .text:
 [      ]*[a-f0-9]+:    90                      nop
 [      ]*[a-f0-9]+:    90                      nop
 [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
-[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
 [      ]*[a-f0-9]+:    0f 1f 00                nopl   \(%rax\)
 
 0+e0 <nop24>:
@@ -79,8 +79,8 @@ Disassembly of section .text:
 [      ]*[a-f0-9]+:    90                      nop
 [      ]*[a-f0-9]+:    90                      nop
 [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
-[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
 [      ]*[a-f0-9]+:    66 90                   xchg   %ax,%ax
 
 0+100 <nop23>:
@@ -93,8 +93,8 @@ Disassembly of section .text:
 [      ]*[a-f0-9]+:    90                      nop
 [      ]*[a-f0-9]+:    90                      nop
 [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
-[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
 [      ]*[a-f0-9]+:    90                      nop
 
 0+120 <nop22>:
@@ -108,8 +108,8 @@ Disassembly of section .text:
 [      ]*[a-f0-9]+:    90                      nop
 [      ]*[a-f0-9]+:    90                      nop
 [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
-[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
 
 0+140 <nop21>:
 [      ]*[a-f0-9]+:    90                      nop
@@ -123,8 +123,8 @@ Disassembly of section .text:
 [      ]*[a-f0-9]+:    90                      nop
 [      ]*[a-f0-9]+:    90                      nop
 [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
-[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   cs nopw 0x0\(%rax,%rax,1\)
 
 0+160 <nop20>:
 [      ]*[a-f0-9]+:    90                      nop
@@ -139,7 +139,7 @@ Disassembly of section .text:
 [      ]*[a-f0-9]+:    90                      nop
 [      ]*[a-f0-9]+:    90                      nop
 [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
 [      ]*[a-f0-9]+:    66 0f 1f 84 00 00 00 00 00      nopw   0x0\(%rax,%rax,1\)
 
 0+180 <nop19>:
@@ -156,7 +156,7 @@ Disassembly of section .text:
 [      ]*[a-f0-9]+:    90                      nop
 [      ]*[a-f0-9]+:    90                      nop
 [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
 [      ]*[a-f0-9]+:    0f 1f 84 00 00 00 00 00         nopl   0x0\(%rax,%rax,1\)
 
 0+1a0 <nop18>:
@@ -174,7 +174,7 @@ Disassembly of section .text:
 [      ]*[a-f0-9]+:    90                      nop
 [      ]*[a-f0-9]+:    90                      nop
 [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
 [      ]*[a-f0-9]+:    0f 1f 80 00 00 00 00    nopl   0x0\(%rax\)
 
 0+1c0 <nop17>:
@@ -193,7 +193,7 @@ Disassembly of section .text:
 [      ]*[a-f0-9]+:    90                      nop
 [      ]*[a-f0-9]+:    90                      nop
 [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
 [      ]*[a-f0-9]+:    66 0f 1f 44 00 00       nopw   0x0\(%rax,%rax,1\)
 
 0+1e0 <nop16>:
@@ -213,6 +213,6 @@ Disassembly of section .text:
 [      ]*[a-f0-9]+:    90                      nop
 [      ]*[a-f0-9]+:    90                      nop
 [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
 [      ]*[a-f0-9]+:    0f 1f 44 00 00          nopl   0x0\(%rax,%rax,1\)
 #pass

diff --git a/gas/testsuite/gas/i386/ilp32/x86-64-nops-5-k8.d b/gas/testsuite/gas/i386/ilp32/x86-64-nops-5-k8.d
index a884406b3458bd70abecde2b73d067c2ad7efa9f..51a8ed7400c9a068cdb79f59a4eb3fa75cb9f131 100644 (file)
--- a/gas/testsuite/gas/i386/ilp32/x86-64-nops-5-k8.d
+++ b/gas/testsuite/gas/i386/ilp32/x86-64-nops-5-k8.d
@@ -29,22 +29,22 @@ Disassembly of section .text:
 
 0+40 <pentium4>:
 [      ]*[a-f0-9]+:    0f be f0                movsbl %al,%esi
-[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
 [      ]*[a-f0-9]+:    66 90                   xchg   %ax,%ax
 
 0+50 <nocona>:
 [      ]*[a-f0-9]+:    0f be f0                movsbl %al,%esi
-[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
 [      ]*[a-f0-9]+:    66 90                   xchg   %ax,%ax
 
 0+60 <core>:
 [      ]*[a-f0-9]+:    0f be f0                movsbl %al,%esi
-[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
 [      ]*[a-f0-9]+:    66 90                   xchg   %ax,%ax
 
 0+70 <core2>:
 [      ]*[a-f0-9]+:    0f be f0                movsbl %al,%esi
-[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
 [      ]*[a-f0-9]+:    66 90                   xchg   %ax,%ax
 
 0+80 <k6>:
@@ -54,12 +54,12 @@ Disassembly of section .text:
 
 0+90 <athlon>:
 [      ]*[a-f0-9]+:    0f be f0                movsbl %al,%esi
-[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
 [      ]*[a-f0-9]+:    66 90                   xchg   %ax,%ax
 
 0+a0 <k8>:
 [      ]*[a-f0-9]+:    0f be f0                movsbl %al,%esi
-[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
 [      ]*[a-f0-9]+:    66 90                   xchg   %ax,%ax
 
 0+b0 <generic32>:
@@ -69,11 +69,11 @@ Disassembly of section .text:
 
 0+c0 <generic64>:
 [      ]*[a-f0-9]+:    0f be f0                movsbl %al,%esi
-[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
 [      ]*[a-f0-9]+:    66 90                   xchg   %ax,%ax
 
 0+d0 <amdfam10>:
 [      ]*[a-f0-9]+:    0f be f0                movsbl %al,%esi
-[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
 [      ]*[a-f0-9]+:    66 90                   xchg   %ax,%ax
 #pass

diff --git a/gas/testsuite/gas/i386/ilp32/x86-64-nops-5.d b/gas/testsuite/gas/i386/ilp32/x86-64-nops-5.d
index b6438c4d6febfd92cac1a8c6841e1125182ce8dc..49754546689ced7eeb0dd63bf5b348b32ad269a9 100644 (file)
--- a/gas/testsuite/gas/i386/ilp32/x86-64-nops-5.d
+++ b/gas/testsuite/gas/i386/ilp32/x86-64-nops-5.d
@@ -28,22 +28,22 @@ Disassembly of section .text:
 
 0+40 <pentium4>:
 [      ]*[a-f0-9]+:    0f be f0                movsbl %al,%esi
-[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
 [      ]*[a-f0-9]+:    66 90                   xchg   %ax,%ax
 
 0+50 <nocona>:
 [      ]*[a-f0-9]+:    0f be f0                movsbl %al,%esi
-[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
 [      ]*[a-f0-9]+:    66 90                   xchg   %ax,%ax
 
 0+60 <core>:
 [      ]*[a-f0-9]+:    0f be f0                movsbl %al,%esi
-[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
 [      ]*[a-f0-9]+:    66 90                   xchg   %ax,%ax
 
 0+70 <core2>:
 [      ]*[a-f0-9]+:    0f be f0                movsbl %al,%esi
-[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
 [      ]*[a-f0-9]+:    66 90                   xchg   %ax,%ax
 
 0+80 <k6>:
@@ -53,12 +53,12 @@ Disassembly of section .text:
 
 0+90 <athlon>:
 [      ]*[a-f0-9]+:    0f be f0                movsbl %al,%esi
-[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
 [      ]*[a-f0-9]+:    66 90                   xchg   %ax,%ax
 
 0+a0 <k8>:
 [      ]*[a-f0-9]+:    0f be f0                movsbl %al,%esi
-[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
 [      ]*[a-f0-9]+:    66 90                   xchg   %ax,%ax
 
 0+b0 <generic32>:
@@ -68,11 +68,11 @@ Disassembly of section .text:
 
 0+c0 <generic64>:
 [      ]*[a-f0-9]+:    0f be f0                movsbl %al,%esi
-[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
 [      ]*[a-f0-9]+:    66 90                   xchg   %ax,%ax
 
 0+d0 <amdfam10>:
 [      ]*[a-f0-9]+:    0f be f0                movsbl %al,%esi
-[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
 [      ]*[a-f0-9]+:    66 90                   xchg   %ax,%ax
 #pass

diff --git a/gas/testsuite/gas/i386/ilp32/x86-64-nops.d b/gas/testsuite/gas/i386/ilp32/x86-64-nops.d
index 3a47e6cb994a71611939506ec4b0e5db3b0a3d63..b874e75bc5079a94af1293b3b464131c527d4f9b 100644 (file)
--- a/gas/testsuite/gas/i386/ilp32/x86-64-nops.d
+++ b/gas/testsuite/gas/i386/ilp32/x86-64-nops.d
@@ -14,7 +14,7 @@ Disassembly of section .text:
 [      ]*[a-f0-9]+:    0f 1f 80 00 00 00 00    nopl   0x0\(%rax\)
 [      ]*[a-f0-9]+:    0f 1f 84 00 00 00 00 00         nopl   0x0\(%rax,%rax,1\)
 [      ]*[a-f0-9]+:    66 0f 1f 84 00 00 00 00 00      nopw   0x0\(%rax,%rax,1\)
-[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   cs nopw 0x0\(%rax,%rax,1\)
 [      ]*[a-f0-9]+:    0f 19 ff                nop    %edi
 [      ]*[a-f0-9]+:    0f 1a ff                nop    %edi
 [      ]*[a-f0-9]+:    0f 1b ff                nop    %edi

diff --git a/gas/testsuite/gas/i386/x86-64-align-branch-1a.d b/gas/testsuite/gas/i386/x86-64-align-branch-1a.d
index 452904e1f65d579ddf8df8a12b7ab6f4c55fa69c..0253d363b47436009f75b71a0bbb5aeed81cbcae 100644 (file)
--- a/gas/testsuite/gas/i386/x86-64-align-branch-1a.d
+++ b/gas/testsuite/gas/i386/x86-64-align-branch-1a.d
@@ -19,7 +19,7 @@ Disassembly of section .text:
   1d:  89 75 f4                mov    %esi,-0xc\(%rbp\)
   20:  48 39 c5                cmp    %rax,%rbp
   23:  74 5d                   je     (0x)?82( .*)?
-  25:  2e 89 75 f4             mov    %esi,%cs:-0xc\(%rbp\)
+  25:  2e 89 75 f4             cs mov %esi,-0xc\(%rbp\)
   29:  89 75 f4                mov    %esi,-0xc\(%rbp\)
   2c:  89 7d f8                mov    %edi,-0x8\(%rbp\)
   2f:  89 75 f4                mov    %esi,-0xc\(%rbp\)
@@ -32,7 +32,7 @@ Disassembly of section .text:
   40:  74 40                   je     (0x)?82( .*)?
   42:  5d                      pop    %rbp
   43:  74 3d                   je     (0x)?82( .*)?
-  45:  2e 89 45 fc             mov    %eax,%cs:-0x4\(%rbp\)
+  45:  2e 89 45 fc             cs mov %eax,-0x4\(%rbp\)
   49:  89 75 f4                mov    %esi,-0xc\(%rbp\)
   4c:  89 7d f8                mov    %edi,-0x8\(%rbp\)
   4f:  89 75 f4                mov    %esi,-0xc\(%rbp\)

diff --git a/gas/testsuite/gas/i386/x86-64-align-branch-1b.d b/gas/testsuite/gas/i386/x86-64-align-branch-1b.d
index 1c63f37f27dc683eadcc71645b955c2b05bcdf91..b043a7a4e1ff4b115f08a604f62cdc294482490d 100644 (file)
--- a/gas/testsuite/gas/i386/x86-64-align-branch-1b.d
+++ b/gas/testsuite/gas/i386/x86-64-align-branch-1b.d
@@ -19,7 +19,7 @@ Disassembly of section .text:
   1d:  89 75 f4                mov    %esi,-0xc\(%rbp\)
   20:  48 39 c5                cmp    %rax,%rbp
   23:  74 5d                   je     (0x)?82( .*)?
-  25:  2e 89 75 f4             mov    %esi,%cs:-0xc\(%rbp\)
+  25:  2e 89 75 f4             cs mov %esi,-0xc\(%rbp\)
   29:  89 75 f4                mov    %esi,-0xc\(%rbp\)
   2c:  89 7d f8                mov    %edi,-0x8\(%rbp\)
   2f:  89 75 f4                mov    %esi,-0xc\(%rbp\)
@@ -32,7 +32,7 @@ Disassembly of section .text:
   40:  74 40                   je     (0x)?82( .*)?
   42:  5d                      pop    %rbp
   43:  74 3d                   je     (0x)?82( .*)?
-  45:  2e 89 45 fc             mov    %eax,%cs:-0x4\(%rbp\)
+  45:  2e 89 45 fc             cs mov %eax,-0x4\(%rbp\)
   49:  89 75 f4                mov    %esi,-0xc\(%rbp\)
   4c:  89 7d f8                mov    %edi,-0x8\(%rbp\)
   4f:  89 75 f4                mov    %esi,-0xc\(%rbp\)

diff --git a/gas/testsuite/gas/i386/x86-64-align-branch-1c.d b/gas/testsuite/gas/i386/x86-64-align-branch-1c.d
index cc7158f364669b84d3709bfdc420f9e6a4a6646f..e9723541ba8ad4b5f799f3645b8fb14f070671be 100644 (file)
--- a/gas/testsuite/gas/i386/x86-64-align-branch-1c.d
+++ b/gas/testsuite/gas/i386/x86-64-align-branch-1c.d
@@ -19,7 +19,7 @@ Disassembly of section .text:
   1d:  89 75 f4                mov    %esi,-0xc\(%rbp\)
   20:  48 39 c5                cmp    %rax,%rbp
   23:  74 5d                   je     (0x)?82( .*)?
-  25:  2e 89 75 f4             mov    %esi,%cs:-0xc\(%rbp\)
+  25:  2e 89 75 f4             cs mov %esi,-0xc\(%rbp\)
   29:  89 75 f4                mov    %esi,-0xc\(%rbp\)
   2c:  89 7d f8                mov    %edi,-0x8\(%rbp\)
   2f:  89 75 f4                mov    %esi,-0xc\(%rbp\)
@@ -32,7 +32,7 @@ Disassembly of section .text:
   40:  74 40                   je     (0x)?82( .*)?
   42:  5d                      pop    %rbp
   43:  74 3d                   je     (0x)?82( .*)?
-  45:  2e 89 45 fc             mov    %eax,%cs:-0x4\(%rbp\)
+  45:  2e 89 45 fc             cs mov %eax,-0x4\(%rbp\)
   49:  89 75 f4                mov    %esi,-0xc\(%rbp\)
   4c:  89 7d f8                mov    %edi,-0x8\(%rbp\)
   4f:  89 75 f4                mov    %esi,-0xc\(%rbp\)

diff --git a/gas/testsuite/gas/i386/x86-64-align-branch-1d.d b/gas/testsuite/gas/i386/x86-64-align-branch-1d.d
index 780663c4f0dfd017524618e6a65f19b1b1db3ff7..99065a63388f82aabca1296bb3146e398a1df2a7 100644 (file)
--- a/gas/testsuite/gas/i386/x86-64-align-branch-1d.d
+++ b/gas/testsuite/gas/i386/x86-64-align-branch-1d.d
@@ -19,7 +19,7 @@ Disassembly of section .text:
   1d:  89 75 f4                mov    %esi,-0xc\(%rbp\)
   20:  48 39 c5                cmp    %rax,%rbp
   23:  74 5b                   je     (0x)?80( .*)?
-  25:  2e 89 75 f4             mov    %esi,%cs:-0xc\(%rbp\)
+  25:  2e 89 75 f4             cs mov %esi,-0xc\(%rbp\)
   29:  89 75 f4                mov    %esi,-0xc\(%rbp\)
   2c:  89 7d f8                mov    %edi,-0x8\(%rbp\)
   2f:  89 75 f4                mov    %esi,-0xc\(%rbp\)

diff --git a/gas/testsuite/gas/i386/x86-64-align-branch-1g.d b/gas/testsuite/gas/i386/x86-64-align-branch-1g.d
index 0e5d881a080723cf15f257a652ae2e68b52b3987..af6c869fa8a051ec7b943fedb6a042aab8bef569 100644 (file)
--- a/gas/testsuite/gas/i386/x86-64-align-branch-1g.d
+++ b/gas/testsuite/gas/i386/x86-64-align-branch-1g.d
@@ -19,7 +19,7 @@ Disassembly of section .text:
   1d:  89 75 f4                mov    %esi,-0xc\(%rbp\)
   20:  48 39 c5                cmp    %rax,%rbp
   23:  74 5d                   je     (0x)?82( .*)?
-  25:  2e 89 75 f4             mov    %esi,%cs:-0xc\(%rbp\)
+  25:  2e 89 75 f4             cs mov %esi,-0xc\(%rbp\)
   29:  89 75 f4                mov    %esi,-0xc\(%rbp\)
   2c:  89 7d f8                mov    %edi,-0x8\(%rbp\)
   2f:  89 75 f4                mov    %esi,-0xc\(%rbp\)
@@ -32,7 +32,7 @@ Disassembly of section .text:
   40:  74 40                   je     (0x)?82( .*)?
   42:  5d                      pop    %rbp
   43:  74 3d                   je     (0x)?82( .*)?
-  45:  2e 89 45 fc             mov    %eax,%cs:-0x4\(%rbp\)
+  45:  2e 89 45 fc             cs mov %eax,-0x4\(%rbp\)
   49:  89 75 f4                mov    %esi,-0xc\(%rbp\)
   4c:  89 7d f8                mov    %edi,-0x8\(%rbp\)
   4f:  89 75 f4                mov    %esi,-0xc\(%rbp\)

diff --git a/gas/testsuite/gas/i386/x86-64-align-branch-2c.d b/gas/testsuite/gas/i386/x86-64-align-branch-2c.d
index 7e28c328dc95906dd3647784dd40a9e69306d9c9..6745e9ca09130204e68dcf347767903c66a69cfd 100644 (file)
--- a/gas/testsuite/gas/i386/x86-64-align-branch-2c.d
+++ b/gas/testsuite/gas/i386/x86-64-align-branch-2c.d
@@ -29,7 +29,7 @@ Disassembly of section .text:
   3a:  89 75 f4                mov    %esi,-0xc\(%rbp\)
   3d:  89 75 f4                mov    %esi,-0xc\(%rbp\)
   40:  ff d0                   call   \*%rax
-  42:  2e 2e 2e 2e 2e 89 75 f4         cs cs cs cs mov %esi,%cs:-0xc\(%rbp\)
+  42:  2e 2e 2e 2e 2e 89 75 f4         cs cs cs cs cs mov %esi,-0xc\(%rbp\)
   4a:  55                      push   %rbp
   4b:  55                      push   %rbp
   4c:  64 89 04 25 01 00 00 00         mov    %eax,%fs:0x1
@@ -38,7 +38,7 @@ Disassembly of section .text:
   5a:  89 75 f4                mov    %esi,-0xc\(%rbp\)
   5d:  89 75 f4                mov    %esi,-0xc\(%rbp\)
   60:  e8 [0-9a-f ]+           call   .*
-  65:  2e 2e 2e 2e 2e 89 75 f4         cs cs cs cs mov %esi,%cs:-0xc\(%rbp\)
+  65:  2e 2e 2e 2e 2e 89 75 f4         cs cs cs cs cs mov %esi,-0xc\(%rbp\)
   6d:  2e 2e 55                cs cs push %rbp
   70:  55                      push   %rbp
   71:  55                      push   %rbp

diff --git a/gas/testsuite/gas/i386/x86-64-align-branch-6.d b/gas/testsuite/gas/i386/x86-64-align-branch-6.d
index 213c26afdca87d12be9430ffc41c2afbd73a68be..e0615920c6c188eeefa14de914bf798838cbabfa 100644 (file)
--- a/gas/testsuite/gas/i386/x86-64-align-branch-6.d
+++ b/gas/testsuite/gas/i386/x86-64-align-branch-6.d
@@ -8,11 +8,11 @@
 Disassembly of section .text:
 
 0+ <_start>:
- +[a-f0-9]+:   66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
- +[a-f0-9]+:   66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
- +[a-f0-9]+:   66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
- +[a-f0-9]+:   66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
- +[a-f0-9]+:   66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
+ +[a-f0-9]+:   66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
+ +[a-f0-9]+:   66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
+ +[a-f0-9]+:   66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
+ +[a-f0-9]+:   66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
+ +[a-f0-9]+:   66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
  +[a-f0-9]+:   0f 1f 80 00 00 00 00    nopl   0x0\(%rax\)
  +[a-f0-9]+:   f2 73 bf                bnd jae 0 <_start>
  +[a-f0-9]+:   c3                      ret *

diff --git a/gas/testsuite/gas/i386/x86-64-align-branch-7.d b/gas/testsuite/gas/i386/x86-64-align-branch-7.d
index 9454d5317e2c6bafce273f71613bc7524ec71fda..2475d3bb4c5b3e351853cdd5d8a6e28cef6cc630 100644 (file)
--- a/gas/testsuite/gas/i386/x86-64-align-branch-7.d
+++ b/gas/testsuite/gas/i386/x86-64-align-branch-7.d
@@ -6,7 +6,7 @@
 Disassembly of section .text:
 
 0+ <foo>:
- +[a-f0-9]+:   2e 66 0f 3a 60 00 03    pcmpestrm \$0x3,%cs:\(%rax\),%xmm0
+ +[a-f0-9]+:   2e 66 0f 3a 60 00 03    cs pcmpestrm \$0x3,\(%rax\),%xmm0
  +[a-f0-9]+:   2e 2e 48 89 e5          cs cs mov %rsp,%rbp
  +[a-f0-9]+:   89 7d f8                mov    %edi,-0x8\(%rbp\)
  +[a-f0-9]+:   89 75 f4                mov    %esi,-0xc\(%rbp\)

diff --git a/gas/testsuite/gas/i386/x86-64-align-branch-8.d b/gas/testsuite/gas/i386/x86-64-align-branch-8.d
index bffabc1d1cc845a05d75a2c80bd65465d32a7f63..6a2493be9ccc27edbc2424855e8f745a38b56401 100644 (file)
--- a/gas/testsuite/gas/i386/x86-64-align-branch-8.d
+++ b/gas/testsuite/gas/i386/x86-64-align-branch-8.d
@@ -6,7 +6,7 @@
 Disassembly of section .text:
 
 0+ <foo>:
- +[a-f0-9]+:   2e c4 63 79 60 38 03    vpcmpestrm \$0x3,%cs:\(%rax\),%xmm15
+ +[a-f0-9]+:   2e c4 63 79 60 38 03    cs vpcmpestrm \$0x3,\(%rax\),%xmm15
  +[a-f0-9]+:   2e 2e 48 89 e5          cs cs mov %rsp,%rbp
  +[a-f0-9]+:   89 7d f8                mov    %edi,-0x8\(%rbp\)
  +[a-f0-9]+:   89 75 f4                mov    %esi,-0xc\(%rbp\)

diff --git a/gas/testsuite/gas/i386/x86-64-nop-1.d b/gas/testsuite/gas/i386/x86-64-nop-1.d
index 7038699af3f33d52f6db37dfcb53ccf2644a6bb7..5778021ed4e807b45a5bfb209de78d076ccd05dd 100644 (file)
--- a/gas/testsuite/gas/i386/x86-64-nop-1.d
+++ b/gas/testsuite/gas/i386/x86-64-nop-1.d
@@ -21,27 +21,27 @@ Disassembly of section .text:
  +[a-f0-9]+:   0f 1f 40 00             nopl   0x0\(%rax\)
 
 0+12 <pseudo_20>:
- +[a-f0-9]+:   66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
+ +[a-f0-9]+:   66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
  +[a-f0-9]+:   66 0f 1f 84 00 00 00 00 00      nopw   0x0\(%rax,%rax,1\)
 
 0+26 <pseudo_30>:
- +[a-f0-9]+:   66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
- +[a-f0-9]+:   66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
+ +[a-f0-9]+:   66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
+ +[a-f0-9]+:   66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
  +[a-f0-9]+:   0f 1f 84 00 00 00 00 00         nopl   0x0\(%rax,%rax,1\)
 
 0+44 <pseudo_129>:
  +[a-f0-9]+:   eb 7f                   jmp    c5 <end>
- +[a-f0-9]+:   66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
- +[a-f0-9]+:   66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
- +[a-f0-9]+:   66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
- +[a-f0-9]+:   66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
- +[a-f0-9]+:   66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
- +[a-f0-9]+:   66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
- +[a-f0-9]+:   66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
- +[a-f0-9]+:   66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
- +[a-f0-9]+:   66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
- +[a-f0-9]+:   66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
- +[a-f0-9]+:   66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
+ +[a-f0-9]+:   66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
+ +[a-f0-9]+:   66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
+ +[a-f0-9]+:   66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
+ +[a-f0-9]+:   66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
+ +[a-f0-9]+:   66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
+ +[a-f0-9]+:   66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
+ +[a-f0-9]+:   66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
+ +[a-f0-9]+:   66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
+ +[a-f0-9]+:   66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
+ +[a-f0-9]+:   66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
+ +[a-f0-9]+:   66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
  +[a-f0-9]+:   66 0f 1f 44 00 00       nopw   0x0\(%rax,%rax,1\)
 
 0+c5 <end>:

diff --git a/gas/testsuite/gas/i386/x86-64-nops-1-core2.d b/gas/testsuite/gas/i386/x86-64-nops-1-core2.d
index 7923361406a153fe867c79ae9bf3238f3aee3929..775d16b8fdd1dd31ff7c2882faaac25408508ac9 100644 (file)
--- a/gas/testsuite/gas/i386/x86-64-nops-1-core2.d
+++ b/gas/testsuite/gas/i386/x86-64-nops-1-core2.d
@@ -10,20 +10,20 @@ Disassembly of section .text:
 
 0+ <nop15>:
 [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
 [      ]*[a-f0-9]+:    0f 1f 40 00             nopl   0x0\(%rax\)
 
 0+10 <nop14>:
 [      ]*[a-f0-9]+:    90                      nop
 [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
 [      ]*[a-f0-9]+:    0f 1f 00                nopl   \(%rax\)
 
 0+20 <nop13>:
 [      ]*[a-f0-9]+:    90                      nop
 [      ]*[a-f0-9]+:    90                      nop
 [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
 [      ]*[a-f0-9]+:    66 90                   xchg   %ax,%ax
 
 0+30 <nop12>:
@@ -31,7 +31,7 @@ Disassembly of section .text:
 [      ]*[a-f0-9]+:    90                      nop
 [      ]*[a-f0-9]+:    90                      nop
 [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
 [      ]*[a-f0-9]+:    90                      nop
 
 0+40 <nop11>:
@@ -40,7 +40,7 @@ Disassembly of section .text:
 [      ]*[a-f0-9]+:    90                      nop
 [      ]*[a-f0-9]+:    90                      nop
 [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
 
 0+50 <nop10>:
 [      ]*[a-f0-9]+:    90                      nop
@@ -49,7 +49,7 @@ Disassembly of section .text:
 [      ]*[a-f0-9]+:    90                      nop
 [      ]*[a-f0-9]+:    90                      nop
 [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   cs nopw 0x0\(%rax,%rax,1\)
 
 0+60 <nop9>:
 [      ]*[a-f0-9]+:    90                      nop

diff --git a/gas/testsuite/gas/i386/x86-64-nops-1-g64.d b/gas/testsuite/gas/i386/x86-64-nops-1-g64.d
index 69de228bacc5c63cd049448440576ab7c9ef8a3d..b80b4c708975f4db7ec139f824d6248fa1d21ed5 100644 (file)
--- a/gas/testsuite/gas/i386/x86-64-nops-1-g64.d
+++ b/gas/testsuite/gas/i386/x86-64-nops-1-g64.d
@@ -10,20 +10,20 @@ Disassembly of section .text:
 
 0+ <nop15>:
 [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
 [      ]*[a-f0-9]+:    0f 1f 40 00             nopl   0x0\(%rax\)
 
 0+10 <nop14>:
 [      ]*[a-f0-9]+:    90                      nop
 [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
 [      ]*[a-f0-9]+:    0f 1f 00                nopl   \(%rax\)
 
 0+20 <nop13>:
 [      ]*[a-f0-9]+:    90                      nop
 [      ]*[a-f0-9]+:    90                      nop
 [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
 [      ]*[a-f0-9]+:    66 90                   xchg   %ax,%ax
 
 0+30 <nop12>:
@@ -31,7 +31,7 @@ Disassembly of section .text:
 [      ]*[a-f0-9]+:    90                      nop
 [      ]*[a-f0-9]+:    90                      nop
 [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
 [      ]*[a-f0-9]+:    90                      nop
 
 0+40 <nop11>:
@@ -40,7 +40,7 @@ Disassembly of section .text:
 [      ]*[a-f0-9]+:    90                      nop
 [      ]*[a-f0-9]+:    90                      nop
 [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
 
 0+50 <nop10>:
 [      ]*[a-f0-9]+:    90                      nop
@@ -49,7 +49,7 @@ Disassembly of section .text:
 [      ]*[a-f0-9]+:    90                      nop
 [      ]*[a-f0-9]+:    90                      nop
 [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   cs nopw 0x0\(%rax,%rax,1\)
 
 0+60 <nop9>:
 [      ]*[a-f0-9]+:    90                      nop

diff --git a/gas/testsuite/gas/i386/x86-64-nops-1-k8.d b/gas/testsuite/gas/i386/x86-64-nops-1-k8.d
index d885bbded4f348b73249a52fa82d397a8412eaf5..569eddaa355bec07b08d5a8f6ff4d777bf34db53 100644 (file)
--- a/gas/testsuite/gas/i386/x86-64-nops-1-k8.d
+++ b/gas/testsuite/gas/i386/x86-64-nops-1-k8.d
@@ -9,20 +9,20 @@ Disassembly of section .text:
 
 0+ <nop15>:
 [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
 [      ]*[a-f0-9]+:    0f 1f 40 00             nopl   0x0\(%rax\)
 
 0+10 <nop14>:
 [      ]*[a-f0-9]+:    90                      nop
 [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
 [      ]*[a-f0-9]+:    0f 1f 00                nopl   \(%rax\)
 
 0+20 <nop13>:
 [      ]*[a-f0-9]+:    90                      nop
 [      ]*[a-f0-9]+:    90                      nop
 [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
 [      ]*[a-f0-9]+:    66 90                   xchg   %ax,%ax
 
 0+30 <nop12>:
@@ -30,7 +30,7 @@ Disassembly of section .text:
 [      ]*[a-f0-9]+:    90                      nop
 [      ]*[a-f0-9]+:    90                      nop
 [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
 [      ]*[a-f0-9]+:    90                      nop
 
 0+40 <nop11>:
@@ -39,7 +39,7 @@ Disassembly of section .text:
 [      ]*[a-f0-9]+:    90                      nop
 [      ]*[a-f0-9]+:    90                      nop
 [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
 
 0+50 <nop10>:
 [      ]*[a-f0-9]+:    90                      nop
@@ -48,7 +48,7 @@ Disassembly of section .text:
 [      ]*[a-f0-9]+:    90                      nop
 [      ]*[a-f0-9]+:    90                      nop
 [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   cs nopw 0x0\(%rax,%rax,1\)
 
 0+60 <nop9>:
 [      ]*[a-f0-9]+:    90                      nop

diff --git a/gas/testsuite/gas/i386/x86-64-nops-1.d b/gas/testsuite/gas/i386/x86-64-nops-1.d
index a73fcb5d4e931aaeefb6d7685e961c560c7cca0b..ab99e560c5325352e63b1235936bf618f89e015b 100644 (file)
--- a/gas/testsuite/gas/i386/x86-64-nops-1.d
+++ b/gas/testsuite/gas/i386/x86-64-nops-1.d
@@ -9,20 +9,20 @@ Disassembly of section .text:
 
 0+ <nop15>:
 [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
 [      ]*[a-f0-9]+:    0f 1f 40 00             nopl   0x0\(%rax\)
 
 0+10 <nop14>:
 [      ]*[a-f0-9]+:    90                      nop
 [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
 [      ]*[a-f0-9]+:    0f 1f 00                nopl   \(%rax\)
 
 0+20 <nop13>:
 [      ]*[a-f0-9]+:    90                      nop
 [      ]*[a-f0-9]+:    90                      nop
 [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
 [      ]*[a-f0-9]+:    66 90                   xchg   %ax,%ax
 
 0+30 <nop12>:
@@ -30,7 +30,7 @@ Disassembly of section .text:
 [      ]*[a-f0-9]+:    90                      nop
 [      ]*[a-f0-9]+:    90                      nop
 [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
 [      ]*[a-f0-9]+:    90                      nop
 
 0+40 <nop11>:
@@ -39,7 +39,7 @@ Disassembly of section .text:
 [      ]*[a-f0-9]+:    90                      nop
 [      ]*[a-f0-9]+:    90                      nop
 [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
 
 0+50 <nop10>:
 [      ]*[a-f0-9]+:    90                      nop
@@ -48,7 +48,7 @@ Disassembly of section .text:
 [      ]*[a-f0-9]+:    90                      nop
 [      ]*[a-f0-9]+:    90                      nop
 [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   cs nopw 0x0\(%rax,%rax,1\)
 
 0+60 <nop9>:
 [      ]*[a-f0-9]+:    90                      nop

diff --git a/gas/testsuite/gas/i386/x86-64-nops-2.d b/gas/testsuite/gas/i386/x86-64-nops-2.d
index c1a1187a1d19f431cf9ff9dacae0dfe60e4a5647..fa07de76bf43f305998158223d46b26ea19abb5c 100644 (file)
--- a/gas/testsuite/gas/i386/x86-64-nops-2.d
+++ b/gas/testsuite/gas/i386/x86-64-nops-2.d
@@ -10,25 +10,25 @@ Disassembly of section .text:
 
 0+ <nop>:
 [      ]*[a-f0-9]+:    0f be f0                movsbl %al,%esi
-[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
 [      ]*[a-f0-9]+:    66 90                   xchg   %ax,%ax
 
 0+10 <nop15>:
 [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
 [      ]*[a-f0-9]+:    0f 1f 40 00             nopl   0x0\(%rax\)
 
 0+20 <nop14>:
 [      ]*[a-f0-9]+:    90                      nop
 [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
 [      ]*[a-f0-9]+:    0f 1f 00                nopl   \(%rax\)
 
 0+30 <nop13>:
 [      ]*[a-f0-9]+:    90                      nop
 [      ]*[a-f0-9]+:    90                      nop
 [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
 [      ]*[a-f0-9]+:    66 90                   xchg   %ax,%ax
 
 0+40 <nop12>:
@@ -36,7 +36,7 @@ Disassembly of section .text:
 [      ]*[a-f0-9]+:    90                      nop
 [      ]*[a-f0-9]+:    90                      nop
 [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
 [      ]*[a-f0-9]+:    90                      nop
 
 0+50 <nop11>:
@@ -45,7 +45,7 @@ Disassembly of section .text:
 [      ]*[a-f0-9]+:    90                      nop
 [      ]*[a-f0-9]+:    90                      nop
 [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
 
 0+60 <nop10>:
 [      ]*[a-f0-9]+:    90                      nop
@@ -54,7 +54,7 @@ Disassembly of section .text:
 [      ]*[a-f0-9]+:    90                      nop
 [      ]*[a-f0-9]+:    90                      nop
 [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   cs nopw 0x0\(%rax,%rax,1\)
 
 0+70 <nop9>:
 [      ]*[a-f0-9]+:    90                      nop

diff --git a/gas/testsuite/gas/i386/x86-64-nops-3.d b/gas/testsuite/gas/i386/x86-64-nops-3.d
index 5bcc9cc2a5d34ddf117797fd77ac8b122c6bcd94..74c4d9c6046d8aa6c8121f15e6350e75845f3c3c 100644 (file)
--- a/gas/testsuite/gas/i386/x86-64-nops-3.d
+++ b/gas/testsuite/gas/i386/x86-64-nops-3.d
@@ -10,10 +10,10 @@ Disassembly of section .text:
 
 0+ <nop>:
 [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
-[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
 [      ]*[a-f0-9]+:    66 0f 1f 84 00 00 00 00 00      nopw   0x0\(%rax,%rax,1\)
 [      ]*[a-f0-9]+:    89 c3                   mov    %eax,%ebx
-[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
 [      ]*[a-f0-9]+:    0f 1f 00                nopl   \(%rax\)
 #pass

diff --git a/gas/testsuite/gas/i386/x86-64-nops-4-core2.d b/gas/testsuite/gas/i386/x86-64-nops-4-core2.d
index ef641cac7b572fbc8afb8ed81139b7494fb0deac..724d3d1e81509c7d312868ea4ffa73b34cd400a2 100644 (file)
--- a/gas/testsuite/gas/i386/x86-64-nops-4-core2.d
+++ b/gas/testsuite/gas/i386/x86-64-nops-4-core2.d
@@ -10,23 +10,23 @@ Disassembly of section .text:
 
 0+ <nop31>:
 [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
-[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
 [      ]*[a-f0-9]+:    66 0f 1f 84 00 00 00 00 00      nopw   0x0\(%rax,%rax,1\)
 
 0+20 <nop30>:
 [      ]*[a-f0-9]+:    90                      nop
 [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
-[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
 [      ]*[a-f0-9]+:    0f 1f 84 00 00 00 00 00         nopl   0x0\(%rax,%rax,1\)
 
 0+40 <nop29>:
 [      ]*[a-f0-9]+:    90                      nop
 [      ]*[a-f0-9]+:    90                      nop
 [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
-[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
 [      ]*[a-f0-9]+:    0f 1f 80 00 00 00 00    nopl   0x0\(%rax\)
 
 0+60 <nop28>:
@@ -34,8 +34,8 @@ Disassembly of section .text:
 [      ]*[a-f0-9]+:    90                      nop
 [      ]*[a-f0-9]+:    90                      nop
 [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
-[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
 [      ]*[a-f0-9]+:    66 0f 1f 44 00 00       nopw   0x0\(%rax,%rax,1\)
 
 0+80 <nop27>:
@@ -44,8 +44,8 @@ Disassembly of section .text:
 [      ]*[a-f0-9]+:    90                      nop
 [      ]*[a-f0-9]+:    90                      nop
 [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
-[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
 [      ]*[a-f0-9]+:    0f 1f 44 00 00          nopl   0x0\(%rax,%rax,1\)
 
 0+a0 <nop26>:
@@ -55,8 +55,8 @@ Disassembly of section .text:
 [      ]*[a-f0-9]+:    90                      nop
 [      ]*[a-f0-9]+:    90                      nop
 [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
-[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
 [      ]*[a-f0-9]+:    0f 1f 40 00             nopl   0x0\(%rax\)
 
 0+c0 <nop25>:
@@ -67,8 +67,8 @@ Disassembly of section .text:
 [      ]*[a-f0-9]+:    90                      nop
 [      ]*[a-f0-9]+:    90                      nop
 [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
-[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
 [      ]*[a-f0-9]+:    0f 1f 00                nopl   \(%rax\)
 
 0+e0 <nop24>:
@@ -80,8 +80,8 @@ Disassembly of section .text:
 [      ]*[a-f0-9]+:    90                      nop
 [      ]*[a-f0-9]+:    90                      nop
 [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
-[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
 [      ]*[a-f0-9]+:    66 90                   xchg   %ax,%ax
 
 0+100 <nop23>:
@@ -94,8 +94,8 @@ Disassembly of section .text:
 [      ]*[a-f0-9]+:    90                      nop
 [      ]*[a-f0-9]+:    90                      nop
 [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
-[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
 [      ]*[a-f0-9]+:    90                      nop
 
 0+120 <nop22>:
@@ -109,8 +109,8 @@ Disassembly of section .text:
 [      ]*[a-f0-9]+:    90                      nop
 [      ]*[a-f0-9]+:    90                      nop
 [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
-[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
 
 0+140 <nop21>:
 [      ]*[a-f0-9]+:    90                      nop
@@ -124,8 +124,8 @@ Disassembly of section .text:
 [      ]*[a-f0-9]+:    90                      nop
 [      ]*[a-f0-9]+:    90                      nop
 [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
-[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   cs nopw 0x0\(%rax,%rax,1\)
 
 0+160 <nop20>:
 [      ]*[a-f0-9]+:    90                      nop
@@ -140,7 +140,7 @@ Disassembly of section .text:
 [      ]*[a-f0-9]+:    90                      nop
 [      ]*[a-f0-9]+:    90                      nop
 [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
 [      ]*[a-f0-9]+:    66 0f 1f 84 00 00 00 00 00      nopw   0x0\(%rax,%rax,1\)
 
 0+180 <nop19>:
@@ -157,7 +157,7 @@ Disassembly of section .text:
 [      ]*[a-f0-9]+:    90                      nop
 [      ]*[a-f0-9]+:    90                      nop
 [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
 [      ]*[a-f0-9]+:    0f 1f 84 00 00 00 00 00         nopl   0x0\(%rax,%rax,1\)
 
 0+1a0 <nop18>:
@@ -175,7 +175,7 @@ Disassembly of section .text:
 [      ]*[a-f0-9]+:    90                      nop
 [      ]*[a-f0-9]+:    90                      nop
 [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
 [      ]*[a-f0-9]+:    0f 1f 80 00 00 00 00    nopl   0x0\(%rax\)
 
 0+1c0 <nop17>:
@@ -194,7 +194,7 @@ Disassembly of section .text:
 [      ]*[a-f0-9]+:    90                      nop
 [      ]*[a-f0-9]+:    90                      nop
 [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
 [      ]*[a-f0-9]+:    66 0f 1f 44 00 00       nopw   0x0\(%rax,%rax,1\)
 
 0+1e0 <nop16>:
@@ -214,6 +214,6 @@ Disassembly of section .text:
 [      ]*[a-f0-9]+:    90                      nop
 [      ]*[a-f0-9]+:    90                      nop
 [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
 [      ]*[a-f0-9]+:    0f 1f 44 00 00          nopl   0x0\(%rax,%rax,1\)
 #pass

diff --git a/gas/testsuite/gas/i386/x86-64-nops-4-k8.d b/gas/testsuite/gas/i386/x86-64-nops-4-k8.d
index 75bb4fb77aef2bb2aec3d16088281936d7296862..c7cf308a5c2d6c1ab20b8d2b3e305ada98c2c96a 100644 (file)
--- a/gas/testsuite/gas/i386/x86-64-nops-4-k8.d
+++ b/gas/testsuite/gas/i386/x86-64-nops-4-k8.d
@@ -9,23 +9,23 @@ Disassembly of section .text:
 
 0+ <nop31>:
 [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
-[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
 [      ]*[a-f0-9]+:    66 0f 1f 84 00 00 00 00 00      nopw   0x0\(%rax,%rax,1\)
 
 0+20 <nop30>:
 [      ]*[a-f0-9]+:    90                      nop
 [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
-[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
 [      ]*[a-f0-9]+:    0f 1f 84 00 00 00 00 00         nopl   0x0\(%rax,%rax,1\)
 
 0+40 <nop29>:
 [      ]*[a-f0-9]+:    90                      nop
 [      ]*[a-f0-9]+:    90                      nop
 [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
-[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
 [      ]*[a-f0-9]+:    0f 1f 80 00 00 00 00    nopl   0x0\(%rax\)
 
 0+60 <nop28>:
@@ -33,8 +33,8 @@ Disassembly of section .text:
 [      ]*[a-f0-9]+:    90                      nop
 [      ]*[a-f0-9]+:    90                      nop
 [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
-[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
 [      ]*[a-f0-9]+:    66 0f 1f 44 00 00       nopw   0x0\(%rax,%rax,1\)
 
 0+80 <nop27>:
@@ -43,8 +43,8 @@ Disassembly of section .text:
 [      ]*[a-f0-9]+:    90                      nop
 [      ]*[a-f0-9]+:    90                      nop
 [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
-[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
 [      ]*[a-f0-9]+:    0f 1f 44 00 00          nopl   0x0\(%rax,%rax,1\)
 
 0+a0 <nop26>:
@@ -54,8 +54,8 @@ Disassembly of section .text:
 [      ]*[a-f0-9]+:    90                      nop
 [      ]*[a-f0-9]+:    90                      nop
 [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
-[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
 [      ]*[a-f0-9]+:    0f 1f 40 00             nopl   0x0\(%rax\)
 
 0+c0 <nop25>:
@@ -66,8 +66,8 @@ Disassembly of section .text:
 [      ]*[a-f0-9]+:    90                      nop
 [      ]*[a-f0-9]+:    90                      nop
 [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
-[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
 [      ]*[a-f0-9]+:    0f 1f 00                nopl   \(%rax\)
 
 0+e0 <nop24>:
@@ -79,8 +79,8 @@ Disassembly of section .text:
 [      ]*[a-f0-9]+:    90                      nop
 [      ]*[a-f0-9]+:    90                      nop
 [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
-[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
 [      ]*[a-f0-9]+:    66 90                   xchg   %ax,%ax
 
 0+100 <nop23>:
@@ -93,8 +93,8 @@ Disassembly of section .text:
 [      ]*[a-f0-9]+:    90                      nop
 [      ]*[a-f0-9]+:    90                      nop
 [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
-[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
 [      ]*[a-f0-9]+:    90                      nop
 
 0+120 <nop22>:
@@ -108,8 +108,8 @@ Disassembly of section .text:
 [      ]*[a-f0-9]+:    90                      nop
 [      ]*[a-f0-9]+:    90                      nop
 [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
-[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
 
 0+140 <nop21>:
 [      ]*[a-f0-9]+:    90                      nop
@@ -123,8 +123,8 @@ Disassembly of section .text:
 [      ]*[a-f0-9]+:    90                      nop
 [      ]*[a-f0-9]+:    90                      nop
 [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
-[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   cs nopw 0x0\(%rax,%rax,1\)
 
 0+160 <nop20>:
 [      ]*[a-f0-9]+:    90                      nop
@@ -139,7 +139,7 @@ Disassembly of section .text:
 [      ]*[a-f0-9]+:    90                      nop
 [      ]*[a-f0-9]+:    90                      nop
 [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
 [      ]*[a-f0-9]+:    66 0f 1f 84 00 00 00 00 00      nopw   0x0\(%rax,%rax,1\)
 
 0+180 <nop19>:
@@ -156,7 +156,7 @@ Disassembly of section .text:
 [      ]*[a-f0-9]+:    90                      nop
 [      ]*[a-f0-9]+:    90                      nop
 [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
 [      ]*[a-f0-9]+:    0f 1f 84 00 00 00 00 00         nopl   0x0\(%rax,%rax,1\)
 
 0+1a0 <nop18>:
@@ -174,7 +174,7 @@ Disassembly of section .text:
 [      ]*[a-f0-9]+:    90                      nop
 [      ]*[a-f0-9]+:    90                      nop
 [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
 [      ]*[a-f0-9]+:    0f 1f 80 00 00 00 00    nopl   0x0\(%rax\)
 
 0+1c0 <nop17>:
@@ -193,7 +193,7 @@ Disassembly of section .text:
 [      ]*[a-f0-9]+:    90                      nop
 [      ]*[a-f0-9]+:    90                      nop
 [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
 [      ]*[a-f0-9]+:    66 0f 1f 44 00 00       nopw   0x0\(%rax,%rax,1\)
 
 0+1e0 <nop16>:
@@ -213,6 +213,6 @@ Disassembly of section .text:
 [      ]*[a-f0-9]+:    90                      nop
 [      ]*[a-f0-9]+:    90                      nop
 [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
 [      ]*[a-f0-9]+:    0f 1f 44 00 00          nopl   0x0\(%rax,%rax,1\)
 #pass

diff --git a/gas/testsuite/gas/i386/x86-64-nops-4.d b/gas/testsuite/gas/i386/x86-64-nops-4.d
index 0d2ff9871bc15821ef028182688b68039ef9fcf9..7a922c9bb80870e8876de13c4544415de305e5b8 100644 (file)
--- a/gas/testsuite/gas/i386/x86-64-nops-4.d
+++ b/gas/testsuite/gas/i386/x86-64-nops-4.d
@@ -10,23 +10,23 @@ Disassembly of section .text:
 
 0+ <nop31>:
 [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
-[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
 [      ]*[a-f0-9]+:    66 0f 1f 84 00 00 00 00 00      nopw   0x0\(%rax,%rax,1\)
 
 0+20 <nop30>:
 [      ]*[a-f0-9]+:    90                      nop
 [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
-[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
 [      ]*[a-f0-9]+:    0f 1f 84 00 00 00 00 00         nopl   0x0\(%rax,%rax,1\)
 
 0+40 <nop29>:
 [      ]*[a-f0-9]+:    90                      nop
 [      ]*[a-f0-9]+:    90                      nop
 [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
-[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
 [      ]*[a-f0-9]+:    0f 1f 80 00 00 00 00    nopl   0x0\(%rax\)
 
 0+60 <nop28>:
@@ -34,8 +34,8 @@ Disassembly of section .text:
 [      ]*[a-f0-9]+:    90                      nop
 [      ]*[a-f0-9]+:    90                      nop
 [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
-[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
 [      ]*[a-f0-9]+:    66 0f 1f 44 00 00       nopw   0x0\(%rax,%rax,1\)
 
 0+80 <nop27>:
@@ -44,8 +44,8 @@ Disassembly of section .text:
 [      ]*[a-f0-9]+:    90                      nop
 [      ]*[a-f0-9]+:    90                      nop
 [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
-[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
 [      ]*[a-f0-9]+:    0f 1f 44 00 00          nopl   0x0\(%rax,%rax,1\)
 
 0+a0 <nop26>:
@@ -55,8 +55,8 @@ Disassembly of section .text:
 [      ]*[a-f0-9]+:    90                      nop
 [      ]*[a-f0-9]+:    90                      nop
 [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
-[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
 [      ]*[a-f0-9]+:    0f 1f 40 00             nopl   0x0\(%rax\)
 
 0+c0 <nop25>:
@@ -67,8 +67,8 @@ Disassembly of section .text:
 [      ]*[a-f0-9]+:    90                      nop
 [      ]*[a-f0-9]+:    90                      nop
 [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
-[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
 [      ]*[a-f0-9]+:    0f 1f 00                nopl   \(%rax\)
 
 0+e0 <nop24>:
@@ -80,8 +80,8 @@ Disassembly of section .text:
 [      ]*[a-f0-9]+:    90                      nop
 [      ]*[a-f0-9]+:    90                      nop
 [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
-[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
 [      ]*[a-f0-9]+:    66 90                   xchg   %ax,%ax
 
 0+100 <nop23>:
@@ -94,8 +94,8 @@ Disassembly of section .text:
 [      ]*[a-f0-9]+:    90                      nop
 [      ]*[a-f0-9]+:    90                      nop
 [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
-[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
 [      ]*[a-f0-9]+:    90                      nop
 
 0+120 <nop22>:
@@ -109,8 +109,8 @@ Disassembly of section .text:
 [      ]*[a-f0-9]+:    90                      nop
 [      ]*[a-f0-9]+:    90                      nop
 [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
-[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
 
 0+140 <nop21>:
 [      ]*[a-f0-9]+:    90                      nop
@@ -124,8 +124,8 @@ Disassembly of section .text:
 [      ]*[a-f0-9]+:    90                      nop
 [      ]*[a-f0-9]+:    90                      nop
 [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
-[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   cs nopw 0x0\(%rax,%rax,1\)
 
 0+160 <nop20>:
 [      ]*[a-f0-9]+:    90                      nop
@@ -140,7 +140,7 @@ Disassembly of section .text:
 [      ]*[a-f0-9]+:    90                      nop
 [      ]*[a-f0-9]+:    90                      nop
 [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
 [      ]*[a-f0-9]+:    66 0f 1f 84 00 00 00 00 00      nopw   0x0\(%rax,%rax,1\)
 
 0+180 <nop19>:
@@ -157,7 +157,7 @@ Disassembly of section .text:
 [      ]*[a-f0-9]+:    90                      nop
 [      ]*[a-f0-9]+:    90                      nop
 [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
 [      ]*[a-f0-9]+:    0f 1f 84 00 00 00 00 00         nopl   0x0\(%rax,%rax,1\)
 
 0+1a0 <nop18>:
@@ -175,7 +175,7 @@ Disassembly of section .text:
 [      ]*[a-f0-9]+:    90                      nop
 [      ]*[a-f0-9]+:    90                      nop
 [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
 [      ]*[a-f0-9]+:    0f 1f 80 00 00 00 00    nopl   0x0\(%rax\)
 
 0+1c0 <nop17>:
@@ -194,7 +194,7 @@ Disassembly of section .text:
 [      ]*[a-f0-9]+:    90                      nop
 [      ]*[a-f0-9]+:    90                      nop
 [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
 [      ]*[a-f0-9]+:    66 0f 1f 44 00 00       nopw   0x0\(%rax,%rax,1\)
 
 0+1e0 <nop16>:
@@ -214,6 +214,6 @@ Disassembly of section .text:
 [      ]*[a-f0-9]+:    90                      nop
 [      ]*[a-f0-9]+:    90                      nop
 [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
 [      ]*[a-f0-9]+:    0f 1f 44 00 00          nopl   0x0\(%rax,%rax,1\)
 #pass

diff --git a/gas/testsuite/gas/i386/x86-64-nops-5-k8.d b/gas/testsuite/gas/i386/x86-64-nops-5-k8.d
index 48410a1f47257d5afc2763cf33cc089070640871..3c7db892ab5acd30f5ca0a52d6e5f78d12407e91 100644 (file)
--- a/gas/testsuite/gas/i386/x86-64-nops-5-k8.d
+++ b/gas/testsuite/gas/i386/x86-64-nops-5-k8.d
@@ -30,22 +30,22 @@ Disassembly of section .text:
 
 0+40 <pentium4>:
 [      ]*[a-f0-9]+:    0f be f0                movsbl %al,%esi
-[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
 [      ]*[a-f0-9]+:    66 90                   xchg   %ax,%ax
 
 0+50 <nocona>:
 [      ]*[a-f0-9]+:    0f be f0                movsbl %al,%esi
-[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
 [      ]*[a-f0-9]+:    66 90                   xchg   %ax,%ax
 
 0+60 <core>:
 [      ]*[a-f0-9]+:    0f be f0                movsbl %al,%esi
-[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
 [      ]*[a-f0-9]+:    66 90                   xchg   %ax,%ax
 
 0+70 <core2>:
 [      ]*[a-f0-9]+:    0f be f0                movsbl %al,%esi
-[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
 [      ]*[a-f0-9]+:    66 90                   xchg   %ax,%ax
 
 0+80 <k6>:
@@ -55,12 +55,12 @@ Disassembly of section .text:
 
 0+90 <athlon>:
 [      ]*[a-f0-9]+:    0f be f0                movsbl %al,%esi
-[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
 [      ]*[a-f0-9]+:    66 90                   xchg   %ax,%ax
 
 0+a0 <k8>:
 [      ]*[a-f0-9]+:    0f be f0                movsbl %al,%esi
-[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
 [      ]*[a-f0-9]+:    66 90                   xchg   %ax,%ax
 
 0+b0 <generic32>:
@@ -70,11 +70,11 @@ Disassembly of section .text:
 
 0+c0 <generic64>:
 [      ]*[a-f0-9]+:    0f be f0                movsbl %al,%esi
-[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
 [      ]*[a-f0-9]+:    66 90                   xchg   %ax,%ax
 
 0+d0 <amdfam10>:
 [      ]*[a-f0-9]+:    0f be f0                movsbl %al,%esi
-[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
 [      ]*[a-f0-9]+:    66 90                   xchg   %ax,%ax
 #pass

diff --git a/gas/testsuite/gas/i386/x86-64-nops-5.d b/gas/testsuite/gas/i386/x86-64-nops-5.d
index 4adebcf5f7c2eab5b3be3832a7eec84b12a6fc38..2b755cf046e1e4b9e15880ec8193f2e65c4bbf41 100644 (file)
--- a/gas/testsuite/gas/i386/x86-64-nops-5.d
+++ b/gas/testsuite/gas/i386/x86-64-nops-5.d
@@ -29,22 +29,22 @@ Disassembly of section .text:
 
 0+40 <pentium4>:
 [      ]*[a-f0-9]+:    0f be f0                movsbl %al,%esi
-[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
 [      ]*[a-f0-9]+:    66 90                   xchg   %ax,%ax
 
 0+50 <nocona>:
 [      ]*[a-f0-9]+:    0f be f0                movsbl %al,%esi
-[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
 [      ]*[a-f0-9]+:    66 90                   xchg   %ax,%ax
 
 0+60 <core>:
 [      ]*[a-f0-9]+:    0f be f0                movsbl %al,%esi
-[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
 [      ]*[a-f0-9]+:    66 90                   xchg   %ax,%ax
 
 0+70 <core2>:
 [      ]*[a-f0-9]+:    0f be f0                movsbl %al,%esi
-[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
 [      ]*[a-f0-9]+:    66 90                   xchg   %ax,%ax
 
 0+80 <k6>:
@@ -54,12 +54,12 @@ Disassembly of section .text:
 
 0+90 <athlon>:
 [      ]*[a-f0-9]+:    0f be f0                movsbl %al,%esi
-[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
 [      ]*[a-f0-9]+:    66 90                   xchg   %ax,%ax
 
 0+a0 <k8>:
 [      ]*[a-f0-9]+:    0f be f0                movsbl %al,%esi
-[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
 [      ]*[a-f0-9]+:    66 90                   xchg   %ax,%ax
 
 0+b0 <generic32>:
@@ -69,11 +69,11 @@ Disassembly of section .text:
 
 0+c0 <generic64>:
 [      ]*[a-f0-9]+:    0f be f0                movsbl %al,%esi
-[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
 [      ]*[a-f0-9]+:    66 90                   xchg   %ax,%ax
 
 0+d0 <amdfam10>:
 [      ]*[a-f0-9]+:    0f be f0                movsbl %al,%esi
-[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
 [      ]*[a-f0-9]+:    66 90                   xchg   %ax,%ax
 #pass

diff --git a/gas/testsuite/gas/i386/x86-64-nops-7.d b/gas/testsuite/gas/i386/x86-64-nops-7.d
index 9a86b11cf15731ec8bb59c9d9e7a09d5f44d7a30..859dfd8ed7cf82ce69c38156405afc909c529c06 100644 (file)
--- a/gas/testsuite/gas/i386/x86-64-nops-7.d
+++ b/gas/testsuite/gas/i386/x86-64-nops-7.d
@@ -10,109 +10,109 @@ Disassembly of section .text:
 0+ <_start>:
  +[a-f0-9]+:   31 c0                   xor    %eax,%eax
  +[a-f0-9]+:   e9 f9 01 00 00          jmp    200 <func1>
- +[a-f0-9]+:   66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
- +[a-f0-9]+:   66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
- +[a-f0-9]+:   66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
- +[a-f0-9]+:   66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
- +[a-f0-9]+:   66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
- +[a-f0-9]+:   66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
- +[a-f0-9]+:   66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
- +[a-f0-9]+:   66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
- +[a-f0-9]+:   66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
- +[a-f0-9]+:   66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
- +[a-f0-9]+:   66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
- +[a-f0-9]+:   66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
- +[a-f0-9]+:   66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
- +[a-f0-9]+:   66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
- +[a-f0-9]+:   66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
- +[a-f0-9]+:   66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
- +[a-f0-9]+:   66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
- +[a-f0-9]+:   66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
- +[a-f0-9]+:   66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
- +[a-f0-9]+:   66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
- +[a-f0-9]+:   66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
- +[a-f0-9]+:   66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
- +[a-f0-9]+:   66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
- +[a-f0-9]+:   66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
- +[a-f0-9]+:   66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
- +[a-f0-9]+:   66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
- +[a-f0-9]+:   66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
- +[a-f0-9]+:   66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
- +[a-f0-9]+:   66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
- +[a-f0-9]+:   66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
- +[a-f0-9]+:   66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
- +[a-f0-9]+:   66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
- +[a-f0-9]+:   66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
- +[a-f0-9]+:   66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
- +[a-f0-9]+:   66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
- +[a-f0-9]+:   66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
- +[a-f0-9]+:   66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
- +[a-f0-9]+:   66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
- +[a-f0-9]+:   66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
- +[a-f0-9]+:   66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
- +[a-f0-9]+:   66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
- +[a-f0-9]+:   66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
- +[a-f0-9]+:   66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
- +[a-f0-9]+:   66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
- +[a-f0-9]+:   66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
- +[a-f0-9]+:   66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%rax,%rax,1\)
+ +[a-f0-9]+:   66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
+ +[a-f0-9]+:   66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
+ +[a-f0-9]+:   66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
+ +[a-f0-9]+:   66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
+ +[a-f0-9]+:   66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
+ +[a-f0-9]+:   66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
+ +[a-f0-9]+:   66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
+ +[a-f0-9]+:   66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
+ +[a-f0-9]+:   66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
+ +[a-f0-9]+:   66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
+ +[a-f0-9]+:   66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
+ +[a-f0-9]+:   66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
+ +[a-f0-9]+:   66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
+ +[a-f0-9]+:   66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
+ +[a-f0-9]+:   66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
+ +[a-f0-9]+:   66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
+ +[a-f0-9]+:   66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
+ +[a-f0-9]+:   66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
+ +[a-f0-9]+:   66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
+ +[a-f0-9]+:   66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
+ +[a-f0-9]+:   66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
+ +[a-f0-9]+:   66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
+ +[a-f0-9]+:   66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
+ +[a-f0-9]+:   66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
+ +[a-f0-9]+:   66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
+ +[a-f0-9]+:   66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
+ +[a-f0-9]+:   66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
+ +[a-f0-9]+:   66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
+ +[a-f0-9]+:   66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
+ +[a-f0-9]+:   66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
+ +[a-f0-9]+:   66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
+ +[a-f0-9]+:   66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
+ +[a-f0-9]+:   66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
+ +[a-f0-9]+:   66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
+ +[a-f0-9]+:   66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
+ +[a-f0-9]+:   66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
+ +[a-f0-9]+:   66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
+ +[a-f0-9]+:   66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
+ +[a-f0-9]+:   66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
+ +[a-f0-9]+:   66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
+ +[a-f0-9]+:   66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
+ +[a-f0-9]+:   66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
+ +[a-f0-9]+:   66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
+ +[a-f0-9]+:   66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
+ +[a-f0-9]+:   66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
+ +[a-f0-9]+:   66 2e 0f 1f 84 00 00 00 00 00   cs nopw 0x0\(%rax,%rax,1\)
 
 0+200 <func1>:
  +[a-f0-9]+:   31 db                   xor    %ebx,%ebx
  +[a-f0-9]+:   e9 f9 00 00 00          jmp    300 <func2>
- +[a-f0-9]+:   66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
- +[a-f0-9]+:   66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
- +[a-f0-9]+:   66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
- +[a-f0-9]+:   66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
- +[a-f0-9]+:   66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
- +[a-f0-9]+:   66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
- +[a-f0-9]+:   66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
- +[a-f0-9]+:   66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
- +[a-f0-9]+:   66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
- +[a-f0-9]+:   66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
- +[a-f0-9]+:   66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
- +[a-f0-9]+:   66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
- +[a-f0-9]+:   66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
- +[a-f0-9]+:   66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
- +[a-f0-9]+:   66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
- +[a-f0-9]+:   66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
- +[a-f0-9]+:   66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
- +[a-f0-9]+:   66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
- +[a-f0-9]+:   66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
- +[a-f0-9]+:   66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
- +[a-f0-9]+:   66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
- +[a-f0-9]+:   66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
+ +[a-f0-9]+:   66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
+ +[a-f0-9]+:   66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
+ +[a-f0-9]+:   66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
+ +[a-f0-9]+:   66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
+ +[a-f0-9]+:   66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
+ +[a-f0-9]+:   66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
+ +[a-f0-9]+:   66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
+ +[a-f0-9]+:   66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
+ +[a-f0-9]+:   66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
+ +[a-f0-9]+:   66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
+ +[a-f0-9]+:   66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
+ +[a-f0-9]+:   66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
+ +[a-f0-9]+:   66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
+ +[a-f0-9]+:   66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
+ +[a-f0-9]+:   66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
+ +[a-f0-9]+:   66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
+ +[a-f0-9]+:   66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
+ +[a-f0-9]+:   66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
+ +[a-f0-9]+:   66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
+ +[a-f0-9]+:   66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
+ +[a-f0-9]+:   66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
+ +[a-f0-9]+:   66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
  +[a-f0-9]+:   0f 1f 80 00 00 00 00    nopl   0x0\(%rax\)
 
 0+300 <func2>:
  +[a-f0-9]+:   31 db                   xor    %ebx,%ebx
  +[a-f0-9]+:   eb 7c                   jmp    380 <func3>
- +[a-f0-9]+:   66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
- +[a-f0-9]+:   66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
- +[a-f0-9]+:   66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
- +[a-f0-9]+:   66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
- +[a-f0-9]+:   66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
- +[a-f0-9]+:   66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
- +[a-f0-9]+:   66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
- +[a-f0-9]+:   66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
- +[a-f0-9]+:   66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
- +[a-f0-9]+:   66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
- +[a-f0-9]+:   66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
+ +[a-f0-9]+:   66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
+ +[a-f0-9]+:   66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
+ +[a-f0-9]+:   66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
+ +[a-f0-9]+:   66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
+ +[a-f0-9]+:   66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
+ +[a-f0-9]+:   66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
+ +[a-f0-9]+:   66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
+ +[a-f0-9]+:   66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
+ +[a-f0-9]+:   66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
+ +[a-f0-9]+:   66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
+ +[a-f0-9]+:   66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
  +[a-f0-9]+:   0f 1f 00                nopl   \(%rax\)
 
 0+380 <func3>:
  +[a-f0-9]+:   31 c9                   xor    %ecx,%ecx
- +[a-f0-9]+:   66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
- +[a-f0-9]+:   66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
- +[a-f0-9]+:   66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
- +[a-f0-9]+:   66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
- +[a-f0-9]+:   66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
+ +[a-f0-9]+:   66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
+ +[a-f0-9]+:   66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
+ +[a-f0-9]+:   66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
+ +[a-f0-9]+:   66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
+ +[a-f0-9]+:   66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
  +[a-f0-9]+:   0f 1f 80 00 00 00 00    nopl   0x0\(%rax\)
 
 0+3c0 <func4>:
  +[a-f0-9]+:   31 d2                   xor    %edx,%edx
- +[a-f0-9]+:   66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
- +[a-f0-9]+:   66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
+ +[a-f0-9]+:   66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
+ +[a-f0-9]+:   66 66 2e 0f 1f 84 00 00 00 00 00        data16 cs nopw 0x0\(%rax,%rax,1\)
  +[a-f0-9]+:   0f 1f 84 00 00 00 00 00         nopl   0x0\(%rax,%rax,1\)
 
 0+3e0 <func5>:

diff --git a/gas/testsuite/gas/i386/x86-64-nops.d b/gas/testsuite/gas/i386/x86-64-nops.d
index faf2dc9b5f4b48b03320435e2c32a7aac64c1b74..311056c0831bdf8087574cbaf5f2e02b1104e7c3 100644 (file)
--- a/gas/testsuite/gas/i386/x86-64-nops.d
+++ b/gas/testsuite/gas/i386/x86-64-nops.d
@@ -13,7 +13,7 @@ Disassembly of section .text:
 [      ]*[a-f0-9]+:    0f 1f 80 00 00 00 00    nopl   0x0\(%rax\)
 [      ]*[a-f0-9]+:    0f 1f 84 00 00 00 00 00         nopl   0x0\(%rax,%rax,1\)
 [      ]*[a-f0-9]+:    66 0f 1f 84 00 00 00 00 00      nopw   0x0\(%rax,%rax,1\)
-[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   cs nopw 0x0\(%rax,%rax,1\)
 [      ]*[a-f0-9]+:    0f 19 ff                nop    %edi
 [      ]*[a-f0-9]+:    0f 1a ff                nop    %edi
 [      ]*[a-f0-9]+:    0f 1b ff                nop    %edi

diff --git a/gas/testsuite/gas/i386/x86-64-segovr.d b/gas/testsuite/gas/i386/x86-64-segovr.d
index 76f85948ac94ced77acb815c2da5a69b368534b2..2e7ebf26efa92d1e1f3aecf7eab6396f25062116 100644 (file)
--- a/gas/testsuite/gas/i386/x86-64-segovr.d
+++ b/gas/testsuite/gas/i386/x86-64-segovr.d
@@ -10,8 +10,8 @@ Disassembly of section .text:
 [      ]*[a-f0-9]+:    8b 01[  ]+mov[  ]+\(%rcx\),%eax
 [      ]*[a-f0-9]+:    8b 02[  ]+mov[  ]+\(%rdx\),%eax
 [      ]*[a-f0-9]+:    8b 03[  ]+mov[  ]+\(%rbx\),%eax
-[      ]*[a-f0-9]+:    3e 8b 04 24[    ]+mov[  ]+%ds:\(%rsp\),%eax
-[      ]*[a-f0-9]+:    3e 8b 45 00[    ]+mov[  ]+%ds:((0x)?0)?\(%rbp\),%eax
+[      ]*[a-f0-9]+:    3e 8b 04 24[    ]+ds mov[       ]+\(%rsp\),%eax
+[      ]*[a-f0-9]+:    3e 8b 45 00[    ]+ds mov[       ]+((0x)?0)?\(%rbp\),%eax
 [      ]*[a-f0-9]+:    8b 06[  ]+mov[  ]+\(%rsi\),%eax
 [      ]*[a-f0-9]+:    8b 07[  ]+mov[  ]+\(%rdi\),%eax
 [      ]*[a-f0-9]+:    41 8b 00[       ]+mov[  ]+\(%r8\),%eax
@@ -22,20 +22,20 @@ Disassembly of section .text:
 [      ]*[a-f0-9]+:    41 8b 45 00[    ]+mov[  ]+((0x)?0)?\(%r13\),%eax
 [      ]*[a-f0-9]+:    41 8b 06[       ]+mov[  ]+\(%r14\),%eax
 [      ]*[a-f0-9]+:    41 8b 07[       ]+mov[  ]+\(%r15\),%eax
-[      ]*[a-f0-9]+:    36 8b 00[       ]+mov[  ]+%ss:\(%rax\),%eax
-[      ]*[a-f0-9]+:    36 8b 01[       ]+mov[  ]+%ss:\(%rcx\),%eax
-[      ]*[a-f0-9]+:    36 8b 02[       ]+mov[  ]+%ss:\(%rdx\),%eax
-[      ]*[a-f0-9]+:    36 8b 03[       ]+mov[  ]+%ss:\(%rbx\),%eax
+[      ]*[a-f0-9]+:    36 8b 00[       ]+ss mov[       ]+\(%rax\),%eax
+[      ]*[a-f0-9]+:    36 8b 01[       ]+ss mov[       ]+\(%rcx\),%eax
+[      ]*[a-f0-9]+:    36 8b 02[       ]+ss mov[       ]+\(%rdx\),%eax
+[      ]*[a-f0-9]+:    36 8b 03[       ]+ss mov[       ]+\(%rbx\),%eax
 [      ]*[a-f0-9]+:    8b 04 24[       ]+mov[  ]+\(%rsp\),%eax
 [      ]*[a-f0-9]+:    8b 45 00[       ]+mov[  ]+((0x)?0)?\(%rbp\),%eax
-[      ]*[a-f0-9]+:    36 8b 06[       ]+mov[  ]+%ss:\(%rsi\),%eax
-[      ]*[a-f0-9]+:    36 8b 07[       ]+mov[  ]+%ss:\(%rdi\),%eax
-[      ]*[a-f0-9]+:    36 41 8b 00[    ]+mov[  ]+%ss:\(%r8\),%eax
-[      ]*[a-f0-9]+:    36 41 8b 01[    ]+mov[  ]+%ss:\(%r9\),%eax
-[      ]*[a-f0-9]+:    36 41 8b 02[    ]+mov[  ]+%ss:\(%r10\),%eax
-[      ]*[a-f0-9]+:    36 41 8b 03[    ]+mov[  ]+%ss:\(%r11\),%eax
-[      ]*[a-f0-9]+:    36 41 8b 04 24[         ]+mov[  ]+%ss:\(%r12\),%eax
-[      ]*[a-f0-9]+:    36 41 8b 45 00[         ]+mov[  ]+%ss:((0x)?0)?\(%r13\),%eax
-[      ]*[a-f0-9]+:    36 41 8b 06[    ]+mov[  ]+%ss:\(%r14\),%eax
-[      ]*[a-f0-9]+:    36 41 8b 07[    ]+mov[  ]+%ss:\(%r15\),%eax
+[      ]*[a-f0-9]+:    36 8b 06[       ]+ss mov[       ]+\(%rsi\),%eax
+[      ]*[a-f0-9]+:    36 8b 07[       ]+ss mov[       ]+\(%rdi\),%eax
+[      ]*[a-f0-9]+:    36 41 8b 00[    ]+ss mov[       ]+\(%r8\),%eax
+[      ]*[a-f0-9]+:    36 41 8b 01[    ]+ss mov[       ]+\(%r9\),%eax
+[      ]*[a-f0-9]+:    36 41 8b 02[    ]+ss mov[       ]+\(%r10\),%eax
+[      ]*[a-f0-9]+:    36 41 8b 03[    ]+ss mov[       ]+\(%r11\),%eax
+[      ]*[a-f0-9]+:    36 41 8b 04 24[         ]+ss mov[       ]+\(%r12\),%eax
+[      ]*[a-f0-9]+:    36 41 8b 45 00[         ]+ss mov[       ]+((0x)?0)?\(%r13\),%eax
+[      ]*[a-f0-9]+:    36 41 8b 06[    ]+ss mov[       ]+\(%r14\),%eax
+[      ]*[a-f0-9]+:    36 41 8b 07[    ]+ss mov[       ]+\(%r15\),%eax
 #pass

diff --git a/ld/ChangeLog b/ld/ChangeLog
index 70ea14b41915e67e90d957c3961cc24e9363c74f..2ae5b487e927d182f39393bbeffd6e226ac806c4 100644 (file)
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,9 @@
+2020-11-14  Borislav Petkov  <bp@suse.de>
+
+       * testsuite/ld-x86-64/pe-x86-64-4.od: Adjust regexes.
+       * testsuite/ld-x86-64/tlsld3.dd: Likewise.
+       * testsuite/ld-x86-64/tlsld4.dd: Likewise.
+
 2020-11-13  H.J. Lu  <hongjiu.lu@intel.com>
 
        PR ld/26869

diff --git a/ld/testsuite/ld-x86-64/align-branch-1.d b/ld/testsuite/ld-x86-64/align-branch-1.d
index 19ac6a87cbb13e7854ef25f0be47dd2e5bbd7f85..b51736501881d5af483a70b9bb417a9af99b53c4 100644 (file)
--- a/ld/testsuite/ld-x86-64/align-branch-1.d
+++ b/ld/testsuite/ld-x86-64/align-branch-1.d
@@ -13,7 +13,7 @@ Disassembly of section .text:
  +[a-f0-9]+:   48 85 ff                test   %rdi,%rdi
  +[a-f0-9]+:   74 1c                   je     [a-f0-9]+ <_start\+0x25>
  +[a-f0-9]+:   66 66 66 64 48 8b 04 25 00 00 00 00     data16 data16 data16 mov %fs:0x0,%rax
- +[a-f0-9]+:   2e 2e 2e 2e 48 8b 98 fc ff ff ff        cs cs cs mov %cs:-0x4\(%rax\),%rbx
+ +[a-f0-9]+:   2e 2e 2e 2e 48 8b 98 fc ff ff ff        cs cs cs cs mov -0x4\(%rax\),%rbx
  +[a-f0-9]+:   48 85 db                test   %rbx,%rbx
  +[a-f0-9]+:   74 00                   je     [a-f0-9]+ <_start\+0x25>
  +[a-f0-9]+:   c3                      ret *

diff --git a/ld/testsuite/ld-x86-64/pe-x86-64-4.od b/ld/testsuite/ld-x86-64/pe-x86-64-4.od
index e8940ba4fc0f1c0b6cf9d337b13346c565cb3de1..302a345b2e210bc0390664c5e6d8f12d18a7abb1 100644 (file)
--- a/ld/testsuite/ld-x86-64/pe-x86-64-4.od
+++ b/ld/testsuite/ld-x86-64/pe-x86-64-4.od
@@ -39,7 +39,7 @@ Disassembly of section .text\$mn:
  +[a-f0-9]+:   83 c8 ff                or     \$0xffffffff,%eax
  +[a-f0-9]+:   c7 05 cb 1f 00 00 55 55 44 44   movl   \$0x44445555,0x1fcb\(%rip\)        # 40301c <Struct\+0x4>
  +[a-f0-9]+:   c3                      ret    
- +[a-f0-9]+:   66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%rax,%rax,1\)
+ +[a-f0-9]+:   66 2e 0f 1f 84 00 00 00 00 00   cs nopw 0x0\(%rax,%rax,1\)
  +[a-f0-9]+:   0f 1f 40 00             nopl   0x0\(%rax\)
 
 0+401060 <opti_Od>:

diff --git a/ld/testsuite/ld-x86-64/tlsld3.dd b/ld/testsuite/ld-x86-64/tlsld3.dd
index 75ac2bfbffaa87912cbcc5b1fb4a825c24e83d9a..25310b06f7c751c48d6d004f67103cfa92f7cc20 100644 (file)
--- a/ld/testsuite/ld-x86-64/tlsld3.dd
+++ b/ld/testsuite/ld-x86-64/tlsld3.dd
@@ -14,7 +14,7 @@ Disassembly of section .text:
 [      ]*[a-f0-9]+:    53                      push   %rbx
 [      ]*[a-f0-9]+:    48 8d 1d ed ff ff ff    lea    -0x13\(%rip\),%rbx        # [0-9a-f]+ <_start>
 [      ]*[a-f0-9]+:    4c 01 db                add    %r11,%rbx
-[      ]*[a-f0-9]+:    66 66 66 66 2e 0f 1f 84 00 00 00 00 00  data16 data16 data16 nopw %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 66 66 66 2e 0f 1f 84 00 00 00 00 00  data16 data16 data16 cs nopw 0x0\(%rax,%rax,1\)
 [      ]*[a-f0-9]+:    64 48 8b 04 25 00 00 00 00      mov    %fs:0x0,%rax
 [      ]*[a-f0-9]+:    8b 80 fc ff ff ff       mov    -0x4\(%rax\),%eax
 [      ]*[a-f0-9]+:    5b                      pop    %rbx

diff --git a/ld/testsuite/ld-x86-64/tlsld4.dd b/ld/testsuite/ld-x86-64/tlsld4.dd
index 711f507fcf007a8645ec8cf027c55de037771f6f..bf5602e714bc4786e41d5fcf3611ff22a4329796 100644 (file)
--- a/ld/testsuite/ld-x86-64/tlsld4.dd
+++ b/ld/testsuite/ld-x86-64/tlsld4.dd
@@ -14,7 +14,7 @@ Disassembly of section .text:
 [      ]*[a-f0-9]+:    41 57                   push   %r15
 [      ]*[a-f0-9]+:    4c 8d 3d eb ff ff ff    lea    -0x15\(%rip\),%r15        # [0-9a-f]+ <_start>
 [      ]*[a-f0-9]+:    4d 01 df                add    %r11,%r15
-[      ]*[a-f0-9]+:    66 66 66 66 2e 0f 1f 84 00 00 00 00 00  data16 data16 data16 nopw %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 66 66 66 2e 0f 1f 84 00 00 00 00 00  data16 data16 data16 cs nopw 0x0\(%rax,%rax,1\)
 [      ]*[a-f0-9]+:    64 48 8b 04 25 00 00 00 00      mov    %fs:0x0,%rax
 [      ]*[a-f0-9]+:    8b 80 fc ff ff ff       mov    -0x4\(%rax\),%eax
 [      ]*[a-f0-9]+:    41 5f                   pop    %r15

diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog
index d00e549addf46eede1df1006c1498aab6889e7e9..b25132a5044c3fd33e60ce8c3eb479321d9efe65 100644 (file)
--- a/opcodes/ChangeLog
+++ b/opcodes/ChangeLog
@@ -1,3 +1,10 @@
+2020-11-14  Borislav Petkov  <bp@suse.de>
+
+       * i386-dis.c (ckprefix): Do not assign active_seg_prefix in
+       64-bit addressing mode.
+       (NOTRACK_Fixup): Test prefixes for PREFIX_DS, instead of
+       active_seg_prefix.
+
 2020-11-11  Przemyslaw Wirkus  <przemyslaw.wirkus@arm.com>
 
        * aarch64-tbl.h: Enable -march=armv8.6-a+ls64.

diff --git a/opcodes/i386-dis.c b/opcodes/i386-dis.c
index 9338b1f3758a76b3e0f3f197f8d038452adce939..58cf001080bcc0f831ea9e6901b1cb96e636d706 100644 (file)
--- a/opcodes/i386-dis.c
+++ b/opcodes/i386-dis.c
@@ -9141,22 +9141,34 @@ ckprefix (void)
        case 0x2e:
          prefixes |= PREFIX_CS;
          last_seg_prefix = i;
-         active_seg_prefix = PREFIX_CS;
+
+         if (address_mode != mode_64bit)
+           active_seg_prefix = PREFIX_CS;
+
          break;
        case 0x36:
          prefixes |= PREFIX_SS;
          last_seg_prefix = i;
-         active_seg_prefix = PREFIX_SS;
+
+         if (address_mode != mode_64bit)
+           active_seg_prefix = PREFIX_SS;
+
          break;
        case 0x3e:
          prefixes |= PREFIX_DS;
          last_seg_prefix = i;
-         active_seg_prefix = PREFIX_DS;
+
+         if (address_mode != mode_64bit)
+           active_seg_prefix = PREFIX_DS;
+
          break;
        case 0x26:
          prefixes |= PREFIX_ES;
          last_seg_prefix = i;
-         active_seg_prefix = PREFIX_ES;
+
+         if (address_mode != mode_64bit)
+           active_seg_prefix = PREFIX_ES;
+
          break;
        case 0x64:
          prefixes |= PREFIX_FS;
@@ -13656,7 +13668,10 @@ static void
 NOTRACK_Fixup (int bytemode ATTRIBUTE_UNUSED,
               int sizeflag ATTRIBUTE_UNUSED)
 {
-  if (active_seg_prefix == PREFIX_DS
+
+  /* Since active_seg_prefix is not set in 64-bit mode, check whether
+     we've seen a PREFIX_DS.  */
+  if ((prefixes & PREFIX_DS) != 0
       && (address_mode != mode_64bit || last_data_prefix < 0))
     {
       /* NOTRACK prefix is only valid on indirect branch instructions.