aboutsummaryrefslogtreecommitdiff
path: root/gas/testsuite
diff options
context:
space:
mode:
authorH.J. Lu <hjl.tools@gmail.com>2011-06-30 15:44:55 +0000
committerH.J. Lu <hjl.tools@gmail.com>2011-06-30 15:44:55 +0000
commit4cb0953da28f24180a3c62664a718ae69dc2458c (patch)
tree7d085a3b92c2d52b02d304a017669021f6777706 /gas/testsuite
parent75d5a45f82040ef3e85023926a1840e27f127d73 (diff)
downloadgdb-4cb0953da28f24180a3c62664a718ae69dc2458c.zip
gdb-4cb0953da28f24180a3c62664a718ae69dc2458c.tar.gz
gdb-4cb0953da28f24180a3c62664a718ae69dc2458c.tar.bz2
Fix rorx in BMI2.
gas/testsuite/ 2011-06-30 H.J. Lu <hongjiu.lu@intel.com> AVX Programming Reference (June, 2011) * gas/i386/bmi2.s: Correct rorx tests. * gas/i386/x86-64-bmi2.s: Likewise. * gas/i386/bmi2-intel.d: Updated. * gas/i386/bmi2.d: Likewise. * gas/i386/x86-64-bmi2-intel.d: Likewise. * gas/i386/x86-64-bmi2.d: Likewise. opcodes/ 2011-06-30 H.J. Lu <hongjiu.lu@intel.com> AVX Programming Reference (June, 2011) * i386-dis.c (vex_len_table): Correct rorxS. * i386-opc.tbl: Correct rorx. * i386-tbl.h: Regenerated.
Diffstat (limited to 'gas/testsuite')
-rw-r--r--gas/testsuite/ChangeLog11
-rw-r--r--gas/testsuite/gas/i386/bmi2-intel.d10
-rw-r--r--gas/testsuite/gas/i386/bmi2.d10
-rw-r--r--gas/testsuite/gas/i386/bmi2.s14
-rw-r--r--gas/testsuite/gas/i386/x86-64-bmi2-intel.d36
-rw-r--r--gas/testsuite/gas/i386/x86-64-bmi2.d36
-rw-r--r--gas/testsuite/gas/i386/x86-64-bmi2.s44
7 files changed, 86 insertions, 75 deletions
diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog
index c5408b8..0b24323 100644
--- a/gas/testsuite/ChangeLog
+++ b/gas/testsuite/ChangeLog
@@ -1,3 +1,14 @@
+2011-06-30 H.J. Lu <hongjiu.lu@intel.com>
+
+ AVX Programming Reference (June, 2011)
+ * gas/i386/bmi2.s: Correct rorx tests.
+ * gas/i386/x86-64-bmi2.s: Likewise.
+
+ * gas/i386/bmi2-intel.d: Updated.
+ * gas/i386/bmi2.d: Likewise.
+ * gas/i386/x86-64-bmi2-intel.d: Likewise.
+ * gas/i386/x86-64-bmi2.d: Likewise.
+
2011-06-30 Paul Carroll <pcarroll@codesourcery.com>
* gas/arm/addthumb2err.s: New test file.
diff --git a/gas/testsuite/gas/i386/bmi2-intel.d b/gas/testsuite/gas/i386/bmi2-intel.d
index 8cf48fc..fa12a0c 100644
--- a/gas/testsuite/gas/i386/bmi2-intel.d
+++ b/gas/testsuite/gas/i386/bmi2-intel.d
@@ -9,8 +9,8 @@
Disassembly of section .text:
0+ <_start>:
-[ ]*[a-f0-9]+: c4 e3 63 f0 f0 07 rorx esi,ebx,eax,0x7
-[ ]*[a-f0-9]+: c4 e3 63 f0 31 07 rorx esi,ebx,DWORD PTR \[ecx\],0x7
+[ ]*[a-f0-9]+: c4 e3 7b f0 d8 07 rorx ebx,eax,0x7
+[ ]*[a-f0-9]+: c4 e3 7b f0 19 07 rorx ebx,DWORD PTR \[ecx\],0x7
[ ]*[a-f0-9]+: c4 e2 63 f6 f0 mulx esi,ebx,eax
[ ]*[a-f0-9]+: c4 e2 63 f6 31 mulx esi,ebx,DWORD PTR \[ecx\]
[ ]*[a-f0-9]+: c4 e2 63 f5 f0 pdep esi,ebx,eax
@@ -25,9 +25,9 @@ Disassembly of section .text:
[ ]*[a-f0-9]+: c4 e2 61 f7 31 shlx esi,DWORD PTR \[ecx\],ebx
[ ]*[a-f0-9]+: c4 e2 7b f7 f3 shrx esi,ebx,eax
[ ]*[a-f0-9]+: c4 e2 63 f7 31 shrx esi,DWORD PTR \[ecx\],ebx
-[ ]*[a-f0-9]+: c4 e3 63 f0 f0 07 rorx esi,ebx,eax,0x7
-[ ]*[a-f0-9]+: c4 e3 63 f0 31 07 rorx esi,ebx,DWORD PTR \[ecx\],0x7
-[ ]*[a-f0-9]+: c4 e3 63 f0 31 07 rorx esi,ebx,DWORD PTR \[ecx\],0x7
+[ ]*[a-f0-9]+: c4 e3 7b f0 d8 07 rorx ebx,eax,0x7
+[ ]*[a-f0-9]+: c4 e3 7b f0 19 07 rorx ebx,DWORD PTR \[ecx\],0x7
+[ ]*[a-f0-9]+: c4 e3 7b f0 19 07 rorx ebx,DWORD PTR \[ecx\],0x7
[ ]*[a-f0-9]+: c4 e2 63 f6 f0 mulx esi,ebx,eax
[ ]*[a-f0-9]+: c4 e2 63 f6 31 mulx esi,ebx,DWORD PTR \[ecx\]
[ ]*[a-f0-9]+: c4 e2 63 f6 31 mulx esi,ebx,DWORD PTR \[ecx\]
diff --git a/gas/testsuite/gas/i386/bmi2.d b/gas/testsuite/gas/i386/bmi2.d
index 35d5e01..d52e4d1 100644
--- a/gas/testsuite/gas/i386/bmi2.d
+++ b/gas/testsuite/gas/i386/bmi2.d
@@ -8,8 +8,8 @@
Disassembly of section .text:
0+ <_start>:
-[ ]*[a-f0-9]+: c4 e3 63 f0 f0 07 rorx \$0x7,%eax,%ebx,%esi
-[ ]*[a-f0-9]+: c4 e3 63 f0 31 07 rorx \$0x7,\(%ecx\),%ebx,%esi
+[ ]*[a-f0-9]+: c4 e3 7b f0 d8 07 rorx \$0x7,%eax,%ebx
+[ ]*[a-f0-9]+: c4 e3 7b f0 19 07 rorx \$0x7,\(%ecx\),%ebx
[ ]*[a-f0-9]+: c4 e2 63 f6 f0 mulx %eax,%ebx,%esi
[ ]*[a-f0-9]+: c4 e2 63 f6 31 mulx \(%ecx\),%ebx,%esi
[ ]*[a-f0-9]+: c4 e2 63 f5 f0 pdep %eax,%ebx,%esi
@@ -24,9 +24,9 @@ Disassembly of section .text:
[ ]*[a-f0-9]+: c4 e2 61 f7 31 shlx %ebx,\(%ecx\),%esi
[ ]*[a-f0-9]+: c4 e2 7b f7 f3 shrx %eax,%ebx,%esi
[ ]*[a-f0-9]+: c4 e2 63 f7 31 shrx %ebx,\(%ecx\),%esi
-[ ]*[a-f0-9]+: c4 e3 63 f0 f0 07 rorx \$0x7,%eax,%ebx,%esi
-[ ]*[a-f0-9]+: c4 e3 63 f0 31 07 rorx \$0x7,\(%ecx\),%ebx,%esi
-[ ]*[a-f0-9]+: c4 e3 63 f0 31 07 rorx \$0x7,\(%ecx\),%ebx,%esi
+[ ]*[a-f0-9]+: c4 e3 7b f0 d8 07 rorx \$0x7,%eax,%ebx
+[ ]*[a-f0-9]+: c4 e3 7b f0 19 07 rorx \$0x7,\(%ecx\),%ebx
+[ ]*[a-f0-9]+: c4 e3 7b f0 19 07 rorx \$0x7,\(%ecx\),%ebx
[ ]*[a-f0-9]+: c4 e2 63 f6 f0 mulx %eax,%ebx,%esi
[ ]*[a-f0-9]+: c4 e2 63 f6 31 mulx \(%ecx\),%ebx,%esi
[ ]*[a-f0-9]+: c4 e2 63 f6 31 mulx \(%ecx\),%ebx,%esi
diff --git a/gas/testsuite/gas/i386/bmi2.s b/gas/testsuite/gas/i386/bmi2.s
index 40b4e55..415994c 100644
--- a/gas/testsuite/gas/i386/bmi2.s
+++ b/gas/testsuite/gas/i386/bmi2.s
@@ -4,9 +4,9 @@
.text
_start:
-# Test for op r32, r32, r/m32, imm8
- rorx $7,%eax,%ebx,%esi
- rorx $7,(%ecx),%ebx,%esi
+# Test for op r32, r/m32, imm8
+ rorx $7,%eax,%ebx
+ rorx $7,(%ecx),%ebx
# Test for op r32, r32, r/m32
mulx %eax,%ebx,%esi
@@ -28,10 +28,10 @@ _start:
.intel_syntax noprefix
-# Test for op r32, r32, r/m32, imm8
- rorx esi,ebx,eax,7
- rorx esi,ebx,DWORD PTR [ecx],7
- rorx esi,ebx,[ecx],7
+# Test for op r32, r/m32, imm8
+ rorx ebx,eax,7
+ rorx ebx,DWORD PTR [ecx],7
+ rorx ebx,[ecx],7
# Test for op r32, r32, r/m32
mulx esi,ebx,eax
diff --git a/gas/testsuite/gas/i386/x86-64-bmi2-intel.d b/gas/testsuite/gas/i386/x86-64-bmi2-intel.d
index 87c8500..b692c1d 100644
--- a/gas/testsuite/gas/i386/x86-64-bmi2-intel.d
+++ b/gas/testsuite/gas/i386/x86-64-bmi2-intel.d
@@ -9,10 +9,10 @@
Disassembly of section .text:
0+ <_start>:
-[ ]*[a-f0-9]+: c4 e3 63 f0 f0 07 rorx esi,ebx,eax,0x7
-[ ]*[a-f0-9]+: c4 e3 63 f0 31 07 rorx esi,ebx,DWORD PTR \[rcx\],0x7
-[ ]*[a-f0-9]+: c4 43 03 f0 d1 07 rorx r10d,r15d,r9d,0x7
-[ ]*[a-f0-9]+: c4 63 03 f0 11 07 rorx r10d,r15d,DWORD PTR \[rcx\],0x7
+[ ]*[a-f0-9]+: c4 e3 7b f0 d8 07 rorx ebx,eax,0x7
+[ ]*[a-f0-9]+: c4 e3 7b f0 19 07 rorx ebx,DWORD PTR \[rcx\],0x7
+[ ]*[a-f0-9]+: c4 43 7b f0 f9 07 rorx r15d,r9d,0x7
+[ ]*[a-f0-9]+: c4 63 7b f0 39 07 rorx r15d,DWORD PTR \[rcx\],0x7
[ ]*[a-f0-9]+: c4 e2 63 f6 f0 mulx esi,ebx,eax
[ ]*[a-f0-9]+: c4 e2 63 f6 31 mulx esi,ebx,DWORD PTR \[rcx\]
[ ]*[a-f0-9]+: c4 42 03 f6 d1 mulx r10d,r15d,r9d
@@ -41,10 +41,10 @@ Disassembly of section .text:
[ ]*[a-f0-9]+: c4 e2 63 f7 31 shrx esi,DWORD PTR \[rcx\],ebx
[ ]*[a-f0-9]+: c4 42 33 f7 d7 shrx r10d,r15d,r9d
[ ]*[a-f0-9]+: c4 62 33 f7 11 shrx r10d,DWORD PTR \[rcx\],r9d
-[ ]*[a-f0-9]+: c4 e3 e3 f0 f0 07 rorx rsi,rbx,rax,0x7
-[ ]*[a-f0-9]+: c4 e3 e3 f0 31 07 rorx rsi,rbx,QWORD PTR \[rcx\],0x7
-[ ]*[a-f0-9]+: c4 43 83 f0 d1 07 rorx r10,r15,r9,0x7
-[ ]*[a-f0-9]+: c4 63 83 f0 11 07 rorx r10,r15,QWORD PTR \[rcx\],0x7
+[ ]*[a-f0-9]+: c4 e3 fb f0 d8 07 rorx rbx,rax,0x7
+[ ]*[a-f0-9]+: c4 e3 fb f0 19 07 rorx rbx,QWORD PTR \[rcx\],0x7
+[ ]*[a-f0-9]+: c4 43 fb f0 f9 07 rorx r15,r9,0x7
+[ ]*[a-f0-9]+: c4 63 fb f0 39 07 rorx r15,QWORD PTR \[rcx\],0x7
[ ]*[a-f0-9]+: c4 e2 e3 f6 f0 mulx rsi,rbx,rax
[ ]*[a-f0-9]+: c4 e2 e3 f6 31 mulx rsi,rbx,QWORD PTR \[rcx\]
[ ]*[a-f0-9]+: c4 42 83 f6 d1 mulx r10,r15,r9
@@ -73,11 +73,11 @@ Disassembly of section .text:
[ ]*[a-f0-9]+: c4 e2 fb f7 31 shrx rsi,QWORD PTR \[rcx\],rax
[ ]*[a-f0-9]+: c4 42 b3 f7 d7 shrx r10,r15,r9
[ ]*[a-f0-9]+: c4 62 b3 f7 11 shrx r10,QWORD PTR \[rcx\],r9
-[ ]*[a-f0-9]+: c4 e3 63 f0 f0 07 rorx esi,ebx,eax,0x7
-[ ]*[a-f0-9]+: c4 e3 63 f0 31 07 rorx esi,ebx,DWORD PTR \[rcx\],0x7
-[ ]*[a-f0-9]+: c4 43 2b f0 f9 07 rorx r15d,r10d,r9d,0x7
-[ ]*[a-f0-9]+: c4 63 2b f0 39 07 rorx r15d,r10d,DWORD PTR \[rcx\],0x7
-[ ]*[a-f0-9]+: c4 e3 63 f0 31 07 rorx esi,ebx,DWORD PTR \[rcx\],0x7
+[ ]*[a-f0-9]+: c4 e3 7b f0 d8 07 rorx ebx,eax,0x7
+[ ]*[a-f0-9]+: c4 e3 7b f0 19 07 rorx ebx,DWORD PTR \[rcx\],0x7
+[ ]*[a-f0-9]+: c4 43 7b f0 d1 07 rorx r10d,r9d,0x7
+[ ]*[a-f0-9]+: c4 63 7b f0 11 07 rorx r10d,DWORD PTR \[rcx\],0x7
+[ ]*[a-f0-9]+: c4 e3 7b f0 19 07 rorx ebx,DWORD PTR \[rcx\],0x7
[ ]*[a-f0-9]+: c4 e2 63 f6 f0 mulx esi,ebx,eax
[ ]*[a-f0-9]+: c4 e2 63 f6 31 mulx esi,ebx,DWORD PTR \[rcx\]
[ ]*[a-f0-9]+: c4 42 2b f6 f9 mulx r15d,r10d,r9d
@@ -113,11 +113,11 @@ Disassembly of section .text:
[ ]*[a-f0-9]+: c4 42 33 f7 fa shrx r15d,r10d,r9d
[ ]*[a-f0-9]+: c4 62 33 f7 39 shrx r15d,DWORD PTR \[rcx\],r9d
[ ]*[a-f0-9]+: c4 e2 63 f7 31 shrx esi,DWORD PTR \[rcx\],ebx
-[ ]*[a-f0-9]+: c4 e3 e3 f0 f0 07 rorx rsi,rbx,rax,0x7
-[ ]*[a-f0-9]+: c4 e3 e3 f0 31 07 rorx rsi,rbx,QWORD PTR \[rcx\],0x7
-[ ]*[a-f0-9]+: c4 43 83 f0 d1 07 rorx r10,r15,r9,0x7
-[ ]*[a-f0-9]+: c4 63 83 f0 11 07 rorx r10,r15,QWORD PTR \[rcx\],0x7
-[ ]*[a-f0-9]+: c4 e3 e3 f0 31 07 rorx rsi,rbx,QWORD PTR \[rcx\],0x7
+[ ]*[a-f0-9]+: c4 e3 fb f0 d8 07 rorx rbx,rax,0x7
+[ ]*[a-f0-9]+: c4 e3 fb f0 19 07 rorx rbx,QWORD PTR \[rcx\],0x7
+[ ]*[a-f0-9]+: c4 43 fb f0 f9 07 rorx r15,r9,0x7
+[ ]*[a-f0-9]+: c4 63 fb f0 39 07 rorx r15,QWORD PTR \[rcx\],0x7
+[ ]*[a-f0-9]+: c4 e3 fb f0 19 07 rorx rbx,QWORD PTR \[rcx\],0x7
[ ]*[a-f0-9]+: c4 e2 e3 f6 f0 mulx rsi,rbx,rax
[ ]*[a-f0-9]+: c4 e2 e3 f6 31 mulx rsi,rbx,QWORD PTR \[rcx\]
[ ]*[a-f0-9]+: c4 42 83 f6 d1 mulx r10,r15,r9
diff --git a/gas/testsuite/gas/i386/x86-64-bmi2.d b/gas/testsuite/gas/i386/x86-64-bmi2.d
index 0d5d37d..0bcdb28 100644
--- a/gas/testsuite/gas/i386/x86-64-bmi2.d
+++ b/gas/testsuite/gas/i386/x86-64-bmi2.d
@@ -8,10 +8,10 @@
Disassembly of section .text:
0+ <_start>:
-[ ]*[a-f0-9]+: c4 e3 63 f0 f0 07 rorx \$0x7,%eax,%ebx,%esi
-[ ]*[a-f0-9]+: c4 e3 63 f0 31 07 rorx \$0x7,\(%rcx\),%ebx,%esi
-[ ]*[a-f0-9]+: c4 43 03 f0 d1 07 rorx \$0x7,%r9d,%r15d,%r10d
-[ ]*[a-f0-9]+: c4 63 03 f0 11 07 rorx \$0x7,\(%rcx\),%r15d,%r10d
+[ ]*[a-f0-9]+: c4 e3 7b f0 d8 07 rorx \$0x7,%eax,%ebx
+[ ]*[a-f0-9]+: c4 e3 7b f0 19 07 rorx \$0x7,\(%rcx\),%ebx
+[ ]*[a-f0-9]+: c4 43 7b f0 f9 07 rorx \$0x7,%r9d,%r15d
+[ ]*[a-f0-9]+: c4 63 7b f0 39 07 rorx \$0x7,\(%rcx\),%r15d
[ ]*[a-f0-9]+: c4 e2 63 f6 f0 mulx %eax,%ebx,%esi
[ ]*[a-f0-9]+: c4 e2 63 f6 31 mulx \(%rcx\),%ebx,%esi
[ ]*[a-f0-9]+: c4 42 03 f6 d1 mulx %r9d,%r15d,%r10d
@@ -40,10 +40,10 @@ Disassembly of section .text:
[ ]*[a-f0-9]+: c4 e2 63 f7 31 shrx %ebx,\(%rcx\),%esi
[ ]*[a-f0-9]+: c4 42 33 f7 d7 shrx %r9d,%r15d,%r10d
[ ]*[a-f0-9]+: c4 62 33 f7 11 shrx %r9d,\(%rcx\),%r10d
-[ ]*[a-f0-9]+: c4 e3 e3 f0 f0 07 rorx \$0x7,%rax,%rbx,%rsi
-[ ]*[a-f0-9]+: c4 e3 e3 f0 31 07 rorx \$0x7,\(%rcx\),%rbx,%rsi
-[ ]*[a-f0-9]+: c4 43 83 f0 d1 07 rorx \$0x7,%r9,%r15,%r10
-[ ]*[a-f0-9]+: c4 63 83 f0 11 07 rorx \$0x7,\(%rcx\),%r15,%r10
+[ ]*[a-f0-9]+: c4 e3 fb f0 d8 07 rorx \$0x7,%rax,%rbx
+[ ]*[a-f0-9]+: c4 e3 fb f0 19 07 rorx \$0x7,\(%rcx\),%rbx
+[ ]*[a-f0-9]+: c4 43 fb f0 f9 07 rorx \$0x7,%r9,%r15
+[ ]*[a-f0-9]+: c4 63 fb f0 39 07 rorx \$0x7,\(%rcx\),%r15
[ ]*[a-f0-9]+: c4 e2 e3 f6 f0 mulx %rax,%rbx,%rsi
[ ]*[a-f0-9]+: c4 e2 e3 f6 31 mulx \(%rcx\),%rbx,%rsi
[ ]*[a-f0-9]+: c4 42 83 f6 d1 mulx %r9,%r15,%r10
@@ -72,11 +72,11 @@ Disassembly of section .text:
[ ]*[a-f0-9]+: c4 e2 fb f7 31 shrx %rax,\(%rcx\),%rsi
[ ]*[a-f0-9]+: c4 42 b3 f7 d7 shrx %r9,%r15,%r10
[ ]*[a-f0-9]+: c4 62 b3 f7 11 shrx %r9,\(%rcx\),%r10
-[ ]*[a-f0-9]+: c4 e3 63 f0 f0 07 rorx \$0x7,%eax,%ebx,%esi
-[ ]*[a-f0-9]+: c4 e3 63 f0 31 07 rorx \$0x7,\(%rcx\),%ebx,%esi
-[ ]*[a-f0-9]+: c4 43 2b f0 f9 07 rorx \$0x7,%r9d,%r10d,%r15d
-[ ]*[a-f0-9]+: c4 63 2b f0 39 07 rorx \$0x7,\(%rcx\),%r10d,%r15d
-[ ]*[a-f0-9]+: c4 e3 63 f0 31 07 rorx \$0x7,\(%rcx\),%ebx,%esi
+[ ]*[a-f0-9]+: c4 e3 7b f0 d8 07 rorx \$0x7,%eax,%ebx
+[ ]*[a-f0-9]+: c4 e3 7b f0 19 07 rorx \$0x7,\(%rcx\),%ebx
+[ ]*[a-f0-9]+: c4 43 7b f0 d1 07 rorx \$0x7,%r9d,%r10d
+[ ]*[a-f0-9]+: c4 63 7b f0 11 07 rorx \$0x7,\(%rcx\),%r10d
+[ ]*[a-f0-9]+: c4 e3 7b f0 19 07 rorx \$0x7,\(%rcx\),%ebx
[ ]*[a-f0-9]+: c4 e2 63 f6 f0 mulx %eax,%ebx,%esi
[ ]*[a-f0-9]+: c4 e2 63 f6 31 mulx \(%rcx\),%ebx,%esi
[ ]*[a-f0-9]+: c4 42 2b f6 f9 mulx %r9d,%r10d,%r15d
@@ -112,11 +112,11 @@ Disassembly of section .text:
[ ]*[a-f0-9]+: c4 42 33 f7 fa shrx %r9d,%r10d,%r15d
[ ]*[a-f0-9]+: c4 62 33 f7 39 shrx %r9d,\(%rcx\),%r15d
[ ]*[a-f0-9]+: c4 e2 63 f7 31 shrx %ebx,\(%rcx\),%esi
-[ ]*[a-f0-9]+: c4 e3 e3 f0 f0 07 rorx \$0x7,%rax,%rbx,%rsi
-[ ]*[a-f0-9]+: c4 e3 e3 f0 31 07 rorx \$0x7,\(%rcx\),%rbx,%rsi
-[ ]*[a-f0-9]+: c4 43 83 f0 d1 07 rorx \$0x7,%r9,%r15,%r10
-[ ]*[a-f0-9]+: c4 63 83 f0 11 07 rorx \$0x7,\(%rcx\),%r15,%r10
-[ ]*[a-f0-9]+: c4 e3 e3 f0 31 07 rorx \$0x7,\(%rcx\),%rbx,%rsi
+[ ]*[a-f0-9]+: c4 e3 fb f0 d8 07 rorx \$0x7,%rax,%rbx
+[ ]*[a-f0-9]+: c4 e3 fb f0 19 07 rorx \$0x7,\(%rcx\),%rbx
+[ ]*[a-f0-9]+: c4 43 fb f0 f9 07 rorx \$0x7,%r9,%r15
+[ ]*[a-f0-9]+: c4 63 fb f0 39 07 rorx \$0x7,\(%rcx\),%r15
+[ ]*[a-f0-9]+: c4 e3 fb f0 19 07 rorx \$0x7,\(%rcx\),%rbx
[ ]*[a-f0-9]+: c4 e2 e3 f6 f0 mulx %rax,%rbx,%rsi
[ ]*[a-f0-9]+: c4 e2 e3 f6 31 mulx \(%rcx\),%rbx,%rsi
[ ]*[a-f0-9]+: c4 42 83 f6 d1 mulx %r9,%r15,%r10
diff --git a/gas/testsuite/gas/i386/x86-64-bmi2.s b/gas/testsuite/gas/i386/x86-64-bmi2.s
index 4976e84..677421f 100644
--- a/gas/testsuite/gas/i386/x86-64-bmi2.s
+++ b/gas/testsuite/gas/i386/x86-64-bmi2.s
@@ -4,11 +4,11 @@
.text
_start:
-# Test for op r32, r32, r/m32, imm8
- rorx $7,%eax,%ebx,%esi
- rorx $7,(%rcx),%ebx,%esi
- rorx $7,%r9d,%r15d,%r10d
- rorx $7,(%rcx),%r15d,%r10d
+# Test for op r32, r/m32, imm8
+ rorx $7,%eax,%ebx
+ rorx $7,(%rcx),%ebx
+ rorx $7,%r9d,%r15d
+ rorx $7,(%rcx),%r15d
# Test for op r32, r32, r/m32
mulx %eax,%ebx,%esi
@@ -42,11 +42,11 @@ _start:
shrx %r9d,%r15d,%r10d
shrx %r9d,(%rcx),%r10d
-# Test for op r64, r64, r/m64, imm8
- rorx $7,%rax,%rbx,%rsi
- rorx $7,(%rcx),%rbx,%rsi
- rorx $7,%r9,%r15,%r10
- rorx $7,(%rcx),%r15,%r10
+# Test for op r64, r/m64, imm8
+ rorx $7,%rax,%rbx
+ rorx $7,(%rcx),%rbx
+ rorx $7,%r9,%r15
+ rorx $7,(%rcx),%r15
# Test for op r64, r64, r/m64
mulx %rax,%rbx,%rsi
@@ -82,12 +82,12 @@ _start:
.intel_syntax noprefix
-# Test for op r32, r32, r/m32, imm8
- rorx esi,ebx,eax,7
- rorx esi,ebx,DWORD PTR [rcx],7
- rorx r15d,r10d,r9d,7
- rorx r15d,r10d,DWORD PTR [rcx],7
- rorx esi,ebx,[rcx],7
+# Test for op r32, r/m32, imm8
+ rorx ebx,eax,7
+ rorx ebx,DWORD PTR [rcx],7
+ rorx r10d,r9d,7
+ rorx r10d,DWORD PTR [rcx],7
+ rorx ebx,[rcx],7
# Test for op r32, r32, r/m32
mulx esi,ebx,eax
@@ -128,12 +128,12 @@ _start:
shrx r15d,DWORD PTR [rcx],r9d
shrx esi,[rcx],ebx
-# Test for op r64, r64, r/m64, imm8
- rorx rsi,rbx,rax,7
- rorx rsi,rbx,QWORD PTR [rcx],7
- rorx r10,r15,r9,7
- rorx r10,r15,QWORD PTR [rcx],7
- rorx rsi,rbx,[rcx],7
+# Test for op r64, r/m64, imm8
+ rorx rbx,rax,7
+ rorx rbx,QWORD PTR [rcx],7
+ rorx r15,r9,7
+ rorx r15,QWORD PTR [rcx],7
+ rorx rbx,[rcx],7
# Test for op r64, r64, r/m64
mulx rsi,rbx,rax