summaryrefslogtreecommitdiff
path: root/gas
diff options
context:
space:
mode:
Diffstat (limited to 'gas')
-rw-r--r--gas/testsuite/ChangeLog45
-rw-r--r--gas/testsuite/gas/i386/i386.exp4
-rw-r--r--gas/testsuite/gas/i386/jump16.d8
-rw-r--r--gas/testsuite/gas/i386/long-1-intel.d14
-rw-r--r--gas/testsuite/gas/i386/long-1.d13
-rw-r--r--gas/testsuite/gas/i386/long-1.s30
-rw-r--r--gas/testsuite/gas/i386/naked.d2
-rw-r--r--gas/testsuite/gas/i386/nops-1-core2.d239
-rw-r--r--gas/testsuite/gas/i386/nops-1-i686.d11
-rw-r--r--gas/testsuite/gas/i386/nops-3-i686.d6
-rw-r--r--gas/testsuite/gas/i386/nops-4-i686.d44
-rw-r--r--gas/testsuite/gas/i386/nops-5-i686.d12
-rw-r--r--gas/testsuite/gas/i386/nops-5.d12
-rw-r--r--gas/testsuite/gas/i386/prefix.d4
-rw-r--r--gas/testsuite/gas/i386/rep.d42
-rw-r--r--gas/testsuite/gas/i386/string-ok.d16
-rw-r--r--gas/testsuite/gas/i386/x86-64-addr32-intel.d6
-rw-r--r--gas/testsuite/gas/i386/x86-64-addr32.d8
-rw-r--r--gas/testsuite/gas/i386/x86-64-cbw-intel.d14
-rw-r--r--gas/testsuite/gas/i386/x86-64-cbw.d14
-rw-r--r--gas/testsuite/gas/i386/x86-64-io-intel.d20
-rw-r--r--gas/testsuite/gas/i386/x86-64-io-suffix.d20
-rw-r--r--gas/testsuite/gas/i386/x86-64-io.d20
-rw-r--r--gas/testsuite/gas/i386/x86-64-long-1-intel.d14
-rw-r--r--gas/testsuite/gas/i386/x86-64-long-1.d13
-rw-r--r--gas/testsuite/gas/i386/x86-64-long-1.s30
-rw-r--r--gas/testsuite/gas/i386/x86-64-lwp.d384
-rw-r--r--gas/testsuite/gas/i386/x86-64-nops-1-core2.d239
-rw-r--r--gas/testsuite/gas/i386/x86-64-nops-1-nocona.d10
-rw-r--r--gas/testsuite/gas/i386/x86-64-nops-1.d11
-rw-r--r--gas/testsuite/gas/i386/x86-64-nops-2.d13
-rw-r--r--gas/testsuite/gas/i386/x86-64-nops-3.d7
-rw-r--r--gas/testsuite/gas/i386/x86-64-nops-4-core2.d45
-rw-r--r--gas/testsuite/gas/i386/x86-64-nops-4.d45
-rw-r--r--gas/testsuite/gas/i386/x86-64-nops-5-k8.d13
-rw-r--r--gas/testsuite/gas/i386/x86-64-nops-5.d13
-rw-r--r--gas/testsuite/gas/i386/x86-64-rep.d52
-rw-r--r--gas/testsuite/gas/i386/x86-64-stack-intel.d60
-rw-r--r--gas/testsuite/gas/i386/x86-64-stack-suffix.d60
-rw-r--r--gas/testsuite/gas/i386/x86-64-stack.d60
40 files changed, 915 insertions, 758 deletions
diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog
index 37dcee4bb69..832894d21bc 100644
--- a/gas/testsuite/ChangeLog
+++ b/gas/testsuite/ChangeLog
@@ -1,3 +1,48 @@
+2009-11-13 H.J. Lu <hongjiu.lu@intel.com>
+
+ * gas/i386/i386.exp: Run long-1, long-1-intel, x86-64-long-1,
+ and x86-64-long-1-intel.
+
+ * gas/i386/long-1-intel.d: New.
+ * gas/i386/long-1.d: Likewise.
+ * gas/i386/long-1.s: Likewise.
+ * gas/i386/x86-64-long-1-intel.d: Likewise.
+ * gas/i386/x86-64-long-1.d: Likewise.
+ * gas/i386/x86-64-long-1.s: Likewise.
+
+ * gas/i386/jump16.d: Updated for prefix processing.
+ * gas/i386/naked.d: Likewise.
+ * gas/i386/nops-1-core2.d: Likewise.
+ * gas/i386/nops-1-i686.d: Likewise.
+ * gas/i386/nops-3-i686.d: Likewise.
+ * gas/i386/nops-4-i686.d: Likewise.
+ * gas/i386/nops-5-i686.d: Likewise.
+ * gas/i386/nops-5.d: Likewise.
+ * gas/i386/prefix.d: Likewise.
+ * gas/i386/rep.d: Likewise.
+ * gas/i386/string-ok.d: Likewise.
+ * gas/i386/x86-64-addr32-intel.d: Likewise.
+ * gas/i386/x86-64-addr32.d: Likewise.
+ * gas/i386/x86-64-cbw-intel.d: Likewise.
+ * gas/i386/x86-64-cbw.d: Likewise.
+ * gas/i386/x86-64-io-intel.d: Likewise.
+ * gas/i386/x86-64-io-suffix.d: Likewise.
+ * gas/i386/x86-64-io.d: Likewise.
+ * gas/i386/x86-64-lwp.d: Likewise.
+ * gas/i386/x86-64-nops-1-core2.d: Likewise.
+ * gas/i386/x86-64-nops-1-nocona.d: Likewise.
+ * gas/i386/x86-64-nops-1.d: Likewise.
+ * gas/i386/x86-64-nops-2.d: Likewise.
+ * gas/i386/x86-64-nops-3.d: Likewise.
+ * gas/i386/x86-64-nops-4-core2.d: Likewise.
+ * gas/i386/x86-64-nops-4.d: Likewise.
+ * gas/i386/x86-64-nops-5-k8.d: Likewise.
+ * gas/i386/x86-64-nops-5.d: Likewise.
+ * gas/i386/x86-64-rep.d: Likewise.
+ * gas/i386/x86-64-stack-intel.d: Likewise.
+ * gas/i386/x86-64-stack-suffix.d: Likewise.
+ * gas/i386/x86-64-stack.d: Likewise.
+
2009-11-12 H.J. Lu <hongjiu.lu@intel.com>
* gas/i386/i386.exp: Run lock-1, lock-1-intel, lockbad-1,
diff --git a/gas/testsuite/gas/i386/i386.exp b/gas/testsuite/gas/i386/i386.exp
index bcdeec5f908..40417b27bc1 100644
--- a/gas/testsuite/gas/i386/i386.exp
+++ b/gas/testsuite/gas/i386/i386.exp
@@ -66,6 +66,8 @@ if [expr ([istarget "i*86-*-*"] || [istarget "x86_64-*-*"]) && [gas_32_check]]
run_dump_test "lock-1"
run_dump_test "lock-1-intel"
run_list_test "lockbad-1" "-al"
+ run_dump_test "long-1"
+ run_dump_test "long-1-intel"
run_dump_test "fp"
run_dump_test "nops"
run_dump_test "nops16-1"
@@ -257,6 +259,8 @@ if [expr ([istarget "i*86-*-*"] || [istarget "x86_64-*-*"]) && [gas_64_check]] t
run_dump_test "x86-64-lock-1"
run_dump_test "x86-64-lock-1-intel"
run_list_test "x86-64-lockbad-1" "-al"
+ run_dump_test "x86-64-long-1"
+ run_dump_test "x86-64-long-1-intel"
run_dump_test "x86-64-cbw"
run_dump_test "x86-64-cbw-intel"
run_dump_test "x86-64-io"
diff --git a/gas/testsuite/gas/i386/jump16.d b/gas/testsuite/gas/i386/jump16.d
index c91c8ae182f..a83bad61570 100644
--- a/gas/testsuite/gas/i386/jump16.d
+++ b/gas/testsuite/gas/i386/jump16.d
@@ -10,16 +10,16 @@ Disassembly of section .text:
[ ]*[a-f0-9]+: e9 f(e|b) ff jmp (0x3|0 <.text>) 3: (R_386_PC)?(DISP)?16 xxx
[ ]*[a-f0-9]+: ff 26 00 00 jmp \*0x0 7: (R_386_)?16 xxx
[ ]*[a-f0-9]+: 66 ff e7 jmpl \*%edi
-[ ]*[a-f0-9]+: 67 ff 27 addr32 jmp \*\(%edi\)
-[ ]*[a-f0-9]+: 67 ff af 00 00 00 00 addr32 ljmp \*0x0\(%edi\) 12: (R_386_)?(dir)?32 xxx
+[ ]*[a-f0-9]+: 67 ff 27 jmp \*\(%edi\)
+[ ]*[a-f0-9]+: 67 ff af 00 00 00 00 ljmp \*0x0\(%edi\) 12: (R_386_)?(dir)?32 xxx
[ ]*[a-f0-9]+: ff 2e 00 00 ljmp \*0x0 18: (R_386_)?16 xxx
[ ]*[a-f0-9]+: ea 00 00 34 12 ljmp \$0x1234,\$0x0 1b: (R_386_)?16 xxx
[ ]*[a-f0-9]+: 66 e8 db ff ff ff calll (0x0|0 <.text>)
[ ]*[a-f0-9]+: 66 e8 (fc|d5) ff ff ff calll (0x27|0 <.text>) 27: (R_386_PC)?(DISP)?32 xxx
[ ]*[a-f0-9]+: 66 ff 16 00 00 calll \*0x0 2e: (R_386_)?16 xxx
[ ]*[a-f0-9]+: 66 ff d7 calll \*%edi
-[ ]*[a-f0-9]+: 67 66 ff 17 addr32 calll \*\(%edi\)
-[ ]*[a-f0-9]+: 67 66 ff 9f 00 00 00 00 addr32 lcalll \*0x0\(%edi\) 3b: (R_386_)?(dir)?32 xxx
+[ ]*[a-f0-9]+: 67 66 ff 17 calll \*\(%edi\)
+[ ]*[a-f0-9]+: 67 66 ff 9f 00 00 00 00 lcalll \*0x0\(%edi\) 3b: (R_386_)?(dir)?32 xxx
[ ]*[a-f0-9]+: 66 ff 1e 00 00 lcalll \*0x0 42: (R_386_)?16 xxx
[ ]*[a-f0-9]+: 66 9a 00 00 00 00 34 12 lcalll \$0x1234,\$0x0 46: (R_386_)?(dir)?32 xxx
[ ]*[a-f0-9]+: eb b2 jmp (0x0|0 <.text>)
diff --git a/gas/testsuite/gas/i386/long-1-intel.d b/gas/testsuite/gas/i386/long-1-intel.d
new file mode 100644
index 00000000000..7a734626abf
--- /dev/null
+++ b/gas/testsuite/gas/i386/long-1-intel.d
@@ -0,0 +1,14 @@
+#objdump: -dwMintel
+#name: i386 long insns (Intel disassembly)
+#source: long-1.s
+
+.*: +file format .*
+
+
+Disassembly of section .text:
+
+0+ <foo>:
+[ ]*[a-f0-9]+: f2 f0 f0 f0 f2 f2 f2 f2 f2 f2 f0 f0 66 0f 28 repnz lock lock lock repnz repnz repnz repnz repnz repnz lock lock \(bad\)
+[ ]*[a-f0-9]+: 00 f2 add dl,dh
+[ ]*[a-f0-9]+: f0 f0 f0 f2 f2 f2 f2 f0 f0 f0 f0 66 0f 28 00 lock lock lock repnz repnz repnz repnz lock lock lock lock movapd xmm0,XMMWORD PTR \[eax\]
+#pass
diff --git a/gas/testsuite/gas/i386/long-1.d b/gas/testsuite/gas/i386/long-1.d
new file mode 100644
index 00000000000..1dccd3674af
--- /dev/null
+++ b/gas/testsuite/gas/i386/long-1.d
@@ -0,0 +1,13 @@
+#objdump: -dw
+#name: i386 long insns
+
+.*: +file format .*
+
+
+Disassembly of section .text:
+
+0+ <foo>:
+[ ]*[a-f0-9]+: f2 f0 f0 f0 f2 f2 f2 f2 f2 f2 f0 f0 66 0f 28 repnz lock lock lock repnz repnz repnz repnz repnz repnz lock lock \(bad\)
+[ ]*[a-f0-9]+: 00 f2 add %dh,%dl
+[ ]*[a-f0-9]+: f0 f0 f0 f2 f2 f2 f2 f0 f0 f0 f0 66 0f 28 00 lock lock lock repnz repnz repnz repnz lock lock lock lock movapd \(%eax\),%xmm0
+#pass
diff --git a/gas/testsuite/gas/i386/long-1.s b/gas/testsuite/gas/i386/long-1.s
new file mode 100644
index 00000000000..4551068bc53
--- /dev/null
+++ b/gas/testsuite/gas/i386/long-1.s
@@ -0,0 +1,30 @@
+# Long Instructions
+
+ .text
+foo:
+.byte 0xf2
+.byte 0xf0
+.byte 0xf0
+.byte 0xf0
+.byte 0xf2
+.byte 0xf2
+.byte 0xf2
+.byte 0xf2
+.byte 0xf2
+.byte 0xf2
+.byte 0xf0
+.byte 0xf0
+movapd (%eax), %xmm0
+.byte 0xf2
+.byte 0xf0
+.byte 0xf0
+.byte 0xf0
+.byte 0xf2
+.byte 0xf2
+.byte 0xf2
+.byte 0xf2
+.byte 0xf0
+.byte 0xf0
+.byte 0xf0
+.byte 0xf0
+movapd (%eax), %xmm0
diff --git a/gas/testsuite/gas/i386/naked.d b/gas/testsuite/gas/i386/naked.d
index 27c1c052e50..c7420183281 100644
--- a/gas/testsuite/gas/i386/naked.d
+++ b/gas/testsuite/gas/i386/naked.d
@@ -18,7 +18,7 @@ Disassembly of section .text:
2e: 65 f3 a5 [ ]*rep movsl %gs:\(%esi\),%es:\(%edi\)
31: ec [ ]*in \(%dx\),%al
32: 66 ef [ ]*out %ax,\(%dx\)
- 34: 67 d2 14 [ ]*addr16 rclb %cl,\(%si\)
+ 34: 67 d2 14[ ]*rclb[ ]+%cl,\(%si\)
37: 0f 20 d0 [ ]*mov %cr2,%eax
3a: 0f 72 d0 04 [ ]*psrld \$0x4,%mm0
3e: 66 47 [ ]*inc %di
diff --git a/gas/testsuite/gas/i386/nops-1-core2.d b/gas/testsuite/gas/i386/nops-1-core2.d
index 58632d79e65..421540888fb 100644
--- a/gas/testsuite/gas/i386/nops-1-core2.d
+++ b/gas/testsuite/gas/i386/nops-1-core2.d
@@ -5,152 +5,153 @@
.*: +file format .*
+
Disassembly of section .text:
0+ <nop15>:
-[ ]*0:[ ]+90[ ]+nop[ ]*
-[ ]*1:[ ]+66 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00[ ]+nopw[ ]+%cs:0x0\(%eax,%eax,1\)
+[ ]*[a-f0-9]+: 90 nop
+[ ]*[a-f0-9]+: 66 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00 data32 data32 data32 data32 data32 nopw %cs:0x0\(%eax,%eax,1\)
0+10 <nop14>:
-[ ]*10:[ ]+90[ ]+nop[ ]*
-[ ]*11:[ ]+90[ ]+nop[ ]*
-[ ]*12:[ ]+66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00[ ]+nopw[ ]+%cs:0x0\(%eax,%eax,1\)
+[ ]*[a-f0-9]+: 90 nop
+[ ]*[a-f0-9]+: 90 nop
+[ ]*[a-f0-9]+: 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00 data32 data32 data32 data32 nopw %cs:0x0\(%eax,%eax,1\)
0+20 <nop13>:
-[ ]*20:[ ]+90[ ]+nop[ ]*
-[ ]*21:[ ]+90[ ]+nop[ ]*
-[ ]*22:[ ]+90[ ]+nop[ ]*
-[ ]*23:[ ]+66 66 66 66 2e 0f 1f 84 00 00 00 00 00[ ]+nopw[ ]+%cs:0x0\(%eax,%eax,1\)
+[ ]*[a-f0-9]+: 90 nop
+[ ]*[a-f0-9]+: 90 nop
+[ ]*[a-f0-9]+: 90 nop
+[ ]*[a-f0-9]+: 66 66 66 66 2e 0f 1f 84 00 00 00 00 00 data32 data32 data32 nopw %cs:0x0\(%eax,%eax,1\)
0+30 <nop12>:
-[ ]*30:[ ]+90[ ]+nop[ ]*
-[ ]*31:[ ]+90[ ]+nop[ ]*
-[ ]*32:[ ]+90[ ]+nop[ ]*
-[ ]*33:[ ]+90[ ]+nop[ ]*
-[ ]*34:[ ]+66 66 66 2e 0f 1f 84 00 00 00 00 00[ ]+nopw[ ]+%cs:0x0\(%eax,%eax,1\)
+[ ]*[a-f0-9]+: 90 nop
+[ ]*[a-f0-9]+: 90 nop
+[ ]*[a-f0-9]+: 90 nop
+[ ]*[a-f0-9]+: 90 nop
+[ ]*[a-f0-9]+: 66 66 66 2e 0f 1f 84 00 00 00 00 00 data32 data32 nopw %cs:0x0\(%eax,%eax,1\)
0+40 <nop11>:
-[ ]*40:[ ]+90[ ]+nop[ ]*
-[ ]*41:[ ]+90[ ]+nop[ ]*
-[ ]*42:[ ]+90[ ]+nop[ ]*
-[ ]*43:[ ]+90[ ]+nop[ ]*
-[ ]*44:[ ]+90[ ]+nop[ ]*
-[ ]*45:[ ]+66 66 2e 0f 1f 84 00 00 00 00 00[ ]+nopw[ ]+%cs:0x0\(%eax,%eax,1\)
+[ ]*[a-f0-9]+: 90 nop
+[ ]*[a-f0-9]+: 90 nop
+[ ]*[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 data32 nopw %cs:0x0\(%eax,%eax,1\)
0+50 <nop10>:
-[ ]*50:[ ]+90[ ]+nop[ ]*
-[ ]*51:[ ]+90[ ]+nop[ ]*
-[ ]*52:[ ]+90[ ]+nop[ ]*
-[ ]*53:[ ]+90[ ]+nop[ ]*
-[ ]*54:[ ]+90[ ]+nop[ ]*
-[ ]*55:[ ]+90[ ]+nop[ ]*
-[ ]*56:[ ]+66 2e 0f 1f 84 00 00 00 00 00[ ]+nopw[ ]+%cs:0x0\(%eax,%eax,1\)
+[ ]*[a-f0-9]+: 90 nop
+[ ]*[a-f0-9]+: 90 nop
+[ ]*[a-f0-9]+: 90 nop
+[ ]*[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\(%eax,%eax,1\)
0+60 <nop9>:
-[ ]*60:[ ]+90[ ]+nop[ ]*
-[ ]*61:[ ]+90[ ]+nop[ ]*
-[ ]*62:[ ]+90[ ]+nop[ ]*
-[ ]*63:[ ]+90[ ]+nop[ ]*
-[ ]*64:[ ]+90[ ]+nop[ ]*
-[ ]*65:[ ]+90[ ]+nop[ ]*
-[ ]*66:[ ]+90[ ]+nop[ ]*
-[ ]*67:[ ]+66 0f 1f 84 00 00 00 00 00[ ]+nopw[ ]+0x0\(%eax,%eax,1\)
+[ ]*[a-f0-9]+: 90 nop
+[ ]*[a-f0-9]+: 90 nop
+[ ]*[a-f0-9]+: 90 nop
+[ ]*[a-f0-9]+: 90 nop
+[ ]*[a-f0-9]+: 90 nop
+[ ]*[a-f0-9]+: 90 nop
+[ ]*[a-f0-9]+: 90 nop
+[ ]*[a-f0-9]+: 66 0f 1f 84 00 00 00 00 00 nopw 0x0\(%eax,%eax,1\)
0+70 <nop8>:
-[ ]*70:[ ]+90[ ]+nop[ ]*
-[ ]*71:[ ]+90[ ]+nop[ ]*
-[ ]*72:[ ]+90[ ]+nop[ ]*
-[ ]*73:[ ]+90[ ]+nop[ ]*
-[ ]*74:[ ]+90[ ]+nop[ ]*
-[ ]*75:[ ]+90[ ]+nop[ ]*
-[ ]*76:[ ]+90[ ]+nop[ ]*
-[ ]*77:[ ]+90[ ]+nop[ ]*
-[ ]*78:[ ]+0f 1f 84 00 00 00 00 00[ ]+nopl[ ]+0x0\(%eax,%eax,1\)
+[ ]*[a-f0-9]+: 90 nop
+[ ]*[a-f0-9]+: 90 nop
+[ ]*[a-f0-9]+: 90 nop
+[ ]*[a-f0-9]+: 90 nop
+[ ]*[a-f0-9]+: 90 nop
+[ ]*[a-f0-9]+: 90 nop
+[ ]*[a-f0-9]+: 90 nop
+[ ]*[a-f0-9]+: 90 nop
+[ ]*[a-f0-9]+: 0f 1f 84 00 00 00 00 00 nopl 0x0\(%eax,%eax,1\)
0+80 <nop7>:
-[ ]*80:[ ]+90[ ]+nop[ ]*
-[ ]*81:[ ]+90[ ]+nop[ ]*
-[ ]*82:[ ]+90[ ]+nop[ ]*
-[ ]*83:[ ]+90[ ]+nop[ ]*
-[ ]*84:[ ]+90[ ]+nop[ ]*
-[ ]*85:[ ]+90[ ]+nop[ ]*
-[ ]*86:[ ]+90[ ]+nop[ ]*
-[ ]*87:[ ]+90[ ]+nop[ ]*
-[ ]*88:[ ]+90[ ]+nop[ ]*
-[ ]*89:[ ]+0f 1f 80 00 00 00 00[ ]+nopl[ ]+0x0\(%eax\)
+[ ]*[a-f0-9]+: 90 nop
+[ ]*[a-f0-9]+: 90 nop
+[ ]*[a-f0-9]+: 90 nop
+[ ]*[a-f0-9]+: 90 nop
+[ ]*[a-f0-9]+: 90 nop
+[ ]*[a-f0-9]+: 90 nop
+[ ]*[a-f0-9]+: 90 nop
+[ ]*[a-f0-9]+: 90 nop
+[ ]*[a-f0-9]+: 90 nop
+[ ]*[a-f0-9]+: 0f 1f 80 00 00 00 00 nopl 0x0\(%eax\)
0+90 <nop6>:
-[ ]*90:[ ]+90[ ]+nop[ ]*
-[ ]*91:[ ]+90[ ]+nop[ ]*
-[ ]*92:[ ]+90[ ]+nop[ ]*
-[ ]*93:[ ]+90[ ]+nop[ ]*
-[ ]*94:[ ]+90[ ]+nop[ ]*
-[ ]*95:[ ]+90[ ]+nop[ ]*
-[ ]*96:[ ]+90[ ]+nop[ ]*
-[ ]*97:[ ]+90[ ]+nop[ ]*
-[ ]*98:[ ]+90[ ]+nop[ ]*
-[ ]*99:[ ]+90[ ]+nop[ ]*
-[ ]*9a:[ ]+66 0f 1f 44 00 00[ ]+nopw[ ]+0x0\(%eax,%eax,1\)
+[ ]*[a-f0-9]+: 90 nop
+[ ]*[a-f0-9]+: 90 nop
+[ ]*[a-f0-9]+: 90 nop
+[ ]*[a-f0-9]+: 90 nop
+[ ]*[a-f0-9]+: 90 nop
+[ ]*[a-f0-9]+: 90 nop
+[ ]*[a-f0-9]+: 90 nop
+[ ]*[a-f0-9]+: 90 nop
+[ ]*[a-f0-9]+: 90 nop
+[ ]*[a-f0-9]+: 90 nop
+[ ]*[a-f0-9]+: 66 0f 1f 44 00 00 nopw 0x0\(%eax,%eax,1\)
0+a0 <nop5>:
-[ ]*a0:[ ]+90[ ]+nop[ ]*
-[ ]*a1:[ ]+90[ ]+nop[ ]*
-[ ]*a2:[ ]+90[ ]+nop[ ]*
-[ ]*a3:[ ]+90[ ]+nop[ ]*
-[ ]*a4:[ ]+90[ ]+nop[ ]*
-[ ]*a5:[ ]+90[ ]+nop[ ]*
-[ ]*a6:[ ]+90[ ]+nop[ ]*
-[ ]*a7:[ ]+90[ ]+nop[ ]*
-[ ]*a8:[ ]+90[ ]+nop[ ]*
-[ ]*a9:[ ]+90[ ]+nop[ ]*
-[ ]*aa:[ ]+90[ ]+nop[ ]*
-[ ]*ab:[ ]+0f 1f 44 00 00[ ]+nopl[ ]+0x0\(%eax,%eax,1\)
+[ ]*[a-f0-9]+: 90 nop
+[ ]*[a-f0-9]+: 90 nop
+[ ]*[a-f0-9]+: 90 nop
+[ ]*[a-f0-9]+: 90 nop
+[ ]*[a-f0-9]+: 90 nop
+[ ]*[a-f0-9]+: 90 nop
+[ ]*[a-f0-9]+: 90 nop
+[ ]*[a-f0-9]+: 90 nop
+[ ]*[a-f0-9]+: 90 nop
+[ ]*[a-f0-9]+: 90 nop
+[ ]*[a-f0-9]+: 90 nop
+[ ]*[a-f0-9]+: 0f 1f 44 00 00 nopl 0x0\(%eax,%eax,1\)
0+b0 <nop4>:
-[ ]*b0:[ ]+90[ ]+nop[ ]*
-[ ]*b1:[ ]+90[ ]+nop[ ]*
-[ ]*b2:[ ]+90[ ]+nop[ ]*
-[ ]*b3:[ ]+90[ ]+nop[ ]*
-[ ]*b4:[ ]+90[ ]+nop[ ]*
-[ ]*b5:[ ]+90[ ]+nop[ ]*
-[ ]*b6:[ ]+90[ ]+nop[ ]*
-[ ]*b7:[ ]+90[ ]+nop[ ]*
-[ ]*b8:[ ]+90[ ]+nop[ ]*
-[ ]*b9:[ ]+90[ ]+nop[ ]*
-[ ]*ba:[ ]+90[ ]+nop[ ]*
-[ ]*bb:[ ]+90[ ]+nop[ ]*
-[ ]*bc:[ ]+0f 1f 40 00[ ]+nopl[ ]+0x0\(%eax\)
+[ ]*[a-f0-9]+: 90 nop
+[ ]*[a-f0-9]+: 90 nop
+[ ]*[a-f0-9]+: 90 nop
+[ ]*[a-f0-9]+: 90 nop
+[ ]*[a-f0-9]+: 90 nop
+[ ]*[a-f0-9]+: 90 nop
+[ ]*[a-f0-9]+: 90 nop
+[ ]*[a-f0-9]+: 90 nop
+[ ]*[a-f0-9]+: 90 nop
+[ ]*[a-f0-9]+: 90 nop
+[ ]*[a-f0-9]+: 90 nop
+[ ]*[a-f0-9]+: 90 nop
+[ ]*[a-f0-9]+: 0f 1f 40 00 nopl 0x0\(%eax\)
0+c0 <nop3>:
-[ ]*c0:[ ]+90[ ]+nop[ ]*
-[ ]*c1:[ ]+90[ ]+nop[ ]*
-[ ]*c2:[ ]+90[ ]+nop[ ]*
-[ ]*c3:[ ]+90[ ]+nop[ ]*
-[ ]*c4:[ ]+90[ ]+nop[ ]*
-[ ]*c5:[ ]+90[ ]+nop[ ]*
-[ ]*c6:[ ]+90[ ]+nop[ ]*
-[ ]*c7:[ ]+90[ ]+nop[ ]*
-[ ]*c8:[ ]+90[ ]+nop[ ]*
-[ ]*c9:[ ]+90[ ]+nop[ ]*
-[ ]*ca:[ ]+90[ ]+nop[ ]*
-[ ]*cb:[ ]+90[ ]+nop[ ]*
-[ ]*cc:[ ]+90[ ]+nop[ ]*
-[ ]*cd:[ ]+0f 1f 00[ ]+nopl[ ]+\(%eax\)
+[ ]*[a-f0-9]+: 90 nop
+[ ]*[a-f0-9]+: 90 nop
+[ ]*[a-f0-9]+: 90 nop
+[ ]*[a-f0-9]+: 90 nop
+[ ]*[a-f0-9]+: 90 nop
+[ ]*[a-f0-9]+: 90 nop
+[ ]*[a-f0-9]+: 90 nop
+[ ]*[a-f0-9]+: 90 nop
+[ ]*[a-f0-9]+: 90 nop
+[ ]*[a-f0-9]+: 90 nop
+[ ]*[a-f0-9]+: 90 nop
+[ ]*[a-f0-9]+: 90 nop
+[ ]*[a-f0-9]+: 90 nop
+[ ]*[a-f0-9]+: 0f 1f 00 nopl \(%eax\)
0+d0 <nop2>:
-[ ]*d0:[ ]+90[ ]+nop[ ]*
-[ ]*d1:[ ]+90[ ]+nop[ ]*
-[ ]*d2:[ ]+90[ ]+nop[ ]*
-[ ]*d3:[ ]+90[ ]+nop[ ]*
-[ ]*d4:[ ]+90[ ]+nop[ ]*
-[ ]*d5:[ ]+90[ ]+nop[ ]*
-[ ]*d6:[ ]+90[ ]+nop[ ]*
-[ ]*d7:[ ]+90[ ]+nop[ ]*
-[ ]*d8:[ ]+90[ ]+nop[ ]*
-[ ]*d9:[ ]+90[ ]+nop[ ]*
-[ ]*da:[ ]+90[ ]+nop[ ]*
-[ ]*db:[ ]+90[ ]+nop[ ]*
-[ ]*dc:[ ]+90[ ]+nop[ ]*
-[ ]*dd:[ ]+90[ ]+nop[ ]*
-[ ]*de:[ ]+66 90[ ]+xchg[ ]+%ax,%ax
+[ ]*[a-f0-9]+: 90 nop
+[ ]*[a-f0-9]+: 90 nop
+[ ]*[a-f0-9]+: 90 nop
+[ ]*[a-f0-9]+: 90 nop
+[ ]*[a-f0-9]+: 90 nop
+[ ]*[a-f0-9]+: 90 nop
+[ ]*[a-f0-9]+: 90 nop
+[ ]*[a-f0-9]+: 90 nop
+[ ]*[a-f0-9]+: 90 nop
+[ ]*[a-f0-9]+: 90 nop
+[ ]*[a-f0-9]+: 90 nop
+[ ]*[a-f0-9]+: 90 nop
+[ ]*[a-f0-9]+: 90 nop
+[ ]*[a-f0-9]+: 90 nop
+[ ]*[a-f0-9]+: 66 90 xchg %ax,%ax
#pass
diff --git a/gas/testsuite/gas/i386/nops-1-i686.d b/gas/testsuite/gas/i386/nops-1-i686.d
index b7c8149e6d8..7752ee23a76 100644
--- a/gas/testsuite/gas/i386/nops-1-i686.d
+++ b/gas/testsuite/gas/i386/nops-1-i686.d
@@ -5,29 +5,30 @@
.*: +file format .*
+
Disassembly of section .text:
0+ <nop15>:
[ ]*[a-f0-9]+: 90 nop
-[ ]*[a-f0-9]+: 66 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00 nopw %cs:0x0\(%eax,%eax,1\)
+[ ]*[a-f0-9]+: 66 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00 data32 data32 data32 data32 data32 nopw %cs:0x0\(%eax,%eax,1\)
0+10 <nop14>:
[ ]*[a-f0-9]+: 90 nop
[ ]*[a-f0-9]+: 90 nop
-[ ]*[a-f0-9]+: 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00 nopw %cs:0x0\(%eax,%eax,1\)
+[ ]*[a-f0-9]+: 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00 data32 data32 data32 data32 nopw %cs:0x0\(%eax,%eax,1\)
0+20 <nop13>:
[ ]*[a-f0-9]+: 90 nop
[ ]*[a-f0-9]+: 90 nop
[ ]*[a-f0-9]+: 90 nop
-[ ]*[a-f0-9]+: 66 66 66 66 2e 0f 1f 84 00 00 00 00 00 nopw %cs:0x0\(%eax,%eax,1\)
+[ ]*[a-f0-9]+: 66 66 66 66 2e 0f 1f 84 00 00 00 00 00 data32 data32 data32 nopw %cs:0x0\(%eax,%eax,1\)
0+30 <nop12>:
[ ]*[a-f0-9]+: 90 nop
[ ]*[a-f0-9]+: 90 nop
[ ]*[a-f0-9]+: 90 nop
[ ]*[a-f0-9]+: 90 nop
-[ ]*[a-f0-9]+: 66 66 66 2e 0f 1f 84 00 00 00 00 00 nopw %cs:0x0\(%eax,%eax,1\)
+[ ]*[a-f0-9]+: 66 66 66 2e 0f 1f 84 00 00 00 00 00 data32 data32 nopw %cs:0x0\(%eax,%eax,1\)
0+40 <nop11>:
[ ]*[a-f0-9]+: 90 nop
@@ -35,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 nopw %cs:0x0\(%eax,%eax,1\)
+[ ]*[a-f0-9]+: 66 66 2e 0f 1f 84 00 00 00 00 00 data32 nopw %cs:0x0\(%eax,%eax,1\)
0+50 <nop10>:
[ ]*[a-f0-9]+: 90 nop
diff --git a/gas/testsuite/gas/i386/nops-3-i686.d b/gas/testsuite/gas/i386/nops-3-i686.d
index 27fe19c1fa5..30d26278183 100644
--- a/gas/testsuite/gas/i386/nops-3-i686.d
+++ b/gas/testsuite/gas/i386/nops-3-i686.d
@@ -10,8 +10,8 @@ Disassembly of section .text:
0+ <nop>:
[ ]*[a-f0-9]+: 90 nop
[ ]*[a-f0-9]+: 90 nop
-[ ]*[a-f0-9]+: 66 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00 nopw %cs:0x0\(%eax,%eax,1\)
-[ ]*[a-f0-9]+: 66 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00 nopw %cs:0x0\(%eax,%eax,1\)
+[ ]*[a-f0-9]+: 66 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00 data32 data32 data32 data32 data32 nopw %cs:0x0\(%eax,%eax,1\)
+[ ]*[a-f0-9]+: 66 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00 data32 data32 data32 data32 data32 nopw %cs:0x0\(%eax,%eax,1\)
[ ]*[a-f0-9]+: 89 c3 mov %eax,%ebx
-[ ]*[a-f0-9]+: 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00 nopw %cs:0x0\(%eax,%eax,1\)
+[ ]*[a-f0-9]+: 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00 data32 data32 data32 data32 nopw %cs:0x0\(%eax,%eax,1\)
#pass
diff --git a/gas/testsuite/gas/i386/nops-4-i686.d b/gas/testsuite/gas/i386/nops-4-i686.d
index d8d8f780eab..3d8420bb28c 100644
--- a/gas/testsuite/gas/i386/nops-4-i686.d
+++ b/gas/testsuite/gas/i386/nops-4-i686.d
@@ -10,29 +10,29 @@ Disassembly of section .text:
0+ <nop31>:
[ ]*[a-f0-9]+: 90 nop
[ ]*[a-f0-9]+: 90 nop
-[ ]*[a-f0-9]+: 66 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00 nopw %cs:0x0\(%eax,%eax,1\)
-[ ]*[a-f0-9]+: 66 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00 nopw %cs:0x0\(%eax,%eax,1\)
+[ ]*[a-f0-9]+: 66 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00 data32 data32 data32 data32 data32 nopw %cs:0x0\(%eax,%eax,1\)
+[ ]*[a-f0-9]+: 66 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00 data32 data32 data32 data32 data32 nopw %cs:0x0\(%eax,%eax,1\)
0+20 <nop30>:
[ ]*[a-f0-9]+: 90 nop
[ ]*[a-f0-9]+: 90 nop
-[ ]*[a-f0-9]+: 66 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00 nopw %cs:0x0\(%eax,%eax,1\)
-[ ]*[a-f0-9]+: 66 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00 nopw %cs:0x0\(%eax,%eax,1\)
+[ ]*[a-f0-9]+: 66 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00 data32 data32 data32 data32 data32 nopw %cs:0x0\(%eax,%eax,1\)
+[ ]*[a-f0-9]+: 66 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00 data32 data32 data32 data32 data32 nopw %cs:0x0\(%eax,%eax,1\)
0+40 <nop29>:
[ ]*[a-f0-9]+: 90 nop
[ ]*[a-f0-9]+: 90 nop
[ ]*[a-f0-9]+: 90 nop
-[ ]*[a-f0-9]+: 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00 nopw %cs:0x0\(%eax,%eax,1\)
-[ ]*[a-f0-9]+: 66 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00 nopw %cs:0x0\(%eax,%eax,1\)
+[ ]*[a-f0-9]+: 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00 data32 data32 data32 data32 nopw %cs:0x0\(%eax,%eax,1\)
+[ ]*[a-f0-9]+: 66 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00 data32 data32 data32 data32 data32 nopw %cs:0x0\(%eax,%eax,1\)
0+60 <nop28>:
[ ]*[a-f0-9]+: 90 nop
[ ]*[a-f0-9]+: 90 nop
[ ]*[a-f0-9]+: 90 nop
[ ]*[a-f0-9]+: 90 nop
-[ ]*[a-f0-9]+: 66 66 66 66 2e 0f 1f 84 00 00 00 00 00 nopw %cs:0x0\(%eax,%eax,1\)
-[ ]*[a-f0-9]+: 66 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00 nopw %cs:0x0\(%eax,%eax,1\)
+[ ]*[a-f0-9]+: 66 66 66 66 2e 0f 1f 84 00 00 00 00 00 data32 data32 data32 nopw %cs:0x0\(%eax,%eax,1\)
+[ ]*[a-f0-9]+: 66 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00 data32 data32 data32 data32 data32 nopw %cs:0x0\(%eax,%eax,1\)
0+80 <nop27>:
[ ]*[a-f0-9]+: 90 nop
@@ -40,8 +40,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 66 2e 0f 1f 84 00 00 00 00 00 nopw %cs:0x0\(%eax,%eax,1\)
-[ ]*[a-f0-9]+: 66 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00 nopw %cs:0x0\(%eax,%eax,1\)
+[ ]*[a-f0-9]+: 66 66 66 2e 0f 1f 84 00 00 00 00 00 data32 data32 nopw %cs:0x0\(%eax,%eax,1\)
+[ ]*[a-f0-9]+: 66 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00 data32 data32 data32 data32 data32 nopw %cs:0x0\(%eax,%eax,1\)
0+a0 <nop26>:
[ ]*[a-f0-9]+: 90 nop
@@ -50,8 +50,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 nopw %cs:0x0\(%eax,%eax,1\)
-[ ]*[a-f0-9]+: 66 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00 nopw %cs:0x0\(%eax,%eax,1\)
+[ ]*[a-f0-9]+: 66 66 2e 0f 1f 84 00 00 00 00 00 data32 nopw %cs:0x0\(%eax,%eax,1\)
+[ ]*[a-f0-9]+: 66 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00 data32 data32 data32 data32 data32 nopw %cs:0x0\(%eax,%eax,1\)
0+c0 <nop25>:
[ ]*[a-f0-9]+: 90 nop
@@ -62,7 +62,7 @@ Disassembly of section .text:
[ ]*[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\(%eax,%eax,1\)
-[ ]*[a-f0-9]+: 66 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00 nopw %cs:0x0\(%eax,%eax,1\)
+[ ]*[a-f0-9]+: 66 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00 data32 data32 data32 data32 data32 nopw %cs:0x0\(%eax,%eax,1\)
0+e0 <nop24>:
[ ]*[a-f0-9]+: 90 nop
@@ -74,7 +74,7 @@ Disassembly of section .text:
[ ]*[a-f0-9]+: 90 nop
[ ]*[a-f0-9]+: 90 nop
[ ]*[a-f0-9]+: 66 0f 1f 84 00 00 00 00 00 nopw 0x0\(%eax,%eax,1\)
-[ ]*[a-f0-9]+: 66 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00 nopw %cs:0x0\(%eax,%eax,1\)
+[ ]*[a-f0-9]+: 66 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00 data32 data32 data32 data32 data32 nopw %cs:0x0\(%eax,%eax,1\)
0+100 <nop23>:
[ ]*[a-f0-9]+: 90 nop
@@ -87,7 +87,7 @@ Disassembly of section .text:
[ ]*[a-f0-9]+: 90 nop
[ ]*[a-f0-9]+: 90 nop
[ ]*[a-f0-9]+: 0f 1f 84 00 00 00 00 00 nopl 0x0\(%eax,%eax,1\)
-[ ]*[a-f0-9]+: 66 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00 nopw %cs:0x0\(%eax,%eax,1\)
+[ ]*[a-f0-9]+: 66 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00 data32 data32 data32 data32 data32 nopw %cs:0x0\(%eax,%eax,1\)
0+120 <nop22>:
[ ]*[a-f0-9]+: 90 nop
@@ -101,7 +101,7 @@ Disassembly of section .text:
[ ]*[a-f0-9]+: 90 nop
[ ]*[a-f0-9]+: 90 nop
[ ]*[a-f0-9]+: 0f 1f 80 00 00 00 00 nopl 0x0\(%eax\)
-[ ]*[a-f0-9]+: 66 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00 nopw %cs:0x0\(%eax,%eax,1\)
+[ ]*[a-f0-9]+: 66 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00 data32 data32 data32 data32 data32 nopw %cs:0x0\(%eax,%eax,1\)
0+140 <nop21>:
[ ]*[a-f0-9]+: 90 nop
@@ -116,7 +116,7 @@ Disassembly of section .text:
[ ]*[a-f0-9]+: 90 nop
[ ]*[a-f0-9]+: 90 nop
[ ]*[a-f0-9]+: 66 0f 1f 44 00 00 nopw 0x0\(%eax,%eax,1\)
-[ ]*[a-f0-9]+: 66 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00 nopw %cs:0x0\(%eax,%eax,1\)
+[ ]*[a-f0-9]+: 66 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00 data32 data32 data32 data32 data32 nopw %cs:0x0\(%eax,%eax,1\)
0+160 <nop20>:
[ ]*[a-f0-9]+: 90 nop
@@ -132,7 +132,7 @@ Disassembly of section .text:
[ ]*[a-f0-9]+: 90 nop
[ ]*[a-f0-9]+: 90 nop
[ ]*[a-f0-9]+: 0f 1f 44 00 00 nopl 0x0\(%eax,%eax,1\)
-[ ]*[a-f0-9]+: 66 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00 nopw %cs:0x0\(%eax,%eax,1\)
+[ ]*[a-f0-9]+: 66 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00 data32 data32 data32 data32 data32 nopw %cs:0x0\(%eax,%eax,1\)
0+180 <nop19>:
[ ]*[a-f0-9]+: 90 nop
@@ -149,7 +149,7 @@ Disassembly of section .text:
[ ]*[a-f0-9]+: 90 nop
[ ]*[a-f0-9]+: 90 nop
[ ]*[a-f0-9]+: 0f 1f 40 00 nopl 0x0\(%eax\)
-[ ]*[a-f0-9]+: 66 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00 nopw %cs:0x0\(%eax,%eax,1\)
+[ ]*[a-f0-9]+: 66 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00 data32 data32 data32 data32 data32 nopw %cs:0x0\(%eax,%eax,1\)
0+1a0 <nop18>:
[ ]*[a-f0-9]+: 90 nop
@@ -167,7 +167,7 @@ Disassembly of section .text:
[ ]*[a-f0-9]+: 90 nop
[ ]*[a-f0-9]+: 90 nop
[ ]*[a-f0-9]+: 0f 1f 00 nopl \(%eax\)
-[ ]*[a-f0-9]+: 66 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00 nopw %cs:0x0\(%eax,%eax,1\)
+[ ]*[a-f0-9]+: 66 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00 data32 data32 data32 data32 data32 nopw %cs:0x0\(%eax,%eax,1\)
0+1c0 <nop17>:
[ ]*[a-f0-9]+: 90 nop
@@ -186,7 +186,7 @@ Disassembly of section .text:
[ ]*[a-f0-9]+: 90 nop
[ ]*[a-f0-9]+: 90 nop
[ ]*[a-f0-9]+: 66 90 xchg %ax,%ax
-[ ]*[a-f0-9]+: 66 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00 nopw %cs:0x0\(%eax,%eax,1\)
+[ ]*[a-f0-9]+: 66 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00 data32 data32 data32 data32 data32 nopw %cs:0x0\(%eax,%eax,1\)
0+1e0 <nop16>:
[ ]*[a-f0-9]+: 90 nop
@@ -206,5 +206,5 @@ Disassembly of section .text:
[ ]*[a-f0-9]+: 90 nop
[ ]*[a-f0-9]+: 90 nop
[ ]*[a-f0-9]+: 90 nop
-[ ]*[a-f0-9]+: 66 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00 nopw %cs:0x0\(%eax,%eax,1\)
+[ ]*[a-f0-9]+: 66 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00 data32 data32 data32 data32 data32 nopw %cs:0x0\(%eax,%eax,1\)
#pass
diff --git a/gas/testsuite/gas/i386/nops-5-i686.d b/gas/testsuite/gas/i386/nops-5-i686.d
index 2452cd4aab8..626204189f5 100644
--- a/gas/testsuite/gas/i386/nops-5-i686.d
+++ b/gas/testsuite/gas/i386/nops-5-i686.d
@@ -24,23 +24,23 @@ Disassembly of section .text:
0+30 <i686>:
[ ]*[a-f0-9]+: 0f be f0 movsbl %al,%esi
-[ ]*[a-f0-9]+: 66 66 66 66 2e 0f 1f 84 00 00 00 00 00 nopw %cs:0x0\(%eax,%eax,1\)
+[ ]*[a-f0-9]+: 66 66 66 66 2e 0f 1f 84 00 00 00 00 00 data32 data32 data32 nopw %cs:0x0\(%eax,%eax,1\)
0+40 <pentium4>:
[ ]*[a-f0-9]+: 0f be f0 movsbl %al,%esi
-[ ]*[a-f0-9]+: 66 66 66 66 2e 0f 1f 84 00 00 00 00 00 nopw %cs:0x0\(%eax,%eax,1\)
+[ ]*[a-f0-9]+: 66 66 66 66 2e 0f 1f 84 00 00 00 00 00 data32 data32 data32 nopw %cs:0x0\(%eax,%eax,1\)
0+50 <nocona>:
[ ]*[a-f0-9]+: 0f be f0 movsbl %al,%esi
-[ ]*[a-f0-9]+: 66 66 66 66 2e 0f 1f 84 00 00 00 00 00 nopw %cs:0x0\(%eax,%eax,1\)
+[ ]*[a-f0-9]+: 66 66 66 66 2e 0f 1f 84 00 00 00 00 00 data32 data32 data32 nopw %cs:0x0\(%eax,%eax,1\)
0+60 <core>:
[ ]*[a-f0-9]+: 0f be f0 movsbl %al,%esi
-[ ]*[a-f0-9]+: 66 66 66 66 2e 0f 1f 84 00 00 00 00 00 nopw %cs:0x0\(%eax,%eax,1\)
+[ ]*[a-f0-9]+: 66 66 66 66 2e 0f 1f 84 00 00 00 00 00 data32 data32 data32 nopw %cs:0x0\(%eax,%eax,1\)
0+70 <core2>:
[ ]*[a-f0-9]+: 0f be f0 movsbl %al,%esi
-[ ]*[a-f0-9]+: 66 66 66 66 2e 0f 1f 84 00 00 00 00 00 nopw %cs:0x0\(%eax,%eax,1\)
+[ ]*[a-f0-9]+: 66 66 66 66 2e 0f 1f 84 00 00 00 00 00 data32 data32 data32 nopw %cs:0x0\(%eax,%eax,1\)
0+80 <k6>:
[ ]*[a-f0-9]+: 0f be f0 movsbl %al,%esi
@@ -64,7 +64,7 @@ Disassembly of section .text:
0+c0 <generic64>:
[ ]*[a-f0-9]+: 0f be f0 movsbl %al,%esi
-[ ]*[a-f0-9]+: 66 66 66 66 2e 0f 1f 84 00 00 00 00 00 nopw %cs:0x0\(%eax,%eax,1\)
+[ ]*[a-f0-9]+: 66 66 66 66 2e 0f 1f 84 00 00 00 00 00 data32 data32 data32 nopw %cs:0x0\(%eax,%eax,1\)
0+d0 <amdfam10>:
[ ]*[a-f0-9]+: 0f be f0 movsbl %al,%esi
diff --git a/gas/testsuite/gas/i386/nops-5.d b/gas/testsuite/gas/i386/nops-5.d
index 49c48b7b6ce..4d5aa03cb93 100644
--- a/gas/testsuite/gas/i386/nops-5.d
+++ b/gas/testsuite/gas/i386/nops-5.d
@@ -22,23 +22,23 @@ Disassembly of section .text:
0+30 <i686>:
[ ]*[a-f0-9]+: 0f be f0 movsbl %al,%esi
-[ ]*[a-f0-9]+: 66 66 66 66 2e 0f 1f 84 00 00 00 00 00 nopw %cs:0x0\(%eax,%eax,1\)
+[ ]*[a-f0-9]+: 66 66 66 66 2e 0f 1f 84 00 00 00 00 00 data32 data32 data32 nopw %cs:0x0\(%eax,%eax,1\)
0+40 <pentium4>:
[ ]*[a-f0-9]+: 0f be f0 movsbl %al,%esi
-[ ]*[a-f0-9]+: 66 66 66 66 2e 0f 1f 84 00 00 00 00 00 nopw %cs:0x0\(%eax,%eax,1\)
+[ ]*[a-f0-9]+: 66 66 66 66 2e 0f 1f 84 00 00 00 00 00 data32 data32 data32 nopw %cs:0x0\(%eax,%eax,1\)
0+50 <nocona>:
[ ]*[a-f0-9]+: 0f be f0 movsbl %al,%esi
-[ ]*[a-f0-9]+: 66 66 66 66 2e 0f 1f 84 00 00 00 00 00 nopw %cs:0x0\(%eax,%eax,1\)
+[ ]*[a-f0-9]+: 66 66 66 66 2e 0f 1f 84 00 00 00 00 00 data32 data32 data32 nopw %cs:0x0\(%eax,%eax,1\)
0+60 <core>:
[ ]*[a-f0-9]+: 0f be f0 movsbl %al,%esi
-[ ]*[a-f0-9]+: 66 66 66 66 2e 0f 1f 84 00 00 00 00 00 nopw %cs:0x0\(%eax,%eax,1\)
+[ ]*[a-f0-9]+: 66 66 66 66 2e 0f 1f 84 00 00 00 00 00 data32 data32 data32 nopw %cs:0x0\(%eax,%eax,1\)
0+70 <core2>:
[ ]*[a-f0-9]+: 0f be f0 movsbl %al,%esi
-[ ]*[a-f0-9]+: 66 66 66 66 2e 0f 1f 84 00 00 00 00 00 nopw %cs:0x0\(%eax,%eax,1\)
+[ ]*[a-f0-9]+: 66 66 66 66 2e 0f 1f 84 00 00 00 00 00 data32 data32 data32 nopw %cs:0x0\(%eax,%eax,1\)
0+80 <k6>:
[ ]*[a-f0-9]+: 0f be f0 movsbl %al,%esi
@@ -62,7 +62,7 @@ Disassembly of section .text:
0+c0 <generic64>:
[ ]*[a-f0-9]+: 0f be f0 movsbl %al,%esi
-[ ]*[a-f0-9]+: 66 66 66 66 2e 0f 1f 84 00 00 00 00 00 nopw %cs:0x0\(%eax,%eax,1\)
+[ ]*[a-f0-9]+: 66 66 66 66 2e 0f 1f 84 00 00 00 00 00 data32 data32 data32 nopw %cs:0x0\(%eax,%eax,1\)
0+d0 <amdfam10>:
[ ]*[a-f0-9]+: 0f be f0 movsbl %al,%esi
diff --git a/gas/testsuite/gas/i386/prefix.d b/gas/testsuite/gas/i386/prefix.d
index 517906d6091..e1552302138 100644
--- a/gas/testsuite/gas/i386/prefix.d
+++ b/gas/testsuite/gas/i386/prefix.d
@@ -6,9 +6,9 @@
Disassembly of section .text:
0+000 <foo>:
- 0: 9b 26 67 d9 3c [ ]*addr16 fstcw %es:\(%si\)
+ 0: 9b 26 67 d9 3c[ ]+fstcw[ ]+%es:\(%si\)
5: 9b df e0 [ ]*fstsw %ax
8: 9b df e0 [ ]*fstsw %ax
b: 9b 67 df e0 [ ]*addr16 fstsw %ax
- f: 36 67 66 f3 a7 [ ]*addr16 repz cmpsw %es:\(%di\),%ss:\(%si\)
+ f: 36 67 66 f3 a7 [ ]*repz cmpsw %es:\(%di\),%ss:\(%si\)
#pass
diff --git a/gas/testsuite/gas/i386/rep.d b/gas/testsuite/gas/i386/rep.d
index 0e0e3741ad9..13b304abec9 100644
--- a/gas/testsuite/gas/i386/rep.d
+++ b/gas/testsuite/gas/i386/rep.d
@@ -27,25 +27,25 @@ Disassembly of section .text:
2b: f3 ab[ ]+rep stos %eax,%es:\(%edi\)
2d: f3 a7[ ]+repz cmpsl %es:\(%edi\),%ds:\(%esi\)
2f: f3 af[ ]+repz scas %es:\(%edi\),%eax
- 31: 67 f3 6c[ ]+addr16 rep insb \(%dx\),%es:\(%di\)
- 34: 67 f3 6e[ ]+addr16 rep outsb %ds:\(%si\),\(%dx\)
- 37: 67 f3 a4[ ]+addr16 rep movsb %ds:\(%si\),%es:\(%di\)
- 3a: 67 f3 ac[ ]+addr16 rep lods %ds:\(%si\),%al
- 3d: 67 f3 aa[ ]+addr16 rep stos %al,%es:\(%di\)
- 40: 67 f3 a6[ ]+addr16 repz cmpsb %es:\(%di\),%ds:\(%si\)
- 43: 67 f3 ae[ ]+addr16 repz scas %es:\(%di\),%al
- 46: 67 66 f3 6d[ ]+addr16 rep insw \(%dx\),%es:\(%di\)
- 4a: 67 66 f3 6f[ ]+addr16 rep outsw %ds:\(%si\),\(%dx\)
- 4e: 67 66 f3 a5[ ]+addr16 rep movsw %ds:\(%si\),%es:\(%di\)
- 52: 67 66 f3 ad[ ]+addr16 rep lods %ds:\(%si\),%ax
- 56: 67 66 f3 ab[ ]+addr16 rep stos %ax,%es:\(%di\)
- 5a: 67 66 f3 a7[ ]+addr16 repz cmpsw %es:\(%di\),%ds:\(%si\)
- 5e: 67 66 f3 af[ ]+addr16 repz scas %es:\(%di\),%ax
- 62: 67 f3 6d[ ]+addr16 rep insl \(%dx\),%es:\(%di\)
- 65: 67 f3 6f[ ]+addr16 rep outsl %ds:\(%si\),\(%dx\)
- 68: 67 f3 a5[ ]+addr16 rep movsl %ds:\(%si\),%es:\(%di\)
- 6b: 67 f3 ad[ ]+addr16 rep lods %ds:\(%si\),%eax
- 6e: 67 f3 ab[ ]+addr16 rep stos %eax,%es:\(%di\)
- 71: 67 f3 a7[ ]+addr16 repz cmpsl %es:\(%di\),%ds:\(%si\)
- 74: 67 f3 af[ ]+addr16 repz scas %es:\(%di\),%eax
+ 31: 67 f3 6c[ ]+rep insb \(%dx\),%es:\(%di\)
+ 34: 67 f3 6e[ ]+rep outsb %ds:\(%si\),\(%dx\)
+ 37: 67 f3 a4[ ]+rep movsb %ds:\(%si\),%es:\(%di\)
+ 3a: 67 f3 ac[ ]+rep lods %ds:\(%si\),%al
+ 3d: 67 f3 aa[ ]+rep stos %al,%es:\(%di\)
+ 40: 67 f3 a6[ ]+repz cmpsb %es:\(%di\),%ds:\(%si\)
+ 43: 67 f3 ae[ ]+repz scas %es:\(%di\),%al
+ 46: 67 66 f3 6d[ ]+rep insw \(%dx\),%es:\(%di\)
+ 4a: 67 66 f3 6f[ ]+rep outsw %ds:\(%si\),\(%dx\)
+ 4e: 67 66 f3 a5[ ]+rep movsw %ds:\(%si\),%es:\(%di\)
+ 52: 67 66 f3 ad[ ]+rep lods %ds:\(%si\),%ax
+ 56: 67 66 f3 ab[ ]+rep stos %ax,%es:\(%di\)
+ 5a: 67 66 f3 a7[ ]+repz cmpsw %es:\(%di\),%ds:\(%si\)
+ 5e: 67 66 f3 af[ ]+repz scas %es:\(%di\),%ax
+ 62: 67 f3 6d[ ]+rep insl \(%dx\),%es:\(%di\)
+ 65: 67 f3 6f[ ]+rep outsl %ds:\(%si\),\(%dx\)
+ 68: 67 f3 a5[ ]+rep movsl %ds:\(%si\),%es:\(%di\)
+ 6b: 67 f3 ad[ ]+rep lods %ds:\(%si\),%eax
+ 6e: 67 f3 ab[ ]+rep stos %eax,%es:\(%di\)
+ 71: 67 f3 a7[ ]+repz cmpsl %es:\(%di\),%ds:\(%si\)
+ 74: 67 f3 af[ ]+repz scas %es:\(%di\),%eax
...
diff --git a/gas/testsuite/gas/i386/string-ok.d b/gas/testsuite/gas/i386/string-ok.d
index 80e0b67b7a4..3e218733de2 100644
--- a/gas/testsuite/gas/i386/string-ok.d
+++ b/gas/testsuite/gas/i386/string-ok.d
@@ -9,7 +9,7 @@ Disassembly of section .text:
0+ <.*start32>:
[ ]+[0-9a-f]+: 2e a6[ ]+cmpsb (%es:)?\(%edi\),%cs:\(%esi\)
[ ]+[0-9a-f]+: a6[ ]+cmpsb (%es:)?\(%edi\),(%ds:)?\(%esi\)
-[ ]+[0-9a-f]+: 67 a6[ ]+(addr16 )?cmpsb (%es:)?\(%di\),(%ds:)?\(%si\)
+[ ]+[0-9a-f]+: 67 a6[ ]+cmpsb (%es:)?\(%di\),(%ds:)?\(%si\)
[ ]+[0-9a-f]+: a6[ ]+cmpsb (%es:)?\(%edi\),(%ds:)?\(%esi\)
[ ]+[0-9a-f]+: 6c[ ]+insb \(%dx\),(%es:)?\(%edi\)
[ ]+[0-9a-f]+: 6c[ ]+insb \(%dx\),(%es:)?\(%edi\)
@@ -17,7 +17,7 @@ Disassembly of section .text:
[ ]+[0-9a-f]+: ac[ ]+lods (%ds:)?\(%esi\),%al
[ ]+[0-9a-f]+: 2e a4[ ]+movsb %cs:\(%esi\),(%es:)?\(%edi\)
[ ]+[0-9a-f]+: a4[ ]+movsb (%ds:)?\(%esi\),(%es:)?\(%edi\)
-[ ]+[0-9a-f]+: 67 a4[ ]+(addr16 )?movsb (%ds:)?\(%si\),(%es:)?\(%di\)
+[ ]+[0-9a-f]+: 67 a4[ ]+movsb (%ds:)?\(%si\),(%es:)?\(%di\)
[ ]+[0-9a-f]+: a4[ ]+movsb (%ds:)?\(%esi\),(%es:)?\(%edi\)
[ ]+[0-9a-f]+: a4[ ]+movsb (%ds:)?\(%esi\),(%es:)?\(%edi\)
[ ]+[0-9a-f]+: 2e 6e[ ]+outsb %cs:\(%esi\),\(%dx\)
@@ -35,17 +35,17 @@ Disassembly of section .text:
[0-9a-f]+ <.*start16>:
[ ]+[0-9a-f]+: a6[ ]+cmpsb (%es:)?\(%edi\),(%ds:)?\(%esi\)
-[ ]+[0-9a-f]+: 67 a4[ ]+(addr16 )?movsb (%ds:)?\(%si\),(%es:)?\(%di\)
+[ ]+[0-9a-f]+: 67 a4[ ]+movsb (%ds:)?\(%si\),(%es:)?\(%di\)
[0-9a-f]+ <.*start64>:
[ ]+[0-9a-f]+: a6[ ]+cmpsb (%es:)?\(%edi\),(%ds:)?\(%esi\)
-[ ]+[0-9a-f]+: 67 a4[ ]+(addr16 )?movsb (%ds:)?\(%si\),(%es:)?\(%di\)
+[ ]+[0-9a-f]+: 67 a4[ ]+movsb (%ds:)?\(%si\),(%es:)?\(%di\)
[0-9a-f]+ <.*intel32>:
[ ]+[0-9a-f]+: 2e a6[ ]+cmpsb (%es:)?\(%edi\),%cs:\(%esi\)
[ ]+[0-9a-f]+: a6[ ]+cmpsb (%es:)?\(%edi\),(%ds:)?\(%esi\)
[ ]+[0-9a-f]+: a6[ ]+cmpsb (%es:)?\(%edi\),(%ds:)?\(%esi\)
-[ ]+[0-9a-f]+: 67 a6[ ]+(addr16 )?cmpsb (%es:)?\(%di\),(%ds:)?\(%si\)
+[ ]+[0-9a-f]+: 67 a6[ ]+cmpsb (%es:)?\(%di\),(%ds:)?\(%si\)
[ ]+[0-9a-f]+: a6[ ]+cmpsb (%es:)?\(%edi\),(%ds:)?\(%esi\)
[ ]+[0-9a-f]+: 6c[ ]+insb \(%dx\),(%es:)?\(%edi\)
[ ]+[0-9a-f]+: 6c[ ]+insb \(%dx\),(%es:)?\(%edi\)
@@ -54,7 +54,7 @@ Disassembly of section .text:
[ ]+[0-9a-f]+: 2e a4[ ]+movsb %cs:\(%esi\),(%es:)?\(%edi\)
[ ]+[0-9a-f]+: a4[ ]+movsb (%ds:)?\(%esi\),(%es:)?\(%edi\)
[ ]+[0-9a-f]+: a4[ ]+movsb (%ds:)?\(%esi\),(%es:)?\(%edi\)
-[ ]+[0-9a-f]+: 67 a4[ ]+(addr16 )?movsb (%ds:)?\(%si\),(%es:)?\(%di\)
+[ ]+[0-9a-f]+: 67 a4[ ]+movsb (%ds:)?\(%si\),(%es:)?\(%di\)
[ ]+[0-9a-f]+: a4[ ]+movsb (%ds:)?\(%esi\),(%es:)?\(%edi\)
[ ]+[0-9a-f]+: a4[ ]+movsb (%ds:)?\(%esi\),(%es:)?\(%edi\)
[ ]+[0-9a-f]+: 2e 6e[ ]+outsb %cs:\(%esi\),\(%dx\)
@@ -72,9 +72,9 @@ Disassembly of section .text:
[0-9a-f]+ <.*intel16>:
[ ]+[0-9a-f]+: a6[ ]+cmpsb (%es:)?\(%edi\),(%ds:)?\(%esi\)
-[ ]+[0-9a-f]+: 67 a4[ ]+(addr16 )?movsb (%ds:)?\(%si\),(%es:)?\(%di\)
+[ ]+[0-9a-f]+: 67 a4[ ]+movsb (%ds:)?\(%si\),(%es:)?\(%di\)
[0-9a-f]+ <.*intel64>:
[ ]+[0-9a-f]+: a6[ ]+cmpsb (%es:)?\(%edi\),(%ds:)?\(%esi\)
-[ ]+[0-9a-f]+: 67 a4[ ]+(addr16 )?movsb (%ds:)?\(%si\),(%es:)?\(%di\)
+[ ]+[0-9a-f]+: 67 a4[ ]+movsb (%ds:)?\(%si\),(%es:)?\(%di\)
#pass
diff --git a/gas/testsuite/gas/i386/x86-64-addr32-intel.d b/gas/testsuite/gas/i386/x86-64-addr32-intel.d
index 8021b03ad41..3a7a0c0f631 100644
--- a/gas/testsuite/gas/i386/x86-64-addr32-intel.d
+++ b/gas/testsuite/gas/i386/x86-64-addr32-intel.d
@@ -8,9 +8,9 @@
Disassembly of section .text:
0+ <.text>:
-[ ]*[a-f0-9]+: 67 48 8d 80 00 00 00 00 addr32 lea rax,\[eax\+0x0\].*
-[ ]*[a-f0-9]+: 67 49 8d 80 00 00 00 00 addr32 lea rax,\[r8d\+0x0\].*
-[ ]*[a-f0-9]+: 67 48 8d 05 00 00 00 00 addr32 lea rax,\[eip\+0x0\].*
+[ ]*[a-f0-9]+: 67 48 8d 80 00 00 00 00[ ]+lea[ ]+rax,\[eax\+0x0\].*
+[ ]*[a-f0-9]+: 67 49 8d 80 00 00 00 00[ ]+lea[ ]+rax,\[r8d\+0x0\].*
+[ ]*[a-f0-9]+: 67 48 8d 05 00 00 00 00[ ]+lea[ ]+rax,\[eip\+0x0\].*
[ ]*[a-f0-9]+: 67 48 8d 04 25 00 00 00 00 addr32 lea rax,ds:0x0.*
[ ]*[a-f0-9]+: 67 a0 98 08 60 00 addr32 mov al,ds:0x600898
[ ]*[a-f0-9]+: 67 66 a1 98 08 60 00 addr32 mov ax,ds:0x600898
diff --git a/gas/testsuite/gas/i386/x86-64-addr32.d b/gas/testsuite/gas/i386/x86-64-addr32.d
index ae25c699d07..b00e0231da3 100644
--- a/gas/testsuite/gas/i386/x86-64-addr32.d
+++ b/gas/testsuite/gas/i386/x86-64-addr32.d
@@ -7,10 +7,10 @@
Disassembly of section .text:
0+ <.text>:
-[ ]*[a-f0-9]+: 67 48 8d 80 00 00 00 00 addr32 lea 0x0\(%eax\),%rax.*
-[ ]*[a-f0-9]+: 67 49 8d 80 00 00 00 00 addr32 lea 0x0\(%r8d\),%rax.*
-[ ]*[a-f0-9]+: 67 48 8d 05 00 00 00 00 addr32 lea 0x0\(%eip\),%rax.*
-[ ]*[a-f0-9]+: 67 48 8d 04 25 00 00 00 00 addr32 lea 0x0,%rax.*
+[ ]*[a-f0-9]+: 67 48 8d 80 00 00 00 00[ ]+lea[ ]+0x0\(%eax\),%rax.*
+[ ]*[a-f0-9]+: 67 49 8d 80 00 00 00 00[ ]+lea[ ]+0x0\(%r8d\),%rax.*
+[ ]*[a-f0-9]+: 67 48 8d 05 00 00 00 00[ ]+lea[ ]+0x0\(%eip\),%rax.*
+[ ]*[a-f0-9]+: 67 48 8d 04 25 00 00 00 00[ ]+addr32 lea[ ]+0x0,%rax.*
[ ]*[a-f0-9]+: 67 a0 98 08 60 00 addr32 mov 0x600898,%al
[ ]*[a-f0-9]+: 67 66 a1 98 08 60 00 addr32 mov 0x600898,%ax
[ ]*[a-f0-9]+: 67 a1 98 08 60 00 addr32 mov 0x600898,%eax
diff --git a/gas/testsuite/gas/i386/x86-64-cbw-intel.d b/gas/testsuite/gas/i386/x86-64-cbw-intel.d
index 616ffad9f25..42ab039260a 100644
--- a/gas/testsuite/gas/i386/x86-64-cbw-intel.d
+++ b/gas/testsuite/gas/i386/x86-64-cbw-intel.d
@@ -10,17 +10,15 @@ Disassembly of section .text:
0: 66 98 cbw
2: 98 cwde
3: 48 98 cdqe
- 5: 66 40 98 rex cbw
- 8: 40 98 rex cwde
- a: 66 data16
- b: 48 98 cdqe
+ 5: 66 40 98 rex cbw
+ 8: 40 98 rex cwde
+ a: 66 48 98 data32 cdqe
0+00d <_cwd>:
d: 66 99 cwd
f: 99 cdq
10: 48 99 cqo
- 12: 66 40 99 rex cwd
- 15: 40 99 rex cdq
- 17: 66 data16
- 18: 48 99 cqo
+ 12: 66 40 99 rex cwd
+ 15: 40 99 rex cdq
+ 17: 66 48 99 data32 cqo
#pass
diff --git a/gas/testsuite/gas/i386/x86-64-cbw.d b/gas/testsuite/gas/i386/x86-64-cbw.d
index 5474ce2859b..6b730d04073 100644
--- a/gas/testsuite/gas/i386/x86-64-cbw.d
+++ b/gas/testsuite/gas/i386/x86-64-cbw.d
@@ -9,17 +9,15 @@ Disassembly of section .text:
0: 66 98 cbtw
2: 98 cwtl
3: 48 98 cltq
- 5: 66 40 98 rex cbtw
- 8: 40 98 rex cwtl
- a: 66 data16
- b: 48 98 cltq
+ 5: 66 40 98 rex cbtw
+ 8: 40 98 rex cwtl
+ a: 66 48 98 data32 cltq
0+00d <_cwd>:
d: 66 99 cwtd
f: 99 cltd
10: 48 99 cqto
- 12: 66 40 99 rex cwtd
- 15: 40 99 rex cltd
- 17: 66 data16
- 18: 48 99 cqto
+ 12: 66 40 99 rex cwtd
+ 15: 40 99 rex cltd
+ 17: 66 48 99 data32 cqto
#pass
diff --git a/gas/testsuite/gas/i386/x86-64-io-intel.d b/gas/testsuite/gas/i386/x86-64-io-intel.d
index c6df6e68c3f..ad22c46ddfd 100644
--- a/gas/testsuite/gas/i386/x86-64-io-intel.d
+++ b/gas/testsuite/gas/i386/x86-64-io-intel.d
@@ -7,22 +7,18 @@
Disassembly of section .text:
0+000 <_in>:
- 0: 48 ed rex.W in eax,dx
- 2: 66 data16
- 3: 48 ed rex.W in eax,dx
+ 0: 48 ed rex.W in eax,dx
+ 2: 66 48 ed data32 rex.W in eax,dx
0+005 <_out>:
- 5: 48 ef rex.W out dx,eax
- 7: 66 data16
- 8: 48 ef rex.W out dx,eax
+ 5: 48 ef rex.W out dx,eax
+ 7: 66 48 ef data32 rex.W out dx,eax
0+00a <_ins>:
- a: 48 6d rex.W ins DWORD PTR es:\[rdi\],dx
- c: 66 data16
- d: 48 6d rex.W ins DWORD PTR es:\[rdi\],dx
+ a: 48 6d rex.W ins DWORD PTR es:\[rdi\],dx
+ c: 66 48 6d data32 rex.W ins DWORD PTR es:\[rdi\],dx
0+00f <_outs>:
- f: 48 6f rex.W outs dx,DWORD PTR ds:\[rsi\]
- 11: 66 data16
- 12: 48 6f rex.W outs dx,DWORD PTR ds:\[rsi\]
+ f: 48 6f rex.W outs dx,DWORD PTR ds:\[rsi\]
+ 11: 66 48 6f data32 rex.W outs dx,DWORD PTR ds:\[rsi\]
#pass
diff --git a/gas/testsuite/gas/i386/x86-64-io-suffix.d b/gas/testsuite/gas/i386/x86-64-io-suffix.d
index a0ee9d0289c..6b460dc6c55 100644
--- a/gas/testsuite/gas/i386/x86-64-io-suffix.d
+++ b/gas/testsuite/gas/i386/x86-64-io-suffix.d
@@ -7,22 +7,18 @@
Disassembly of section .text:
0+000 <_in>:
- 0: 48 ed rex.W inl \(%dx\),%eax
- 2: 66 data16
- 3: 48 ed rex.W inl \(%dx\),%eax
+ 0: 48 ed rex.W inl \(%dx\),%eax
+ 2: 66 48 ed data32 rex.W inl \(%dx\),%eax
0+005 <_out>:
- 5: 48 ef rex.W outl %eax,\(%dx\)
- 7: 66 data16
- 8: 48 ef rex.W outl %eax,\(%dx\)
+ 5: 48 ef rex.W outl %eax,\(%dx\)
+ 7: 66 48 ef data32 rex.W outl %eax,\(%dx\)
0+00a <_ins>:
- a: 48 6d rex.W insl \(%dx\),%es:\(%rdi\)
- c: 66 data16
- d: 48 6d rex.W insl \(%dx\),%es:\(%rdi\)
+ a: 48 6d rex.W insl \(%dx\),%es:\(%rdi\)
+ c: 66 48 6d data32 rex.W insl \(%dx\),%es:\(%rdi\)
0+00f <_outs>:
- f: 48 6f rex.W outsl %ds:\(%rsi\),\(%dx\)
- 11: 66 data16
- 12: 48 6f rex.W outsl %ds:\(%rsi\),\(%dx\)
+ f: 48 6f rex.W outsl %ds:\(%rsi\),\(%dx\)
+ 11: 66 48 6f data32 rex.W outsl %ds:\(%rsi\),\(%dx\)
#pass
diff --git a/gas/testsuite/gas/i386/x86-64-io.d b/gas/testsuite/gas/i386/x86-64-io.d
index 3e3b7e7bad2..7310f1a1cb4 100644
--- a/gas/testsuite/gas/i386/x86-64-io.d
+++ b/gas/testsuite/gas/i386/x86-64-io.d
@@ -6,22 +6,18 @@
Disassembly of section .text:
0+000 <_in>:
- 0: 48 ed rex.W in \(%dx\),%eax
- 2: 66 data16
- 3: 48 ed rex.W in \(%dx\),%eax
+ 0: 48 ed rex.W in \(%dx\),%eax
+ 2: 66 48 ed data32 rex.W in \(%dx\),%eax
0+005 <_out>:
- 5: 48 ef rex.W out %eax,\(%dx\)
- 7: 66 data16
- 8: 48 ef rex.W out %eax,\(%dx\)
+ 5: 48 ef rex.W out %eax,\(%dx\)
+ 7: 66 48 ef data32 rex.W out %eax,\(%dx\)
0+00a <_ins>:
- a: 48 6d rex.W insl \(%dx\),%es:\(%rdi\)
- c: 66 data16
- d: 48 6d rex.W insl \(%dx\),%es:\(%rdi\)
+ a: 48 6d rex.W insl \(%dx\),%es:\(%rdi\)
+ c: 66 48 6d data32 rex.W insl \(%dx\),%es:\(%rdi\)
0+00f <_outs>:
- f: 48 6f rex.W outsl %ds:\(%rsi\),\(%dx\)
- 11: 66 data16
- 12: 48 6f rex.W outsl %ds:\(%rsi\),\(%dx\)
+ f: 48 6f rex.W outsl %ds:\(%rsi\),\(%dx\)
+ 11: 66 48 6f data32 rex.W outsl %ds:\(%rsi\),\(%dx\)
#pass
diff --git a/gas/testsuite/gas/i386/x86-64-long-1-intel.d b/gas/testsuite/gas/i386/x86-64-long-1-intel.d
new file mode 100644
index 00000000000..28b291a5854
--- /dev/null
+++ b/gas/testsuite/gas/i386/x86-64-long-1-intel.d
@@ -0,0 +1,14 @@
+#objdump: -dwMintel
+#name: x86-64 long insns (Intel disassembly)
+#source: x86-64-long-1.s
+
+.*: +file format .*
+
+
+Disassembly of section .text:
+
+0+ <foo>:
+[ ]*[a-f0-9]+: f2 f0 f0 f0 f2 f2 f2 f2 f2 f2 f0 f0 66 0f 28 repnz lock lock lock repnz repnz repnz repnz repnz repnz lock lock \(bad\)
+[ ]*[a-f0-9]+: 00 f2 add dl,dh
+[ ]*[a-f0-9]+: f0 f0 f0 f2 f2 f2 f2 f0 f0 f0 f0 66 0f 28 00 lock lock lock repnz repnz repnz repnz lock lock lock lock movapd xmm0,XMMWORD PTR \[rax\]
+#pass
diff --git a/gas/testsuite/gas/i386/x86-64-long-1.d b/gas/testsuite/gas/i386/x86-64-long-1.d
new file mode 100644
index 00000000000..dbb603a9f32
--- /dev/null
+++ b/gas/testsuite/gas/i386/x86-64-long-1.d
@@ -0,0 +1,13 @@
+#objdump: -dw
+#name: x86-64 long insns
+
+.*: +file format .*
+
+
+Disassembly of section .text:
+
+0+ <foo>:
+[ ]*[a-f0-9]+: f2 f0 f0 f0 f2 f2 f2 f2 f2 f2 f0 f0 66 0f 28 repnz lock lock lock repnz repnz repnz repnz repnz repnz lock lock \(bad\)
+[ ]*[a-f0-9]+: 00 f2 add %dh,%dl
+[ ]*[a-f0-9]+: f0 f0 f0 f2 f2 f2 f2 f0 f0 f0 f0 66 0f 28 00 lock lock lock repnz repnz repnz repnz lock lock lock lock movapd \(%rax\),%xmm0
+#pass
diff --git a/gas/testsuite/gas/i386/x86-64-long-1.s b/gas/testsuite/gas/i386/x86-64-long-1.s
new file mode 100644
index 00000000000..73f9a533a28
--- /dev/null
+++ b/gas/testsuite/gas/i386/x86-64-long-1.s
@@ -0,0 +1,30 @@
+# 64bit long Instructions
+
+ .text
+foo:
+.byte 0xf2
+.byte 0xf0
+.byte 0xf0
+.byte 0xf0
+.byte 0xf2
+.byte 0xf2
+.byte 0xf2
+.byte 0xf2
+.byte 0xf2
+.byte 0xf2
+.byte 0xf0
+.byte 0xf0
+movapd (%rax), %xmm0
+.byte 0xf2
+.byte 0xf0
+.byte 0xf0
+.byte 0xf0
+.byte 0xf2
+.byte 0xf2
+.byte 0xf2
+.byte 0xf2
+.byte 0xf0
+.byte 0xf0
+.byte 0xf0
+.byte 0xf0
+movapd (%rax), %xmm0
diff --git a/gas/testsuite/gas/i386/x86-64-lwp.d b/gas/testsuite/gas/i386/x86-64-lwp.d
index 33c3748603f..3d8eede4ad0 100644
--- a/gas/testsuite/gas/i386/x86-64-lwp.d
+++ b/gas/testsuite/gas/i386/x86-64-lwp.d
@@ -198,196 +198,196 @@ Disassembly of section .text:
[ ]*[a-f0-9]+: 8f ea 90 12 cd 78 56 34 12[ ]+lwpval \$0x12345678,%ebp,%r13
[ ]*[a-f0-9]+: 8f ea 88 12 ce 78 56 34 12[ ]+lwpval \$0x12345678,%esi,%r14
[ ]*[a-f0-9]+: 8f ea 80 12 cf 78 56 34 12[ ]+lwpval \$0x12345678,%edi,%r15
-[ ]*[a-f0-9]+: 67 8f ea 78 12 00 34 12[ ]+addr32 lwpins \$0x1234,\(%eax\),%ax
-[ ]*[a-f0-9]+: 67 8f ea 70 12 01 34 12[ ]+addr32 lwpins \$0x1234,\(%ecx\),%cx
-[ ]*[a-f0-9]+: 67 8f ea 68 12 02 34 12[ ]+addr32 lwpins \$0x1234,\(%edx\),%dx
-[ ]*[a-f0-9]+: 67 8f ea 60 12 03 34 12[ ]+addr32 lwpins \$0x1234,\(%ebx\),%bx
-[ ]*[a-f0-9]+: 67 8f ea 58 12 04 24 34 12[ ]+addr32 lwpins \$0x1234,\(%esp\),%sp
-[ ]*[a-f0-9]+: 67 8f ea 50 12 45 00 34 12[ ]+addr32 lwpins \$0x1234,0x0\(%ebp\),%bp
-[ ]*[a-f0-9]+: 67 8f ea 48 12 06 34 12[ ]+addr32 lwpins \$0x1234,\(%esi\),%si
-[ ]*[a-f0-9]+: 67 8f ea 40 12 07 34 12[ ]+addr32 lwpins \$0x1234,\(%edi\),%di
-[ ]*[a-f0-9]+: 67 8f ca 38 12 00 34 12[ ]+addr32 lwpins \$0x1234,\(%r8d\),%r8w
-[ ]*[a-f0-9]+: 67 8f ca 30 12 01 34 12[ ]+addr32 lwpins \$0x1234,\(%r9d\),%r9w
-[ ]*[a-f0-9]+: 67 8f ca 28 12 02 34 12[ ]+addr32 lwpins \$0x1234,\(%r10d\),%r10w
-[ ]*[a-f0-9]+: 67 8f ca 20 12 03 34 12[ ]+addr32 lwpins \$0x1234,\(%r11d\),%r11w
-[ ]*[a-f0-9]+: 67 8f ca 18 12 04 24 34 12[ ]+addr32 lwpins \$0x1234,\(%r12d\),%r12w
-[ ]*[a-f0-9]+: 67 8f ca 10 12 45 00 34 12[ ]+addr32 lwpins \$0x1234,0x0\(%r13d\),%r13w
-[ ]*[a-f0-9]+: 67 8f ca 08 12 06 34 12[ ]+addr32 lwpins \$0x1234,\(%r14d\),%r14w
-[ ]*[a-f0-9]+: 67 8f ca 00 12 07 34 12[ ]+addr32 lwpins \$0x1234,\(%r15d\),%r15w
-[ ]*[a-f0-9]+: 67 8f ca 7c 12 07 78 56 34 12[ ]+addr32 lwpins \$0x12345678,\(%r15d\),%eax
-[ ]*[a-f0-9]+: 67 8f ca 74 12 06 78 56 34 12[ ]+addr32 lwpins \$0x12345678,\(%r14d\),%ecx
-[ ]*[a-f0-9]+: 67 8f ca 6c 12 45 00 78 56 34 12[ ]+addr32 lwpins \$0x12345678,0x0\(%r13d\),%edx
-[ ]*[a-f0-9]+: 67 8f ca 64 12 04 24 78 56 34 12[ ]+addr32 lwpins \$0x12345678,\(%r12d\),%ebx
-[ ]*[a-f0-9]+: 67 8f ca 5c 12 03 78 56 34 12[ ]+addr32 lwpins \$0x12345678,\(%r11d\),%esp
-[ ]*[a-f0-9]+: 67 8f ca 54 12 02 78 56 34 12[ ]+addr32 lwpins \$0x12345678,\(%r10d\),%ebp
-[ ]*[a-f0-9]+: 67 8f ca 4c 12 01 78 56 34 12[ ]+addr32 lwpins \$0x12345678,\(%r9d\),%esi
-[ ]*[a-f0-9]+: 67 8f ca 44 12 00 78 56 34 12[ ]+addr32 lwpins \$0x12345678,\(%r8d\),%edi
-[ ]*[a-f0-9]+: 67 8f ea 3c 12 07 78 56 34 12[ ]+addr32 lwpins \$0x12345678,\(%edi\),%r8d
-[ ]*[a-f0-9]+: 67 8f ea 34 12 06 78 56 34 12[ ]+addr32 lwpins \$0x12345678,\(%esi\),%r9d
-[ ]*[a-f0-9]+: 67 8f ea 2c 12 45 00 78 56 34 12[ ]+addr32 lwpins \$0x12345678,0x0\(%ebp\),%r10d
-[ ]*[a-f0-9]+: 67 8f ea 24 12 04 24 78 56 34 12[ ]+addr32 lwpins \$0x12345678,\(%esp\),%r11d
-[ ]*[a-f0-9]+: 67 8f ea 1c 12 03 78 56 34 12[ ]+addr32 lwpins \$0x12345678,\(%ebx\),%r12d
-[ ]*[a-f0-9]+: 67 8f ea 14 12 02 78 56 34 12[ ]+addr32 lwpins \$0x12345678,\(%edx\),%r13d
-[ ]*[a-f0-9]+: 67 8f ea 0c 12 01 78 56 34 12[ ]+addr32 lwpins \$0x12345678,\(%ecx\),%r14d
-[ ]*[a-f0-9]+: 67 8f ea 04 12 00 78 56 34 12[ ]+addr32 lwpins \$0x12345678,\(%eax\),%r15d
-[ ]*[a-f0-9]+: 67 8f ca f8 12 07 78 56 34 12[ ]+addr32 lwpins \$0x12345678,\(%r15d\),%rax
-[ ]*[a-f0-9]+: 67 8f ca f0 12 06 78 56 34 12[ ]+addr32 lwpins \$0x12345678,\(%r14d\),%rcx
-[ ]*[a-f0-9]+: 67 8f ca e8 12 45 00 78 56 34 12[ ]+addr32 lwpins \$0x12345678,0x0\(%r13d\),%rdx
-[ ]*[a-f0-9]+: 67 8f ca e0 12 04 24 78 56 34 12[ ]+addr32 lwpins \$0x12345678,\(%r12d\),%rbx
-[ ]*[a-f0-9]+: 67 8f ca d8 12 03 78 56 34 12[ ]+addr32 lwpins \$0x12345678,\(%r11d\),%rsp
-[ ]*[a-f0-9]+: 67 8f ca d0 12 02 78 56 34 12[ ]+addr32 lwpins \$0x12345678,\(%r10d\),%rbp
-[ ]*[a-f0-9]+: 67 8f ca c8 12 01 78 56 34 12[ ]+addr32 lwpins \$0x12345678,\(%r9d\),%rsi
-[ ]*[a-f0-9]+: 67 8f ca c0 12 00 78 56 34 12[ ]+addr32 lwpins \$0x12345678,\(%r8d\),%rdi
-[ ]*[a-f0-9]+: 67 8f ea b8 12 00 78 56 34 12[ ]+addr32 lwpins \$0x12345678,\(%eax\),%r8
-[ ]*[a-f0-9]+: 67 8f ea b0 12 01 78 56 34 12[ ]+addr32 lwpins \$0x12345678,\(%ecx\),%r9
-[ ]*[a-f0-9]+: 67 8f ea a8 12 02 78 56 34 12[ ]+addr32 lwpins \$0x12345678,\(%edx\),%r10
-[ ]*[a-f0-9]+: 67 8f ea a0 12 03 78 56 34 12[ ]+addr32 lwpins \$0x12345678,\(%ebx\),%r11
-[ ]*[a-f0-9]+: 67 8f ea 98 12 04 24 78 56 34 12[ ]+addr32 lwpins \$0x12345678,\(%esp\),%r12
-[ ]*[a-f0-9]+: 67 8f ea 90 12 45 00 78 56 34 12[ ]+addr32 lwpins \$0x12345678,0x0\(%ebp\),%r13
-[ ]*[a-f0-9]+: 67 8f ea 88 12 06 78 56 34 12[ ]+addr32 lwpins \$0x12345678,\(%esi\),%r14
-[ ]*[a-f0-9]+: 67 8f ea 80 12 07 78 56 34 12[ ]+addr32 lwpins \$0x12345678,\(%edi\),%r15
-[ ]*[a-f0-9]+: 67 8f ea 78 12 08 34 12[ ]+addr32 lwpval \$0x1234,\(%eax\),%ax
-[ ]*[a-f0-9]+: 67 8f ea 70 12 09 34 12[ ]+addr32 lwpval \$0x1234,\(%ecx\),%cx
-[ ]*[a-f0-9]+: 67 8f ea 68 12 0a 34 12[ ]+addr32 lwpval \$0x1234,\(%edx\),%dx
-[ ]*[a-f0-9]+: 67 8f ea 60 12 0b 34 12[ ]+addr32 lwpval \$0x1234,\(%ebx\),%bx
-[ ]*[a-f0-9]+: 67 8f ea 58 12 0c 24 34 12[ ]+addr32 lwpval \$0x1234,\(%esp\),%sp
-[ ]*[a-f0-9]+: 67 8f ea 50 12 4d 00 34 12[ ]+addr32 lwpval \$0x1234,0x0\(%ebp\),%bp
-[ ]*[a-f0-9]+: 67 8f ea 48 12 0e 34 12[ ]+addr32 lwpval \$0x1234,\(%esi\),%si
-[ ]*[a-f0-9]+: 67 8f ea 40 12 0f 34 12[ ]+addr32 lwpval \$0x1234,\(%edi\),%di
-[ ]*[a-f0-9]+: 67 8f ca 38 12 08 34 12[ ]+addr32 lwpval \$0x1234,\(%r8d\),%r8w
-[ ]*[a-f0-9]+: 67 8f ca 30 12 09 34 12[ ]+addr32 lwpval \$0x1234,\(%r9d\),%r9w
-[ ]*[a-f0-9]+: 67 8f ca 28 12 0a 34 12[ ]+addr32 lwpval \$0x1234,\(%r10d\),%r10w
-[ ]*[a-f0-9]+: 67 8f ca 20 12 0b 34 12[ ]+addr32 lwpval \$0x1234,\(%r11d\),%r11w
-[ ]*[a-f0-9]+: 67 8f ca 18 12 0c 24 34 12[ ]+addr32 lwpval \$0x1234,\(%r12d\),%r12w
-[ ]*[a-f0-9]+: 67 8f ca 10 12 4d 00 34 12[ ]+addr32 lwpval \$0x1234,0x0\(%r13d\),%r13w
-[ ]*[a-f0-9]+: 67 8f ca 08 12 0e 34 12[ ]+addr32 lwpval \$0x1234,\(%r14d\),%r14w
-[ ]*[a-f0-9]+: 67 8f ca 00 12 0f 34 12[ ]+addr32 lwpval \$0x1234,\(%r15d\),%r15w
-[ ]*[a-f0-9]+: 67 8f ca 7c 12 0f 78 56 34 12[ ]+addr32 lwpval \$0x12345678,\(%r15d\),%eax
-[ ]*[a-f0-9]+: 67 8f ca 74 12 0e 78 56 34 12[ ]+addr32 lwpval \$0x12345678,\(%r14d\),%ecx
-[ ]*[a-f0-9]+: 67 8f ca 6c 12 4d 00 78 56 34 12[ ]+addr32 lwpval \$0x12345678,0x0\(%r13d\),%edx
-[ ]*[a-f0-9]+: 67 8f ca 64 12 0c 24 78 56 34 12[ ]+addr32 lwpval \$0x12345678,\(%r12d\),%ebx
-[ ]*[a-f0-9]+: 67 8f ca 5c 12 0b 78 56 34 12[ ]+addr32 lwpval \$0x12345678,\(%r11d\),%esp
-[ ]*[a-f0-9]+: 67 8f ca 54 12 0a 78 56 34 12[ ]+addr32 lwpval \$0x12345678,\(%r10d\),%ebp
-[ ]*[a-f0-9]+: 67 8f ca 4c 12 09 78 56 34 12[ ]+addr32 lwpval \$0x12345678,\(%r9d\),%esi
-[ ]*[a-f0-9]+: 67 8f ca 44 12 08 78 56 34 12[ ]+addr32 lwpval \$0x12345678,\(%r8d\),%edi
-[ ]*[a-f0-9]+: 67 8f ea 3c 12 0f 78 56 34 12[ ]+addr32 lwpval \$0x12345678,\(%edi\),%r8d
-[ ]*[a-f0-9]+: 67 8f ea 34 12 0e 78 56 34 12[ ]+addr32 lwpval \$0x12345678,\(%esi\),%r9d
-[ ]*[a-f0-9]+: 67 8f ea 2c 12 4d 00 78 56 34 12[ ]+addr32 lwpval \$0x12345678,0x0\(%ebp\),%r10d
-[ ]*[a-f0-9]+: 67 8f ea 24 12 0c 24 78 56 34 12[ ]+addr32 lwpval \$0x12345678,\(%esp\),%r11d
-[ ]*[a-f0-9]+: 67 8f ea 1c 12 0b 78 56 34 12[ ]+addr32 lwpval \$0x12345678,\(%ebx\),%r12d
-[ ]*[a-f0-9]+: 67 8f ea 14 12 0a 78 56 34 12[ ]+addr32 lwpval \$0x12345678,\(%edx\),%r13d
-[ ]*[a-f0-9]+: 67 8f ea 0c 12 09 78 56 34 12[ ]+addr32 lwpval \$0x12345678,\(%ecx\),%r14d
-[ ]*[a-f0-9]+: 67 8f ea 04 12 08 78 56 34 12[ ]+addr32 lwpval \$0x12345678,\(%eax\),%r15d
-[ ]*[a-f0-9]+: 67 8f ca f8 12 0f 78 56 34 12[ ]+addr32 lwpval \$0x12345678,\(%r15d\),%rax
-[ ]*[a-f0-9]+: 67 8f ca f0 12 0e 78 56 34 12[ ]+addr32 lwpval \$0x12345678,\(%r14d\),%rcx
-[ ]*[a-f0-9]+: 67 8f ca e8 12 4d 00 78 56 34 12[ ]+addr32 lwpval \$0x12345678,0x0\(%r13d\),%rdx
-[ ]*[a-f0-9]+: 67 8f ca e0 12 0c 24 78 56 34 12[ ]+addr32 lwpval \$0x12345678,\(%r12d\),%rbx
-[ ]*[a-f0-9]+: 67 8f ca d8 12 0b 78 56 34 12[ ]+addr32 lwpval \$0x12345678,\(%r11d\),%rsp
-[ ]*[a-f0-9]+: 67 8f ca d0 12 0a 78 56 34 12[ ]+addr32 lwpval \$0x12345678,\(%r10d\),%rbp
-[ ]*[a-f0-9]+: 67 8f ca c8 12 09 78 56 34 12[ ]+addr32 lwpval \$0x12345678,\(%r9d\),%rsi
-[ ]*[a-f0-9]+: 67 8f ca c0 12 08 78 56 34 12[ ]+addr32 lwpval \$0x12345678,\(%r8d\),%rdi
-[ ]*[a-f0-9]+: 67 8f ea b8 12 08 78 56 34 12[ ]+addr32 lwpval \$0x12345678,\(%eax\),%r8
-[ ]*[a-f0-9]+: 67 8f ea b0 12 09 78 56 34 12[ ]+addr32 lwpval \$0x12345678,\(%ecx\),%r9
-[ ]*[a-f0-9]+: 67 8f ea a8 12 0a 78 56 34 12[ ]+addr32 lwpval \$0x12345678,\(%edx\),%r10
-[ ]*[a-f0-9]+: 67 8f ea a0 12 0b 78 56 34 12[ ]+addr32 lwpval \$0x12345678,\(%ebx\),%r11
-[ ]*[a-f0-9]+: 67 8f ea 98 12 0c 24 78 56 34 12[ ]+addr32 lwpval \$0x12345678,\(%esp\),%r12
-[ ]*[a-f0-9]+: 67 8f ea 90 12 4d 00 78 56 34 12[ ]+addr32 lwpval \$0x12345678,0x0\(%ebp\),%r13
-[ ]*[a-f0-9]+: 67 8f ea 88 12 0e 78 56 34 12[ ]+addr32 lwpval \$0x12345678,\(%esi\),%r14
-[ ]*[a-f0-9]+: 67 8f ea 80 12 0f 78 56 34 12[ ]+addr32 lwpval \$0x12345678,\(%edi\),%r15
-[ ]*[a-f0-9]+: 67 8f ea 78 12 80 fe ca 00 00 34 12[ ]+addr32 lwpins \$0x1234,0xcafe\(%eax\),%ax
-[ ]*[a-f0-9]+: 67 8f ea 70 12 81 fe ca 00 00 34 12[ ]+addr32 lwpins \$0x1234,0xcafe\(%ecx\),%cx
-[ ]*[a-f0-9]+: 67 8f ea 68 12 82 fe ca 00 00 34 12[ ]+addr32 lwpins \$0x1234,0xcafe\(%edx\),%dx
-[ ]*[a-f0-9]+: 67 8f ea 60 12 83 fe ca 00 00 34 12[ ]+addr32 lwpins \$0x1234,0xcafe\(%ebx\),%bx
-[ ]*[a-f0-9]+: 67 8f ea 58 12 84 24 fe ca 00 00 34 12[ ]+addr32 lwpins \$0x1234,0xcafe\(%esp\),%sp
-[ ]*[a-f0-9]+: 67 8f ea 50 12 85 fe ca 00 00 34 12[ ]+addr32 lwpins \$0x1234,0xcafe\(%ebp\),%bp
-[ ]*[a-f0-9]+: 67 8f ea 48 12 86 fe ca 00 00 34 12[ ]+addr32 lwpins \$0x1234,0xcafe\(%esi\),%si
-[ ]*[a-f0-9]+: 67 8f ea 40 12 87 fe ca 00 00 34 12[ ]+addr32 lwpins \$0x1234,0xcafe\(%edi\),%di
-[ ]*[a-f0-9]+: 67 8f ca 38 12 80 fe ca 00 00 34 12[ ]+addr32 lwpins \$0x1234,0xcafe\(%r8d\),%r8w
-[ ]*[a-f0-9]+: 67 8f ca 30 12 81 fe ca 00 00 34 12[ ]+addr32 lwpins \$0x1234,0xcafe\(%r9d\),%r9w
-[ ]*[a-f0-9]+: 67 8f ca 28 12 82 fe ca 00 00 34 12[ ]+addr32 lwpins \$0x1234,0xcafe\(%r10d\),%r10w
-[ ]*[a-f0-9]+: 67 8f ca 20 12 83 fe ca 00 00 34 12[ ]+addr32 lwpins \$0x1234,0xcafe\(%r11d\),%r11w
-[ ]*[a-f0-9]+: 67 8f ca 18 12 84 24 fe ca 00 00 34 12[ ]+addr32 lwpins \$0x1234,0xcafe\(%r12d\),%r12w
-[ ]*[a-f0-9]+: 67 8f ca 10 12 85 fe ca 00 00 34 12[ ]+addr32 lwpins \$0x1234,0xcafe\(%r13d\),%r13w
-[ ]*[a-f0-9]+: 67 8f ca 08 12 86 fe ca 00 00 34 12[ ]+addr32 lwpins \$0x1234,0xcafe\(%r14d\),%r14w
-[ ]*[a-f0-9]+: 67 8f ca 00 12 87 fe ca 00 00 34 12[ ]+addr32 lwpins \$0x1234,0xcafe\(%r15d\),%r15w
-[ ]*[a-f0-9]+: 67 8f ca 7c 12 87 fe ca 00 00 78 56 34 12[ ]+addr32 lwpins \$0x12345678,0xcafe\(%r15d\),%eax
-[ ]*[a-f0-9]+: 67 8f ca 74 12 86 fe ca 00 00 78 56 34 12[ ]+addr32 lwpins \$0x12345678,0xcafe\(%r14d\),%ecx
-[ ]*[a-f0-9]+: 67 8f ca 6c 12 85 fe ca 00 00 78 56 34 12[ ]+addr32 lwpins \$0x12345678,0xcafe\(%r13d\),%edx
-[ ]*[a-f0-9]+: 67 8f ca 64 12 84 24 fe ca 00 00 78 56 34 12[ ]+addr32 lwpins \$0x12345678,0xcafe\(%r12d\),%ebx
-[ ]*[a-f0-9]+: 67 8f ca 5c 12 83 fe ca 00 00 78 56 34 12[ ]+addr32 lwpins \$0x12345678,0xcafe\(%r11d\),%esp
-[ ]*[a-f0-9]+: 67 8f ca 54 12 82 fe ca 00 00 78 56 34 12[ ]+addr32 lwpins \$0x12345678,0xcafe\(%r10d\),%ebp
-[ ]*[a-f0-9]+: 67 8f ca 4c 12 81 fe ca 00 00 78 56 34 12[ ]+addr32 lwpins \$0x12345678,0xcafe\(%r9d\),%esi
-[ ]*[a-f0-9]+: 67 8f ca 44 12 80 fe ca 00 00 78 56 34 12[ ]+addr32 lwpins \$0x12345678,0xcafe\(%r8d\),%edi
-[ ]*[a-f0-9]+: 67 8f ea 3c 12 87 fe ca 00 00 78 56 34 12[ ]+addr32 lwpins \$0x12345678,0xcafe\(%edi\),%r8d
-[ ]*[a-f0-9]+: 67 8f ea 34 12 86 fe ca 00 00 78 56 34 12[ ]+addr32 lwpins \$0x12345678,0xcafe\(%esi\),%r9d
-[ ]*[a-f0-9]+: 67 8f ea 2c 12 85 fe ca 00 00 78 56 34 12[ ]+addr32 lwpins \$0x12345678,0xcafe\(%ebp\),%r10d
-[ ]*[a-f0-9]+: 67 8f ea 24 12 84 24 fe ca 00 00 78 56 34 12[ ]+addr32 lwpins \$0x12345678,0xcafe\(%esp\),%r11d
-[ ]*[a-f0-9]+: 67 8f ea 1c 12 83 fe ca 00 00 78 56 34 12[ ]+addr32 lwpins \$0x12345678,0xcafe\(%ebx\),%r12d
-[ ]*[a-f0-9]+: 67 8f ea 14 12 82 fe ca 00 00 78 56 34 12[ ]+addr32 lwpins \$0x12345678,0xcafe\(%edx\),%r13d
-[ ]*[a-f0-9]+: 67 8f ea 0c 12 81 fe ca 00 00 78 56 34 12[ ]+addr32 lwpins \$0x12345678,0xcafe\(%ecx\),%r14d
-[ ]*[a-f0-9]+: 67 8f ea 04 12 80 fe ca 00 00 78 56 34 12[ ]+addr32 lwpins \$0x12345678,0xcafe\(%eax\),%r15d
-[ ]*[a-f0-9]+: 67 8f ca f8 12 87 fe ca 00 00 78 56 34 12[ ]+addr32 lwpins \$0x12345678,0xcafe\(%r15d\),%rax
-[ ]*[a-f0-9]+: 67 8f ca f0 12 86 fe ca 00 00 78 56 34 12[ ]+addr32 lwpins \$0x12345678,0xcafe\(%r14d\),%rcx
-[ ]*[a-f0-9]+: 67 8f ca e8 12 85 fe ca 00 00 78 56 34 12[ ]+addr32 lwpins \$0x12345678,0xcafe\(%r13d\),%rdx
-[ ]*[a-f0-9]+: 67 8f ca e0 12 84 24 fe ca 00 00 78 56 34 12[ ]+addr32 lwpins \$0x12345678,0xcafe\(%r12d\),%rbx
-[ ]*[a-f0-9]+: 67 8f ca d8 12 83 fe ca 00 00 78 56 34 12[ ]+addr32 lwpins \$0x12345678,0xcafe\(%r11d\),%rsp
-[ ]*[a-f0-9]+: 67 8f ca d0 12 82 fe ca 00 00 78 56 34 12[ ]+addr32 lwpins \$0x12345678,0xcafe\(%r10d\),%rbp
-[ ]*[a-f0-9]+: 67 8f ca c8 12 81 fe ca 00 00 78 56 34 12[ ]+addr32 lwpins \$0x12345678,0xcafe\(%r9d\),%rsi
-[ ]*[a-f0-9]+: 67 8f ca c0 12 80 fe ca 00 00 78 56 34 12[ ]+addr32 lwpins \$0x12345678,0xcafe\(%r8d\),%rdi
-[ ]*[a-f0-9]+: 67 8f ea b8 12 80 fe ca 00 00 78 56 34 12[ ]+addr32 lwpins \$0x12345678,0xcafe\(%eax\),%r8
-[ ]*[a-f0-9]+: 67 8f ea b0 12 81 fe ca 00 00 78 56 34 12[ ]+addr32 lwpins \$0x12345678,0xcafe\(%ecx\),%r9
-[ ]*[a-f0-9]+: 67 8f ea a8 12 82 fe ca 00 00 78 56 34 12[ ]+addr32 lwpins \$0x12345678,0xcafe\(%edx\),%r10
-[ ]*[a-f0-9]+: 67 8f ea a0 12 83 fe ca 00 00 78 56 34 12[ ]+addr32 lwpins \$0x12345678,0xcafe\(%ebx\),%r11
-[ ]*[a-f0-9]+: 67 8f ea 98 12 84 24 fe ca 00 00 78 56 34 12[ ]+addr32 lwpins \$0x12345678,0xcafe\(%esp\),%r12
-[ ]*[a-f0-9]+: 67 8f ea 90 12 85 fe ca 00 00 78 56 34 12[ ]+addr32 lwpins \$0x12345678,0xcafe\(%ebp\),%r13
-[ ]*[a-f0-9]+: 67 8f ea 88 12 86 fe ca 00 00 78 56 34 12[ ]+addr32 lwpins \$0x12345678,0xcafe\(%esi\),%r14
-[ ]*[a-f0-9]+: 67 8f ea 80 12 87 fe ca 00 00 78 56 34 12[ ]+addr32 lwpins \$0x12345678,0xcafe\(%edi\),%r15
-[ ]*[a-f0-9]+: 67 8f ea 78 12 88 fe ca 00 00 34 12[ ]+addr32 lwpval \$0x1234,0xcafe\(%eax\),%ax
-[ ]*[a-f0-9]+: 67 8f ea 70 12 89 fe ca 00 00 34 12[ ]+addr32 lwpval \$0x1234,0xcafe\(%ecx\),%cx
-[ ]*[a-f0-9]+: 67 8f ea 68 12 8a fe ca 00 00 34 12[ ]+addr32 lwpval \$0x1234,0xcafe\(%edx\),%dx
-[ ]*[a-f0-9]+: 67 8f ea 60 12 8b fe ca 00 00 34 12[ ]+addr32 lwpval \$0x1234,0xcafe\(%ebx\),%bx
-[ ]*[a-f0-9]+: 67 8f ea 58 12 8c 24 fe ca 00 00 34 12[ ]+addr32 lwpval \$0x1234,0xcafe\(%esp\),%sp
-[ ]*[a-f0-9]+: 67 8f ea 50 12 8d fe ca 00 00 34 12[ ]+addr32 lwpval \$0x1234,0xcafe\(%ebp\),%bp
-[ ]*[a-f0-9]+: 67 8f ea 48 12 8e fe ca 00 00 34 12[ ]+addr32 lwpval \$0x1234,0xcafe\(%esi\),%si
-[ ]*[a-f0-9]+: 67 8f ea 40 12 8f fe ca 00 00 34 12[ ]+addr32 lwpval \$0x1234,0xcafe\(%edi\),%di
-[ ]*[a-f0-9]+: 67 8f ca 38 12 88 fe ca 00 00 34 12[ ]+addr32 lwpval \$0x1234,0xcafe\(%r8d\),%r8w
-[ ]*[a-f0-9]+: 67 8f ca 30 12 89 fe ca 00 00 34 12[ ]+addr32 lwpval \$0x1234,0xcafe\(%r9d\),%r9w
-[ ]*[a-f0-9]+: 67 8f ca 28 12 8a fe ca 00 00 34 12[ ]+addr32 lwpval \$0x1234,0xcafe\(%r10d\),%r10w
-[ ]*[a-f0-9]+: 67 8f ca 20 12 8b fe ca 00 00 34 12[ ]+addr32 lwpval \$0x1234,0xcafe\(%r11d\),%r11w
-[ ]*[a-f0-9]+: 67 8f ca 18 12 8c 24 fe ca 00 00 34 12[ ]+addr32 lwpval \$0x1234,0xcafe\(%r12d\),%r12w
-[ ]*[a-f0-9]+: 67 8f ca 10 12 8d fe ca 00 00 34 12[ ]+addr32 lwpval \$0x1234,0xcafe\(%r13d\),%r13w
-[ ]*[a-f0-9]+: 67 8f ca 08 12 8e fe ca 00 00 34 12[ ]+addr32 lwpval \$0x1234,0xcafe\(%r14d\),%r14w
-[ ]*[a-f0-9]+: 67 8f ca 00 12 8f fe ca 00 00 34 12[ ]+addr32 lwpval \$0x1234,0xcafe\(%r15d\),%r15w
-[ ]*[a-f0-9]+: 67 8f ca 7c 12 8f fe ca 00 00 78 56 34 12[ ]+addr32 lwpval \$0x12345678,0xcafe\(%r15d\),%eax
-[ ]*[a-f0-9]+: 67 8f ca 74 12 8e fe ca 00 00 78 56 34 12[ ]+addr32 lwpval \$0x12345678,0xcafe\(%r14d\),%ecx
-[ ]*[a-f0-9]+: 67 8f ca 6c 12 8d fe ca 00 00 78 56 34 12[ ]+addr32 lwpval \$0x12345678,0xcafe\(%r13d\),%edx
-[ ]*[a-f0-9]+: 67 8f ca 64 12 8c 24 fe ca 00 00 78 56 34 12[ ]+addr32 lwpval \$0x12345678,0xcafe\(%r12d\),%ebx
-[ ]*[a-f0-9]+: 67 8f ca 5c 12 8b fe ca 00 00 78 56 34 12[ ]+addr32 lwpval \$0x12345678,0xcafe\(%r11d\),%esp
-[ ]*[a-f0-9]+: 67 8f ca 54 12 8a fe ca 00 00 78 56 34 12[ ]+addr32 lwpval \$0x12345678,0xcafe\(%r10d\),%ebp
-[ ]*[a-f0-9]+: 67 8f ca 4c 12 89 fe ca 00 00 78 56 34 12[ ]+addr32 lwpval \$0x12345678,0xcafe\(%r9d\),%esi
-[ ]*[a-f0-9]+: 67 8f ca 44 12 88 fe ca 00 00 78 56 34 12[ ]+addr32 lwpval \$0x12345678,0xcafe\(%r8d\),%edi
-[ ]*[a-f0-9]+: 67 8f ea 3c 12 8f fe ca 00 00 78 56 34 12[ ]+addr32 lwpval \$0x12345678,0xcafe\(%edi\),%r8d
-[ ]*[a-f0-9]+: 67 8f ea 34 12 8e fe ca 00 00 78 56 34 12[ ]+addr32 lwpval \$0x12345678,0xcafe\(%esi\),%r9d
-[ ]*[a-f0-9]+: 67 8f ea 2c 12 8d fe ca 00 00 78 56 34 12[ ]+addr32 lwpval \$0x12345678,0xcafe\(%ebp\),%r10d
-[ ]*[a-f0-9]+: 67 8f ea 24 12 8c 24 fe ca 00 00 78 56 34 12[ ]+addr32 lwpval \$0x12345678,0xcafe\(%esp\),%r11d
-[ ]*[a-f0-9]+: 67 8f ea 1c 12 8b fe ca 00 00 78 56 34 12[ ]+addr32 lwpval \$0x12345678,0xcafe\(%ebx\),%r12d
-[ ]*[a-f0-9]+: 67 8f ea 14 12 8a fe ca 00 00 78 56 34 12[ ]+addr32 lwpval \$0x12345678,0xcafe\(%edx\),%r13d
-[ ]*[a-f0-9]+: 67 8f ea 0c 12 89 fe ca 00 00 78 56 34 12[ ]+addr32 lwpval \$0x12345678,0xcafe\(%ecx\),%r14d
-[ ]*[a-f0-9]+: 67 8f ea 04 12 88 fe ca 00 00 78 56 34 12[ ]+addr32 lwpval \$0x12345678,0xcafe\(%eax\),%r15d
-[ ]*[a-f0-9]+: 67 8f ca f8 12 8f fe ca 00 00 78 56 34 12[ ]+addr32 lwpval \$0x12345678,0xcafe\(%r15d\),%rax
-[ ]*[a-f0-9]+: 67 8f ca f0 12 8e fe ca 00 00 78 56 34 12[ ]+addr32 lwpval \$0x12345678,0xcafe\(%r14d\),%rcx
-[ ]*[a-f0-9]+: 67 8f ca e8 12 8d fe ca 00 00 78 56 34 12[ ]+addr32 lwpval \$0x12345678,0xcafe\(%r13d\),%rdx
-[ ]*[a-f0-9]+: 67 8f ca e0 12 8c 24 fe ca 00 00 78 56 34 12[ ]+addr32 lwpval \$0x12345678,0xcafe\(%r12d\),%rbx
-[ ]*[a-f0-9]+: 67 8f ca d8 12 8b fe ca 00 00 78 56 34 12[ ]+addr32 lwpval \$0x12345678,0xcafe\(%r11d\),%rsp
-[ ]*[a-f0-9]+: 67 8f ca d0 12 8a fe ca 00 00 78 56 34 12[ ]+addr32 lwpval \$0x12345678,0xcafe\(%r10d\),%rbp
-[ ]*[a-f0-9]+: 67 8f ca c8 12 89 fe ca 00 00 78 56 34 12[ ]+addr32 lwpval \$0x12345678,0xcafe\(%r9d\),%rsi
-[ ]*[a-f0-9]+: 67 8f ca c0 12 88 fe ca 00 00 78 56 34 12[ ]+addr32 lwpval \$0x12345678,0xcafe\(%r8d\),%rdi
-[ ]*[a-f0-9]+: 67 8f ea b8 12 88 fe ca 00 00 78 56 34 12[ ]+addr32 lwpval \$0x12345678,0xcafe\(%eax\),%r8
-[ ]*[a-f0-9]+: 67 8f ea b0 12 89 fe ca 00 00 78 56 34 12[ ]+addr32 lwpval \$0x12345678,0xcafe\(%ecx\),%r9
-[ ]*[a-f0-9]+: 67 8f ea a8 12 8a fe ca 00 00 78 56 34 12[ ]+addr32 lwpval \$0x12345678,0xcafe\(%edx\),%r10
-[ ]*[a-f0-9]+: 67 8f ea a0 12 8b fe ca 00 00 78 56 34 12[ ]+addr32 lwpval \$0x12345678,0xcafe\(%ebx\),%r11
-[ ]*[a-f0-9]+: 67 8f ea 98 12 8c 24 fe ca 00 00 78 56 34 12[ ]+addr32 lwpval \$0x12345678,0xcafe\(%esp\),%r12
-[ ]*[a-f0-9]+: 67 8f ea 90 12 8d fe ca 00 00 78 56 34 12[ ]+addr32 lwpval \$0x12345678,0xcafe\(%ebp\),%r13
-[ ]*[a-f0-9]+: 67 8f ea 88 12 8e fe ca 00 00 78 56 34 12[ ]+addr32 lwpval \$0x12345678,0xcafe\(%esi\),%r14
-[ ]*[a-f0-9]+: 67 8f ea 80 12 8f fe ca 00 00 78 56 34 12[ ]+addr32 lwpval \$0x12345678,0xcafe\(%edi\),%r15
+[ ]*[a-f0-9]+: 67 8f ea 78 12 00 34 12[ ]+lwpins \$0x1234,\(%eax\),%ax
+[ ]*[a-f0-9]+: 67 8f ea 70 12 01 34 12[ ]+lwpins \$0x1234,\(%ecx\),%cx
+[ ]*[a-f0-9]+: 67 8f ea 68 12 02 34 12[ ]+lwpins \$0x1234,\(%edx\),%dx
+[ ]*[a-f0-9]+: 67 8f ea 60 12 03 34 12[ ]+lwpins \$0x1234,\(%ebx\),%bx
+[ ]*[a-f0-9]+: 67 8f ea 58 12 04 24 34 12[ ]+lwpins \$0x1234,\(%esp\),%sp
+[ ]*[a-f0-9]+: 67 8f ea 50 12 45 00 34 12[ ]+lwpins \$0x1234,0x0\(%ebp\),%bp
+[ ]*[a-f0-9]+: 67 8f ea 48 12 06 34 12[ ]+lwpins \$0x1234,\(%esi\),%si
+[ ]*[a-f0-9]+: 67 8f ea 40 12 07 34 12[ ]+lwpins \$0x1234,\(%edi\),%di
+[ ]*[a-f0-9]+: 67 8f ca 38 12 00 34 12[ ]+lwpins \$0x1234,\(%r8d\),%r8w
+[ ]*[a-f0-9]+: 67 8f ca 30 12 01 34 12[ ]+lwpins \$0x1234,\(%r9d\),%r9w
+[ ]*[a-f0-9]+: 67 8f ca 28 12 02 34 12[ ]+lwpins \$0x1234,\(%r10d\),%r10w
+[ ]*[a-f0-9]+: 67 8f ca 20 12 03 34 12[ ]+lwpins \$0x1234,\(%r11d\),%r11w
+[ ]*[a-f0-9]+: 67 8f ca 18 12 04 24 34 12[ ]+lwpins \$0x1234,\(%r12d\),%r12w
+[ ]*[a-f0-9]+: 67 8f ca 10 12 45 00 34 12[ ]+lwpins \$0x1234,0x0\(%r13d\),%r13w
+[ ]*[a-f0-9]+: 67 8f ca 08 12 06 34 12[ ]+lwpins \$0x1234,\(%r14d\),%r14w
+[ ]*[a-f0-9]+: 67 8f ca 00 12 07 34 12[ ]+lwpins \$0x1234,\(%r15d\),%r15w
+[ ]*[a-f0-9]+: 67 8f ca 7c 12 07 78 56 34 12[ ]+lwpins \$0x12345678,\(%r15d\),%eax
+[ ]*[a-f0-9]+: 67 8f ca 74 12 06 78 56 34 12[ ]+lwpins \$0x12345678,\(%r14d\),%ecx
+[ ]*[a-f0-9]+: 67 8f ca 6c 12 45 00 78 56 34 12[ ]+lwpins \$0x12345678,0x0\(%r13d\),%edx
+[ ]*[a-f0-9]+: 67 8f ca 64 12 04 24 78 56 34 12[ ]+lwpins \$0x12345678,\(%r12d\),%ebx
+[ ]*[a-f0-9]+: 67 8f ca 5c 12 03 78 56 34 12[ ]+lwpins \$0x12345678,\(%r11d\),%esp
+[ ]*[a-f0-9]+: 67 8f ca 54 12 02 78 56 34 12[ ]+lwpins \$0x12345678,\(%r10d\),%ebp
+[ ]*[a-f0-9]+: 67 8f ca 4c 12 01 78 56 34 12[ ]+lwpins \$0x12345678,\(%r9d\),%esi
+[ ]*[a-f0-9]+: 67 8f ca 44 12 00 78 56 34 12[ ]+lwpins \$0x12345678,\(%r8d\),%edi
+[ ]*[a-f0-9]+: 67 8f ea 3c 12 07 78 56 34 12[ ]+lwpins \$0x12345678,\(%edi\),%r8d
+[ ]*[a-f0-9]+: 67 8f ea 34 12 06 78 56 34 12[ ]+lwpins \$0x12345678,\(%esi\),%r9d
+[ ]*[a-f0-9]+: 67 8f ea 2c 12 45 00 78 56 34 12[ ]+lwpins \$0x12345678,0x0\(%ebp\),%r10d
+[ ]*[a-f0-9]+: 67 8f ea 24 12 04 24 78 56 34 12[ ]+lwpins \$0x12345678,\(%esp\),%r11d
+[ ]*[a-f0-9]+: 67 8f ea 1c 12 03 78 56 34 12[ ]+lwpins \$0x12345678,\(%ebx\),%r12d
+[ ]*[a-f0-9]+: 67 8f ea 14 12 02 78 56 34 12[ ]+lwpins \$0x12345678,\(%edx\),%r13d
+[ ]*[a-f0-9]+: 67 8f ea 0c 12 01 78 56 34 12[ ]+lwpins \$0x12345678,\(%ecx\),%r14d
+[ ]*[a-f0-9]+: 67 8f ea 04 12 00 78 56 34 12[ ]+lwpins \$0x12345678,\(%eax\),%r15d
+[ ]*[a-f0-9]+: 67 8f ca f8 12 07 78 56 34 12[ ]+lwpins \$0x12345678,\(%r15d\),%rax
+[ ]*[a-f0-9]+: 67 8f ca f0 12 06 78 56 34 12[ ]+lwpins \$0x12345678,\(%r14d\),%rcx
+[ ]*[a-f0-9]+: 67 8f ca e8 12 45 00 78 56 34 12[ ]+lwpins \$0x12345678,0x0\(%r13d\),%rdx
+[ ]*[a-f0-9]+: 67 8f ca e0 12 04 24 78 56 34 12[ ]+lwpins \$0x12345678,\(%r12d\),%rbx
+[ ]*[a-f0-9]+: 67 8f ca d8 12 03 78 56 34 12[ ]+lwpins \$0x12345678,\(%r11d\),%rsp
+[ ]*[a-f0-9]+: 67 8f ca d0 12 02 78 56 34 12[ ]+lwpins \$0x12345678,\(%r10d\),%rbp
+[ ]*[a-f0-9]+: 67 8f ca c8 12 01 78 56 34 12[ ]+lwpins \$0x12345678,\(%r9d\),%rsi
+[ ]*[a-f0-9]+: 67 8f ca c0 12 00 78 56 34 12[ ]+lwpins \$0x12345678,\(%r8d\),%rdi
+[ ]*[a-f0-9]+: 67 8f ea b8 12 00 78 56 34 12[ ]+lwpins \$0x12345678,\(%eax\),%r8
+[ ]*[a-f0-9]+: 67 8f ea b0 12 01 78 56 34 12[ ]+lwpins \$0x12345678,\(%ecx\),%r9
+[ ]*[a-f0-9]+: 67 8f ea a8 12 02 78 56 34 12[ ]+lwpins \$0x12345678,\(%edx\),%r10
+[ ]*[a-f0-9]+: 67 8f ea a0 12 03 78 56 34 12[ ]+lwpins \$0x12345678,\(%ebx\),%r11
+[ ]*[a-f0-9]+: 67 8f ea 98 12 04 24 78 56 34 12[ ]+lwpins \$0x12345678,\(%esp\),%r12
+[ ]*[a-f0-9]+: 67 8f ea 90 12 45 00 78 56 34 12[ ]+lwpins \$0x12345678,0x0\(%ebp\),%r13
+[ ]*[a-f0-9]+: 67 8f ea 88 12 06 78 56 34 12[ ]+lwpins \$0x12345678,\(%esi\),%r14
+[ ]*[a-f0-9]+: 67 8f ea 80 12 07 78 56 34 12[ ]+lwpins \$0x12345678,\(%edi\),%r15
+[ ]*[a-f0-9]+: 67 8f ea 78 12 08 34 12[ ]+lwpval \$0x1234,\(%eax\),%ax
+[ ]*[a-f0-9]+: 67 8f ea 70 12 09 34 12[ ]+lwpval \$0x1234,\(%ecx\),%cx
+[ ]*[a-f0-9]+: 67 8f ea 68 12 0a 34 12[ ]+lwpval \$0x1234,\(%edx\),%dx
+[ ]*[a-f0-9]+: 67 8f ea 60 12 0b 34 12[ ]+lwpval \$0x1234,\(%ebx\),%bx
+[ ]*[a-f0-9]+: 67 8f ea 58 12 0c 24 34 12[ ]+lwpval \$0x1234,\(%esp\),%sp
+[ ]*[a-f0-9]+: 67 8f ea 50 12 4d 00 34 12[ ]+lwpval \$0x1234,0x0\(%ebp\),%bp
+[ ]*[a-f0-9]+: 67 8f ea 48 12 0e 34 12[ ]+lwpval \$0x1234,\(%esi\),%si
+[ ]*[a-f0-9]+: 67 8f ea 40 12 0f 34 12[ ]+lwpval \$0x1234,\(%edi\),%di
+[ ]*[a-f0-9]+: 67 8f ca 38 12 08 34 12[ ]+lwpval \$0x1234,\(%r8d\),%r8w
+[ ]*[a-f0-9]+: 67 8f ca 30 12 09 34 12[ ]+lwpval \$0x1234,\(%r9d\),%r9w
+[ ]*[a-f0-9]+: 67 8f ca 28 12 0a 34 12[ ]+lwpval \$0x1234,\(%r10d\),%r10w
+[ ]*[a-f0-9]+: 67 8f ca 20 12 0b 34 12[ ]+lwpval \$0x1234,\(%r11d\),%r11w
+[ ]*[a-f0-9]+: 67 8f ca 18 12 0c 24 34 12[ ]+lwpval \$0x1234,\(%r12d\),%r12w
+[ ]*[a-f0-9]+: 67 8f ca 10 12 4d 00 34 12[ ]+lwpval \$0x1234,0x0\(%r13d\),%r13w
+[ ]*[a-f0-9]+: 67 8f ca 08 12 0e 34 12[ ]+lwpval \$0x1234,\(%r14d\),%r14w
+[ ]*[a-f0-9]+: 67 8f ca 00 12 0f 34 12[ ]+lwpval \$0x1234,\(%r15d\),%r15w
+[ ]*[a-f0-9]+: 67 8f ca 7c 12 0f 78 56 34 12[ ]+lwpval \$0x12345678,\(%r15d\),%eax
+[ ]*[a-f0-9]+: 67 8f ca 74 12 0e 78 56 34 12[ ]+lwpval \$0x12345678,\(%r14d\),%ecx
+[ ]*[a-f0-9]+: 67 8f ca 6c 12 4d 00 78 56 34 12[ ]+lwpval \$0x12345678,0x0\(%r13d\),%edx
+[ ]*[a-f0-9]+: 67 8f ca 64 12 0c 24 78 56 34 12[ ]+lwpval \$0x12345678,\(%r12d\),%ebx
+[ ]*[a-f0-9]+: 67 8f ca 5c 12 0b 78 56 34 12[ ]+lwpval \$0x12345678,\(%r11d\),%esp
+[ ]*[a-f0-9]+: 67 8f ca 54 12 0a 78 56 34 12[ ]+lwpval \$0x12345678,\(%r10d\),%ebp
+[ ]*[a-f0-9]+: 67 8f ca 4c 12 09 78 56 34 12[ ]+lwpval \$0x12345678,\(%r9d\),%esi
+[ ]*[a-f0-9]+: 67 8f ca 44 12 08 78 56 34 12[ ]+lwpval \$0x12345678,\(%r8d\),%edi
+[ ]*[a-f0-9]+: 67 8f ea 3c 12 0f 78 56 34 12[ ]+lwpval \$0x12345678,\(%edi\),%r8d
+[ ]*[a-f0-9]+: 67 8f ea 34 12 0e 78 56 34 12[ ]+lwpval \$0x12345678,\(%esi\),%r9d
+[ ]*[a-f0-9]+: 67 8f ea 2c 12 4d 00 78 56 34 12[ ]+lwpval \$0x12345678,0x0\(%ebp\),%r10d
+[ ]*[a-f0-9]+: 67 8f ea 24 12 0c 24 78 56 34 12[ ]+lwpval \$0x12345678,\(%esp\),%r11d
+[ ]*[a-f0-9]+: 67 8f ea 1c 12 0b 78 56 34 12[ ]+lwpval \$0x12345678,\(%ebx\),%r12d
+[ ]*[a-f0-9]+: 67 8f ea 14 12 0a 78 56 34 12[ ]+lwpval \$0x12345678,\(%edx\),%r13d
+[ ]*[a-f0-9]+: 67 8f ea 0c 12 09 78 56 34 12[ ]+lwpval \$0x12345678,\(%ecx\),%r14d
+[ ]*[a-f0-9]+: 67 8f ea 04 12 08 78 56 34 12[ ]+lwpval \$0x12345678,\(%eax\),%r15d
+[ ]*[a-f0-9]+: 67 8f ca f8 12 0f 78 56 34 12[ ]+lwpval \$0x12345678,\(%r15d\),%rax
+[ ]*[a-f0-9]+: 67 8f ca f0 12 0e 78 56 34 12[ ]+lwpval \$0x12345678,\(%r14d\),%rcx
+[ ]*[a-f0-9]+: 67 8f ca e8 12 4d 00 78 56 34 12[ ]+lwpval \$0x12345678,0x0\(%r13d\),%rdx
+[ ]*[a-f0-9]+: 67 8f ca e0 12 0c 24 78 56 34 12[ ]+lwpval \$0x12345678,\(%r12d\),%rbx
+[ ]*[a-f0-9]+: 67 8f ca d8 12 0b 78 56 34 12[ ]+lwpval \$0x12345678,\(%r11d\),%rsp
+[ ]*[a-f0-9]+: 67 8f ca d0 12 0a 78 56 34 12[ ]+lwpval \$0x12345678,\(%r10d\),%rbp
+[ ]*[a-f0-9]+: 67 8f ca c8 12 09 78 56 34 12[ ]+lwpval \$0x12345678,\(%r9d\),%rsi
+[ ]*[a-f0-9]+: 67 8f ca c0 12 08 78 56 34 12[ ]+lwpval \$0x12345678,\(%r8d\),%rdi
+[ ]*[a-f0-9]+: 67 8f ea b8 12 08 78 56 34 12[ ]+lwpval \$0x12345678,\(%eax\),%r8
+[ ]*[a-f0-9]+: 67 8f ea b0 12 09 78 56 34 12[ ]+lwpval \$0x12345678,\(%ecx\),%r9
+[ ]*[a-f0-9]+: 67 8f ea a8 12 0a 78 56 34 12[ ]+lwpval \$0x12345678,\(%edx\),%r10
+[ ]*[a-f0-9]+: 67 8f ea a0 12 0b 78 56 34 12[ ]+lwpval \$0x12345678,\(%ebx\),%r11
+[ ]*[a-f0-9]+: 67 8f ea 98 12 0c 24 78 56 34 12[ ]+lwpval \$0x12345678,\(%esp\),%r12
+[ ]*[a-f0-9]+: 67 8f ea 90 12 4d 00 78 56 34 12[ ]+lwpval \$0x12345678,0x0\(%ebp\),%r13
+[ ]*[a-f0-9]+: 67 8f ea 88 12 0e 78 56 34 12[ ]+lwpval \$0x12345678,\(%esi\),%r14
+[ ]*[a-f0-9]+: 67 8f ea 80 12 0f 78 56 34 12[ ]+lwpval \$0x12345678,\(%edi\),%r15
+[ ]*[a-f0-9]+: 67 8f ea 78 12 80 fe ca 00 00 34 12[ ]+lwpins \$0x1234,0xcafe\(%eax\),%ax
+[ ]*[a-f0-9]+: 67 8f ea 70 12 81 fe ca 00 00 34 12[ ]+lwpins \$0x1234,0xcafe\(%ecx\),%cx
+[ ]*[a-f0-9]+: 67 8f ea 68 12 82 fe ca 00 00 34 12[ ]+lwpins \$0x1234,0xcafe\(%edx\),%dx
+[ ]*[a-f0-9]+: 67 8f ea 60 12 83 fe ca 00 00 34 12[ ]+lwpins \$0x1234,0xcafe\(%ebx\),%bx
+[ ]*[a-f0-9]+: 67 8f ea 58 12 84 24 fe ca 00 00 34 12[ ]+lwpins \$0x1234,0xcafe\(%esp\),%sp
+[ ]*[a-f0-9]+: 67 8f ea 50 12 85 fe ca 00 00 34 12[ ]+lwpins \$0x1234,0xcafe\(%ebp\),%bp
+[ ]*[a-f0-9]+: 67 8f ea 48 12 86 fe ca 00 00 34 12[ ]+lwpins \$0x1234,0xcafe\(%esi\),%si
+[ ]*[a-f0-9]+: 67 8f ea 40 12 87 fe ca 00 00 34 12[ ]+lwpins \$0x1234,0xcafe\(%edi\),%di
+[ ]*[a-f0-9]+: 67 8f ca 38 12 80 fe ca 00 00 34 12[ ]+lwpins \$0x1234,0xcafe\(%r8d\),%r8w
+[ ]*[a-f0-9]+: 67 8f ca 30 12 81 fe ca 00 00 34 12[ ]+lwpins \$0x1234,0xcafe\(%r9d\),%r9w
+[ ]*[a-f0-9]+: 67 8f ca 28 12 82 fe ca 00 00 34 12[ ]+lwpins \$0x1234,0xcafe\(%r10d\),%r10w
+[ ]*[a-f0-9]+: 67 8f ca 20 12 83 fe ca 00 00 34 12[ ]+lwpins \$0x1234,0xcafe\(%r11d\),%r11w
+[ ]*[a-f0-9]+: 67 8f ca 18 12 84 24 fe ca 00 00 34 12[ ]+lwpins \$0x1234,0xcafe\(%r12d\),%r12w
+[ ]*[a-f0-9]+: 67 8f ca 10 12 85 fe ca 00 00 34 12[ ]+lwpins \$0x1234,0xcafe\(%r13d\),%r13w
+[ ]*[a-f0-9]+: 67 8f ca 08 12 86 fe ca 00 00 34 12[ ]+lwpins \$0x1234,0xcafe\(%r14d\),%r14w
+[ ]*[a-f0-9]+: 67 8f ca 00 12 87 fe ca 00 00 34 12[ ]+lwpins \$0x1234,0xcafe\(%r15d\),%r15w
+[ ]*[a-f0-9]+: 67 8f ca 7c 12 87 fe ca 00 00 78 56 34 12[ ]+lwpins \$0x12345678,0xcafe\(%r15d\),%eax
+[ ]*[a-f0-9]+: 67 8f ca 74 12 86 fe ca 00 00 78 56 34 12[ ]+lwpins \$0x12345678,0xcafe\(%r14d\),%ecx
+[ ]*[a-f0-9]+: 67 8f ca 6c 12 85 fe ca 00 00 78 56 34 12[ ]+lwpins \$0x12345678,0xcafe\(%r13d\),%edx
+[ ]*[a-f0-9]+: 67 8f ca 64 12 84 24 fe ca 00 00 78 56 34 12[ ]+lwpins \$0x12345678,0xcafe\(%r12d\),%ebx
+[ ]*[a-f0-9]+: 67 8f ca 5c 12 83 fe ca 00 00 78 56 34 12[ ]+lwpins \$0x12345678,0xcafe\(%r11d\),%esp
+[ ]*[a-f0-9]+: 67 8f ca 54 12 82 fe ca 00 00 78 56 34 12[ ]+lwpins \$0x12345678,0xcafe\(%r10d\),%ebp
+[ ]*[a-f0-9]+: 67 8f ca 4c 12 81 fe ca 00 00 78 56 34 12[ ]+lwpins \$0x12345678,0xcafe\(%r9d\),%esi
+[ ]*[a-f0-9]+: 67 8f ca 44 12 80 fe ca 00 00 78 56 34 12[ ]+lwpins \$0x12345678,0xcafe\(%r8d\),%edi
+[ ]*[a-f0-9]+: 67 8f ea 3c 12 87 fe ca 00 00 78 56 34 12[ ]+lwpins \$0x12345678,0xcafe\(%edi\),%r8d
+[ ]*[a-f0-9]+: 67 8f ea 34 12 86 fe ca 00 00 78 56 34 12[ ]+lwpins \$0x12345678,0xcafe\(%esi\),%r9d
+[ ]*[a-f0-9]+: 67 8f ea 2c 12 85 fe ca 00 00 78 56 34 12[ ]+lwpins \$0x12345678,0xcafe\(%ebp\),%r10d
+[ ]*[a-f0-9]+: 67 8f ea 24 12 84 24 fe ca 00 00 78 56 34 12[ ]+lwpins \$0x12345678,0xcafe\(%esp\),%r11d
+[ ]*[a-f0-9]+: 67 8f ea 1c 12 83 fe ca 00 00 78 56 34 12[ ]+lwpins \$0x12345678,0xcafe\(%ebx\),%r12d
+[ ]*[a-f0-9]+: 67 8f ea 14 12 82 fe ca 00 00 78 56 34 12[ ]+lwpins \$0x12345678,0xcafe\(%edx\),%r13d
+[ ]*[a-f0-9]+: 67 8f ea 0c 12 81 fe ca 00 00 78 56 34 12[ ]+lwpins \$0x12345678,0xcafe\(%ecx\),%r14d
+[ ]*[a-f0-9]+: 67 8f ea 04 12 80 fe ca 00 00 78 56 34 12[ ]+lwpins \$0x12345678,0xcafe\(%eax\),%r15d
+[ ]*[a-f0-9]+: 67 8f ca f8 12 87 fe ca 00 00 78 56 34 12[ ]+lwpins \$0x12345678,0xcafe\(%r15d\),%rax
+[ ]*[a-f0-9]+: 67 8f ca f0 12 86 fe ca 00 00 78 56 34 12[ ]+lwpins \$0x12345678,0xcafe\(%r14d\),%rcx
+[ ]*[a-f0-9]+: 67 8f ca e8 12 85 fe ca 00 00 78 56 34 12[ ]+lwpins \$0x12345678,0xcafe\(%r13d\),%rdx
+[ ]*[a-f0-9]+: 67 8f ca e0 12 84 24 fe ca 00 00 78 56 34 12[ ]+lwpins \$0x12345678,0xcafe\(%r12d\),%rbx
+[ ]*[a-f0-9]+: 67 8f ca d8 12 83 fe ca 00 00 78 56 34 12[ ]+lwpins \$0x12345678,0xcafe\(%r11d\),%rsp
+[ ]*[a-f0-9]+: 67 8f ca d0 12 82 fe ca 00 00 78 56 34 12[ ]+lwpins \$0x12345678,0xcafe\(%r10d\),%rbp
+[ ]*[a-f0-9]+: 67 8f ca c8 12 81 fe ca 00 00 78 56 34 12[ ]+lwpins \$0x12345678,0xcafe\(%r9d\),%rsi
+[ ]*[a-f0-9]+: 67 8f ca c0 12 80 fe ca 00 00 78 56 34 12[ ]+lwpins \$0x12345678,0xcafe\(%r8d\),%rdi
+[ ]*[a-f0-9]+: 67 8f ea b8 12 80 fe ca 00 00 78 56 34 12[ ]+lwpins \$0x12345678,0xcafe\(%eax\),%r8
+[ ]*[a-f0-9]+: 67 8f ea b0 12 81 fe ca 00 00 78 56 34 12[ ]+lwpins \$0x12345678,0xcafe\(%ecx\),%r9
+[ ]*[a-f0-9]+: 67 8f ea a8 12 82 fe ca 00 00 78 56 34 12[ ]+lwpins \$0x12345678,0xcafe\(%edx\),%r10
+[ ]*[a-f0-9]+: 67 8f ea a0 12 83 fe ca 00 00 78 56 34 12[ ]+lwpins \$0x12345678,0xcafe\(%ebx\),%r11
+[ ]*[a-f0-9]+: 67 8f ea 98 12 84 24 fe ca 00 00 78 56 34 12[ ]+lwpins \$0x12345678,0xcafe\(%esp\),%r12
+[ ]*[a-f0-9]+: 67 8f ea 90 12 85 fe ca 00 00 78 56 34 12[ ]+lwpins \$0x12345678,0xcafe\(%ebp\),%r13
+[ ]*[a-f0-9]+: 67 8f ea 88 12 86 fe ca 00 00 78 56 34 12[ ]+lwpins \$0x12345678,0xcafe\(%esi\),%r14
+[ ]*[a-f0-9]+: 67 8f ea 80 12 87 fe ca 00 00 78 56 34 12[ ]+lwpins \$0x12345678,0xcafe\(%edi\),%r15
+[ ]*[a-f0-9]+: 67 8f ea 78 12 88 fe ca 00 00 34 12[ ]+lwpval \$0x1234,0xcafe\(%eax\),%ax
+[ ]*[a-f0-9]+: 67 8f ea 70 12 89 fe ca 00 00 34 12[ ]+lwpval \$0x1234,0xcafe\(%ecx\),%cx
+[ ]*[a-f0-9]+: 67 8f ea 68 12 8a fe ca 00 00 34 12[ ]+lwpval \$0x1234,0xcafe\(%edx\),%dx
+[ ]*[a-f0-9]+: 67 8f ea 60 12 8b fe ca 00 00 34 12[ ]+lwpval \$0x1234,0xcafe\(%ebx\),%bx
+[ ]*[a-f0-9]+: 67 8f ea 58 12 8c 24 fe ca 00 00 34 12[ ]+lwpval \$0x1234,0xcafe\(%esp\),%sp
+[ ]*[a-f0-9]+: 67 8f ea 50 12 8d fe ca 00 00 34 12[ ]+lwpval \$0x1234,0xcafe\(%ebp\),%bp
+[ ]*[a-f0-9]+: 67 8f ea 48 12 8e fe ca 00 00 34 12[ ]+lwpval \$0x1234,0xcafe\(%esi\),%si
+[ ]*[a-f0-9]+: 67 8f ea 40 12 8f fe ca 00 00 34 12[ ]+lwpval \$0x1234,0xcafe\(%edi\),%di
+[ ]*[a-f0-9]+: 67 8f ca 38 12 88 fe ca 00 00 34 12[ ]+lwpval \$0x1234,0xcafe\(%r8d\),%r8w
+[ ]*[a-f0-9]+: 67 8f ca 30 12 89 fe ca 00 00 34 12[ ]+lwpval \$0x1234,0xcafe\(%r9d\),%r9w
+[ ]*[a-f0-9]+: 67 8f ca 28 12 8a fe ca 00 00 34 12[ ]+lwpval \$0x1234,0xcafe\(%r10d\),%r10w
+[ ]*[a-f0-9]+: 67 8f ca 20 12 8b fe ca 00 00 34 12[ ]+lwpval \$0x1234,0xcafe\(%r11d\),%r11w
+[ ]*[a-f0-9]+: 67 8f ca 18 12 8c 24 fe ca 00 00 34 12[ ]+lwpval \$0x1234,0xcafe\(%r12d\),%r12w
+[ ]*[a-f0-9]+: 67 8f ca 10 12 8d fe ca 00 00 34 12[ ]+lwpval \$0x1234,0xcafe\(%r13d\),%r13w
+[ ]*[a-f0-9]+: 67 8f ca 08 12 8e fe ca 00 00 34 12[ ]+lwpval \$0x1234,0xcafe\(%r14d\),%r14w
+[ ]*[a-f0-9]+: 67 8f ca 00 12 8f fe ca 00 00 34 12[ ]+lwpval \$0x1234,0xcafe\(%r15d\),%r15w
+[ ]*[a-f0-9]+: 67 8f ca 7c 12 8f fe ca 00 00 78 56 34 12[ ]+lwpval \$0x12345678,0xcafe\(%r15d\),%eax
+[ ]*[a-f0-9]+: 67 8f ca 74 12 8e fe ca 00 00 78 56 34 12[ ]+lwpval \$0x12345678,0xcafe\(%r14d\),%ecx
+[ ]*[a-f0-9]+: 67 8f ca 6c 12 8d fe ca 00 00 78 56 34 12[ ]+lwpval \$0x12345678,0xcafe\(%r13d\),%edx
+[ ]*[a-f0-9]+: 67 8f ca 64 12 8c 24 fe ca 00 00 78 56 34 12[ ]+lwpval \$0x12345678,0xcafe\(%r12d\),%ebx
+[ ]*[a-f0-9]+: 67 8f ca 5c 12 8b fe ca 00 00 78 56 34 12[ ]+lwpval \$0x12345678,0xcafe\(%r11d\),%esp
+[ ]*[a-f0-9]+: 67 8f ca 54 12 8a fe ca 00 00 78 56 34 12[ ]+lwpval \$0x12345678,0xcafe\(%r10d\),%ebp
+[ ]*[a-f0-9]+: 67 8f ca 4c 12 89 fe ca 00 00 78 56 34 12[ ]+lwpval \$0x12345678,0xcafe\(%r9d\),%esi
+[ ]*[a-f0-9]+: 67 8f ca 44 12 88 fe ca 00 00 78 56 34 12[ ]+lwpval \$0x12345678,0xcafe\(%r8d\),%edi
+[ ]*[a-f0-9]+: 67 8f ea 3c 12 8f fe ca 00 00 78 56 34 12[ ]+lwpval \$0x12345678,0xcafe\(%edi\),%r8d
+[ ]*[a-f0-9]+: 67 8f ea 34 12 8e fe ca 00 00 78 56 34 12[ ]+lwpval \$0x12345678,0xcafe\(%esi\),%r9d
+[ ]*[a-f0-9]+: 67 8f ea 2c 12 8d fe ca 00 00 78 56 34 12[ ]+lwpval \$0x12345678,0xcafe\(%ebp\),%r10d
+[ ]*[a-f0-9]+: 67 8f ea 24 12 8c 24 fe ca 00 00 78 56 34 12[ ]+lwpval \$0x12345678,0xcafe\(%esp\),%r11d
+[ ]*[a-f0-9]+: 67 8f ea 1c 12 8b fe ca 00 00 78 56 34 12[ ]+lwpval \$0x12345678,0xcafe\(%ebx\),%r12d
+[ ]*[a-f0-9]+: 67 8f ea 14 12 8a fe ca 00 00 78 56 34 12[ ]+lwpval \$0x12345678,0xcafe\(%edx\),%r13d
+[ ]*[a-f0-9]+: 67 8f ea 0c 12 89 fe ca 00 00 78 56 34 12[ ]+lwpval \$0x12345678,0xcafe\(%ecx\),%r14d
+[ ]*[a-f0-9]+: 67 8f ea 04 12 88 fe ca 00 00 78 56 34 12[ ]+lwpval \$0x12345678,0xcafe\(%eax\),%r15d
+[ ]*[a-f0-9]+: 67 8f ca f8 12 8f fe ca 00 00 78 56 34 12[ ]+lwpval \$0x12345678,0xcafe\(%r15d\),%rax
+[ ]*[a-f0-9]+: 67 8f ca f0 12 8e fe ca 00 00 78 56 34 12[ ]+lwpval \$0x12345678,0xcafe\(%r14d\),%rcx
+[ ]*[a-f0-9]+: 67 8f ca e8 12 8d fe ca 00 00 78 56 34 12[ ]+lwpval \$0x12345678,0xcafe\(%r13d\),%rdx
+[ ]*[a-f0-9]+: 67 8f ca e0 12 8c 24 fe ca 00 00 78 56 34 12[ ]+lwpval \$0x12345678,0xcafe\(%r12d\),%rbx
+[ ]*[a-f0-9]+: 67 8f ca d8 12 8b fe ca 00 00 78 56 34 12[ ]+lwpval \$0x12345678,0xcafe\(%r11d\),%rsp
+[ ]*[a-f0-9]+: 67 8f ca d0 12 8a fe ca 00 00 78 56 34 12[ ]+lwpval \$0x12345678,0xcafe\(%r10d\),%rbp
+[ ]*[a-f0-9]+: 67 8f ca c8 12 89 fe ca 00 00 78 56 34 12[ ]+lwpval \$0x12345678,0xcafe\(%r9d\),%rsi
+[ ]*[a-f0-9]+: 67 8f ca c0 12 88 fe ca 00 00 78 56 34 12[ ]+lwpval \$0x12345678,0xcafe\(%r8d\),%rdi
+[ ]*[a-f0-9]+: 67 8f ea b8 12 88 fe ca 00 00 78 56 34 12[ ]+lwpval \$0x12345678,0xcafe\(%eax\),%r8
+[ ]*[a-f0-9]+: 67 8f ea b0 12 89 fe ca 00 00 78 56 34 12[ ]+lwpval \$0x12345678,0xcafe\(%ecx\),%r9
+[ ]*[a-f0-9]+: 67 8f ea a8 12 8a fe ca 00 00 78 56 34 12[ ]+lwpval \$0x12345678,0xcafe\(%edx\),%r10
+[ ]*[a-f0-9]+: 67 8f ea a0 12 8b fe ca 00 00 78 56 34 12[ ]+lwpval \$0x12345678,0xcafe\(%ebx\),%r11
+[ ]*[a-f0-9]+: 67 8f ea 98 12 8c 24 fe ca 00 00 78 56 34 12[ ]+lwpval \$0x12345678,0xcafe\(%esp\),%r12
+[ ]*[a-f0-9]+: 67 8f ea 90 12 8d fe ca 00 00 78 56 34 12[ ]+lwpval \$0x12345678,0xcafe\(%ebp\),%r13
+[ ]*[a-f0-9]+: 67 8f ea 88 12 8e fe ca 00 00 78 56 34 12[ ]+lwpval \$0x12345678,0xcafe\(%esi\),%r14
+[ ]*[a-f0-9]+: 67 8f ea 80 12 8f fe ca 00 00 78 56 34 12[ ]+lwpval \$0x12345678,0xcafe\(%edi\),%r15
#pass
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 9f28894a095..420230ceaff 100644
--- a/gas/testsuite/gas/i386/x86-64-nops-1-core2.d
+++ b/gas/testsuite/gas/i386/x86-64-nops-1-core2.d
@@ -5,152 +5,153 @@
.*: +file format .*
+
Disassembly of section .text:
0+ <nop15>:
-[ ]*0:[ ]+90[ ]+nop[ ]*
-[ ]*1:[ ]+66 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00[ ]+nopw[ ]+%cs:0x0\(%rax,%rax,1\)
+[ ]*[a-f0-9]+: 90 nop
+[ ]*[a-f0-9]+: 66 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00 data32 data32 data32 data32 data32 nopw %cs:0x0\(%rax,%rax,1\)
0+10 <nop14>:
-[ ]*10:[ ]+90[ ]+nop[ ]*
-[ ]*11:[ ]+90[ ]+nop[ ]*
-[ ]*12:[ ]+66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00[ ]+nopw[ ]+%cs:0x0\(%rax,%rax,1\)
+[ ]*[a-f0-9]+: 90 nop
+[ ]*[a-f0-9]+: 90 nop
+[ ]*[a-f0-9]+: 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00 data32 data32 data32 data32 nopw %cs:0x0\(%rax,%rax,1\)
0+20 <nop13>:
-[ ]*20:[ ]+90[ ]+nop[ ]*
-[ ]*21:[ ]+90[ ]+nop[ ]*
-[ ]*22:[ ]+90[ ]+nop[ ]*
-[ ]*23:[ ]+66 66 66 66 2e 0f 1f 84 00 00 00 00 00[ ]+nopw[ ]+%cs:0x0\(%rax,%rax,1\)
+[ ]*[a-f0-9]+: 90 nop
+[ ]*[a-f0-9]+: 90 nop
+[ ]*[a-f0-9]+: 90 nop
+[ ]*[a-f0-9]+: 66 66 66 66 2e 0f 1f 84 00 00 00 00 00 data32 data32 data32 nopw %cs:0x0\(%rax,%rax,1\)
0+30 <nop12>:
-[ ]*30:[ ]+90[ ]+nop[ ]*
-[ ]*31:[ ]+90[ ]+nop[ ]*
-[ ]*32:[ ]+90[ ]+nop[ ]*
-[ ]*33:[ ]+90[ ]+nop[ ]*
-[ ]*34:[ ]+66 66 66 2e 0f 1f 84 00 00 00 00 00[ ]+nopw[ ]+%cs:0x0\(%rax,%rax,1\)
+[ ]*[a-f0-9]+: 90 nop
+[ ]*[a-f0-9]+: 90 nop
+[ ]*[a-f0-9]+: 90 nop
+[ ]*[a-f0-9]+: 90 nop
+[ ]*[a-f0-9]+: 66 66 66 2e 0f 1f 84 00 00 00 00 00 data32 data32 nopw %cs:0x0\(%rax,%rax,1\)
0+40 <nop11>:
-[ ]*40:[ ]+90[ ]+nop[ ]*
-[ ]*41:[ ]+90[ ]+nop[ ]*
-[ ]*42:[ ]+90[ ]+nop[ ]*
-[ ]*43:[ ]+90[ ]+nop[ ]*
-[ ]*44:[ ]+90[ ]+nop[ ]*
-[ ]*45:[ ]+66 66 2e 0f 1f 84 00 00 00 00 00[ ]+nopw[ ]+%cs:0x0\(%rax,%rax,1\)
+[ ]*[a-f0-9]+: 90 nop
+[ ]*[a-f0-9]+: 90 nop
+[ ]*[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 data32 nopw %cs:0x0\(%rax,%rax,1\)
0+50 <nop10>:
-[ ]*50:[ ]+90[ ]+nop[ ]*
-[ ]*51:[ ]+90[ ]+nop[ ]*
-[ ]*52:[ ]+90[ ]+nop[ ]*
-[ ]*53:[ ]+90[ ]+nop[ ]*
-[ ]*54:[ ]+90[ ]+nop[ ]*
-[ ]*55:[ ]+90[ ]+nop[ ]*
-[ ]*56:[ ]+66 2e 0f 1f 84 00 00 00 00 00[ ]+nopw[ ]+%cs:0x0\(%rax,%rax,1\)
+[ ]*[a-f0-9]+: 90 nop
+[ ]*[a-f0-9]+: 90 nop
+[ ]*[a-f0-9]+: 90 nop
+[ ]*[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\)
0+60 <nop9>:
-[ ]*60:[ ]+90[ ]+nop[ ]*
-[ ]*61:[ ]+90[ ]+nop[ ]*
-[ ]*62:[ ]+90[ ]+nop[ ]*
-[ ]*63:[ ]+90[ ]+nop[ ]*
-[ ]*64:[ ]+90[ ]+nop[ ]*
-[ ]*65:[ ]+90[ ]+nop[ ]*
-[ ]*66:[ ]+90[ ]+nop[ ]*
-[ ]*67:[ ]+66 0f 1f 84 00 00 00 00 00[ ]+nopw[ ]+0x0\(%rax,%rax,1\)
+[ ]*[a-f0-9]+: 90 nop
+[ ]*[a-f0-9]+: 90 nop
+[ ]*[a-f0-9]+: 90 nop
+[ ]*[a-f0-9]+: 90 nop
+[ ]*[a-f0-9]+: 90 nop
+[ ]*[a-f0-9]+: 90 nop
+[ ]*[a-f0-9]+: 90 nop
+[ ]*[a-f0-9]+: 66 0f 1f 84 00 00 00 00 00 nopw 0x0\(%rax,%rax,1\)
0+70 <nop8>:
-[ ]*70:[ ]+90[ ]+nop[ ]*
-[ ]*71:[ ]+90[ ]+nop[ ]*
-[ ]*72:[ ]+90[ ]+nop[ ]*
-[ ]*73:[ ]+90[ ]+nop[ ]*
-[ ]*74:[ ]+90[ ]+nop[ ]*
-[ ]*75:[ ]+90[ ]+nop[ ]*
-[ ]*76:[ ]+90[ ]+nop[ ]*
-[ ]*77:[ ]+90[ ]+nop[ ]*
-[ ]*78:[ ]+0f 1f 84 00 00 00 00 00[ ]+nopl[ ]+0x0\(%rax,%rax,1\)
+[ ]*[a-f0-9]+: 90 nop
+[ ]*[a-f0-9]+: 90 nop
+[ ]*[a-f0-9]+: 90 nop
+[ ]*[a-f0-9]+: 90 nop
+[ ]*[a-f0-9]+: 90 nop
+[ ]*[a-f0-9]+: 90 nop
+[ ]*[a-f0-9]+: 90 nop
+[ ]*[a-f0-9]+: 90 nop
+[ ]*[a-f0-9]+: 0f 1f 84 00 00 00 00 00 nopl 0x0\(%rax,%rax,1\)
0+80 <nop7>:
-[ ]*80:[ ]+90[ ]+nop[ ]*
-[ ]*81:[ ]+90[ ]+nop[ ]*
-[ ]*82:[ ]+90[ ]+nop[ ]*
-[ ]*83:[ ]+90[ ]+nop[ ]*
-[ ]*84:[ ]+90[ ]+nop[ ]*
-[ ]*85:[ ]+90[ ]+nop[ ]*
-[ ]*86:[ ]+90[ ]+nop[ ]*
-[ ]*87:[ ]+90[ ]+nop[ ]*
-[ ]*88:[ ]+90[ ]+nop[ ]*
-[ ]*89:[ ]+0f 1f 80 00 00 00 00[ ]+nopl[ ]+0x0\(%rax\)
+[ ]*[a-f0-9]+: 90 nop
+[ ]*[a-f0-9]+: 90 nop
+[ ]*[a-f0-9]+: 90 nop
+[ ]*[a-f0-9]+: 90 nop
+[ ]*[a-f0-9]+: 90 nop
+[ ]*[a-f0-9]+: 90 nop
+[ ]*[a-f0-9]+: 90 nop
+[ ]*[a-f0-9]+: 90 nop
+[ ]*[a-f0-9]+: 90 nop
+[ ]*[a-f0-9]+: 0f 1f 80 00 00 00 00 nopl 0x0\(%rax\)
0+90 <nop6>:
-[ ]*90:[ ]+90[ ]+nop[ ]*
-[ ]*91:[ ]+90[ ]+nop[ ]*
-[ ]*92:[ ]+90[ ]+nop[ ]*
-[ ]*93:[ ]+90[ ]+nop[ ]*
-[ ]*94:[ ]+90[ ]+nop[ ]*
-[ ]*95:[ ]+90[ ]+nop[ ]*
-[ ]*96:[ ]+90[ ]+nop[ ]*
-[ ]*97:[ ]+90[ ]+nop[ ]*
-[ ]*98:[ ]+90[ ]+nop[ ]*
-[ ]*99:[ ]+90[ ]+nop[ ]*
-[ ]*9a:[ ]+66 0f 1f 44 00 00[ ]+nopw[ ]+0x0\(%rax,%rax,1\)
+[ ]*[a-f0-9]+: 90 nop
+[ ]*[a-f0-9]+: 90 nop
+[ ]*[a-f0-9]+: 90 nop
+[ ]*[a-f0-9]+: 90 nop
+[ ]*[a-f0-9]+: 90 nop
+[ ]*[a-f0-9]+: 90 nop
+[ ]*[a-f0-9]+: 90 nop
+[ ]*[a-f0-9]+: 90 nop
+[ ]*[a-f0-9]+: 90 nop
+[ ]*[a-f0-9]+: 90 nop
+[ ]*[a-f0-9]+: 66 0f 1f 44 00 00 nopw 0x0\(%rax,%rax,1\)
0+a0 <nop5>:
-[ ]*a0:[ ]+90[ ]+nop[ ]*
-[ ]*a1:[ ]+90[ ]+nop[ ]*
-[ ]*a2:[ ]+90[ ]+nop[ ]*
-[ ]*a3:[ ]+90[ ]+nop[ ]*
-[ ]*a4:[ ]+90[ ]+nop[ ]*
-[ ]*a5:[ ]+90[ ]+nop[ ]*
-[ ]*a6:[ ]+90[ ]+nop[ ]*
-[ ]*a7:[ ]+90[ ]+nop[ ]*
-[ ]*a8:[ ]+90[ ]+nop[ ]*
-[ ]*a9:[ ]+90[ ]+nop[ ]*
-[ ]*aa:[ ]+90[ ]+nop[ ]*
-[ ]*ab:[ ]+0f 1f 44 00 00[ ]+nopl[ ]+0x0\(%rax,%rax,1\)
+[ ]*[a-f0-9]+: 90 nop
+[ ]*[a-f0-9]+: 90 nop
+[ ]*[a-f0-9]+: 90 nop
+[ ]*[a-f0-9]+: 90 nop
+[ ]*[a-f0-9]+: 90 nop
+[ ]*[a-f0-9]+: 90 nop
+[ ]*[a-f0-9]+: 90 nop
+[ ]*[a-f0-9]+: 90 nop
+[ ]*[a-f0-9]+: 90 nop
+[ ]*[a-f0-9]+: 90 nop
+[ ]*[a-f0-9]+: 90 nop
+[ ]*[a-f0-9]+: 0f 1f 44 00 00 nopl 0x0\(%rax,%rax,1\)
0+b0 <nop4>:
-[ ]*b0:[ ]+90[ ]+nop[ ]*
-[ ]*b1:[ ]+90[ ]+nop[ ]*
-[ ]*b2:[ ]+90[ ]+nop[ ]*
-[ ]*b3:[ ]+90[ ]+nop[ ]*
-[ ]*b4:[ ]+90[ ]+nop[ ]*
-[ ]*b5:[ ]+90[ ]+nop[ ]*
-[ ]*b6:[ ]+90[ ]+nop[ ]*
-[ ]*b7:[ ]+90[ ]+nop[ ]*
-[ ]*b8:[ ]+90[ ]+nop[ ]*
-[ ]*b9:[ ]+90[ ]+nop[ ]*
-[ ]*ba:[ ]+90[ ]+nop[ ]*
-[ ]*bb:[ ]+90[ ]+nop[ ]*
-[ ]*bc:[ ]+0f 1f 40 00[ ]+nopl[ ]+0x0\(%rax\)
+[ ]*[a-f0-9]+: 90 nop
+[ ]*[a-f0-9]+: 90 nop
+[ ]*[a-f0-9]+: 90 nop
+[ ]*[a-f0-9]+: 90 nop
+[ ]*[a-f0-9]+: 90 nop
+[ ]*[a-f0-9]+: 90 nop
+[ ]*[a-f0-9]+: 90 nop
+[ ]*[a-f0-9]+: 90 nop
+[ ]*[a-f0-9]+: 90 nop
+[ ]*[a-f0-9]+: 90 nop
+[ ]*[a-f0-9]+: 90 nop
+[ ]*[a-f0-9]+: 90 nop
+[ ]*[a-f0-9]+: 0f 1f 40 00 nopl 0x0\(%rax\)
0+c0 <nop3>:
-[ ]*c0:[ ]+90[ ]+nop[ ]*
-[ ]*c1:[ ]+90[ ]+nop[ ]*
-[ ]*c2:[ ]+90[ ]+nop[ ]*
-[ ]*c3:[ ]+90[ ]+nop[ ]*
-[ ]*c4:[ ]+90[ ]+nop[ ]*
-[ ]*c5:[ ]+90[ ]+nop[ ]*
-[ ]*c6:[ ]+90[ ]+nop[ ]*
-[ ]*c7:[ ]+90[ ]+nop[ ]*
-[ ]*c8:[ ]+90[ ]+nop[ ]*
-[ ]*c9:[ ]+90[ ]+nop[ ]*
-[ ]*ca:[ ]+90[ ]+nop[ ]*
-[ ]*cb:[ ]+90[ ]+nop[ ]*
-[ ]*cc:[ ]+90[ ]+nop[ ]*
-[ ]*cd:[ ]+0f 1f 00[ ]+nopl[ ]+\(%rax\)
+[ ]*[a-f0-9]+: 90 nop
+[ ]*[a-f0-9]+: 90 nop
+[ ]*[a-f0-9]+: 90 nop
+[ ]*[a-f0-9]+: 90 nop
+[ ]*[a-f0-9]+: 90 nop
+[ ]*[a-f0-9]+: 90 nop
+[ ]*[a-f0-9]+: 90 nop
+[ ]*[a-f0-9]+: 90 nop
+[ ]*[a-f0-9]+: 90 nop
+[ ]*[a-f0-9]+: 90 nop
+[ ]*[a-f0-9]+: 90 nop
+[ ]*[a-f0-9]+: 90 nop
+[ ]*[a-f0-9]+: 90 nop
+[ ]*[a-f0-9]+: 0f 1f 00 nopl \(%rax\)
0+d0 <nop2>:
-[ ]*d0:[ ]+90[ ]+nop[ ]*
-[ ]*d1:[ ]+90[ ]+nop[ ]*
-[ ]*d2:[ ]+90[ ]+nop[ ]*
-[ ]*d3:[ ]+90[ ]+nop[ ]*
-[ ]*d4:[ ]+90[ ]+nop[ ]*
-[ ]*d5:[ ]+90[ ]+nop[ ]*
-[ ]*d6:[ ]+90[ ]+nop[ ]*
-[ ]*d7:[ ]+90[ ]+nop[ ]*
-[ ]*d8:[ ]+90[ ]+nop[ ]*
-[ ]*d9:[ ]+90[ ]+nop[ ]*
-[ ]*da:[ ]+90[ ]+nop[ ]*
-[ ]*db:[ ]+90[ ]+nop[ ]*
-[ ]*dc:[ ]+90[ ]+nop[ ]*
-[ ]*dd:[ ]+90[ ]+nop[ ]*
-[ ]*de:[ ]+66 90[ ]+xchg[ ]+%ax,%ax
+[ ]*[a-f0-9]+: 90 nop
+[ ]*[a-f0-9]+: 90 nop
+[ ]*[a-f0-9]+: 90 nop
+[ ]*[a-f0-9]+: 90 nop
+[ ]*[a-f0-9]+: 90 nop
+[ ]*[a-f0-9]+: 90 nop
+[ ]*[a-f0-9]+: 90 nop
+[ ]*[a-f0-9]+: 90 nop
+[ ]*[a-f0-9]+: 90 nop
+[ ]*[a-f0-9]+: 90 nop
+[ ]*[a-f0-9]+: 90 nop
+[ ]*[a-f0-9]+: 90 nop
+[ ]*[a-f0-9]+: 90 nop
+[ ]*[a-f0-9]+: 90 nop
+[ ]*[a-f0-9]+: 66 90 xchg %ax,%ax
#pass
diff --git a/gas/testsuite/gas/i386/x86-64-nops-1-nocona.d b/gas/testsuite/gas/i386/x86-64-nops-1-nocona.d
index ccef1a6bcf6..244d06b5064 100644
--- a/gas/testsuite/gas/i386/x86-64-nops-1-nocona.d
+++ b/gas/testsuite/gas/i386/x86-64-nops-1-nocona.d
@@ -9,25 +9,25 @@ Disassembly of section .text:
0+ <nop15>:
[ ]*[a-f0-9]+: 90 nop
-[ ]*[a-f0-9]+: 66 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00 nopw %cs:0x0\(%rax,%rax,1\)
+[ ]*[a-f0-9]+: 66 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00 data32 data32 data32 data32 data32 nopw %cs:0x0\(%rax,%rax,1\)
0+10 <nop14>:
[ ]*[a-f0-9]+: 90 nop
[ ]*[a-f0-9]+: 90 nop
-[ ]*[a-f0-9]+: 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00 nopw %cs:0x0\(%rax,%rax,1\)
+[ ]*[a-f0-9]+: 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00 data32 data32 data32 data32 nopw %cs:0x0\(%rax,%rax,1\)
0+20 <nop13>:
[ ]*[a-f0-9]+: 90 nop
[ ]*[a-f0-9]+: 90 nop
[ ]*[a-f0-9]+: 90 nop
-[ ]*[a-f0-9]+: 66 66 66 66 2e 0f 1f 84 00 00 00 00 00 nopw %cs:0x0\(%rax,%rax,1\)
+[ ]*[a-f0-9]+: 66 66 66 66 2e 0f 1f 84 00 00 00 00 00 data32 data32 data32 nopw %cs:0x0\(%rax,%rax,1\)
0+30 <nop12>:
[ ]*[a-f0-9]+: 90 nop
[ ]*[a-f0-9]+: 90 nop
[ ]*[a-f0-9]+: 90 nop
[ ]*[a-f0-9]+: 90 nop
-[ ]*[a-f0-9]+: 66 66 66 2e 0f 1f 84 00 00 00 00 00 nopw %cs:0x0\(%rax,%rax,1\)
+[ ]*[a-f0-9]+: 66 66 66 2e 0f 1f 84 00 00 00 00 00 data32 data32 nopw %cs:0x0\(%rax,%rax,1\)
0+40 <nop11>:
[ ]*[a-f0-9]+: 90 nop
@@ -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 nopw %cs:0x0\(%rax,%rax,1\)
+[ ]*[a-f0-9]+: 66 66 2e 0f 1f 84 00 00 00 00 00 data32 nopw %cs:0x0\(%rax,%rax,1\)
0+50 <nop10>:
[ ]*[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 87ad9a73387..cb8cea5b041 100644
--- a/gas/testsuite/gas/i386/x86-64-nops-1.d
+++ b/gas/testsuite/gas/i386/x86-64-nops-1.d
@@ -5,29 +5,30 @@
.*: +file format .*
+
Disassembly of section .text:
0+ <nop15>:
[ ]*[a-f0-9]+: 90 nop
-[ ]*[a-f0-9]+: 66 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00 nopw %cs:0x0\(%rax,%rax,1\)
+[ ]*[a-f0-9]+: 66 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00 data32 data32 data32 data32 data32 nopw %cs:0x0\(%rax,%rax,1\)
0+10 <nop14>:
[ ]*[a-f0-9]+: 90 nop
[ ]*[a-f0-9]+: 90 nop
-[ ]*[a-f0-9]+: 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00 nopw %cs:0x0\(%rax,%rax,1\)
+[ ]*[a-f0-9]+: 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00 data32 data32 data32 data32 nopw %cs:0x0\(%rax,%rax,1\)
0+20 <nop13>:
[ ]*[a-f0-9]+: 90 nop
[ ]*[a-f0-9]+: 90 nop
[ ]*[a-f0-9]+: 90 nop
-[ ]*[a-f0-9]+: 66 66 66 66 2e 0f 1f 84 00 00 00 00 00 nopw %cs:0x0\(%rax,%rax,1\)
+[ ]*[a-f0-9]+: 66 66 66 66 2e 0f 1f 84 00 00 00 00 00 data32 data32 data32 nopw %cs:0x0\(%rax,%rax,1\)
0+30 <nop12>:
[ ]*[a-f0-9]+: 90 nop
[ ]*[a-f0-9]+: 90 nop
[ ]*[a-f0-9]+: 90 nop
[ ]*[a-f0-9]+: 90 nop
-[ ]*[a-f0-9]+: 66 66 66 2e 0f 1f 84 00 00 00 00 00 nopw %cs:0x0\(%rax,%rax,1\)
+[ ]*[a-f0-9]+: 66 66 66 2e 0f 1f 84 00 00 00 00 00 data32 data32 nopw %cs:0x0\(%rax,%rax,1\)
0+40 <nop11>:
[ ]*[a-f0-9]+: 90 nop
@@ -35,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 nopw %cs:0x0\(%rax,%rax,1\)
+[ ]*[a-f0-9]+: 66 66 2e 0f 1f 84 00 00 00 00 00 data32 nopw %cs:0x0\(%rax,%rax,1\)
0+50 <nop10>:
[ ]*[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 3859cc9c974..72616f851f7 100644
--- a/gas/testsuite/gas/i386/x86-64-nops-2.d
+++ b/gas/testsuite/gas/i386/x86-64-nops-2.d
@@ -5,33 +5,34 @@
.*: +file format .*
+
Disassembly of section .text:
0+ <nop>:
[ ]*[a-f0-9]+: 0f be f0 movsbl %al,%esi
-[ ]*[a-f0-9]+: 66 66 66 66 2e 0f 1f 84 00 00 00 00 00 nopw %cs:0x0\(%rax,%rax,1\)
+[ ]*[a-f0-9]+: 66 66 66 66 2e 0f 1f 84 00 00 00 00 00 data32 data32 data32 nopw %cs:0x0\(%rax,%rax,1\)
0+10 <nop15>:
[ ]*[a-f0-9]+: 90 nop
-[ ]*[a-f0-9]+: 66 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00 nopw %cs:0x0\(%rax,%rax,1\)
+[ ]*[a-f0-9]+: 66 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00 data32 data32 data32 data32 data32 nopw %cs:0x0\(%rax,%rax,1\)
0+20 <nop14>:
[ ]*[a-f0-9]+: 90 nop
[ ]*[a-f0-9]+: 90 nop
-[ ]*[a-f0-9]+: 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00 nopw %cs:0x0\(%rax,%rax,1\)
+[ ]*[a-f0-9]+: 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00 data32 data32 data32 data32 nopw %cs:0x0\(%rax,%rax,1\)
0+30 <nop13>:
[ ]*[a-f0-9]+: 90 nop
[ ]*[a-f0-9]+: 90 nop
[ ]*[a-f0-9]+: 90 nop
-[ ]*[a-f0-9]+: 66 66 66 66 2e 0f 1f 84 00 00 00 00 00 nopw %cs:0x0\(%rax,%rax,1\)
+[ ]*[a-f0-9]+: 66 66 66 66 2e 0f 1f 84 00 00 00 00 00 data32 data32 data32 nopw %cs:0x0\(%rax,%rax,1\)
0+40 <nop12>:
[ ]*[a-f0-9]+: 90 nop
[ ]*[a-f0-9]+: 90 nop
[ ]*[a-f0-9]+: 90 nop
[ ]*[a-f0-9]+: 90 nop
-[ ]*[a-f0-9]+: 66 66 66 2e 0f 1f 84 00 00 00 00 00 nopw %cs:0x0\(%rax,%rax,1\)
+[ ]*[a-f0-9]+: 66 66 66 2e 0f 1f 84 00 00 00 00 00 data32 data32 nopw %cs:0x0\(%rax,%rax,1\)
0+50 <nop11>:
[ ]*[a-f0-9]+: 90 nop
@@ -39,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 nopw %cs:0x0\(%rax,%rax,1\)
+[ ]*[a-f0-9]+: 66 66 2e 0f 1f 84 00 00 00 00 00 data32 nopw %cs:0x0\(%rax,%rax,1\)
0+60 <nop10>:
[ ]*[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 128c82573d6..a606f841d91 100644
--- a/gas/testsuite/gas/i386/x86-64-nops-3.d
+++ b/gas/testsuite/gas/i386/x86-64-nops-3.d
@@ -5,13 +5,14 @@
.*: +file format .*
+
Disassembly of section .text:
0+ <nop>:
[ ]*[a-f0-9]+: 90 nop
[ ]*[a-f0-9]+: 90 nop
-[ ]*[a-f0-9]+: 66 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00 nopw %cs:0x0\(%rax,%rax,1\)
-[ ]*[a-f0-9]+: 66 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00 nopw %cs:0x0\(%rax,%rax,1\)
+[ ]*[a-f0-9]+: 66 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00 data32 data32 data32 data32 data32 nopw %cs:0x0\(%rax,%rax,1\)
+[ ]*[a-f0-9]+: 66 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00 data32 data32 data32 data32 data32 nopw %cs:0x0\(%rax,%rax,1\)
[ ]*[a-f0-9]+: 89 c3 mov %eax,%ebx
-[ ]*[a-f0-9]+: 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00 nopw %cs:0x0\(%rax,%rax,1\)
+[ ]*[a-f0-9]+: 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00 data32 data32 data32 data32 nopw %cs:0x0\(%rax,%rax,1\)
#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 f5ec9184264..4f2a3eda4a8 100644
--- a/gas/testsuite/gas/i386/x86-64-nops-4-core2.d
+++ b/gas/testsuite/gas/i386/x86-64-nops-4-core2.d
@@ -5,34 +5,35 @@
.*: +file format .*
+
Disassembly of section .text:
0+ <nop31>:
[ ]*[a-f0-9]+: 90 nop
[ ]*[a-f0-9]+: 90 nop
-[ ]*[a-f0-9]+: 66 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00 nopw %cs:0x0\(%rax,%rax,1\)
-[ ]*[a-f0-9]+: 66 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00 nopw %cs:0x0\(%rax,%rax,1\)
+[ ]*[a-f0-9]+: 66 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00 data32 data32 data32 data32 data32 nopw %cs:0x0\(%rax,%rax,1\)
+[ ]*[a-f0-9]+: 66 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00 data32 data32 data32 data32 data32 nopw %cs:0x0\(%rax,%rax,1\)
0+20 <nop30>:
[ ]*[a-f0-9]+: 90 nop
[ ]*[a-f0-9]+: 90 nop
-[ ]*[a-f0-9]+: 66 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00 nopw %cs:0x0\(%rax,%rax,1\)
-[ ]*[a-f0-9]+: 66 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00 nopw %cs:0x0\(%rax,%rax,1\)
+[ ]*[a-f0-9]+: 66 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00 data32 data32 data32 data32 data32 nopw %cs:0x0\(%rax,%rax,1\)
+[ ]*[a-f0-9]+: 66 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00 data32 data32 data32 data32 data32 nopw %cs: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 66 66 66 2e 0f 1f 84 00 00 00 00 00 nopw %cs:0x0\(%rax,%rax,1\)
-[ ]*[a-f0-9]+: 66 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00 nopw %cs:0x0\(%rax,%rax,1\)
+[ ]*[a-f0-9]+: 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00 data32 data32 data32 data32 nopw %cs:0x0\(%rax,%rax,1\)
+[ ]*[a-f0-9]+: 66 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00 data32 data32 data32 data32 data32 nopw %cs:0x0\(%rax,%rax,1\)
0+60 <nop28>:
[ ]*[a-f0-9]+: 90 nop
[ ]*[a-f0-9]+: 90 nop
[ ]*[a-f0-9]+: 90 nop
[ ]*[a-f0-9]+: 90 nop
-[ ]*[a-f0-9]+: 66 66 66 66 2e 0f 1f 84 00 00 00 00 00 nopw %cs:0x0\(%rax,%rax,1\)
-[ ]*[a-f0-9]+: 66 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00 nopw %cs:0x0\(%rax,%rax,1\)
+[ ]*[a-f0-9]+: 66 66 66 66 2e 0f 1f 84 00 00 00 00 00 data32 data32 data32 nopw %cs:0x0\(%rax,%rax,1\)
+[ ]*[a-f0-9]+: 66 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00 data32 data32 data32 data32 data32 nopw %cs:0x0\(%rax,%rax,1\)
0+80 <nop27>:
[ ]*[a-f0-9]+: 90 nop
@@ -40,8 +41,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 66 2e 0f 1f 84 00 00 00 00 00 nopw %cs:0x0\(%rax,%rax,1\)
-[ ]*[a-f0-9]+: 66 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00 nopw %cs:0x0\(%rax,%rax,1\)
+[ ]*[a-f0-9]+: 66 66 66 2e 0f 1f 84 00 00 00 00 00 data32 data32 nopw %cs:0x0\(%rax,%rax,1\)
+[ ]*[a-f0-9]+: 66 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00 data32 data32 data32 data32 data32 nopw %cs:0x0\(%rax,%rax,1\)
0+a0 <nop26>:
[ ]*[a-f0-9]+: 90 nop
@@ -50,8 +51,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 nopw %cs:0x0\(%rax,%rax,1\)
-[ ]*[a-f0-9]+: 66 66 66 66 66 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 data32 nopw %cs:0x0\(%rax,%rax,1\)
+[ ]*[a-f0-9]+: 66 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00 data32 data32 data32 data32 data32 nopw %cs:0x0\(%rax,%rax,1\)
0+c0 <nop25>:
[ ]*[a-f0-9]+: 90 nop
@@ -62,7 +63,7 @@ Disassembly of section .text:
[ ]*[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 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00 nopw %cs:0x0\(%rax,%rax,1\)
+[ ]*[a-f0-9]+: 66 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00 data32 data32 data32 data32 data32 nopw %cs:0x0\(%rax,%rax,1\)
0+e0 <nop24>:
[ ]*[a-f0-9]+: 90 nop
@@ -74,7 +75,7 @@ Disassembly of section .text:
[ ]*[a-f0-9]+: 90 nop
[ ]*[a-f0-9]+: 90 nop
[ ]*[a-f0-9]+: 66 0f 1f 84 00 00 00 00 00 nopw 0x0\(%rax,%rax,1\)
-[ ]*[a-f0-9]+: 66 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00 nopw %cs:0x0\(%rax,%rax,1\)
+[ ]*[a-f0-9]+: 66 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00 data32 data32 data32 data32 data32 nopw %cs:0x0\(%rax,%rax,1\)
0+100 <nop23>:
[ ]*[a-f0-9]+: 90 nop
@@ -87,7 +88,7 @@ Disassembly of section .text:
[ ]*[a-f0-9]+: 90 nop
[ ]*[a-f0-9]+: 90 nop
[ ]*[a-f0-9]+: 0f 1f 84 00 00 00 00 00 nopl 0x0\(%rax,%rax,1\)
-[ ]*[a-f0-9]+: 66 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00 nopw %cs:0x0\(%rax,%rax,1\)
+[ ]*[a-f0-9]+: 66 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00 data32 data32 data32 data32 data32 nopw %cs:0x0\(%rax,%rax,1\)
0+120 <nop22>:
[ ]*[a-f0-9]+: 90 nop
@@ -101,7 +102,7 @@ Disassembly of section .text:
[ ]*[a-f0-9]+: 90 nop
[ ]*[a-f0-9]+: 90 nop
[ ]*[a-f0-9]+: 0f 1f 80 00 00 00 00 nopl 0x0\(%rax\)
-[ ]*[a-f0-9]+: 66 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00 nopw %cs:0x0\(%rax,%rax,1\)
+[ ]*[a-f0-9]+: 66 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00 data32 data32 data32 data32 data32 nopw %cs:0x0\(%rax,%rax,1\)
0+140 <nop21>:
[ ]*[a-f0-9]+: 90 nop
@@ -116,7 +117,7 @@ Disassembly of section .text:
[ ]*[a-f0-9]+: 90 nop
[ ]*[a-f0-9]+: 90 nop
[ ]*[a-f0-9]+: 66 0f 1f 44 00 00 nopw 0x0\(%rax,%rax,1\)
-[ ]*[a-f0-9]+: 66 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00 nopw %cs:0x0\(%rax,%rax,1\)
+[ ]*[a-f0-9]+: 66 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00 data32 data32 data32 data32 data32 nopw %cs:0x0\(%rax,%rax,1\)
0+160 <nop20>:
[ ]*[a-f0-9]+: 90 nop
@@ -132,7 +133,7 @@ Disassembly of section .text:
[ ]*[a-f0-9]+: 90 nop
[ ]*[a-f0-9]+: 90 nop
[ ]*[a-f0-9]+: 0f 1f 44 00 00 nopl 0x0\(%rax,%rax,1\)
-[ ]*[a-f0-9]+: 66 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00 nopw %cs:0x0\(%rax,%rax,1\)
+[ ]*[a-f0-9]+: 66 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00 data32 data32 data32 data32 data32 nopw %cs:0x0\(%rax,%rax,1\)
0+180 <nop19>:
[ ]*[a-f0-9]+: 90 nop
@@ -149,7 +150,7 @@ Disassembly of section .text:
[ ]*[a-f0-9]+: 90 nop
[ ]*[a-f0-9]+: 90 nop
[ ]*[a-f0-9]+: 0f 1f 40 00 nopl 0x0\(%rax\)
-[ ]*[a-f0-9]+: 66 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00 nopw %cs:0x0\(%rax,%rax,1\)
+[ ]*[a-f0-9]+: 66 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00 data32 data32 data32 data32 data32 nopw %cs:0x0\(%rax,%rax,1\)
0+1a0 <nop18>:
[ ]*[a-f0-9]+: 90 nop
@@ -167,7 +168,7 @@ Disassembly of section .text:
[ ]*[a-f0-9]+: 90 nop
[ ]*[a-f0-9]+: 90 nop
[ ]*[a-f0-9]+: 0f 1f 00 nopl \(%rax\)
-[ ]*[a-f0-9]+: 66 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00 nopw %cs:0x0\(%rax,%rax,1\)
+[ ]*[a-f0-9]+: 66 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00 data32 data32 data32 data32 data32 nopw %cs:0x0\(%rax,%rax,1\)
0+1c0 <nop17>:
[ ]*[a-f0-9]+: 90 nop
@@ -186,7 +187,7 @@ Disassembly of section .text:
[ ]*[a-f0-9]+: 90 nop
[ ]*[a-f0-9]+: 90 nop
[ ]*[a-f0-9]+: 66 90 xchg %ax,%ax
-[ ]*[a-f0-9]+: 66 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00 nopw %cs:0x0\(%rax,%rax,1\)
+[ ]*[a-f0-9]+: 66 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00 data32 data32 data32 data32 data32 nopw %cs:0x0\(%rax,%rax,1\)
0+1e0 <nop16>:
[ ]*[a-f0-9]+: 90 nop
@@ -206,5 +207,5 @@ Disassembly of section .text:
[ ]*[a-f0-9]+: 90 nop
[ ]*[a-f0-9]+: 90 nop
[ ]*[a-f0-9]+: 90 nop
-[ ]*[a-f0-9]+: 66 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00 nopw %cs:0x0\(%rax,%rax,1\)
+[ ]*[a-f0-9]+: 66 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00 data32 data32 data32 data32 data32 nopw %cs: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 c706b8e1b84..91afdc2ef83 100644
--- a/gas/testsuite/gas/i386/x86-64-nops-4.d
+++ b/gas/testsuite/gas/i386/x86-64-nops-4.d
@@ -5,34 +5,35 @@
.*: +file format .*
+
Disassembly of section .text:
0+ <nop31>:
[ ]*[a-f0-9]+: 90 nop
[ ]*[a-f0-9]+: 90 nop
-[ ]*[a-f0-9]+: 66 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00 nopw %cs:0x0\(%rax,%rax,1\)
-[ ]*[a-f0-9]+: 66 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00 nopw %cs:0x0\(%rax,%rax,1\)
+[ ]*[a-f0-9]+: 66 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00 data32 data32 data32 data32 data32 nopw %cs:0x0\(%rax,%rax,1\)
+[ ]*[a-f0-9]+: 66 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00 data32 data32 data32 data32 data32 nopw %cs:0x0\(%rax,%rax,1\)
0+20 <nop30>:
[ ]*[a-f0-9]+: 90 nop
[ ]*[a-f0-9]+: 90 nop
-[ ]*[a-f0-9]+: 66 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00 nopw %cs:0x0\(%rax,%rax,1\)
-[ ]*[a-f0-9]+: 66 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00 nopw %cs:0x0\(%rax,%rax,1\)
+[ ]*[a-f0-9]+: 66 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00 data32 data32 data32 data32 data32 nopw %cs:0x0\(%rax,%rax,1\)
+[ ]*[a-f0-9]+: 66 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00 data32 data32 data32 data32 data32 nopw %cs: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 66 66 66 2e 0f 1f 84 00 00 00 00 00 nopw %cs:0x0\(%rax,%rax,1\)
-[ ]*[a-f0-9]+: 66 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00 nopw %cs:0x0\(%rax,%rax,1\)
+[ ]*[a-f0-9]+: 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00 data32 data32 data32 data32 nopw %cs:0x0\(%rax,%rax,1\)
+[ ]*[a-f0-9]+: 66 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00 data32 data32 data32 data32 data32 nopw %cs:0x0\(%rax,%rax,1\)
0+60 <nop28>:
[ ]*[a-f0-9]+: 90 nop
[ ]*[a-f0-9]+: 90 nop
[ ]*[a-f0-9]+: 90 nop
[ ]*[a-f0-9]+: 90 nop
-[ ]*[a-f0-9]+: 66 66 66 66 2e 0f 1f 84 00 00 00 00 00 nopw %cs:0x0\(%rax,%rax,1\)
-[ ]*[a-f0-9]+: 66 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00 nopw %cs:0x0\(%rax,%rax,1\)
+[ ]*[a-f0-9]+: 66 66 66 66 2e 0f 1f 84 00 00 00 00 00 data32 data32 data32 nopw %cs:0x0\(%rax,%rax,1\)
+[ ]*[a-f0-9]+: 66 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00 data32 data32 data32 data32 data32 nopw %cs:0x0\(%rax,%rax,1\)
0+80 <nop27>:
[ ]*[a-f0-9]+: 90 nop
@@ -40,8 +41,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 66 2e 0f 1f 84 00 00 00 00 00 nopw %cs:0x0\(%rax,%rax,1\)
-[ ]*[a-f0-9]+: 66 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00 nopw %cs:0x0\(%rax,%rax,1\)
+[ ]*[a-f0-9]+: 66 66 66 2e 0f 1f 84 00 00 00 00 00 data32 data32 nopw %cs:0x0\(%rax,%rax,1\)
+[ ]*[a-f0-9]+: 66 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00 data32 data32 data32 data32 data32 nopw %cs:0x0\(%rax,%rax,1\)
0+a0 <nop26>:
[ ]*[a-f0-9]+: 90 nop
@@ -50,8 +51,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 nopw %cs:0x0\(%rax,%rax,1\)
-[ ]*[a-f0-9]+: 66 66 66 66 66 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 data32 nopw %cs:0x0\(%rax,%rax,1\)
+[ ]*[a-f0-9]+: 66 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00 data32 data32 data32 data32 data32 nopw %cs:0x0\(%rax,%rax,1\)
0+c0 <nop25>:
[ ]*[a-f0-9]+: 90 nop
@@ -62,7 +63,7 @@ Disassembly of section .text:
[ ]*[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 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00 nopw %cs:0x0\(%rax,%rax,1\)
+[ ]*[a-f0-9]+: 66 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00 data32 data32 data32 data32 data32 nopw %cs:0x0\(%rax,%rax,1\)
0+e0 <nop24>:
[ ]*[a-f0-9]+: 90 nop
@@ -74,7 +75,7 @@ Disassembly of section .text:
[ ]*[a-f0-9]+: 90 nop
[ ]*[a-f0-9]+: 90 nop
[ ]*[a-f0-9]+: 66 0f 1f 84 00 00 00 00 00 nopw 0x0\(%rax,%rax,1\)
-[ ]*[a-f0-9]+: 66 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00 nopw %cs:0x0\(%rax,%rax,1\)
+[ ]*[a-f0-9]+: 66 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00 data32 data32 data32 data32 data32 nopw %cs:0x0\(%rax,%rax,1\)
0+100 <nop23>:
[ ]*[a-f0-9]+: 90 nop
@@ -87,7 +88,7 @@ Disassembly of section .text:
[ ]*[a-f0-9]+: 90 nop
[ ]*[a-f0-9]+: 90 nop
[ ]*[a-f0-9]+: 0f 1f 84 00 00 00 00 00 nopl 0x0\(%rax,%rax,1\)
-[ ]*[a-f0-9]+: 66 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00 nopw %cs:0x0\(%rax,%rax,1\)
+[ ]*[a-f0-9]+: 66 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00 data32 data32 data32 data32 data32 nopw %cs:0x0\(%rax,%rax,1\)
0+120 <nop22>:
[ ]*[a-f0-9]+: 90 nop
@@ -101,7 +102,7 @@ Disassembly of section .text:
[ ]*[a-f0-9]+: 90 nop
[ ]*[a-f0-9]+: 90 nop
[ ]*[a-f0-9]+: 0f 1f 80 00 00 00 00 nopl 0x0\(%rax\)
-[ ]*[a-f0-9]+: 66 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00 nopw %cs:0x0\(%rax,%rax,1\)
+[ ]*[a-f0-9]+: 66 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00 data32 data32 data32 data32 data32 nopw %cs:0x0\(%rax,%rax,1\)
0+140 <nop21>:
[ ]*[a-f0-9]+: 90 nop
@@ -116,7 +117,7 @@ Disassembly of section .text:
[ ]*[a-f0-9]+: 90 nop
[ ]*[a-f0-9]+: 90 nop
[ ]*[a-f0-9]+: 66 0f 1f 44 00 00 nopw 0x0\(%rax,%rax,1\)
-[ ]*[a-f0-9]+: 66 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00 nopw %cs:0x0\(%rax,%rax,1\)
+[ ]*[a-f0-9]+: 66 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00 data32 data32 data32 data32 data32 nopw %cs:0x0\(%rax,%rax,1\)
0+160 <nop20>:
[ ]*[a-f0-9]+: 90 nop
@@ -132,7 +133,7 @@ Disassembly of section .text:
[ ]*[a-f0-9]+: 90 nop
[ ]*[a-f0-9]+: 90 nop
[ ]*[a-f0-9]+: 0f 1f 44 00 00 nopl 0x0\(%rax,%rax,1\)
-[ ]*[a-f0-9]+: 66 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00 nopw %cs:0x0\(%rax,%rax,1\)
+[ ]*[a-f0-9]+: 66 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00 data32 data32 data32 data32 data32 nopw %cs:0x0\(%rax,%rax,1\)
0+180 <nop19>:
[ ]*[a-f0-9]+: 90 nop
@@ -149,7 +150,7 @@ Disassembly of section .text:
[ ]*[a-f0-9]+: 90 nop
[ ]*[a-f0-9]+: 90 nop
[ ]*[a-f0-9]+: 0f 1f 40 00 nopl 0x0\(%rax\)
-[ ]*[a-f0-9]+: 66 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00 nopw %cs:0x0\(%rax,%rax,1\)
+[ ]*[a-f0-9]+: 66 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00 data32 data32 data32 data32 data32 nopw %cs:0x0\(%rax,%rax,1\)
0+1a0 <nop18>:
[ ]*[a-f0-9]+: 90 nop
@@ -167,7 +168,7 @@ Disassembly of section .text:
[ ]*[a-f0-9]+: 90 nop
[ ]*[a-f0-9]+: 90 nop
[ ]*[a-f0-9]+: 0f 1f 00 nopl \(%rax\)
-[ ]*[a-f0-9]+: 66 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00 nopw %cs:0x0\(%rax,%rax,1\)
+[ ]*[a-f0-9]+: 66 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00 data32 data32 data32 data32 data32 nopw %cs:0x0\(%rax,%rax,1\)
0+1c0 <nop17>:
[ ]*[a-f0-9]+: 90 nop
@@ -186,7 +187,7 @@ Disassembly of section .text:
[ ]*[a-f0-9]+: 90 nop
[ ]*[a-f0-9]+: 90 nop
[ ]*[a-f0-9]+: 66 90 xchg %ax,%ax
-[ ]*[a-f0-9]+: 66 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00 nopw %cs:0x0\(%rax,%rax,1\)
+[ ]*[a-f0-9]+: 66 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00 data32 data32 data32 data32 data32 nopw %cs:0x0\(%rax,%rax,1\)
0+1e0 <nop16>:
[ ]*[a-f0-9]+: 90 nop
@@ -206,5 +207,5 @@ Disassembly of section .text:
[ ]*[a-f0-9]+: 90 nop
[ ]*[a-f0-9]+: 90 nop
[ ]*[a-f0-9]+: 90 nop
-[ ]*[a-f0-9]+: 66 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00 nopw %cs:0x0\(%rax,%rax,1\)
+[ ]*[a-f0-9]+: 66 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00 data32 data32 data32 data32 data32 nopw %cs: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 05d1e2e86fc..b0bd3dc441e 100644
--- a/gas/testsuite/gas/i386/x86-64-nops-5-k8.d
+++ b/gas/testsuite/gas/i386/x86-64-nops-5-k8.d
@@ -5,6 +5,7 @@
.*: +file format .*
+
Disassembly of section .text:
0+ <i386>:
@@ -24,23 +25,23 @@ Disassembly of section .text:
0+30 <i686>:
[ ]*[a-f0-9]+: 0f be f0 movsbl %al,%esi
-[ ]*[a-f0-9]+: 66 66 66 66 2e 0f 1f 84 00 00 00 00 00 nopw %cs:0x0\(%rax,%rax,1\)
+[ ]*[a-f0-9]+: 66 66 66 66 2e 0f 1f 84 00 00 00 00 00 data32 data32 data32 nopw %cs:0x0\(%rax,%rax,1\)
0+40 <pentium4>:
[ ]*[a-f0-9]+: 0f be f0 movsbl %al,%esi
-[ ]*[a-f0-9]+: 66 66 66 66 2e 0f 1f 84 00 00 00 00 00 nopw %cs:0x0\(%rax,%rax,1\)
+[ ]*[a-f0-9]+: 66 66 66 66 2e 0f 1f 84 00 00 00 00 00 data32 data32 data32 nopw %cs:0x0\(%rax,%rax,1\)
0+50 <nocona>:
[ ]*[a-f0-9]+: 0f be f0 movsbl %al,%esi
-[ ]*[a-f0-9]+: 66 66 66 66 2e 0f 1f 84 00 00 00 00 00 nopw %cs:0x0\(%rax,%rax,1\)
+[ ]*[a-f0-9]+: 66 66 66 66 2e 0f 1f 84 00 00 00 00 00 data32 data32 data32 nopw %cs:0x0\(%rax,%rax,1\)
0+60 <core>:
[ ]*[a-f0-9]+: 0f be f0 movsbl %al,%esi
-[ ]*[a-f0-9]+: 66 66 66 66 2e 0f 1f 84 00 00 00 00 00 nopw %cs:0x0\(%rax,%rax,1\)
+[ ]*[a-f0-9]+: 66 66 66 66 2e 0f 1f 84 00 00 00 00 00 data32 data32 data32 nopw %cs:0x0\(%rax,%rax,1\)
0+70 <core2>:
[ ]*[a-f0-9]+: 0f be f0 movsbl %al,%esi
-[ ]*[a-f0-9]+: 66 66 66 66 2e 0f 1f 84 00 00 00 00 00 nopw %cs:0x0\(%rax,%rax,1\)
+[ ]*[a-f0-9]+: 66 66 66 66 2e 0f 1f 84 00 00 00 00 00 data32 data32 data32 nopw %cs:0x0\(%rax,%rax,1\)
0+80 <k6>:
[ ]*[a-f0-9]+: 0f be f0 movsbl %al,%esi
@@ -64,7 +65,7 @@ Disassembly of section .text:
0+c0 <generic64>:
[ ]*[a-f0-9]+: 0f be f0 movsbl %al,%esi
-[ ]*[a-f0-9]+: 66 66 66 66 2e 0f 1f 84 00 00 00 00 00 nopw %cs:0x0\(%rax,%rax,1\)
+[ ]*[a-f0-9]+: 66 66 66 66 2e 0f 1f 84 00 00 00 00 00 data32 data32 data32 nopw %cs:0x0\(%rax,%rax,1\)
0+d0 <amdfam10>:
[ ]*[a-f0-9]+: 0f be f0 movsbl %al,%esi
diff --git a/gas/testsuite/gas/i386/x86-64-nops-5.d b/gas/testsuite/gas/i386/x86-64-nops-5.d
index cf0401d9886..475300d7622 100644
--- a/gas/testsuite/gas/i386/x86-64-nops-5.d
+++ b/gas/testsuite/gas/i386/x86-64-nops-5.d
@@ -4,6 +4,7 @@
.*: +file format .*
+
Disassembly of section .text:
0+ <i386>:
@@ -23,23 +24,23 @@ Disassembly of section .text:
0+30 <i686>:
[ ]*[a-f0-9]+: 0f be f0 movsbl %al,%esi
-[ ]*[a-f0-9]+: 66 66 66 66 2e 0f 1f 84 00 00 00 00 00 nopw %cs:0x0\(%rax,%rax,1\)
+[ ]*[a-f0-9]+: 66 66 66 66 2e 0f 1f 84 00 00 00 00 00 data32 data32 data32 nopw %cs:0x0\(%rax,%rax,1\)
0+40 <pentium4>:
[ ]*[a-f0-9]+: 0f be f0 movsbl %al,%esi
-[ ]*[a-f0-9]+: 66 66 66 66 2e 0f 1f 84 00 00 00 00 00 nopw %cs:0x0\(%rax,%rax,1\)
+[ ]*[a-f0-9]+: 66 66 66 66 2e 0f 1f 84 00 00 00 00 00 data32 data32 data32 nopw %cs:0x0\(%rax,%rax,1\)
0+50 <nocona>:
[ ]*[a-f0-9]+: 0f be f0 movsbl %al,%esi
-[ ]*[a-f0-9]+: 66 66 66 66 2e 0f 1f 84 00 00 00 00 00 nopw %cs:0x0\(%rax,%rax,1\)
+[ ]*[a-f0-9]+: 66 66 66 66 2e 0f 1f 84 00 00 00 00 00 data32 data32 data32 nopw %cs:0x0\(%rax,%rax,1\)
0+60 <core>:
[ ]*[a-f0-9]+: 0f be f0 movsbl %al,%esi
-[ ]*[a-f0-9]+: 66 66 66 66 2e 0f 1f 84 00 00 00 00 00 nopw %cs:0x0\(%rax,%rax,1\)
+[ ]*[a-f0-9]+: 66 66 66 66 2e 0f 1f 84 00 00 00 00 00 data32 data32 data32 nopw %cs:0x0\(%rax,%rax,1\)
0+70 <core2>:
[ ]*[a-f0-9]+: 0f be f0 movsbl %al,%esi
-[ ]*[a-f0-9]+: 66 66 66 66 2e 0f 1f 84 00 00 00 00 00 nopw %cs:0x0\(%rax,%rax,1\)
+[ ]*[a-f0-9]+: 66 66 66 66 2e 0f 1f 84 00 00 00 00 00 data32 data32 data32 nopw %cs:0x0\(%rax,%rax,1\)
0+80 <k6>:
[ ]*[a-f0-9]+: 0f be f0 movsbl %al,%esi
@@ -63,7 +64,7 @@ Disassembly of section .text:
0+c0 <generic64>:
[ ]*[a-f0-9]+: 0f be f0 movsbl %al,%esi
-[ ]*[a-f0-9]+: 66 66 66 66 2e 0f 1f 84 00 00 00 00 00 nopw %cs:0x0\(%rax,%rax,1\)
+[ ]*[a-f0-9]+: 66 66 66 66 2e 0f 1f 84 00 00 00 00 00 data32 data32 data32 nopw %cs:0x0\(%rax,%rax,1\)
0+d0 <amdfam10>:
[ ]*[a-f0-9]+: 0f be f0 movsbl %al,%esi
diff --git a/gas/testsuite/gas/i386/x86-64-rep.d b/gas/testsuite/gas/i386/x86-64-rep.d
index d3f2acfdc62..cafb9c70720 100644
--- a/gas/testsuite/gas/i386/x86-64-rep.d
+++ b/gas/testsuite/gas/i386/x86-64-rep.d
@@ -32,30 +32,30 @@ Disassembly of section .text:
37: f3 48 ab[ ]+rep stos %rax,%es:\(%rdi\)
3a: f3 48 a7[ ]+repz cmpsq %es:\(%rdi\),%ds:\(%rsi\)
3d: f3 48 af[ ]+repz scas %es:\(%rdi\),%rax
- 40: 67 f3 6c[ ]+addr32 rep insb \(%dx\),%es:\(%edi\)
- 43: 67 f3 6e[ ]+addr32 rep outsb %ds:\(%esi\),\(%dx\)
- 46: 67 f3 a4[ ]+addr32 rep movsb %ds:\(%esi\),%es:\(%edi\)
- 49: 67 f3 ac[ ]+addr32 rep lods %ds:\(%esi\),%al
- 4c: 67 f3 aa[ ]+addr32 rep stos %al,%es:\(%edi\)
- 4f: 67 f3 a6[ ]+addr32 repz cmpsb %es:\(%edi\),%ds:\(%esi\)
- 52: 67 f3 ae[ ]+addr32 repz scas %es:\(%edi\),%al
- 55: 67 66 f3 6d[ ]+addr32 rep insw \(%dx\),%es:\(%edi\)
- 59: 67 66 f3 6f[ ]+addr32 rep outsw %ds:\(%esi\),\(%dx\)
- 5d: 67 66 f3 a5[ ]+addr32 rep movsw %ds:\(%esi\),%es:\(%edi\)
- 61: 67 66 f3 ad[ ]+addr32 rep lods %ds:\(%esi\),%ax
- 65: 67 66 f3 ab[ ]+addr32 rep stos %ax,%es:\(%edi\)
- 69: 67 66 f3 a7[ ]+addr32 repz cmpsw %es:\(%edi\),%ds:\(%esi\)
- 6d: 67 66 f3 af[ ]+addr32 repz scas %es:\(%edi\),%ax
- 71: 67 f3 6d[ ]+addr32 rep insl \(%dx\),%es:\(%edi\)
- 74: 67 f3 6f[ ]+addr32 rep outsl %ds:\(%esi\),\(%dx\)
- 77: 67 f3 a5[ ]+addr32 rep movsl %ds:\(%esi\),%es:\(%edi\)
- 7a: 67 f3 ad[ ]+addr32 rep lods %ds:\(%esi\),%eax
- 7d: 67 f3 ab[ ]+addr32 rep stos %eax,%es:\(%edi\)
- 80: 67 f3 a7[ ]+addr32 repz cmpsl %es:\(%edi\),%ds:\(%esi\)
- 83: 67 f3 af[ ]+addr32 repz scas %es:\(%edi\),%eax
- 86: 67 f3 48 a5[ ]+addr32 rep movsq %ds:\(%esi\),%es:\(%edi\)
- 8a: 67 f3 48 ad[ ]+addr32 rep lods %ds:\(%esi\),%rax
- 8e: 67 f3 48 ab[ ]+addr32 rep stos %rax,%es:\(%edi\)
- 92: 67 f3 48 a7[ ]+addr32 repz cmpsq %es:\(%edi\),%ds:\(%esi\)
- 96: 67 f3 48 af[ ]+addr32 repz scas %es:\(%edi\),%rax
+ 40: 67 f3 6c[ ]+rep insb \(%dx\),%es:\(%edi\)
+ 43: 67 f3 6e[ ]+rep outsb %ds:\(%esi\),\(%dx\)
+ 46: 67 f3 a4[ ]+rep movsb %ds:\(%esi\),%es:\(%edi\)
+ 49: 67 f3 ac[ ]+rep lods %ds:\(%esi\),%al
+ 4c: 67 f3 aa[ ]+rep stos %al,%es:\(%edi\)
+ 4f: 67 f3 a6[ ]+repz cmpsb %es:\(%edi\),%ds:\(%esi\)
+ 52: 67 f3 ae[ ]+repz scas %es:\(%edi\),%al
+ 55: 67 66 f3 6d[ ]+rep insw \(%dx\),%es:\(%edi\)
+ 59: 67 66 f3 6f[ ]+rep outsw %ds:\(%esi\),\(%dx\)
+ 5d: 67 66 f3 a5[ ]+rep movsw %ds:\(%esi\),%es:\(%edi\)
+ 61: 67 66 f3 ad[ ]+rep lods %ds:\(%esi\),%ax
+ 65: 67 66 f3 ab[ ]+rep stos %ax,%es:\(%edi\)
+ 69: 67 66 f3 a7[ ]+repz cmpsw %es:\(%edi\),%ds:\(%esi\)
+ 6d: 67 66 f3 af[ ]+repz scas %es:\(%edi\),%ax
+ 71: 67 f3 6d[ ]+rep insl \(%dx\),%es:\(%edi\)
+ 74: 67 f3 6f[ ]+rep outsl %ds:\(%esi\),\(%dx\)
+ 77: 67 f3 a5[ ]+rep movsl %ds:\(%esi\),%es:\(%edi\)
+ 7a: 67 f3 ad[ ]+rep lods %ds:\(%esi\),%eax
+ 7d: 67 f3 ab[ ]+rep stos %eax,%es:\(%edi\)
+ 80: 67 f3 a7[ ]+repz cmpsl %es:\(%edi\),%ds:\(%esi\)
+ 83: 67 f3 af[ ]+repz scas %es:\(%edi\),%eax
+ 86: 67 f3 48 a5[ ]+rep movsq %ds:\(%esi\),%es:\(%edi\)
+ 8a: 67 f3 48 ad[ ]+rep lods %ds:\(%esi\),%rax
+ 8e: 67 f3 48 ab[ ]+rep stos %rax,%es:\(%edi\)
+ 92: 67 f3 48 a7[ ]+repz cmpsq %es:\(%edi\),%ds:\(%esi\)
+ 96: 67 f3 48 af[ ]+repz scas %es:\(%edi\),%rax
#pass
diff --git a/gas/testsuite/gas/i386/x86-64-stack-intel.d b/gas/testsuite/gas/i386/x86-64-stack-intel.d
index aaeff2ffcb3..a09be6cb87c 100644
--- a/gas/testsuite/gas/i386/x86-64-stack-intel.d
+++ b/gas/testsuite/gas/i386/x86-64-stack-intel.d
@@ -7,34 +7,34 @@
Disassembly of section .text:
0+ <_start>:
-[ ]*[0-9a-f]+:[ ]+50[ ]+push[ ]+rax
-[ ]*[0-9a-f]+:[ ]+66 50[ ]+push[ ]+ax
-[ ]*[0-9a-f]+:[ ]+66 48 50[ ]+push[ ]+rax
-[ ]*[0-9a-f]+:[ ]+58[ ]+pop[ ]+rax
-[ ]*[0-9a-f]+:[ ]+66 58[ ]+pop[ ]+ax
-[ ]*[0-9a-f]+:[ ]+66 48 58[ ]+pop[ ]+rax
-[ ]*[0-9a-f]+:[ ]+8f c0[ ]+pop[ ]+rax
-[ ]*[0-9a-f]+:[ ]+66 8f c0[ ]+pop[ ]+ax
-[ ]*[0-9a-f]+:[ ]+66 48 8f c0[ ]+pop[ ]+rax
-[ ]*[0-9a-f]+:[ ]+8f 00[ ]+pop[ ]+QWORD PTR \[rax\]
-[ ]*[0-9a-f]+:[ ]+66 8f 00[ ]+pop[ ]+WORD PTR \[rax\]
-[ ]*[0-9a-f]+:[ ]+66 48 8f 00[ ]+pop[ ]+QWORD PTR \[rax\]
-[ ]*[0-9a-f]+:[ ]+ff d0[ ]+call[ ]+rax
-[ ]*[0-9a-f]+:[ ]+66 ff d0[ ]+call[ ]+ax
-[ ]*[0-9a-f]+:[ ]+66 48 ff d0[ ]+call[ ]+rax
-[ ]*[0-9a-f]+:[ ]+ff 10[ ]+call[ ]+QWORD PTR \[rax\]
-[ ]*[0-9a-f]+:[ ]+66 ff 10[ ]+call[ ]+WORD PTR \[rax\]
-[ ]*[0-9a-f]+:[ ]+66 48 ff 10[ ]+call[ ]+QWORD PTR \[rax\]
-[ ]*[0-9a-f]+:[ ]+ff e0[ ]+jmp[ ]+rax
-[ ]*[0-9a-f]+:[ ]+66 ff e0[ ]+jmp[ ]+ax
-[ ]*[0-9a-f]+:[ ]+66 48 ff e0[ ]+jmp[ ]+rax
-[ ]*[0-9a-f]+:[ ]+ff 20[ ]+jmp[ ]+QWORD PTR \[rax\]
-[ ]*[0-9a-f]+:[ ]+66 ff 20[ ]+jmp[ ]+WORD PTR \[rax\]
-[ ]*[0-9a-f]+:[ ]+66 48 ff 20[ ]+jmp[ ]+QWORD PTR \[rax\]
-[ ]*[0-9a-f]+:[ ]+ff f0[ ]+push[ ]+rax
-[ ]*[0-9a-f]+:[ ]+66 ff f0[ ]+push[ ]+ax
-[ ]*[0-9a-f]+:[ ]+66 48 ff f0[ ]+push[ ]+rax
-[ ]*[0-9a-f]+:[ ]+ff 30[ ]+push[ ]+QWORD PTR \[rax\]
-[ ]*[0-9a-f]+:[ ]+66 ff 30[ ]+push[ ]+WORD PTR \[rax\]
-[ ]*[0-9a-f]+:[ ]+66 48 ff 30[ ]+push[ ]+QWORD PTR \[rax\]
+[ ]*[a-f0-9]+: 50 push rax
+[ ]*[a-f0-9]+: 66 50 push ax
+[ ]*[a-f0-9]+: 66 48 50 data32 push rax
+[ ]*[a-f0-9]+: 58 pop rax
+[ ]*[a-f0-9]+: 66 58 pop ax
+[ ]*[a-f0-9]+: 66 48 58 data32 pop rax
+[ ]*[a-f0-9]+: 8f c0 pop rax
+[ ]*[a-f0-9]+: 66 8f c0 pop ax
+[ ]*[a-f0-9]+: 66 48 8f c0 data32 pop rax
+[ ]*[a-f0-9]+: 8f 00 pop QWORD PTR \[rax\]
+[ ]*[a-f0-9]+: 66 8f 00 pop WORD PTR \[rax\]
+[ ]*[a-f0-9]+: 66 48 8f 00 data32 pop QWORD PTR \[rax\]
+[ ]*[a-f0-9]+: ff d0 call rax
+[ ]*[a-f0-9]+: 66 ff d0 call ax
+[ ]*[a-f0-9]+: 66 48 ff d0 data32 call rax
+[ ]*[a-f0-9]+: ff 10 call QWORD PTR \[rax\]
+[ ]*[a-f0-9]+: 66 ff 10 call WORD PTR \[rax\]
+[ ]*[a-f0-9]+: 66 48 ff 10 data32 call QWORD PTR \[rax\]
+[ ]*[a-f0-9]+: ff e0 jmp rax
+[ ]*[a-f0-9]+: 66 ff e0 jmp ax
+[ ]*[a-f0-9]+: 66 48 ff e0 data32 jmp rax
+[ ]*[a-f0-9]+: ff 20 jmp QWORD PTR \[rax\]
+[ ]*[a-f0-9]+: 66 ff 20 jmp WORD PTR \[rax\]
+[ ]*[a-f0-9]+: 66 48 ff 20 data32 jmp QWORD PTR \[rax\]
+[ ]*[a-f0-9]+: ff f0 push rax
+[ ]*[a-f0-9]+: 66 ff f0 push ax
+[ ]*[a-f0-9]+: 66 48 ff f0 data32 push rax
+[ ]*[a-f0-9]+: ff 30 push QWORD PTR \[rax\]
+[ ]*[a-f0-9]+: 66 ff 30 push WORD PTR \[rax\]
+[ ]*[a-f0-9]+: 66 48 ff 30 data32 push QWORD PTR \[rax\]
#pass
diff --git a/gas/testsuite/gas/i386/x86-64-stack-suffix.d b/gas/testsuite/gas/i386/x86-64-stack-suffix.d
index 75fd900feae..ce1386a1e45 100644
--- a/gas/testsuite/gas/i386/x86-64-stack-suffix.d
+++ b/gas/testsuite/gas/i386/x86-64-stack-suffix.d
@@ -7,34 +7,34 @@
Disassembly of section .text:
0+ <_start>:
-[ ]*[0-9a-f]+:[ ]+50[ ]+pushq[ ]+%rax
-[ ]*[0-9a-f]+:[ ]+66 50[ ]+pushw[ ]+%ax
-[ ]*[0-9a-f]+:[ ]+66 48 50[ ]+pushq[ ]+%rax
-[ ]*[0-9a-f]+:[ ]+58[ ]+popq[ ]+%rax
-[ ]*[0-9a-f]+:[ ]+66 58[ ]+popw[ ]+%ax
-[ ]*[0-9a-f]+:[ ]+66 48 58[ ]+popq[ ]+%rax
-[ ]*[0-9a-f]+:[ ]+8f c0[ ]+popq[ ]+%rax
-[ ]*[0-9a-f]+:[ ]+66 8f c0[ ]+popw[ ]+%ax
-[ ]*[0-9a-f]+:[ ]+66 48 8f c0[ ]+popq[ ]+%rax
-[ ]*[0-9a-f]+:[ ]+8f 00[ ]+popq[ ]+\(%rax\)
-[ ]*[0-9a-f]+:[ ]+66 8f 00[ ]+popw[ ]+\(%rax\)
-[ ]*[0-9a-f]+:[ ]+66 48 8f 00[ ]+popq[ ]+\(%rax\)
-[ ]*[0-9a-f]+:[ ]+ff d0[ ]+callq[ ]+\*%rax
-[ ]*[0-9a-f]+:[ ]+66 ff d0[ ]+callw[ ]+\*%ax
-[ ]*[0-9a-f]+:[ ]+66 48 ff d0[ ]+callq[ ]+\*%rax
-[ ]*[0-9a-f]+:[ ]+ff 10[ ]+callq[ ]+\*\(%rax\)
-[ ]*[0-9a-f]+:[ ]+66 ff 10[ ]+callw[ ]+\*\(%rax\)
-[ ]*[0-9a-f]+:[ ]+66 48 ff 10[ ]+callq[ ]+\*\(%rax\)
-[ ]*[0-9a-f]+:[ ]+ff e0[ ]+jmpq[ ]+\*%rax
-[ ]*[0-9a-f]+:[ ]+66 ff e0[ ]+jmpw[ ]+\*%ax
-[ ]*[0-9a-f]+:[ ]+66 48 ff e0[ ]+jmpq[ ]+\*%rax
-[ ]*[0-9a-f]+:[ ]+ff 20[ ]+jmpq[ ]+\*\(%rax\)
-[ ]*[0-9a-f]+:[ ]+66 ff 20[ ]+jmpw[ ]+\*\(%rax\)
-[ ]*[0-9a-f]+:[ ]+66 48 ff 20[ ]+jmpq[ ]+\*\(%rax\)
-[ ]*[0-9a-f]+:[ ]+ff f0[ ]+pushq[ ]+%rax
-[ ]*[0-9a-f]+:[ ]+66 ff f0[ ]+pushw[ ]+%ax
-[ ]*[0-9a-f]+:[ ]+66 48 ff f0[ ]+pushq[ ]+%rax
-[ ]*[0-9a-f]+:[ ]+ff 30[ ]+pushq[ ]+\(%rax\)
-[ ]*[0-9a-f]+:[ ]+66 ff 30[ ]+pushw[ ]+\(%rax\)
-[ ]*[0-9a-f]+:[ ]+66 48 ff 30[ ]+pushq[ ]+\(%rax\)
+[ ]*[a-f0-9]+: 50 pushq %rax
+[ ]*[a-f0-9]+: 66 50 pushw %ax
+[ ]*[a-f0-9]+: 66 48 50 data32 pushq %rax
+[ ]*[a-f0-9]+: 58 popq %rax
+[ ]*[a-f0-9]+: 66 58 popw %ax
+[ ]*[a-f0-9]+: 66 48 58 data32 popq %rax
+[ ]*[a-f0-9]+: 8f c0 popq %rax
+[ ]*[a-f0-9]+: 66 8f c0 popw %ax
+[ ]*[a-f0-9]+: 66 48 8f c0 data32 popq %rax
+[ ]*[a-f0-9]+: 8f 00 popq \(%rax\)
+[ ]*[a-f0-9]+: 66 8f 00 popw \(%rax\)
+[ ]*[a-f0-9]+: 66 48 8f 00 data32 popq \(%rax\)
+[ ]*[a-f0-9]+: ff d0 callq \*%rax
+[ ]*[a-f0-9]+: 66 ff d0 callw \*%ax
+[ ]*[a-f0-9]+: 66 48 ff d0 data32 callq \*%rax
+[ ]*[a-f0-9]+: ff 10 callq \*\(%rax\)
+[ ]*[a-f0-9]+: 66 ff 10 callw \*\(%rax\)
+[ ]*[a-f0-9]+: 66 48 ff 10 data32 callq \*\(%rax\)
+[ ]*[a-f0-9]+: ff e0 jmpq \*%rax
+[ ]*[a-f0-9]+: 66 ff e0 jmpw \*%ax
+[ ]*[a-f0-9]+: 66 48 ff e0 data32 jmpq \*%rax
+[ ]*[a-f0-9]+: ff 20 jmpq \*\(%rax\)
+[ ]*[a-f0-9]+: 66 ff 20 jmpw \*\(%rax\)
+[ ]*[a-f0-9]+: 66 48 ff 20 data32 jmpq \*\(%rax\)
+[ ]*[a-f0-9]+: ff f0 pushq %rax
+[ ]*[a-f0-9]+: 66 ff f0 pushw %ax
+[ ]*[a-f0-9]+: 66 48 ff f0 data32 pushq %rax
+[ ]*[a-f0-9]+: ff 30 pushq \(%rax\)
+[ ]*[a-f0-9]+: 66 ff 30 pushw \(%rax\)
+[ ]*[a-f0-9]+: 66 48 ff 30 data32 pushq \(%rax\)
#pass
diff --git a/gas/testsuite/gas/i386/x86-64-stack.d b/gas/testsuite/gas/i386/x86-64-stack.d
index f686a04fee8..2d806f479c6 100644
--- a/gas/testsuite/gas/i386/x86-64-stack.d
+++ b/gas/testsuite/gas/i386/x86-64-stack.d
@@ -6,34 +6,34 @@
Disassembly of section .text:
0+ <_start>:
-[ ]*[0-9a-f]+:[ ]+50[ ]+pushq?[ ]+%rax
-[ ]*[0-9a-f]+:[ ]+66 50[ ]+pushw?[ ]+%ax
-[ ]*[0-9a-f]+:[ ]+66 48 50[ ]+pushq?[ ]+%rax
-[ ]*[0-9a-f]+:[ ]+58[ ]+popq?[ ]+%rax
-[ ]*[0-9a-f]+:[ ]+66 58[ ]+popw?[ ]+%ax
-[ ]*[0-9a-f]+:[ ]+66 48 58[ ]+popq?[ ]+%rax
-[ ]*[0-9a-f]+:[ ]+8f c0[ ]+popq?[ ]+%rax
-[ ]*[0-9a-f]+:[ ]+66 8f c0[ ]+popw?[ ]+%ax
-[ ]*[0-9a-f]+:[ ]+66 48 8f c0[ ]+popq?[ ]+%rax
-[ ]*[0-9a-f]+:[ ]+8f 00[ ]+popq[ ]+\(%rax\)
-[ ]*[0-9a-f]+:[ ]+66 8f 00[ ]+popw[ ]+\(%rax\)
-[ ]*[0-9a-f]+:[ ]+66 48 8f 00[ ]+popq[ ]+\(%rax\)
-[ ]*[0-9a-f]+:[ ]+ff d0[ ]+callq?[ ]+\*%rax
-[ ]*[0-9a-f]+:[ ]+66 ff d0[ ]+callw?[ ]+\*%ax
-[ ]*[0-9a-f]+:[ ]+66 48 ff d0[ ]+callq?[ ]+\*%rax
-[ ]*[0-9a-f]+:[ ]+ff 10[ ]+callq[ ]+\*\(%rax\)
-[ ]*[0-9a-f]+:[ ]+66 ff 10[ ]+callw[ ]+\*\(%rax\)
-[ ]*[0-9a-f]+:[ ]+66 48 ff 10[ ]+callq[ ]+\*\(%rax\)
-[ ]*[0-9a-f]+:[ ]+ff e0[ ]+jmpq?[ ]+\*%rax
-[ ]*[0-9a-f]+:[ ]+66 ff e0[ ]+jmpw?[ ]+\*%ax
-[ ]*[0-9a-f]+:[ ]+66 48 ff e0[ ]+jmpq?[ ]+\*%rax
-[ ]*[0-9a-f]+:[ ]+ff 20[ ]+jmpq[ ]+\*\(%rax\)
-[ ]*[0-9a-f]+:[ ]+66 ff 20[ ]+jmpw[ ]+\*\(%rax\)
-[ ]*[0-9a-f]+:[ ]+66 48 ff 20[ ]+jmpq[ ]+\*\(%rax\)
-[ ]*[0-9a-f]+:[ ]+ff f0[ ]+pushq?[ ]+%rax
-[ ]*[0-9a-f]+:[ ]+66 ff f0[ ]+pushw?[ ]+%ax
-[ ]*[0-9a-f]+:[ ]+66 48 ff f0[ ]+pushq?[ ]+%rax
-[ ]*[0-9a-f]+:[ ]+ff 30[ ]+pushq[ ]+\(%rax\)
-[ ]*[0-9a-f]+:[ ]+66 ff 30[ ]+pushw[ ]+\(%rax\)
-[ ]*[0-9a-f]+:[ ]+66 48 ff 30[ ]+pushq[ ]+\(%rax\)
+[ ]*[a-f0-9]+: 50 push %rax
+[ ]*[a-f0-9]+: 66 50 push %ax
+[ ]*[a-f0-9]+: 66 48 50 data32 push %rax
+[ ]*[a-f0-9]+: 58 pop %rax
+[ ]*[a-f0-9]+: 66 58 pop %ax
+[ ]*[a-f0-9]+: 66 48 58 data32 pop %rax
+[ ]*[a-f0-9]+: 8f c0 pop %rax
+[ ]*[a-f0-9]+: 66 8f c0 pop %ax
+[ ]*[a-f0-9]+: 66 48 8f c0 data32 pop %rax
+[ ]*[a-f0-9]+: 8f 00 popq \(%rax\)
+[ ]*[a-f0-9]+: 66 8f 00 popw \(%rax\)
+[ ]*[a-f0-9]+: 66 48 8f 00 data32 popq \(%rax\)
+[ ]*[a-f0-9]+: ff d0 callq \*%rax
+[ ]*[a-f0-9]+: 66 ff d0 callw \*%ax
+[ ]*[a-f0-9]+: 66 48 ff d0 data32 callq \*%rax
+[ ]*[a-f0-9]+: ff 10 callq \*\(%rax\)
+[ ]*[a-f0-9]+: 66 ff 10 callw \*\(%rax\)
+[ ]*[a-f0-9]+: 66 48 ff 10 data32 callq \*\(%rax\)
+[ ]*[a-f0-9]+: ff e0 jmpq \*%rax
+[ ]*[a-f0-9]+: 66 ff e0 jmpw \*%ax
+[ ]*[a-f0-9]+: 66 48 ff e0 data32 jmpq \*%rax
+[ ]*[a-f0-9]+: ff 20 jmpq \*\(%rax\)
+[ ]*[a-f0-9]+: 66 ff 20 jmpw \*\(%rax\)
+[ ]*[a-f0-9]+: 66 48 ff 20 data32 jmpq \*\(%rax\)
+[ ]*[a-f0-9]+: ff f0 push %rax
+[ ]*[a-f0-9]+: 66 ff f0 push %ax
+[ ]*[a-f0-9]+: 66 48 ff f0 data32 push %rax
+[ ]*[a-f0-9]+: ff 30 pushq \(%rax\)
+[ ]*[a-f0-9]+: 66 ff 30 pushw \(%rax\)
+[ ]*[a-f0-9]+: 66 48 ff 30 data32 pushq \(%rax\)
#pass