x86: fix SYSRET disassembly, improve {,V}CVTSI2S{S,D} and PTWRITE

SYSRET can't use the same macro as IRET, since there's no 16-bit operand
size form of it. Re-use LQ for it instead.

Doing so made obvious that outside of 64-bit mode {,V}CVTSI2S{S,D} and
PTWRITE should have an 'l' suffix printed only in suffix-always mode.

19 files changed, 254 insertions, 231 deletions

diff --git a/gas/ChangeLog b/gas/ChangeLog
index aad2676..4c265fe 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,5 +1,20 @@
 2020-06-25  Jan Beulich  <jbeulich@suse.com>
 
+	* testsuite/gas/i386/avx-16bit.d,
+	testsuite/gas/i386/avx-scalar.d, testsuite/gas/i386/avx.d,
+	testsuite/gas/i386/avx512f-16bit.d,
+	testsuite/gas/i386/avx512f.d,
+	testsuite/gas/i386/evex-lig256.d,
+	testsuite/gas/i386/evex-lig512.d
+	testsuite/gas/i386/evex-wig1.d, testsuite/gas/i386/katmai.d,
+	testsuite/gas/i386/noreg16.d, testsuite/gas/i386/noreg32.d,
+	testsuite/gas/i386/ptwrite.d, testsuite/gas/i386/simd.d,
+	testsuite/gas/i386/sse2-16bit.d,
+	testsuite/gas/i386/sse2.d, testsuite/gas/i386/sse2avx.d: Adjust
+	expectations.
+
+2020-06-25  Jan Beulich  <jbeulich@suse.com>
+
 	* config/tc-i386.c (md_assemble): Also reject explicit REX
 	prefixes with VEX and alike encoded insns. Zap consumed bits
 	from i.rex.
diff --git a/gas/testsuite/gas/i386/avx-16bit.d b/gas/testsuite/gas/i386/avx-16bit.d
index 9f4207c..c1c6929 100644
--- a/gas/testsuite/gas/i386/avx-16bit.d
+++ b/gas/testsuite/gas/i386/avx-16bit.d
@@ -1202,9 +1202,9 @@ Disassembly of section .text:
 [ 	]*[a-f0-9]+:	c4 e3 59 22 f1 07    	vpinsrd \$0x7,%ecx,%xmm4,%xmm6
 [ 	]*[a-f0-9]+:	67 c4 e3 59 22 31 07 	vpinsrd \$0x7,\(%ecx\),%xmm4,%xmm6
 [ 	]*[a-f0-9]+:	c5 db 2a f1          	vcvtsi2sd %ecx,%xmm4,%xmm6
-[ 	]*[a-f0-9]+:	67 c5 db 2a 31       	vcvtsi2sdl \(%ecx\),%xmm4,%xmm6
+[ 	]*[a-f0-9]+:	67 c5 db 2a 31       	vcvtsi2sd \(%ecx\),%xmm4,%xmm6
 [ 	]*[a-f0-9]+:	c5 da 2a f1          	vcvtsi2ss %ecx,%xmm4,%xmm6
-[ 	]*[a-f0-9]+:	67 c5 da 2a 31       	vcvtsi2ssl \(%ecx\),%xmm4,%xmm6
+[ 	]*[a-f0-9]+:	67 c5 da 2a 31       	vcvtsi2ss \(%ecx\),%xmm4,%xmm6
 [ 	]*[a-f0-9]+:	c5 ca c2 d4 07       	vcmpordss %xmm4,%xmm6,%xmm2
 [ 	]*[a-f0-9]+:	67 c5 ca c2 11 07    	vcmpordss \(%ecx\),%xmm6,%xmm2
 [ 	]*[a-f0-9]+:	c4 e3 49 21 d4 07    	vinsertps \$0x7,%xmm4,%xmm6,%xmm2
@@ -1263,7 +1263,7 @@ Disassembly of section .text:
 [ 	]*[a-f0-9]+:	c5 f9 e0 3e 34 12    	vpavgb 0x1234,%xmm0,%xmm7
 [ 	]*[a-f0-9]+:	c4 e3 79 df 06 34 12 07 	vaeskeygenassist \$0x7,0x1234,%xmm0
 [ 	]*[a-f0-9]+:	c4 e3 79 14 06 34 12 07 	vpextrb \$0x7,%xmm0,0x1234
-[ 	]*[a-f0-9]+:	c5 fb 2a 3e 34 12    	vcvtsi2sdl 0x1234,%xmm0,%xmm7
+[ 	]*[a-f0-9]+:	c5 fb 2a 3e 34 12    	vcvtsi2sd 0x1234,%xmm0,%xmm7
 [ 	]*[a-f0-9]+:	c4 e3 79 44 3e 34 12 07 	vpclmulqdq \$0x7,0x1234,%xmm0,%xmm7
 [ 	]*[a-f0-9]+:	c4 e3 59 4a 36 34 12 00 	vblendvps %xmm0,0x1234,%xmm4,%xmm6
 [ 	]*[a-f0-9]+:	c4 e3 79 20 3e 34 12 07 	vpinsrb \$0x7,0x1234,%xmm0,%xmm7
@@ -1284,7 +1284,7 @@ Disassembly of section .text:
 [ 	]*[a-f0-9]+:	67 c5 f9 e0 7d 00    	vpavgb 0x0\(%ebp\),%xmm0,%xmm7
 [ 	]*[a-f0-9]+:	67 c4 e3 79 df 45 00 07 	vaeskeygenassist \$0x7,0x0\(%ebp\),%xmm0
 [ 	]*[a-f0-9]+:	67 c4 e3 79 14 45 00 07 	vpextrb \$0x7,%xmm0,0x0\(%ebp\)
-[ 	]*[a-f0-9]+:	67 c5 fb 2a 7d 00    	vcvtsi2sdl 0x0\(%ebp\),%xmm0,%xmm7
+[ 	]*[a-f0-9]+:	67 c5 fb 2a 7d 00    	vcvtsi2sd 0x0\(%ebp\),%xmm0,%xmm7
 [ 	]*[a-f0-9]+:	67 c4 e3 79 44 7d 00 07 	vpclmulqdq \$0x7,0x0\(%ebp\),%xmm0,%xmm7
 [ 	]*[a-f0-9]+:	67 c4 e3 59 4a 75 00 00 	vblendvps %xmm0,0x0\(%ebp\),%xmm4,%xmm6
 [ 	]*[a-f0-9]+:	67 c4 e3 79 20 7d 00 07 	vpinsrb \$0x7,0x0\(%ebp\),%xmm0,%xmm7
@@ -1305,7 +1305,7 @@ Disassembly of section .text:
 [ 	]*[a-f0-9]+:	67 c5 f9 e0 3c 24    	vpavgb \(%esp\),%xmm0,%xmm7
 [ 	]*[a-f0-9]+:	67 c4 e3 79 df 04 24 07 	vaeskeygenassist \$0x7,\(%esp\),%xmm0
 [ 	]*[a-f0-9]+:	67 c4 e3 79 14 04 24 07 	vpextrb \$0x7,%xmm0,\(%esp\)
-[ 	]*[a-f0-9]+:	67 c5 fb 2a 3c 24    	vcvtsi2sdl \(%esp\),%xmm0,%xmm7
+[ 	]*[a-f0-9]+:	67 c5 fb 2a 3c 24    	vcvtsi2sd \(%esp\),%xmm0,%xmm7
 [ 	]*[a-f0-9]+:	67 c4 e3 79 44 3c 24 07 	vpclmulqdq \$0x7,\(%esp\),%xmm0,%xmm7
 [ 	]*[a-f0-9]+:	67 c4 e3 59 4a 34 24 00 	vblendvps %xmm0,\(%esp\),%xmm4,%xmm6
 [ 	]*[a-f0-9]+:	67 c4 e3 79 20 3c 24 07 	vpinsrb \$0x7,\(%esp\),%xmm0,%xmm7
@@ -1326,7 +1326,7 @@ Disassembly of section .text:
 [ 	]*[a-f0-9]+:	67 c5 f9 e0 bd 99 00 00 00 	vpavgb 0x99\(%ebp\),%xmm0,%xmm7
 [ 	]*[a-f0-9]+:	67 c4 e3 79 df 85 99 00 00 00 07 	vaeskeygenassist \$0x7,0x99\(%ebp\),%xmm0
 [ 	]*[a-f0-9]+:	67 c4 e3 79 14 85 99 00 00 00 07 	vpextrb \$0x7,%xmm0,0x99\(%ebp\)
-[ 	]*[a-f0-9]+:	67 c5 fb 2a bd 99 00 00 00 	vcvtsi2sdl 0x99\(%ebp\),%xmm0,%xmm7
+[ 	]*[a-f0-9]+:	67 c5 fb 2a bd 99 00 00 00 	vcvtsi2sd 0x99\(%ebp\),%xmm0,%xmm7
 [ 	]*[a-f0-9]+:	67 c4 e3 79 44 bd 99 00 00 00 07 	vpclmulqdq \$0x7,0x99\(%ebp\),%xmm0,%xmm7
 [ 	]*[a-f0-9]+:	67 c4 e3 59 4a b5 99 00 00 00 00 	vblendvps %xmm0,0x99\(%ebp\),%xmm4,%xmm6
 [ 	]*[a-f0-9]+:	67 c4 e3 79 20 bd 99 00 00 00 07 	vpinsrb \$0x7,0x99\(%ebp\),%xmm0,%xmm7
@@ -1347,7 +1347,7 @@ Disassembly of section .text:
 [ 	]*[a-f0-9]+:	67 c5 f9 e0 3c 25 99 00 00 00 	vpavgb 0x99\(,%eiz,1\),%xmm0,%xmm7
 [ 	]*[a-f0-9]+:	67 c4 e3 79 df 04 25 99 00 00 00 07 	vaeskeygenassist \$0x7,0x99\(,%eiz,1\),%xmm0
 [ 	]*[a-f0-9]+:	67 c4 e3 79 14 04 25 99 00 00 00 07 	vpextrb \$0x7,%xmm0,0x99\(,%eiz,1\)
-[ 	]*[a-f0-9]+:	67 c5 fb 2a 3c 25 99 00 00 00 	vcvtsi2sdl 0x99\(,%eiz,1\),%xmm0,%xmm7
+[ 	]*[a-f0-9]+:	67 c5 fb 2a 3c 25 99 00 00 00 	vcvtsi2sd 0x99\(,%eiz,1\),%xmm0,%xmm7
 [ 	]*[a-f0-9]+:	67 c4 e3 79 44 3c 25 99 00 00 00 07 	vpclmulqdq \$0x7,0x99\(,%eiz,1\),%xmm0,%xmm7
 [ 	]*[a-f0-9]+:	67 c4 e3 59 4a 34 25 99 00 00 00 00 	vblendvps %xmm0,0x99\(,%eiz,1\),%xmm4,%xmm6
 [ 	]*[a-f0-9]+:	67 c4 e3 79 20 3c 25 99 00 00 00 07 	vpinsrb \$0x7,0x99\(,%eiz,1\),%xmm0,%xmm7
@@ -1368,7 +1368,7 @@ Disassembly of section .text:
 [ 	]*[a-f0-9]+:	67 c5 f9 e0 3c 65 99 00 00 00 	vpavgb 0x99\(,%eiz,2\),%xmm0,%xmm7
 [ 	]*[a-f0-9]+:	67 c4 e3 79 df 04 65 99 00 00 00 07 	vaeskeygenassist \$0x7,0x99\(,%eiz,2\),%xmm0
 [ 	]*[a-f0-9]+:	67 c4 e3 79 14 04 65 99 00 00 00 07 	vpextrb \$0x7,%xmm0,0x99\(,%eiz,2\)
-[ 	]*[a-f0-9]+:	67 c5 fb 2a 3c 65 99 00 00 00 	vcvtsi2sdl 0x99\(,%eiz,2\),%xmm0,%xmm7
+[ 	]*[a-f0-9]+:	67 c5 fb 2a 3c 65 99 00 00 00 	vcvtsi2sd 0x99\(,%eiz,2\),%xmm0,%xmm7
 [ 	]*[a-f0-9]+:	67 c4 e3 79 44 3c 65 99 00 00 00 07 	vpclmulqdq \$0x7,0x99\(,%eiz,2\),%xmm0,%xmm7
 [ 	]*[a-f0-9]+:	67 c4 e3 59 4a 34 65 99 00 00 00 00 	vblendvps %xmm0,0x99\(,%eiz,2\),%xmm4,%xmm6
 [ 	]*[a-f0-9]+:	67 c4 e3 79 20 3c 65 99 00 00 00 07 	vpinsrb \$0x7,0x99\(,%eiz,2\),%xmm0,%xmm7
@@ -1389,7 +1389,7 @@ Disassembly of section .text:
 [ 	]*[a-f0-9]+:	67 c5 f9 e0 bc 20 99 00 00 00 	vpavgb 0x99\(%eax,%eiz,1\),%xmm0,%xmm7
 [ 	]*[a-f0-9]+:	67 c4 e3 79 df 84 20 99 00 00 00 07 	vaeskeygenassist \$0x7,0x99\(%eax,%eiz,1\),%xmm0
 [ 	]*[a-f0-9]+:	67 c4 e3 79 14 84 20 99 00 00 00 07 	vpextrb \$0x7,%xmm0,0x99\(%eax,%eiz,1\)
-[ 	]*[a-f0-9]+:	67 c5 fb 2a bc 20 99 00 00 00 	vcvtsi2sdl 0x99\(%eax,%eiz,1\),%xmm0,%xmm7
+[ 	]*[a-f0-9]+:	67 c5 fb 2a bc 20 99 00 00 00 	vcvtsi2sd 0x99\(%eax,%eiz,1\),%xmm0,%xmm7
 [ 	]*[a-f0-9]+:	67 c4 e3 79 44 bc 20 99 00 00 00 07 	vpclmulqdq \$0x7,0x99\(%eax,%eiz,1\),%xmm0,%xmm7
 [ 	]*[a-f0-9]+:	67 c4 e3 59 4a b4 20 99 00 00 00 00 	vblendvps %xmm0,0x99\(%eax,%eiz,1\),%xmm4,%xmm6
 [ 	]*[a-f0-9]+:	67 c4 e3 79 20 bc 20 99 00 00 00 07 	vpinsrb \$0x7,0x99\(%eax,%eiz,1\),%xmm0,%xmm7
@@ -1410,7 +1410,7 @@ Disassembly of section .text:
 [ 	]*[a-f0-9]+:	67 c5 f9 e0 bc 60 99 00 00 00 	vpavgb 0x99\(%eax,%eiz,2\),%xmm0,%xmm7
 [ 	]*[a-f0-9]+:	67 c4 e3 79 df 84 60 99 00 00 00 07 	vaeskeygenassist \$0x7,0x99\(%eax,%eiz,2\),%xmm0
 [ 	]*[a-f0-9]+:	67 c4 e3 79 14 84 60 99 00 00 00 07 	vpextrb \$0x7,%xmm0,0x99\(%eax,%eiz,2\)
-[ 	]*[a-f0-9]+:	67 c5 fb 2a bc 60 99 00 00 00 	vcvtsi2sdl 0x99\(%eax,%eiz,2\),%xmm0,%xmm7
+[ 	]*[a-f0-9]+:	67 c5 fb 2a bc 60 99 00 00 00 	vcvtsi2sd 0x99\(%eax,%eiz,2\),%xmm0,%xmm7
 [ 	]*[a-f0-9]+:	67 c4 e3 79 44 bc 60 99 00 00 00 07 	vpclmulqdq \$0x7,0x99\(%eax,%eiz,2\),%xmm0,%xmm7
 [ 	]*[a-f0-9]+:	67 c4 e3 59 4a b4 60 99 00 00 00 00 	vblendvps %xmm0,0x99\(%eax,%eiz,2\),%xmm4,%xmm6
 [ 	]*[a-f0-9]+:	67 c4 e3 79 20 bc 60 99 00 00 00 07 	vpinsrb \$0x7,0x99\(%eax,%eiz,2\),%xmm0,%xmm7
@@ -1431,7 +1431,7 @@ Disassembly of section .text:
 [ 	]*[a-f0-9]+:	67 c5 f9 e0 bc 98 99 00 00 00 	vpavgb 0x99\(%eax,%ebx,4\),%xmm0,%xmm7
 [ 	]*[a-f0-9]+:	67 c4 e3 79 df 84 98 99 00 00 00 07 	vaeskeygenassist \$0x7,0x99\(%eax,%ebx,4\),%xmm0
 [ 	]*[a-f0-9]+:	67 c4 e3 79 14 84 98 99 00 00 00 07 	vpextrb \$0x7,%xmm0,0x99\(%eax,%ebx,4\)
-[ 	]*[a-f0-9]+:	67 c5 fb 2a bc 98 99 00 00 00 	vcvtsi2sdl 0x99\(%eax,%ebx,4\),%xmm0,%xmm7
+[ 	]*[a-f0-9]+:	67 c5 fb 2a bc 98 99 00 00 00 	vcvtsi2sd 0x99\(%eax,%ebx,4\),%xmm0,%xmm7
 [ 	]*[a-f0-9]+:	67 c4 e3 79 44 bc 98 99 00 00 00 07 	vpclmulqdq \$0x7,0x99\(%eax,%ebx,4\),%xmm0,%xmm7
 [ 	]*[a-f0-9]+:	67 c4 e3 59 4a b4 98 99 00 00 00 00 	vblendvps %xmm0,0x99\(%eax,%ebx,4\),%xmm4,%xmm6
 [ 	]*[a-f0-9]+:	67 c4 e3 79 20 bc 98 99 00 00 00 07 	vpinsrb \$0x7,0x99\(%eax,%ebx,4\),%xmm0,%xmm7
@@ -1452,7 +1452,7 @@ Disassembly of section .text:
 [ 	]*[a-f0-9]+:	67 c5 f9 e0 bc cc 99 00 00 00 	vpavgb 0x99\(%esp,%ecx,8\),%xmm0,%xmm7
 [ 	]*[a-f0-9]+:	67 c4 e3 79 df 84 cc 99 00 00 00 07 	vaeskeygenassist \$0x7,0x99\(%esp,%ecx,8\),%xmm0
 [ 	]*[a-f0-9]+:	67 c4 e3 79 14 84 cc 99 00 00 00 07 	vpextrb \$0x7,%xmm0,0x99\(%esp,%ecx,8\)
-[ 	]*[a-f0-9]+:	67 c5 fb 2a bc cc 99 00 00 00 	vcvtsi2sdl 0x99\(%esp,%ecx,8\),%xmm0,%xmm7
+[ 	]*[a-f0-9]+:	67 c5 fb 2a bc cc 99 00 00 00 	vcvtsi2sd 0x99\(%esp,%ecx,8\),%xmm0,%xmm7
 [ 	]*[a-f0-9]+:	67 c4 e3 79 44 bc cc 99 00 00 00 07 	vpclmulqdq \$0x7,0x99\(%esp,%ecx,8\),%xmm0,%xmm7
 [ 	]*[a-f0-9]+:	67 c4 e3 59 4a b4 cc 99 00 00 00 00 	vblendvps %xmm0,0x99\(%esp,%ecx,8\),%xmm4,%xmm6
 [ 	]*[a-f0-9]+:	67 c4 e3 79 20 bc cc 99 00 00 00 07 	vpinsrb \$0x7,0x99\(%esp,%ecx,8\),%xmm0,%xmm7
@@ -1473,7 +1473,7 @@ Disassembly of section .text:
 [ 	]*[a-f0-9]+:	67 c5 f9 e0 bc 15 99 00 00 00 	vpavgb 0x99\(%ebp,%edx,1\),%xmm0,%xmm7
 [ 	]*[a-f0-9]+:	67 c4 e3 79 df 84 15 99 00 00 00 07 	vaeskeygenassist \$0x7,0x99\(%ebp,%edx,1\),%xmm0
 [ 	]*[a-f0-9]+:	67 c4 e3 79 14 84 15 99 00 00 00 07 	vpextrb \$0x7,%xmm0,0x99\(%ebp,%edx,1\)
-[ 	]*[a-f0-9]+:	67 c5 fb 2a bc 15 99 00 00 00 	vcvtsi2sdl 0x99\(%ebp,%edx,1\),%xmm0,%xmm7
+[ 	]*[a-f0-9]+:	67 c5 fb 2a bc 15 99 00 00 00 	vcvtsi2sd 0x99\(%ebp,%edx,1\),%xmm0,%xmm7
 [ 	]*[a-f0-9]+:	67 c4 e3 79 44 bc 15 99 00 00 00 07 	vpclmulqdq \$0x7,0x99\(%ebp,%edx,1\),%xmm0,%xmm7
 [ 	]*[a-f0-9]+:	67 c4 e3 59 4a b4 15 99 00 00 00 00 	vblendvps %xmm0,0x99\(%ebp,%edx,1\),%xmm4,%xmm6
 [ 	]*[a-f0-9]+:	67 c4 e3 79 20 bc 15 99 00 00 00 07 	vpinsrb \$0x7,0x99\(%ebp,%edx,1\),%xmm0,%xmm7
@@ -3105,11 +3105,11 @@ Disassembly of section .text:
 [ 	]*[a-f0-9]+:	67 c4 e3 59 22 31 07 	vpinsrd \$0x7,\(%ecx\),%xmm4,%xmm6
 [ 	]*[a-f0-9]+:	67 c4 e3 59 22 31 07 	vpinsrd \$0x7,\(%ecx\),%xmm4,%xmm6
 [ 	]*[a-f0-9]+:	c5 db 2a f1          	vcvtsi2sd %ecx,%xmm4,%xmm6
-[ 	]*[a-f0-9]+:	67 c5 db 2a 31       	vcvtsi2sdl \(%ecx\),%xmm4,%xmm6
-[ 	]*[a-f0-9]+:	67 c5 db 2a 31       	vcvtsi2sdl \(%ecx\),%xmm4,%xmm6
+[ 	]*[a-f0-9]+:	67 c5 db 2a 31       	vcvtsi2sd \(%ecx\),%xmm4,%xmm6
+[ 	]*[a-f0-9]+:	67 c5 db 2a 31       	vcvtsi2sd \(%ecx\),%xmm4,%xmm6
 [ 	]*[a-f0-9]+:	c5 da 2a f1          	vcvtsi2ss %ecx,%xmm4,%xmm6
-[ 	]*[a-f0-9]+:	67 c5 da 2a 31       	vcvtsi2ssl \(%ecx\),%xmm4,%xmm6
-[ 	]*[a-f0-9]+:	67 c5 da 2a 31       	vcvtsi2ssl \(%ecx\),%xmm4,%xmm6
+[ 	]*[a-f0-9]+:	67 c5 da 2a 31       	vcvtsi2ss \(%ecx\),%xmm4,%xmm6
+[ 	]*[a-f0-9]+:	67 c5 da 2a 31       	vcvtsi2ss \(%ecx\),%xmm4,%xmm6
 [ 	]*[a-f0-9]+:	c5 ca c2 d4 07       	vcmpordss %xmm4,%xmm6,%xmm2
 [ 	]*[a-f0-9]+:	67 c5 ca c2 11 07    	vcmpordss \(%ecx\),%xmm6,%xmm2
 [ 	]*[a-f0-9]+:	67 c5 ca c2 11 07    	vcmpordss \(%ecx\),%xmm6,%xmm2
@@ -3179,7 +3179,7 @@ Disassembly of section .text:
 [ 	]*[a-f0-9]+:	c5 f9 e0 3e 34 12    	vpavgb 0x1234,%xmm0,%xmm7
 [ 	]*[a-f0-9]+:	c4 e3 79 df 06 34 12 07 	vaeskeygenassist \$0x7,0x1234,%xmm0
 [ 	]*[a-f0-9]+:	c4 e3 79 14 06 34 12 07 	vpextrb \$0x7,%xmm0,0x1234
-[ 	]*[a-f0-9]+:	c5 fb 2a 3e 34 12    	vcvtsi2sdl 0x1234,%xmm0,%xmm7
+[ 	]*[a-f0-9]+:	c5 fb 2a 3e 34 12    	vcvtsi2sd 0x1234,%xmm0,%xmm7
 [ 	]*[a-f0-9]+:	c4 e3 79 44 3e 34 12 07 	vpclmulqdq \$0x7,0x1234,%xmm0,%xmm7
 [ 	]*[a-f0-9]+:	c4 e3 59 4a 36 34 12 00 	vblendvps %xmm0,0x1234,%xmm4,%xmm6
 [ 	]*[a-f0-9]+:	c4 e3 79 20 3e 34 12 07 	vpinsrb \$0x7,0x1234,%xmm0,%xmm7
@@ -3200,7 +3200,7 @@ Disassembly of section .text:
 [ 	]*[a-f0-9]+:	67 c5 f9 e0 7d 00    	vpavgb 0x0\(%ebp\),%xmm0,%xmm7
 [ 	]*[a-f0-9]+:	67 c4 e3 79 df 45 00 07 	vaeskeygenassist \$0x7,0x0\(%ebp\),%xmm0
 [ 	]*[a-f0-9]+:	67 c4 e3 79 14 45 00 07 	vpextrb \$0x7,%xmm0,0x0\(%ebp\)
-[ 	]*[a-f0-9]+:	67 c5 fb 2a 7d 00    	vcvtsi2sdl 0x0\(%ebp\),%xmm0,%xmm7
+[ 	]*[a-f0-9]+:	67 c5 fb 2a 7d 00    	vcvtsi2sd 0x0\(%ebp\),%xmm0,%xmm7
 [ 	]*[a-f0-9]+:	67 c4 e3 79 44 7d 00 07 	vpclmulqdq \$0x7,0x0\(%ebp\),%xmm0,%xmm7
 [ 	]*[a-f0-9]+:	67 c4 e3 59 4a 75 00 00 	vblendvps %xmm0,0x0\(%ebp\),%xmm4,%xmm6
 [ 	]*[a-f0-9]+:	67 c4 e3 79 20 7d 00 07 	vpinsrb \$0x7,0x0\(%ebp\),%xmm0,%xmm7
@@ -3221,7 +3221,7 @@ Disassembly of section .text:
 [ 	]*[a-f0-9]+:	67 c5 f9 e0 bd 99 00 00 00 	vpavgb 0x99\(%ebp\),%xmm0,%xmm7
 [ 	]*[a-f0-9]+:	67 c4 e3 79 df 85 99 00 00 00 07 	vaeskeygenassist \$0x7,0x99\(%ebp\),%xmm0
 [ 	]*[a-f0-9]+:	67 c4 e3 79 14 85 99 00 00 00 07 	vpextrb \$0x7,%xmm0,0x99\(%ebp\)
-[ 	]*[a-f0-9]+:	67 c5 fb 2a bd 99 00 00 00 	vcvtsi2sdl 0x99\(%ebp\),%xmm0,%xmm7
+[ 	]*[a-f0-9]+:	67 c5 fb 2a bd 99 00 00 00 	vcvtsi2sd 0x99\(%ebp\),%xmm0,%xmm7
 [ 	]*[a-f0-9]+:	67 c4 e3 79 44 bd 99 00 00 00 07 	vpclmulqdq \$0x7,0x99\(%ebp\),%xmm0,%xmm7
 [ 	]*[a-f0-9]+:	67 c4 e3 59 4a b5 99 00 00 00 00 	vblendvps %xmm0,0x99\(%ebp\),%xmm4,%xmm6
 [ 	]*[a-f0-9]+:	67 c4 e3 79 20 bd 99 00 00 00 07 	vpinsrb \$0x7,0x99\(%ebp\),%xmm0,%xmm7
@@ -3242,7 +3242,7 @@ Disassembly of section .text:
 [ 	]*[a-f0-9]+:	67 c5 f9 e0 3c 25 99 00 00 00 	vpavgb 0x99\(,%eiz,1\),%xmm0,%xmm7
 [ 	]*[a-f0-9]+:	67 c4 e3 79 df 04 25 99 00 00 00 07 	vaeskeygenassist \$0x7,0x99\(,%eiz,1\),%xmm0
 [ 	]*[a-f0-9]+:	67 c4 e3 79 14 04 25 99 00 00 00 07 	vpextrb \$0x7,%xmm0,0x99\(,%eiz,1\)
-[ 	]*[a-f0-9]+:	67 c5 fb 2a 3c 25 99 00 00 00 	vcvtsi2sdl 0x99\(,%eiz,1\),%xmm0,%xmm7
+[ 	]*[a-f0-9]+:	67 c5 fb 2a 3c 25 99 00 00 00 	vcvtsi2sd 0x99\(,%eiz,1\),%xmm0,%xmm7
 [ 	]*[a-f0-9]+:	67 c4 e3 79 44 3c 25 99 00 00 00 07 	vpclmulqdq \$0x7,0x99\(,%eiz,1\),%xmm0,%xmm7
 [ 	]*[a-f0-9]+:	67 c4 e3 59 4a 34 25 99 00 00 00 00 	vblendvps %xmm0,0x99\(,%eiz,1\),%xmm4,%xmm6
 [ 	]*[a-f0-9]+:	67 c4 e3 79 20 3c 25 99 00 00 00 07 	vpinsrb \$0x7,0x99\(,%eiz,1\),%xmm0,%xmm7
@@ -3263,7 +3263,7 @@ Disassembly of section .text:
 [ 	]*[a-f0-9]+:	67 c5 f9 e0 3c 65 99 00 00 00 	vpavgb 0x99\(,%eiz,2\),%xmm0,%xmm7
 [ 	]*[a-f0-9]+:	67 c4 e3 79 df 04 65 99 00 00 00 07 	vaeskeygenassist \$0x7,0x99\(,%eiz,2\),%xmm0
 [ 	]*[a-f0-9]+:	67 c4 e3 79 14 04 65 99 00 00 00 07 	vpextrb \$0x7,%xmm0,0x99\(,%eiz,2\)
-[ 	]*[a-f0-9]+:	67 c5 fb 2a 3c 65 99 00 00 00 	vcvtsi2sdl 0x99\(,%eiz,2\),%xmm0,%xmm7
+[ 	]*[a-f0-9]+:	67 c5 fb 2a 3c 65 99 00 00 00 	vcvtsi2sd 0x99\(,%eiz,2\),%xmm0,%xmm7
 [ 	]*[a-f0-9]+:	67 c4 e3 79 44 3c 65 99 00 00 00 07 	vpclmulqdq \$0x7,0x99\(,%eiz,2\),%xmm0,%xmm7
 [ 	]*[a-f0-9]+:	67 c4 e3 59 4a 34 65 99 00 00 00 00 	vblendvps %xmm0,0x99\(,%eiz,2\),%xmm4,%xmm6
 [ 	]*[a-f0-9]+:	67 c4 e3 79 20 3c 65 99 00 00 00 07 	vpinsrb \$0x7,0x99\(,%eiz,2\),%xmm0,%xmm7
@@ -3284,7 +3284,7 @@ Disassembly of section .text:
 [ 	]*[a-f0-9]+:	67 c5 f9 e0 bc 20 99 00 00 00 	vpavgb 0x99\(%eax,%eiz,1\),%xmm0,%xmm7
 [ 	]*[a-f0-9]+:	67 c4 e3 79 df 84 20 99 00 00 00 07 	vaeskeygenassist \$0x7,0x99\(%eax,%eiz,1\),%xmm0
 [ 	]*[a-f0-9]+:	67 c4 e3 79 14 84 20 99 00 00 00 07 	vpextrb \$0x7,%xmm0,0x99\(%eax,%eiz,1\)
-[ 	]*[a-f0-9]+:	67 c5 fb 2a bc 20 99 00 00 00 	vcvtsi2sdl 0x99\(%eax,%eiz,1\),%xmm0,%xmm7
+[ 	]*[a-f0-9]+:	67 c5 fb 2a bc 20 99 00 00 00 	vcvtsi2sd 0x99\(%eax,%eiz,1\),%xmm0,%xmm7
 [ 	]*[a-f0-9]+:	67 c4 e3 79 44 bc 20 99 00 00 00 07 	vpclmulqdq \$0x7,0x99\(%eax,%eiz,1\),%xmm0,%xmm7
 [ 	]*[a-f0-9]+:	67 c4 e3 59 4a b4 20 99 00 00 00 00 	vblendvps %xmm0,0x99\(%eax,%eiz,1\),%xmm4,%xmm6
 [ 	]*[a-f0-9]+:	67 c4 e3 79 20 bc 20 99 00 00 00 07 	vpinsrb \$0x7,0x99\(%eax,%eiz,1\),%xmm0,%xmm7
@@ -3305,7 +3305,7 @@ Disassembly of section .text:
 [ 	]*[a-f0-9]+:	67 c5 f9 e0 bc 60 99 00 00 00 	vpavgb 0x99\(%eax,%eiz,2\),%xmm0,%xmm7
 [ 	]*[a-f0-9]+:	67 c4 e3 79 df 84 60 99 00 00 00 07 	vaeskeygenassist \$0x7,0x99\(%eax,%eiz,2\),%xmm0
 [ 	]*[a-f0-9]+:	67 c4 e3 79 14 84 60 99 00 00 00 07 	vpextrb \$0x7,%xmm0,0x99\(%eax,%eiz,2\)
-[ 	]*[a-f0-9]+:	67 c5 fb 2a bc 60 99 00 00 00 	vcvtsi2sdl 0x99\(%eax,%eiz,2\),%xmm0,%xmm7
+[ 	]*[a-f0-9]+:	67 c5 fb 2a bc 60 99 00 00 00 	vcvtsi2sd 0x99\(%eax,%eiz,2\),%xmm0,%xmm7
 [ 	]*[a-f0-9]+:	67 c4 e3 79 44 bc 60 99 00 00 00 07 	vpclmulqdq \$0x7,0x99\(%eax,%eiz,2\),%xmm0,%xmm7
 [ 	]*[a-f0-9]+:	67 c4 e3 59 4a b4 60 99 00 00 00 00 	vblendvps %xmm0,0x99\(%eax,%eiz,2\),%xmm4,%xmm6
 [ 	]*[a-f0-9]+:	67 c4 e3 79 20 bc 60 99 00 00 00 07 	vpinsrb \$0x7,0x99\(%eax,%eiz,2\),%xmm0,%xmm7
@@ -3326,7 +3326,7 @@ Disassembly of section .text:
 [ 	]*[a-f0-9]+:	67 c5 f9 e0 bc 98 99 00 00 00 	vpavgb 0x99\(%eax,%ebx,4\),%xmm0,%xmm7
 [ 	]*[a-f0-9]+:	67 c4 e3 79 df 84 98 99 00 00 00 07 	vaeskeygenassist \$0x7,0x99\(%eax,%ebx,4\),%xmm0
 [ 	]*[a-f0-9]+:	67 c4 e3 79 14 84 98 99 00 00 00 07 	vpextrb \$0x7,%xmm0,0x99\(%eax,%ebx,4\)
-[ 	]*[a-f0-9]+:	67 c5 fb 2a bc 98 99 00 00 00 	vcvtsi2sdl 0x99\(%eax,%ebx,4\),%xmm0,%xmm7
+[ 	]*[a-f0-9]+:	67 c5 fb 2a bc 98 99 00 00 00 	vcvtsi2sd 0x99\(%eax,%ebx,4\),%xmm0,%xmm7
 [ 	]*[a-f0-9]+:	67 c4 e3 79 44 bc 98 99 00 00 00 07 	vpclmulqdq \$0x7,0x99\(%eax,%ebx,4\),%xmm0,%xmm7
 [ 	]*[a-f0-9]+:	67 c4 e3 59 4a b4 98 99 00 00 00 00 	vblendvps %xmm0,0x99\(%eax,%ebx,4\),%xmm4,%xmm6
 [ 	]*[a-f0-9]+:	67 c4 e3 79 20 bc 98 99 00 00 00 07 	vpinsrb \$0x7,0x99\(%eax,%ebx,4\),%xmm0,%xmm7
@@ -3347,7 +3347,7 @@ Disassembly of section .text:
 [ 	]*[a-f0-9]+:	67 c5 f9 e0 bc cc 99 00 00 00 	vpavgb 0x99\(%esp,%ecx,8\),%xmm0,%xmm7
 [ 	]*[a-f0-9]+:	67 c4 e3 79 df 84 cc 99 00 00 00 07 	vaeskeygenassist \$0x7,0x99\(%esp,%ecx,8\),%xmm0
 [ 	]*[a-f0-9]+:	67 c4 e3 79 14 84 cc 99 00 00 00 07 	vpextrb \$0x7,%xmm0,0x99\(%esp,%ecx,8\)
-[ 	]*[a-f0-9]+:	67 c5 fb 2a bc cc 99 00 00 00 	vcvtsi2sdl 0x99\(%esp,%ecx,8\),%xmm0,%xmm7
+[ 	]*[a-f0-9]+:	67 c5 fb 2a bc cc 99 00 00 00 	vcvtsi2sd 0x99\(%esp,%ecx,8\),%xmm0,%xmm7
 [ 	]*[a-f0-9]+:	67 c4 e3 79 44 bc cc 99 00 00 00 07 	vpclmulqdq \$0x7,0x99\(%esp,%ecx,8\),%xmm0,%xmm7
 [ 	]*[a-f0-9]+:	67 c4 e3 59 4a b4 cc 99 00 00 00 00 	vblendvps %xmm0,0x99\(%esp,%ecx,8\),%xmm4,%xmm6
 [ 	]*[a-f0-9]+:	67 c4 e3 79 20 bc cc 99 00 00 00 07 	vpinsrb \$0x7,0x99\(%esp,%ecx,8\),%xmm0,%xmm7
@@ -3368,7 +3368,7 @@ Disassembly of section .text:
 [ 	]*[a-f0-9]+:	67 c5 f9 e0 bc 15 99 00 00 00 	vpavgb 0x99\(%ebp,%edx,1\),%xmm0,%xmm7
 [ 	]*[a-f0-9]+:	67 c4 e3 79 df 84 15 99 00 00 00 07 	vaeskeygenassist \$0x7,0x99\(%ebp,%edx,1\),%xmm0
 [ 	]*[a-f0-9]+:	67 c4 e3 79 14 84 15 99 00 00 00 07 	vpextrb \$0x7,%xmm0,0x99\(%ebp,%edx,1\)
-[ 	]*[a-f0-9]+:	67 c5 fb 2a bc 15 99 00 00 00 	vcvtsi2sdl 0x99\(%ebp,%edx,1\),%xmm0,%xmm7
+[ 	]*[a-f0-9]+:	67 c5 fb 2a bc 15 99 00 00 00 	vcvtsi2sd 0x99\(%ebp,%edx,1\),%xmm0,%xmm7
 [ 	]*[a-f0-9]+:	67 c4 e3 79 44 bc 15 99 00 00 00 07 	vpclmulqdq \$0x7,0x99\(%ebp,%edx,1\),%xmm0,%xmm7
 [ 	]*[a-f0-9]+:	67 c4 e3 59 4a b4 15 99 00 00 00 00 	vblendvps %xmm0,0x99\(%ebp,%edx,1\),%xmm4,%xmm6
 [ 	]*[a-f0-9]+:	67 c4 e3 79 20 bc 15 99 00 00 00 07 	vpinsrb \$0x7,0x99\(%ebp,%edx,1\),%xmm0,%xmm7
diff --git a/gas/testsuite/gas/i386/avx-scalar.d b/gas/testsuite/gas/i386/avx-scalar.d
index 47bb3ed..7ab1824 100644
--- a/gas/testsuite/gas/i386/avx-scalar.d
+++ b/gas/testsuite/gas/i386/avx-scalar.d
@@ -197,26 +197,26 @@ Disassembly of section .text:
 [ 	]*[a-f0-9]+:	c5 fe 2c cc          	vcvttss2si %xmm4,%ecx
 [ 	]*[a-f0-9]+:	c5 fe 2c 09          	vcvttss2si \(%ecx\),%ecx
 [ 	]*[a-f0-9]+:	c5 df 2a f1          	vcvtsi2sd %ecx,%xmm4,%xmm6
-[ 	]*[a-f0-9]+:	c5 df 2a 31          	vcvtsi2sdl \(%ecx\),%xmm4,%xmm6
+[ 	]*[a-f0-9]+:	c5 df 2a 31          	vcvtsi2sd \(%ecx\),%xmm4,%xmm6
 [ 	]*[a-f0-9]+:	c5 de 2a f1          	vcvtsi2ss %ecx,%xmm4,%xmm6
-[ 	]*[a-f0-9]+:	c5 de 2a 31          	vcvtsi2ssl \(%ecx\),%xmm4,%xmm6
+[ 	]*[a-f0-9]+:	c5 de 2a 31          	vcvtsi2ss \(%ecx\),%xmm4,%xmm6
 [ 	]*[a-f0-9]+:	c5 ce c2 d4 07       	vcmpordss %xmm4,%xmm6,%xmm2
 [ 	]*[a-f0-9]+:	c5 ce c2 11 07       	vcmpordss \(%ecx\),%xmm6,%xmm2
 [ 	]*[a-f0-9]+:	c4 e3 4d 0a d4 07    	vroundss \$0x7,%xmm4,%xmm6,%xmm2
 [ 	]*[a-f0-9]+:	c4 e3 4d 0a 11 07    	vroundss \$0x7,\(%ecx\),%xmm6,%xmm2
 [ 	]*[a-f0-9]+:	c5 cf 10 d4          	vmovsd %xmm4,%xmm6,%xmm2
 [ 	]*[a-f0-9]+:	c5 ce 10 d4          	vmovss %xmm4,%xmm6,%xmm2
-[ 	]*[a-f0-9]+:	c5 ff 2a 3d 34 12 00 00 	vcvtsi2sdl 0x1234,%xmm0,%xmm7
-[ 	]*[a-f0-9]+:	c5 ff 2a 7d 00       	vcvtsi2sdl 0x0\(%ebp\),%xmm0,%xmm7
-[ 	]*[a-f0-9]+:	c5 ff 2a 3c 24       	vcvtsi2sdl \(%esp\),%xmm0,%xmm7
-[ 	]*[a-f0-9]+:	c5 ff 2a bd 99 00 00 00 	vcvtsi2sdl 0x99\(%ebp\),%xmm0,%xmm7
-[ 	]*[a-f0-9]+:	c5 ff 2a 3c 25 99 00 00 00 	vcvtsi2sdl 0x99\(,%eiz,1\),%xmm0,%xmm7
-[ 	]*[a-f0-9]+:	c5 ff 2a 3c 65 99 00 00 00 	vcvtsi2sdl 0x99\(,%eiz,2\),%xmm0,%xmm7
-[ 	]*[a-f0-9]+:	c5 ff 2a bc 20 99 00 00 00 	vcvtsi2sdl 0x99\(%eax,%eiz,1\),%xmm0,%xmm7
-[ 	]*[a-f0-9]+:	c5 ff 2a bc 60 99 00 00 00 	vcvtsi2sdl 0x99\(%eax,%eiz,2\),%xmm0,%xmm7
-[ 	]*[a-f0-9]+:	c5 ff 2a bc 98 99 00 00 00 	vcvtsi2sdl 0x99\(%eax,%ebx,4\),%xmm0,%xmm7
-[ 	]*[a-f0-9]+:	c5 ff 2a bc cc 99 00 00 00 	vcvtsi2sdl 0x99\(%esp,%ecx,8\),%xmm0,%xmm7
-[ 	]*[a-f0-9]+:	c5 ff 2a bc 15 99 00 00 00 	vcvtsi2sdl 0x99\(%ebp,%edx,1\),%xmm0,%xmm7
+[ 	]*[a-f0-9]+:	c5 ff 2a 3d 34 12 00 00 	vcvtsi2sd 0x1234,%xmm0,%xmm7
+[ 	]*[a-f0-9]+:	c5 ff 2a 7d 00       	vcvtsi2sd 0x0\(%ebp\),%xmm0,%xmm7
+[ 	]*[a-f0-9]+:	c5 ff 2a 3c 24       	vcvtsi2sd \(%esp\),%xmm0,%xmm7
+[ 	]*[a-f0-9]+:	c5 ff 2a bd 99 00 00 00 	vcvtsi2sd 0x99\(%ebp\),%xmm0,%xmm7
+[ 	]*[a-f0-9]+:	c5 ff 2a 3c 25 99 00 00 00 	vcvtsi2sd 0x99\(,%eiz,1\),%xmm0,%xmm7
+[ 	]*[a-f0-9]+:	c5 ff 2a 3c 65 99 00 00 00 	vcvtsi2sd 0x99\(,%eiz,2\),%xmm0,%xmm7
+[ 	]*[a-f0-9]+:	c5 ff 2a bc 20 99 00 00 00 	vcvtsi2sd 0x99\(%eax,%eiz,1\),%xmm0,%xmm7
+[ 	]*[a-f0-9]+:	c5 ff 2a bc 60 99 00 00 00 	vcvtsi2sd 0x99\(%eax,%eiz,2\),%xmm0,%xmm7
+[ 	]*[a-f0-9]+:	c5 ff 2a bc 98 99 00 00 00 	vcvtsi2sd 0x99\(%eax,%ebx,4\),%xmm0,%xmm7
+[ 	]*[a-f0-9]+:	c5 ff 2a bc cc 99 00 00 00 	vcvtsi2sd 0x99\(%esp,%ecx,8\),%xmm0,%xmm7
+[ 	]*[a-f0-9]+:	c5 ff 2a bc 15 99 00 00 00 	vcvtsi2sd 0x99\(%ebp,%edx,1\),%xmm0,%xmm7
 [ 	]*[a-f0-9]+:	c5 fd 2f f4          	vcomisd %xmm4,%xmm6
 [ 	]*[a-f0-9]+:	c5 fd 2f 21          	vcomisd \(%ecx\),%xmm4
 [ 	]*[a-f0-9]+:	c5 fd 2f 21          	vcomisd \(%ecx\),%xmm4
@@ -502,11 +502,11 @@ Disassembly of section .text:
 [ 	]*[a-f0-9]+:	c5 fe 2c 09          	vcvttss2si \(%ecx\),%ecx
 [ 	]*[a-f0-9]+:	c5 fe 2c 09          	vcvttss2si \(%ecx\),%ecx
 [ 	]*[a-f0-9]+:	c5 df 2a f1          	vcvtsi2sd %ecx,%xmm4,%xmm6
-[ 	]*[a-f0-9]+:	c5 df 2a 31          	vcvtsi2sdl \(%ecx\),%xmm4,%xmm6
-[ 	]*[a-f0-9]+:	c5 df 2a 31          	vcvtsi2sdl \(%ecx\),%xmm4,%xmm6
+[ 	]*[a-f0-9]+:	c5 df 2a 31          	vcvtsi2sd \(%ecx\),%xmm4,%xmm6
+[ 	]*[a-f0-9]+:	c5 df 2a 31          	vcvtsi2sd \(%ecx\),%xmm4,%xmm6
 [ 	]*[a-f0-9]+:	c5 de 2a f1          	vcvtsi2ss %ecx,%xmm4,%xmm6
-[ 	]*[a-f0-9]+:	c5 de 2a 31          	vcvtsi2ssl \(%ecx\),%xmm4,%xmm6
-[ 	]*[a-f0-9]+:	c5 de 2a 31          	vcvtsi2ssl \(%ecx\),%xmm4,%xmm6
+[ 	]*[a-f0-9]+:	c5 de 2a 31          	vcvtsi2ss \(%ecx\),%xmm4,%xmm6
+[ 	]*[a-f0-9]+:	c5 de 2a 31          	vcvtsi2ss \(%ecx\),%xmm4,%xmm6
 [ 	]*[a-f0-9]+:	c5 ce c2 d4 07       	vcmpordss %xmm4,%xmm6,%xmm2
 [ 	]*[a-f0-9]+:	c5 ce c2 11 07       	vcmpordss \(%ecx\),%xmm6,%xmm2
 [ 	]*[a-f0-9]+:	c5 ce c2 11 07       	vcmpordss \(%ecx\),%xmm6,%xmm2
@@ -515,14 +515,14 @@ Disassembly of section .text:
 [ 	]*[a-f0-9]+:	c4 e3 4d 0a 11 07    	vroundss \$0x7,\(%ecx\),%xmm6,%xmm2
 [ 	]*[a-f0-9]+:	c5 cf 10 d4          	vmovsd %xmm4,%xmm6,%xmm2
 [ 	]*[a-f0-9]+:	c5 ce 10 d4          	vmovss %xmm4,%xmm6,%xmm2
-[ 	]*[a-f0-9]+:	c5 ff 2a 3d 34 12 00 00 	vcvtsi2sdl 0x1234,%xmm0,%xmm7
-[ 	]*[a-f0-9]+:	c5 ff 2a 7d 00       	vcvtsi2sdl 0x0\(%ebp\),%xmm0,%xmm7
-[ 	]*[a-f0-9]+:	c5 ff 2a bd 99 00 00 00 	vcvtsi2sdl 0x99\(%ebp\),%xmm0,%xmm7
-[ 	]*[a-f0-9]+:	c5 ff 2a 3c 25 99 00 00 00 	vcvtsi2sdl 0x99\(,%eiz,1\),%xmm0,%xmm7
-[ 	]*[a-f0-9]+:	c5 ff 2a 3c 65 99 00 00 00 	vcvtsi2sdl 0x99\(,%eiz,2\),%xmm0,%xmm7
-[ 	]*[a-f0-9]+:	c5 ff 2a bc 20 99 00 00 00 	vcvtsi2sdl 0x99\(%eax,%eiz,1\),%xmm0,%xmm7
-[ 	]*[a-f0-9]+:	c5 ff 2a bc 60 99 00 00 00 	vcvtsi2sdl 0x99\(%eax,%eiz,2\),%xmm0,%xmm7
-[ 	]*[a-f0-9]+:	c5 ff 2a bc 98 99 00 00 00 	vcvtsi2sdl 0x99\(%eax,%ebx,4\),%xmm0,%xmm7
-[ 	]*[a-f0-9]+:	c5 ff 2a bc cc 99 00 00 00 	vcvtsi2sdl 0x99\(%esp,%ecx,8\),%xmm0,%xmm7
-[ 	]*[a-f0-9]+:	c5 ff 2a bc 15 99 00 00 00 	vcvtsi2sdl 0x99\(%ebp,%edx,1\),%xmm0,%xmm7
+[ 	]*[a-f0-9]+:	c5 ff 2a 3d 34 12 00 00 	vcvtsi2sd 0x1234,%xmm0,%xmm7
+[ 	]*[a-f0-9]+:	c5 ff 2a 7d 00       	vcvtsi2sd 0x0\(%ebp\),%xmm0,%xmm7
+[ 	]*[a-f0-9]+:	c5 ff 2a bd 99 00 00 00 	vcvtsi2sd 0x99\(%ebp\),%xmm0,%xmm7
+[ 	]*[a-f0-9]+:	c5 ff 2a 3c 25 99 00 00 00 	vcvtsi2sd 0x99\(,%eiz,1\),%xmm0,%xmm7
+[ 	]*[a-f0-9]+:	c5 ff 2a 3c 65 99 00 00 00 	vcvtsi2sd 0x99\(,%eiz,2\),%xmm0,%xmm7
+[ 	]*[a-f0-9]+:	c5 ff 2a bc 20 99 00 00 00 	vcvtsi2sd 0x99\(%eax,%eiz,1\),%xmm0,%xmm7
+[ 	]*[a-f0-9]+:	c5 ff 2a bc 60 99 00 00 00 	vcvtsi2sd 0x99\(%eax,%eiz,2\),%xmm0,%xmm7
+[ 	]*[a-f0-9]+:	c5 ff 2a bc 98 99 00 00 00 	vcvtsi2sd 0x99\(%eax,%ebx,4\),%xmm0,%xmm7
+[ 	]*[a-f0-9]+:	c5 ff 2a bc cc 99 00 00 00 	vcvtsi2sd 0x99\(%esp,%ecx,8\),%xmm0,%xmm7
+[ 	]*[a-f0-9]+:	c5 ff 2a bc 15 99 00 00 00 	vcvtsi2sd 0x99\(%ebp,%edx,1\),%xmm0,%xmm7
 #pass
diff --git a/gas/testsuite/gas/i386/avx.d b/gas/testsuite/gas/i386/avx.d
index d25e0e3..4741c45 100644
--- a/gas/testsuite/gas/i386/avx.d
+++ b/gas/testsuite/gas/i386/avx.d
@@ -1201,9 +1201,9 @@ Disassembly of section .text:
 [ 	]*[a-f0-9]+:	c4 e3 59 22 f1 07    	vpinsrd \$0x7,%ecx,%xmm4,%xmm6
 [ 	]*[a-f0-9]+:	c4 e3 59 22 31 07    	vpinsrd \$0x7,\(%ecx\),%xmm4,%xmm6
 [ 	]*[a-f0-9]+:	c5 db 2a f1          	vcvtsi2sd %ecx,%xmm4,%xmm6
-[ 	]*[a-f0-9]+:	c5 db 2a 31          	vcvtsi2sdl \(%ecx\),%xmm4,%xmm6
+[ 	]*[a-f0-9]+:	c5 db 2a 31          	vcvtsi2sd \(%ecx\),%xmm4,%xmm6
 [ 	]*[a-f0-9]+:	c5 da 2a f1          	vcvtsi2ss %ecx,%xmm4,%xmm6
-[ 	]*[a-f0-9]+:	c5 da 2a 31          	vcvtsi2ssl \(%ecx\),%xmm4,%xmm6
+[ 	]*[a-f0-9]+:	c5 da 2a 31          	vcvtsi2ss \(%ecx\),%xmm4,%xmm6
 [ 	]*[a-f0-9]+:	c5 ca c2 d4 07       	vcmpordss %xmm4,%xmm6,%xmm2
 [ 	]*[a-f0-9]+:	c5 ca c2 11 07       	vcmpordss \(%ecx\),%xmm6,%xmm2
 [ 	]*[a-f0-9]+:	c4 e3 49 21 d4 07    	vinsertps \$0x7,%xmm4,%xmm6,%xmm2
@@ -1262,7 +1262,7 @@ Disassembly of section .text:
 [ 	]*[a-f0-9]+:	c5 f9 e0 3d 34 12 00 00 	vpavgb 0x1234,%xmm0,%xmm7
 [ 	]*[a-f0-9]+:	c4 e3 79 df 05 34 12 00 00 07 	vaeskeygenassist \$0x7,0x1234,%xmm0
 [ 	]*[a-f0-9]+:	c4 e3 79 14 05 34 12 00 00 07 	vpextrb \$0x7,%xmm0,0x1234
-[ 	]*[a-f0-9]+:	c5 fb 2a 3d 34 12 00 00 	vcvtsi2sdl 0x1234,%xmm0,%xmm7
+[ 	]*[a-f0-9]+:	c5 fb 2a 3d 34 12 00 00 	vcvtsi2sd 0x1234,%xmm0,%xmm7
 [ 	]*[a-f0-9]+:	c4 e3 79 44 3d 34 12 00 00 07 	vpclmulqdq \$0x7,0x1234,%xmm0,%xmm7
 [ 	]*[a-f0-9]+:	c4 e3 59 4a 35 34 12 00 00 00 	vblendvps %xmm0,0x1234,%xmm4,%xmm6
 [ 	]*[a-f0-9]+:	c4 e3 79 20 3d 34 12 00 00 07 	vpinsrb \$0x7,0x1234,%xmm0,%xmm7
@@ -1283,7 +1283,7 @@ Disassembly of section .text:
 [ 	]*[a-f0-9]+:	c5 f9 e0 7d 00       	vpavgb 0x0\(%ebp\),%xmm0,%xmm7
 [ 	]*[a-f0-9]+:	c4 e3 79 df 45 00 07 	vaeskeygenassist \$0x7,0x0\(%ebp\),%xmm0
 [ 	]*[a-f0-9]+:	c4 e3 79 14 45 00 07 	vpextrb \$0x7,%xmm0,0x0\(%ebp\)
-[ 	]*[a-f0-9]+:	c5 fb 2a 7d 00       	vcvtsi2sdl 0x0\(%ebp\),%xmm0,%xmm7
+[ 	]*[a-f0-9]+:	c5 fb 2a 7d 00       	vcvtsi2sd 0x0\(%ebp\),%xmm0,%xmm7
 [ 	]*[a-f0-9]+:	c4 e3 79 44 7d 00 07 	vpclmulqdq \$0x7,0x0\(%ebp\),%xmm0,%xmm7
 [ 	]*[a-f0-9]+:	c4 e3 59 4a 75 00 00 	vblendvps %xmm0,0x0\(%ebp\),%xmm4,%xmm6
 [ 	]*[a-f0-9]+:	c4 e3 79 20 7d 00 07 	vpinsrb \$0x7,0x0\(%ebp\),%xmm0,%xmm7
@@ -1304,7 +1304,7 @@ Disassembly of section .text:
 [ 	]*[a-f0-9]+:	c5 f9 e0 3c 24       	vpavgb \(%esp\),%xmm0,%xmm7
 [ 	]*[a-f0-9]+:	c4 e3 79 df 04 24 07 	vaeskeygenassist \$0x7,\(%esp\),%xmm0
 [ 	]*[a-f0-9]+:	c4 e3 79 14 04 24 07 	vpextrb \$0x7,%xmm0,\(%esp\)
-[ 	]*[a-f0-9]+:	c5 fb 2a 3c 24       	vcvtsi2sdl \(%esp\),%xmm0,%xmm7
+[ 	]*[a-f0-9]+:	c5 fb 2a 3c 24       	vcvtsi2sd \(%esp\),%xmm0,%xmm7
 [ 	]*[a-f0-9]+:	c4 e3 79 44 3c 24 07 	vpclmulqdq \$0x7,\(%esp\),%xmm0,%xmm7
 [ 	]*[a-f0-9]+:	c4 e3 59 4a 34 24 00 	vblendvps %xmm0,\(%esp\),%xmm4,%xmm6
 [ 	]*[a-f0-9]+:	c4 e3 79 20 3c 24 07 	vpinsrb \$0x7,\(%esp\),%xmm0,%xmm7
@@ -1325,7 +1325,7 @@ Disassembly of section .text:
 [ 	]*[a-f0-9]+:	c5 f9 e0 bd 99 00 00 00 	vpavgb 0x99\(%ebp\),%xmm0,%xmm7
 [ 	]*[a-f0-9]+:	c4 e3 79 df 85 99 00 00 00 07 	vaeskeygenassist \$0x7,0x99\(%ebp\),%xmm0
 [ 	]*[a-f0-9]+:	c4 e3 79 14 85 99 00 00 00 07 	vpextrb \$0x7,%xmm0,0x99\(%ebp\)
-[ 	]*[a-f0-9]+:	c5 fb 2a bd 99 00 00 00 	vcvtsi2sdl 0x99\(%ebp\),%xmm0,%xmm7
+[ 	]*[a-f0-9]+:	c5 fb 2a bd 99 00 00 00 	vcvtsi2sd 0x99\(%ebp\),%xmm0,%xmm7
 [ 	]*[a-f0-9]+:	c4 e3 79 44 bd 99 00 00 00 07 	vpclmulqdq \$0x7,0x99\(%ebp\),%xmm0,%xmm7
 [ 	]*[a-f0-9]+:	c4 e3 59 4a b5 99 00 00 00 00 	vblendvps %xmm0,0x99\(%ebp\),%xmm4,%xmm6
 [ 	]*[a-f0-9]+:	c4 e3 79 20 bd 99 00 00 00 07 	vpinsrb \$0x7,0x99\(%ebp\),%xmm0,%xmm7
@@ -1346,7 +1346,7 @@ Disassembly of section .text:
 [ 	]*[a-f0-9]+:	c5 f9 e0 3c 25 99 00 00 00 	vpavgb 0x99\(,%eiz,1\),%xmm0,%xmm7
 [ 	]*[a-f0-9]+:	c4 e3 79 df 04 25 99 00 00 00 07 	vaeskeygenassist \$0x7,0x99\(,%eiz,1\),%xmm0
 [ 	]*[a-f0-9]+:	c4 e3 79 14 04 25 99 00 00 00 07 	vpextrb \$0x7,%xmm0,0x99\(,%eiz,1\)
-[ 	]*[a-f0-9]+:	c5 fb 2a 3c 25 99 00 00 00 	vcvtsi2sdl 0x99\(,%eiz,1\),%xmm0,%xmm7
+[ 	]*[a-f0-9]+:	c5 fb 2a 3c 25 99 00 00 00 	vcvtsi2sd 0x99\(,%eiz,1\),%xmm0,%xmm7
 [ 	]*[a-f0-9]+:	c4 e3 79 44 3c 25 99 00 00 00 07 	vpclmulqdq \$0x7,0x99\(,%eiz,1\),%xmm0,%xmm7
 [ 	]*[a-f0-9]+:	c4 e3 59 4a 34 25 99 00 00 00 00 	vblendvps %xmm0,0x99\(,%eiz,1\),%xmm4,%xmm6
 [ 	]*[a-f0-9]+:	c4 e3 79 20 3c 25 99 00 00 00 07 	vpinsrb \$0x7,0x99\(,%eiz,1\),%xmm0,%xmm7
@@ -1367,7 +1367,7 @@ Disassembly of section .text:
 [ 	]*[a-f0-9]+:	c5 f9 e0 3c 65 99 00 00 00 	vpavgb 0x99\(,%eiz,2\),%xmm0,%xmm7
 [ 	]*[a-f0-9]+:	c4 e3 79 df 04 65 99 00 00 00 07 	vaeskeygenassist \$0x7,0x99\(,%eiz,2\),%xmm0
 [ 	]*[a-f0-9]+:	c4 e3 79 14 04 65 99 00 00 00 07 	vpextrb \$0x7,%xmm0,0x99\(,%eiz,2\)
-[ 	]*[a-f0-9]+:	c5 fb 2a 3c 65 99 00 00 00 	vcvtsi2sdl 0x99\(,%eiz,2\),%xmm0,%xmm7
+[ 	]*[a-f0-9]+:	c5 fb 2a 3c 65 99 00 00 00 	vcvtsi2sd 0x99\(,%eiz,2\),%xmm0,%xmm7
 [ 	]*[a-f0-9]+:	c4 e3 79 44 3c 65 99 00 00 00 07 	vpclmulqdq \$0x7,0x99\(,%eiz,2\),%xmm0,%xmm7
 [ 	]*[a-f0-9]+:	c4 e3 59 4a 34 65 99 00 00 00 00 	vblendvps %xmm0,0x99\(,%eiz,2\),%xmm4,%xmm6
 [ 	]*[a-f0-9]+:	c4 e3 79 20 3c 65 99 00 00 00 07 	vpinsrb \$0x7,0x99\(,%eiz,2\),%xmm0,%xmm7
@@ -1388,7 +1388,7 @@ Disassembly of section .text:
 [ 	]*[a-f0-9]+:	c5 f9 e0 bc 20 99 00 00 00 	vpavgb 0x99\(%eax,%eiz,1\),%xmm0,%xmm7
 [ 	]*[a-f0-9]+:	c4 e3 79 df 84 20 99 00 00 00 07 	vaeskeygenassist \$0x7,0x99\(%eax,%eiz,1\),%xmm0
 [ 	]*[a-f0-9]+:	c4 e3 79 14 84 20 99 00 00 00 07 	vpextrb \$0x7,%xmm0,0x99\(%eax,%eiz,1\)
-[ 	]*[a-f0-9]+:	c5 fb 2a bc 20 99 00 00 00 	vcvtsi2sdl 0x99\(%eax,%eiz,1\),%xmm0,%xmm7
+[ 	]*[a-f0-9]+:	c5 fb 2a bc 20 99 00 00 00 	vcvtsi2sd 0x99\(%eax,%eiz,1\),%xmm0,%xmm7
 [ 	]*[a-f0-9]+:	c4 e3 79 44 bc 20 99 00 00 00 07 	vpclmulqdq \$0x7,0x99\(%eax,%eiz,1\),%xmm0,%xmm7
 [ 	]*[a-f0-9]+:	c4 e3 59 4a b4 20 99 00 00 00 00 	vblendvps %xmm0,0x99\(%eax,%eiz,1\),%xmm4,%xmm6
 [ 	]*[a-f0-9]+:	c4 e3 79 20 bc 20 99 00 00 00 07 	vpinsrb \$0x7,0x99\(%eax,%eiz,1\),%xmm0,%xmm7
@@ -1409,7 +1409,7 @@ Disassembly of section .text:
 [ 	]*[a-f0-9]+:	c5 f9 e0 bc 60 99 00 00 00 	vpavgb 0x99\(%eax,%eiz,2\),%xmm0,%xmm7
 [ 	]*[a-f0-9]+:	c4 e3 79 df 84 60 99 00 00 00 07 	vaeskeygenassist \$0x7,0x99\(%eax,%eiz,2\),%xmm0
 [ 	]*[a-f0-9]+:	c4 e3 79 14 84 60 99 00 00 00 07 	vpextrb \$0x7,%xmm0,0x99\(%eax,%eiz,2\)
-[ 	]*[a-f0-9]+:	c5 fb 2a bc 60 99 00 00 00 	vcvtsi2sdl 0x99\(%eax,%eiz,2\),%xmm0,%xmm7
+[ 	]*[a-f0-9]+:	c5 fb 2a bc 60 99 00 00 00 	vcvtsi2sd 0x99\(%eax,%eiz,2\),%xmm0,%xmm7
 [ 	]*[a-f0-9]+:	c4 e3 79 44 bc 60 99 00 00 00 07 	vpclmulqdq \$0x7,0x99\(%eax,%eiz,2\),%xmm0,%xmm7
 [ 	]*[a-f0-9]+:	c4 e3 59 4a b4 60 99 00 00 00 00 	vblendvps %xmm0,0x99\(%eax,%eiz,2\),%xmm4,%xmm6
 [ 	]*[a-f0-9]+:	c4 e3 79 20 bc 60 99 00 00 00 07 	vpinsrb \$0x7,0x99\(%eax,%eiz,2\),%xmm0,%xmm7
@@ -1430,7 +1430,7 @@ Disassembly of section .text:
 [ 	]*[a-f0-9]+:	c5 f9 e0 bc 98 99 00 00 00 	vpavgb 0x99\(%eax,%ebx,4\),%xmm0,%xmm7
 [ 	]*[a-f0-9]+:	c4 e3 79 df 84 98 99 00 00 00 07 	vaeskeygenassist \$0x7,0x99\(%eax,%ebx,4\),%xmm0
 [ 	]*[a-f0-9]+:	c4 e3 79 14 84 98 99 00 00 00 07 	vpextrb \$0x7,%xmm0,0x99\(%eax,%ebx,4\)
-[ 	]*[a-f0-9]+:	c5 fb 2a bc 98 99 00 00 00 	vcvtsi2sdl 0x99\(%eax,%ebx,4\),%xmm0,%xmm7
+[ 	]*[a-f0-9]+:	c5 fb 2a bc 98 99 00 00 00 	vcvtsi2sd 0x99\(%eax,%ebx,4\),%xmm0,%xmm7
 [ 	]*[a-f0-9]+:	c4 e3 79 44 bc 98 99 00 00 00 07 	vpclmulqdq \$0x7,0x99\(%eax,%ebx,4\),%xmm0,%xmm7
 [ 	]*[a-f0-9]+:	c4 e3 59 4a b4 98 99 00 00 00 00 	vblendvps %xmm0,0x99\(%eax,%ebx,4\),%xmm4,%xmm6
 [ 	]*[a-f0-9]+:	c4 e3 79 20 bc 98 99 00 00 00 07 	vpinsrb \$0x7,0x99\(%eax,%ebx,4\),%xmm0,%xmm7
@@ -1451,7 +1451,7 @@ Disassembly of section .text:
 [ 	]*[a-f0-9]+:	c5 f9 e0 bc cc 99 00 00 00 	vpavgb 0x99\(%esp,%ecx,8\),%xmm0,%xmm7
 [ 	]*[a-f0-9]+:	c4 e3 79 df 84 cc 99 00 00 00 07 	vaeskeygenassist \$0x7,0x99\(%esp,%ecx,8\),%xmm0
 [ 	]*[a-f0-9]+:	c4 e3 79 14 84 cc 99 00 00 00 07 	vpextrb \$0x7,%xmm0,0x99\(%esp,%ecx,8\)
-[ 	]*[a-f0-9]+:	c5 fb 2a bc cc 99 00 00 00 	vcvtsi2sdl 0x99\(%esp,%ecx,8\),%xmm0,%xmm7
+[ 	]*[a-f0-9]+:	c5 fb 2a bc cc 99 00 00 00 	vcvtsi2sd 0x99\(%esp,%ecx,8\),%xmm0,%xmm7
 [ 	]*[a-f0-9]+:	c4 e3 79 44 bc cc 99 00 00 00 07 	vpclmulqdq \$0x7,0x99\(%esp,%ecx,8\),%xmm0,%xmm7
 [ 	]*[a-f0-9]+:	c4 e3 59 4a b4 cc 99 00 00 00 00 	vblendvps %xmm0,0x99\(%esp,%ecx,8\),%xmm4,%xmm6
 [ 	]*[a-f0-9]+:	c4 e3 79 20 bc cc 99 00 00 00 07 	vpinsrb \$0x7,0x99\(%esp,%ecx,8\),%xmm0,%xmm7
@@ -1472,7 +1472,7 @@ Disassembly of section .text:
 [ 	]*[a-f0-9]+:	c5 f9 e0 bc 15 99 00 00 00 	vpavgb 0x99\(%ebp,%edx,1\),%xmm0,%xmm7
 [ 	]*[a-f0-9]+:	c4 e3 79 df 84 15 99 00 00 00 07 	vaeskeygenassist \$0x7,0x99\(%ebp,%edx,1\),%xmm0
 [ 	]*[a-f0-9]+:	c4 e3 79 14 84 15 99 00 00 00 07 	vpextrb \$0x7,%xmm0,0x99\(%ebp,%edx,1\)
-[ 	]*[a-f0-9]+:	c5 fb 2a bc 15 99 00 00 00 	vcvtsi2sdl 0x99\(%ebp,%edx,1\),%xmm0,%xmm7
+[ 	]*[a-f0-9]+:	c5 fb 2a bc 15 99 00 00 00 	vcvtsi2sd 0x99\(%ebp,%edx,1\),%xmm0,%xmm7
 [ 	]*[a-f0-9]+:	c4 e3 79 44 bc 15 99 00 00 00 07 	vpclmulqdq \$0x7,0x99\(%ebp,%edx,1\),%xmm0,%xmm7
 [ 	]*[a-f0-9]+:	c4 e3 59 4a b4 15 99 00 00 00 00 	vblendvps %xmm0,0x99\(%ebp,%edx,1\),%xmm4,%xmm6
 [ 	]*[a-f0-9]+:	c4 e3 79 20 bc 15 99 00 00 00 07 	vpinsrb \$0x7,0x99\(%ebp,%edx,1\),%xmm0,%xmm7
@@ -3104,11 +3104,11 @@ Disassembly of section .text:
 [ 	]*[a-f0-9]+:	c4 e3 59 22 31 07    	vpinsrd \$0x7,\(%ecx\),%xmm4,%xmm6
 [ 	]*[a-f0-9]+:	c4 e3 59 22 31 07    	vpinsrd \$0x7,\(%ecx\),%xmm4,%xmm6
 [ 	]*[a-f0-9]+:	c5 db 2a f1          	vcvtsi2sd %ecx,%xmm4,%xmm6
-[ 	]*[a-f0-9]+:	c5 db 2a 31          	vcvtsi2sdl \(%ecx\),%xmm4,%xmm6
-[ 	]*[a-f0-9]+:	c5 db 2a 31          	vcvtsi2sdl \(%ecx\),%xmm4,%xmm6
+[ 	]*[a-f0-9]+:	c5 db 2a 31          	vcvtsi2sd \(%ecx\),%xmm4,%xmm6
+[ 	]*[a-f0-9]+:	c5 db 2a 31          	vcvtsi2sd \(%ecx\),%xmm4,%xmm6
 [ 	]*[a-f0-9]+:	c5 da 2a f1          	vcvtsi2ss %ecx,%xmm4,%xmm6
-[ 	]*[a-f0-9]+:	c5 da 2a 31          	vcvtsi2ssl \(%ecx\),%xmm4,%xmm6
-[ 	]*[a-f0-9]+:	c5 da 2a 31          	vcvtsi2ssl \(%ecx\),%xmm4,%xmm6
+[ 	]*[a-f0-9]+:	c5 da 2a 31          	vcvtsi2ss \(%ecx\),%xmm4,%xmm6
+[ 	]*[a-f0-9]+:	c5 da 2a 31          	vcvtsi2ss \(%ecx\),%xmm4,%xmm6
 [ 	]*[a-f0-9]+:	c5 ca c2 d4 07       	vcmpordss %xmm4,%xmm6,%xmm2
 [ 	]*[a-f0-9]+:	c5 ca c2 11 07       	vcmpordss \(%ecx\),%xmm6,%xmm2
 [ 	]*[a-f0-9]+:	c5 ca c2 11 07       	vcmpordss \(%ecx\),%xmm6,%xmm2
@@ -3178,7 +3178,7 @@ Disassembly of section .text:
 [ 	]*[a-f0-9]+:	c5 f9 e0 3d 34 12 00 00 	vpavgb 0x1234,%xmm0,%xmm7
 [ 	]*[a-f0-9]+:	c4 e3 79 df 05 34 12 00 00 07 	vaeskeygenassist \$0x7,0x1234,%xmm0
 [ 	]*[a-f0-9]+:	c4 e3 79 14 05 34 12 00 00 07 	vpextrb \$0x7,%xmm0,0x1234
-[ 	]*[a-f0-9]+:	c5 fb 2a 3d 34 12 00 00 	vcvtsi2sdl 0x1234,%xmm0,%xmm7
+[ 	]*[a-f0-9]+:	c5 fb 2a 3d 34 12 00 00 	vcvtsi2sd 0x1234,%xmm0,%xmm7
 [ 	]*[a-f0-9]+:	c4 e3 79 44 3d 34 12 00 00 07 	vpclmulqdq \$0x7,0x1234,%xmm0,%xmm7
 [ 	]*[a-f0-9]+:	c4 e3 59 4a 35 34 12 00 00 00 	vblendvps %xmm0,0x1234,%xmm4,%xmm6
 [ 	]*[a-f0-9]+:	c4 e3 79 20 3d 34 12 00 00 07 	vpinsrb \$0x7,0x1234,%xmm0,%xmm7
@@ -3199,7 +3199,7 @@ Disassembly of section .text:
 [ 	]*[a-f0-9]+:	c5 f9 e0 7d 00       	vpavgb 0x0\(%ebp\),%xmm0,%xmm7
 [ 	]*[a-f0-9]+:	c4 e3 79 df 45 00 07 	vaeskeygenassist \$0x7,0x0\(%ebp\),%xmm0
 [ 	]*[a-f0-9]+:	c4 e3 79 14 45 00 07 	vpextrb \$0x7,%xmm0,0x0\(%ebp\)
-[ 	]*[a-f0-9]+:	c5 fb 2a 7d 00       	vcvtsi2sdl 0x0\(%ebp\),%xmm0,%xmm7
+[ 	]*[a-f0-9]+:	c5 fb 2a 7d 00       	vcvtsi2sd 0x0\(%ebp\),%xmm0,%xmm7
 [ 	]*[a-f0-9]+:	c4 e3 79 44 7d 00 07 	vpclmulqdq \$0x7,0x0\(%ebp\),%xmm0,%xmm7
 [ 	]*[a-f0-9]+:	c4 e3 59 4a 75 00 00 	vblendvps %xmm0,0x0\(%ebp\),%xmm4,%xmm6
 [ 	]*[a-f0-9]+:	c4 e3 79 20 7d 00 07 	vpinsrb \$0x7,0x0\(%ebp\),%xmm0,%xmm7
@@ -3220,7 +3220,7 @@ Disassembly of section .text:
 [ 	]*[a-f0-9]+:	c5 f9 e0 bd 99 00 00 00 	vpavgb 0x99\(%ebp\),%xmm0,%xmm7
 [ 	]*[a-f0-9]+:	c4 e3 79 df 85 99 00 00 00 07 	vaeskeygenassist \$0x7,0x99\(%ebp\),%xmm0
 [ 	]*[a-f0-9]+:	c4 e3 79 14 85 99 00 00 00 07 	vpextrb \$0x7,%xmm0,0x99\(%ebp\)
-[ 	]*[a-f0-9]+:	c5 fb 2a bd 99 00 00 00 	vcvtsi2sdl 0x99\(%ebp\),%xmm0,%xmm7
+[ 	]*[a-f0-9]+:	c5 fb 2a bd 99 00 00 00 	vcvtsi2sd 0x99\(%ebp\),%xmm0,%xmm7
 [ 	]*[a-f0-9]+:	c4 e3 79 44 bd 99 00 00 00 07 	vpclmulqdq \$0x7,0x99\(%ebp\),%xmm0,%xmm7
 [ 	]*[a-f0-9]+:	c4 e3 59 4a b5 99 00 00 00 00 	vblendvps %xmm0,0x99\(%ebp\),%xmm4,%xmm6
 [ 	]*[a-f0-9]+:	c4 e3 79 20 bd 99 00 00 00 07 	vpinsrb \$0x7,0x99\(%ebp\),%xmm0,%xmm7
@@ -3241,7 +3241,7 @@ Disassembly of section .text:
 [ 	]*[a-f0-9]+:	c5 f9 e0 3c 25 99 00 00 00 	vpavgb 0x99\(,%eiz,1\),%xmm0,%xmm7
 [ 	]*[a-f0-9]+:	c4 e3 79 df 04 25 99 00 00 00 07 	vaeskeygenassist \$0x7,0x99\(,%eiz,1\),%xmm0
 [ 	]*[a-f0-9]+:	c4 e3 79 14 04 25 99 00 00 00 07 	vpextrb \$0x7,%xmm0,0x99\(,%eiz,1\)
-[ 	]*[a-f0-9]+:	c5 fb 2a 3c 25 99 00 00 00 	vcvtsi2sdl 0x99\(,%eiz,1\),%xmm0,%xmm7
+[ 	]*[a-f0-9]+:	c5 fb 2a 3c 25 99 00 00 00 	vcvtsi2sd 0x99\(,%eiz,1\),%xmm0,%xmm7
 [ 	]*[a-f0-9]+:	c4 e3 79 44 3c 25 99 00 00 00 07 	vpclmulqdq \$0x7,0x99\(,%eiz,1\),%xmm0,%xmm7
 [ 	]*[a-f0-9]+:	c4 e3 59 4a 34 25 99 00 00 00 00 	vblendvps %xmm0,0x99\(,%eiz,1\),%xmm4,%xmm6
 [ 	]*[a-f0-9]+:	c4 e3 79 20 3c 25 99 00 00 00 07 	vpinsrb \$0x7,0x99\(,%eiz,1\),%xmm0,%xmm7
@@ -3262,7 +3262,7 @@ Disassembly of section .text:
 [ 	]*[a-f0-9]+:	c5 f9 e0 3c 65 99 00 00 00 	vpavgb 0x99\(,%eiz,2\),%xmm0,%xmm7
 [ 	]*[a-f0-9]+:	c4 e3 79 df 04 65 99 00 00 00 07 	vaeskeygenassist \$0x7,0x99\(,%eiz,2\),%xmm0
 [ 	]*[a-f0-9]+:	c4 e3 79 14 04 65 99 00 00 00 07 	vpextrb \$0x7,%xmm0,0x99\(,%eiz,2\)
-[ 	]*[a-f0-9]+:	c5 fb 2a 3c 65 99 00 00 00 	vcvtsi2sdl 0x99\(,%eiz,2\),%xmm0,%xmm7
+[ 	]*[a-f0-9]+:	c5 fb 2a 3c 65 99 00 00 00 	vcvtsi2sd 0x99\(,%eiz,2\),%xmm0,%xmm7
 [ 	]*[a-f0-9]+:	c4 e3 79 44 3c 65 99 00 00 00 07 	vpclmulqdq \$0x7,0x99\(,%eiz,2\),%xmm0,%xmm7
 [ 	]*[a-f0-9]+:	c4 e3 59 4a 34 65 99 00 00 00 00 	vblendvps %xmm0,0x99\(,%eiz,2\),%xmm4,%xmm6
 [ 	]*[a-f0-9]+:	c4 e3 79 20 3c 65 99 00 00 00 07 	vpinsrb \$0x7,0x99\(,%eiz,2\),%xmm0,%xmm7
@@ -3283,7 +3283,7 @@ Disassembly of section .text:
 [ 	]*[a-f0-9]+:	c5 f9 e0 bc 20 99 00 00 00 	vpavgb 0x99\(%eax,%eiz,1\),%xmm0,%xmm7
 [ 	]*[a-f0-9]+:	c4 e3 79 df 84 20 99 00 00 00 07 	vaeskeygenassist \$0x7,0x99\(%eax,%eiz,1\),%xmm0
 [ 	]*[a-f0-9]+:	c4 e3 79 14 84 20 99 00 00 00 07 	vpextrb \$0x7,%xmm0,0x99\(%eax,%eiz,1\)
-[ 	]*[a-f0-9]+:	c5 fb 2a bc 20 99 00 00 00 	vcvtsi2sdl 0x99\(%eax,%eiz,1\),%xmm0,%xmm7
+[ 	]*[a-f0-9]+:	c5 fb 2a bc 20 99 00 00 00 	vcvtsi2sd 0x99\(%eax,%eiz,1\),%xmm0,%xmm7
 [ 	]*[a-f0-9]+:	c4 e3 79 44 bc 20 99 00 00 00 07 	vpclmulqdq \$0x7,0x99\(%eax,%eiz,1\),%xmm0,%xmm7
 [ 	]*[a-f0-9]+:	c4 e3 59 4a b4 20 99 00 00 00 00 	vblendvps %xmm0,0x99\(%eax,%eiz,1\),%xmm4,%xmm6
 [ 	]*[a-f0-9]+:	c4 e3 79 20 bc 20 99 00 00 00 07 	vpinsrb \$0x7,0x99\(%eax,%eiz,1\),%xmm0,%xmm7
@@ -3304,7 +3304,7 @@ Disassembly of section .text:
 [ 	]*[a-f0-9]+:	c5 f9 e0 bc 60 99 00 00 00 	vpavgb 0x99\(%eax,%eiz,2\),%xmm0,%xmm7
 [ 	]*[a-f0-9]+:	c4 e3 79 df 84 60 99 00 00 00 07 	vaeskeygenassist \$0x7,0x99\(%eax,%eiz,2\),%xmm0
 [ 	]*[a-f0-9]+:	c4 e3 79 14 84 60 99 00 00 00 07 	vpextrb \$0x7,%xmm0,0x99\(%eax,%eiz,2\)
-[ 	]*[a-f0-9]+:	c5 fb 2a bc 60 99 00 00 00 	vcvtsi2sdl 0x99\(%eax,%eiz,2\),%xmm0,%xmm7
+[ 	]*[a-f0-9]+:	c5 fb 2a bc 60 99 00 00 00 	vcvtsi2sd 0x99\(%eax,%eiz,2\),%xmm0,%xmm7
 [ 	]*[a-f0-9]+:	c4 e3 79 44 bc 60 99 00 00 00 07 	vpclmulqdq \$0x7,0x99\(%eax,%eiz,2\),%xmm0,%xmm7
 [ 	]*[a-f0-9]+:	c4 e3 59 4a b4 60 99 00 00 00 00 	vblendvps %xmm0,0x99\(%eax,%eiz,2\),%xmm4,%xmm6
 [ 	]*[a-f0-9]+:	c4 e3 79 20 bc 60 99 00 00 00 07 	vpinsrb \$0x7,0x99\(%eax,%eiz,2\),%xmm0,%xmm7
@@ -3325,7 +3325,7 @@ Disassembly of section .text:
 [ 	]*[a-f0-9]+:	c5 f9 e0 bc 98 99 00 00 00 	vpavgb 0x99\(%eax,%ebx,4\),%xmm0,%xmm7
 [ 	]*[a-f0-9]+:	c4 e3 79 df 84 98 99 00 00 00 07 	vaeskeygenassist \$0x7,0x99\(%eax,%ebx,4\),%xmm0
 [ 	]*[a-f0-9]+:	c4 e3 79 14 84 98 99 00 00 00 07 	vpextrb \$0x7,%xmm0,0x99\(%eax,%ebx,4\)
-[ 	]*[a-f0-9]+:	c5 fb 2a bc 98 99 00 00 00 	vcvtsi2sdl 0x99\(%eax,%ebx,4\),%xmm0,%xmm7
+[ 	]*[a-f0-9]+:	c5 fb 2a bc 98 99 00 00 00 	vcvtsi2sd 0x99\(%eax,%ebx,4\),%xmm0,%xmm7
 [ 	]*[a-f0-9]+:	c4 e3 79 44 bc 98 99 00 00 00 07 	vpclmulqdq \$0x7,0x99\(%eax,%ebx,4\),%xmm0,%xmm7
 [ 	]*[a-f0-9]+:	c4 e3 59 4a b4 98 99 00 00 00 00 	vblendvps %xmm0,0x99\(%eax,%ebx,4\),%xmm4,%xmm6
 [ 	]*[a-f0-9]+:	c4 e3 79 20 bc 98 99 00 00 00 07 	vpinsrb \$0x7,0x99\(%eax,%ebx,4\),%xmm0,%xmm7
@@ -3346,7 +3346,7 @@ Disassembly of section .text:
 [ 	]*[a-f0-9]+:	c5 f9 e0 bc cc 99 00 00 00 	vpavgb 0x99\(%esp,%ecx,8\),%xmm0,%xmm7
 [ 	]*[a-f0-9]+:	c4 e3 79 df 84 cc 99 00 00 00 07 	vaeskeygenassist \$0x7,0x99\(%esp,%ecx,8\),%xmm0
 [ 	]*[a-f0-9]+:	c4 e3 79 14 84 cc 99 00 00 00 07 	vpextrb \$0x7,%xmm0,0x99\(%esp,%ecx,8\)
-[ 	]*[a-f0-9]+:	c5 fb 2a bc cc 99 00 00 00 	vcvtsi2sdl 0x99\(%esp,%ecx,8\),%xmm0,%xmm7
+[ 	]*[a-f0-9]+:	c5 fb 2a bc cc 99 00 00 00 	vcvtsi2sd 0x99\(%esp,%ecx,8\),%xmm0,%xmm7
 [ 	]*[a-f0-9]+:	c4 e3 79 44 bc cc 99 00 00 00 07 	vpclmulqdq \$0x7,0x99\(%esp,%ecx,8\),%xmm0,%xmm7
 [ 	]*[a-f0-9]+:	c4 e3 59 4a b4 cc 99 00 00 00 00 	vblendvps %xmm0,0x99\(%esp,%ecx,8\),%xmm4,%xmm6
 [ 	]*[a-f0-9]+:	c4 e3 79 20 bc cc 99 00 00 00 07 	vpinsrb \$0x7,0x99\(%esp,%ecx,8\),%xmm0,%xmm7
@@ -3367,7 +3367,7 @@ Disassembly of section .text:
 [ 	]*[a-f0-9]+:	c5 f9 e0 bc 15 99 00 00 00 	vpavgb 0x99\(%ebp,%edx,1\),%xmm0,%xmm7
 [ 	]*[a-f0-9]+:	c4 e3 79 df 84 15 99 00 00 00 07 	vaeskeygenassist \$0x7,0x99\(%ebp,%edx,1\),%xmm0
 [ 	]*[a-f0-9]+:	c4 e3 79 14 84 15 99 00 00 00 07 	vpextrb \$0x7,%xmm0,0x99\(%ebp,%edx,1\)
-[ 	]*[a-f0-9]+:	c5 fb 2a bc 15 99 00 00 00 	vcvtsi2sdl 0x99\(%ebp,%edx,1\),%xmm0,%xmm7
+[ 	]*[a-f0-9]+:	c5 fb 2a bc 15 99 00 00 00 	vcvtsi2sd 0x99\(%ebp,%edx,1\),%xmm0,%xmm7
 [ 	]*[a-f0-9]+:	c4 e3 79 44 bc 15 99 00 00 00 07 	vpclmulqdq \$0x7,0x99\(%ebp,%edx,1\),%xmm0,%xmm7
 [ 	]*[a-f0-9]+:	c4 e3 59 4a b4 15 99 00 00 00 00 	vblendvps %xmm0,0x99\(%ebp,%edx,1\),%xmm4,%xmm6
 [ 	]*[a-f0-9]+:	c4 e3 79 20 bc 15 99 00 00 00 07 	vpinsrb \$0x7,0x99\(%ebp,%edx,1\),%xmm0,%xmm7
diff --git a/gas/testsuite/gas/i386/avx512f-16bit.d b/gas/testsuite/gas/i386/avx512f-16bit.d
index 69f7893..93a4a58 100644
--- a/gas/testsuite/gas/i386/avx512f-16bit.d
+++ b/gas/testsuite/gas/i386/avx512f-16bit.d
@@ -5903,12 +5903,12 @@ Disassembly of section .text:
 [ 	]*[a-f0-9]+:	67 62 f1 7e 08 79 aa fc fd ff ff 	vcvtss2usi -0x204\(%edx\),%ebp
 [ 	]*[a-f0-9]+:	62 f1 57 08 7b f0    	vcvtusi2sd %eax,%xmm5,%xmm6
 [ 	]*[a-f0-9]+:	62 f1 57 08 7b f5    	vcvtusi2sd %ebp,%xmm5,%xmm6
-[ 	]*[a-f0-9]+:	67 62 f1 57 08 7b 31 	vcvtusi2sdl \(%ecx\),%xmm5,%xmm6
-[ 	]*[a-f0-9]+:	67 62 f1 57 08 7b b4 f4 c0 1d fe ff 	vcvtusi2sdl -0x1e240\(%esp,%esi,8\),%xmm5,%xmm6
-[ 	]*[a-f0-9]+:	67 62 f1 57 08 7b 72 7f 	vcvtusi2sdl 0x1fc\(%edx\),%xmm5,%xmm6
-[ 	]*[a-f0-9]+:	67 62 f1 57 08 7b b2 00 02 00 00 	vcvtusi2sdl 0x200\(%edx\),%xmm5,%xmm6
-[ 	]*[a-f0-9]+:	67 62 f1 57 08 7b 72 80 	vcvtusi2sdl -0x200\(%edx\),%xmm5,%xmm6
-[ 	]*[a-f0-9]+:	67 62 f1 57 08 7b b2 fc fd ff ff 	vcvtusi2sdl -0x204\(%edx\),%xmm5,%xmm6
+[ 	]*[a-f0-9]+:	67 62 f1 57 08 7b 31 	vcvtusi2sd \(%ecx\),%xmm5,%xmm6
+[ 	]*[a-f0-9]+:	67 62 f1 57 08 7b b4 f4 c0 1d fe ff 	vcvtusi2sd -0x1e240\(%esp,%esi,8\),%xmm5,%xmm6
+[ 	]*[a-f0-9]+:	67 62 f1 57 08 7b 72 7f 	vcvtusi2sd 0x1fc\(%edx\),%xmm5,%xmm6
+[ 	]*[a-f0-9]+:	67 62 f1 57 08 7b b2 00 02 00 00 	vcvtusi2sd 0x200\(%edx\),%xmm5,%xmm6
+[ 	]*[a-f0-9]+:	67 62 f1 57 08 7b 72 80 	vcvtusi2sd -0x200\(%edx\),%xmm5,%xmm6
+[ 	]*[a-f0-9]+:	67 62 f1 57 08 7b b2 fc fd ff ff 	vcvtusi2sd -0x204\(%edx\),%xmm5,%xmm6
 [ 	]*[a-f0-9]+:	62 f1 56 08 7b f0    	vcvtusi2ss %eax,%xmm5,%xmm6
 [ 	]*[a-f0-9]+:	62 f1 56 18 7b f0    	vcvtusi2ss %eax,\{rn-sae\},%xmm5,%xmm6
 [ 	]*[a-f0-9]+:	62 f1 56 58 7b f0    	vcvtusi2ss %eax,\{ru-sae\},%xmm5,%xmm6
@@ -5919,12 +5919,12 @@ Disassembly of section .text:
 [ 	]*[a-f0-9]+:	62 f1 56 58 7b f5    	vcvtusi2ss %ebp,\{ru-sae\},%xmm5,%xmm6
 [ 	]*[a-f0-9]+:	62 f1 56 38 7b f5    	vcvtusi2ss %ebp,\{rd-sae\},%xmm5,%xmm6
 [ 	]*[a-f0-9]+:	62 f1 56 78 7b f5    	vcvtusi2ss %ebp,\{rz-sae\},%xmm5,%xmm6
-[ 	]*[a-f0-9]+:	67 62 f1 56 08 7b 31 	vcvtusi2ssl \(%ecx\),%xmm5,%xmm6
-[ 	]*[a-f0-9]+:	67 62 f1 56 08 7b b4 f4 c0 1d fe ff 	vcvtusi2ssl -0x1e240\(%esp,%esi,8\),%xmm5,%xmm6
-[ 	]*[a-f0-9]+:	67 62 f1 56 08 7b 72 7f 	vcvtusi2ssl 0x1fc\(%edx\),%xmm5,%xmm6
-[ 	]*[a-f0-9]+:	67 62 f1 56 08 7b b2 00 02 00 00 	vcvtusi2ssl 0x200\(%edx\),%xmm5,%xmm6
-[ 	]*[a-f0-9]+:	67 62 f1 56 08 7b 72 80 	vcvtusi2ssl -0x200\(%edx\),%xmm5,%xmm6
-[ 	]*[a-f0-9]+:	67 62 f1 56 08 7b b2 fc fd ff ff 	vcvtusi2ssl -0x204\(%edx\),%xmm5,%xmm6
+[ 	]*[a-f0-9]+:	67 62 f1 56 08 7b 31 	vcvtusi2ss \(%ecx\),%xmm5,%xmm6
+[ 	]*[a-f0-9]+:	67 62 f1 56 08 7b b4 f4 c0 1d fe ff 	vcvtusi2ss -0x1e240\(%esp,%esi,8\),%xmm5,%xmm6
+[ 	]*[a-f0-9]+:	67 62 f1 56 08 7b 72 7f 	vcvtusi2ss 0x1fc\(%edx\),%xmm5,%xmm6
+[ 	]*[a-f0-9]+:	67 62 f1 56 08 7b b2 00 02 00 00 	vcvtusi2ss 0x200\(%edx\),%xmm5,%xmm6
+[ 	]*[a-f0-9]+:	67 62 f1 56 08 7b 72 80 	vcvtusi2ss -0x200\(%edx\),%xmm5,%xmm6
+[ 	]*[a-f0-9]+:	67 62 f1 56 08 7b b2 fc fd ff ff 	vcvtusi2ss -0x204\(%edx\),%xmm5,%xmm6
 [ 	]*[a-f0-9]+:	62 f2 d5 48 2c f4    	vscalefpd %zmm4,%zmm5,%zmm6
 [ 	]*[a-f0-9]+:	62 f2 d5 4f 2c f4    	vscalefpd %zmm4,%zmm5,%zmm6\{%k7\}
 [ 	]*[a-f0-9]+:	62 f2 d5 cf 2c f4    	vscalefpd %zmm4,%zmm5,%zmm6\{%k7\}\{z\}
@@ -12546,12 +12546,12 @@ Disassembly of section .text:
 [ 	]*[a-f0-9]+:	67 62 f1 7e 08 79 aa fc fd ff ff 	vcvtss2usi -0x204\(%edx\),%ebp
 [ 	]*[a-f0-9]+:	62 f1 57 08 7b f0    	vcvtusi2sd %eax,%xmm5,%xmm6
 [ 	]*[a-f0-9]+:	62 f1 57 08 7b f5    	vcvtusi2sd %ebp,%xmm5,%xmm6
-[ 	]*[a-f0-9]+:	67 62 f1 57 08 7b 31 	vcvtusi2sdl \(%ecx\),%xmm5,%xmm6
-[ 	]*[a-f0-9]+:	67 62 f1 57 08 7b b4 f4 c0 1d fe ff 	vcvtusi2sdl -0x1e240\(%esp,%esi,8\),%xmm5,%xmm6
-[ 	]*[a-f0-9]+:	67 62 f1 57 08 7b 72 7f 	vcvtusi2sdl 0x1fc\(%edx\),%xmm5,%xmm6
-[ 	]*[a-f0-9]+:	67 62 f1 57 08 7b b2 00 02 00 00 	vcvtusi2sdl 0x200\(%edx\),%xmm5,%xmm6
-[ 	]*[a-f0-9]+:	67 62 f1 57 08 7b 72 80 	vcvtusi2sdl -0x200\(%edx\),%xmm5,%xmm6
-[ 	]*[a-f0-9]+:	67 62 f1 57 08 7b b2 fc fd ff ff 	vcvtusi2sdl -0x204\(%edx\),%xmm5,%xmm6
+[ 	]*[a-f0-9]+:	67 62 f1 57 08 7b 31 	vcvtusi2sd \(%ecx\),%xmm5,%xmm6
+[ 	]*[a-f0-9]+:	67 62 f1 57 08 7b b4 f4 c0 1d fe ff 	vcvtusi2sd -0x1e240\(%esp,%esi,8\),%xmm5,%xmm6
+[ 	]*[a-f0-9]+:	67 62 f1 57 08 7b 72 7f 	vcvtusi2sd 0x1fc\(%edx\),%xmm5,%xmm6
+[ 	]*[a-f0-9]+:	67 62 f1 57 08 7b b2 00 02 00 00 	vcvtusi2sd 0x200\(%edx\),%xmm5,%xmm6
+[ 	]*[a-f0-9]+:	67 62 f1 57 08 7b 72 80 	vcvtusi2sd -0x200\(%edx\),%xmm5,%xmm6
+[ 	]*[a-f0-9]+:	67 62 f1 57 08 7b b2 fc fd ff ff 	vcvtusi2sd -0x204\(%edx\),%xmm5,%xmm6
 [ 	]*[a-f0-9]+:	62 f1 56 08 7b f0    	vcvtusi2ss %eax,%xmm5,%xmm6
 [ 	]*[a-f0-9]+:	62 f1 56 18 7b f0    	vcvtusi2ss %eax,\{rn-sae\},%xmm5,%xmm6
 [ 	]*[a-f0-9]+:	62 f1 56 58 7b f0    	vcvtusi2ss %eax,\{ru-sae\},%xmm5,%xmm6
@@ -12562,12 +12562,12 @@ Disassembly of section .text:
 [ 	]*[a-f0-9]+:	62 f1 56 58 7b f5    	vcvtusi2ss %ebp,\{ru-sae\},%xmm5,%xmm6
 [ 	]*[a-f0-9]+:	62 f1 56 38 7b f5    	vcvtusi2ss %ebp,\{rd-sae\},%xmm5,%xmm6
 [ 	]*[a-f0-9]+:	62 f1 56 78 7b f5    	vcvtusi2ss %ebp,\{rz-sae\},%xmm5,%xmm6
-[ 	]*[a-f0-9]+:	67 62 f1 56 08 7b 31 	vcvtusi2ssl \(%ecx\),%xmm5,%xmm6
-[ 	]*[a-f0-9]+:	67 62 f1 56 08 7b b4 f4 c0 1d fe ff 	vcvtusi2ssl -0x1e240\(%esp,%esi,8\),%xmm5,%xmm6
-[ 	]*[a-f0-9]+:	67 62 f1 56 08 7b 72 7f 	vcvtusi2ssl 0x1fc\(%edx\),%xmm5,%xmm6
-[ 	]*[a-f0-9]+:	67 62 f1 56 08 7b b2 00 02 00 00 	vcvtusi2ssl 0x200\(%edx\),%xmm5,%xmm6
-[ 	]*[a-f0-9]+:	67 62 f1 56 08 7b 72 80 	vcvtusi2ssl -0x200\(%edx\),%xmm5,%xmm6
-[ 	]*[a-f0-9]+:	67 62 f1 56 08 7b b2 fc fd ff ff 	vcvtusi2ssl -0x204\(%edx\),%xmm5,%xmm6
+[ 	]*[a-f0-9]+:	67 62 f1 56 08 7b 31 	vcvtusi2ss \(%ecx\),%xmm5,%xmm6
+[ 	]*[a-f0-9]+:	67 62 f1 56 08 7b b4 f4 c0 1d fe ff 	vcvtusi2ss -0x1e240\(%esp,%esi,8\),%xmm5,%xmm6
+[ 	]*[a-f0-9]+:	67 62 f1 56 08 7b 72 7f 	vcvtusi2ss 0x1fc\(%edx\),%xmm5,%xmm6
+[ 	]*[a-f0-9]+:	67 62 f1 56 08 7b b2 00 02 00 00 	vcvtusi2ss 0x200\(%edx\),%xmm5,%xmm6
+[ 	]*[a-f0-9]+:	67 62 f1 56 08 7b 72 80 	vcvtusi2ss -0x200\(%edx\),%xmm5,%xmm6
+[ 	]*[a-f0-9]+:	67 62 f1 56 08 7b b2 fc fd ff ff 	vcvtusi2ss -0x204\(%edx\),%xmm5,%xmm6
 [ 	]*[a-f0-9]+:	62 f2 d5 48 2c f4    	vscalefpd %zmm4,%zmm5,%zmm6
 [ 	]*[a-f0-9]+:	62 f2 d5 4f 2c f4    	vscalefpd %zmm4,%zmm5,%zmm6\{%k7\}
 [ 	]*[a-f0-9]+:	62 f2 d5 cf 2c f4    	vscalefpd %zmm4,%zmm5,%zmm6\{%k7\}\{z\}
diff --git a/gas/testsuite/gas/i386/avx512f.d b/gas/testsuite/gas/i386/avx512f.d
index 1f52093..6fd1215 100644
--- a/gas/testsuite/gas/i386/avx512f.d
+++ b/gas/testsuite/gas/i386/avx512f.d
@@ -5903,12 +5903,12 @@ Disassembly of section .text:
 [ 	]*[a-f0-9]+:	62 f1 7e 08 79 aa fc fd ff ff 	vcvtss2usi -0x204\(%edx\),%ebp
 [ 	]*[a-f0-9]+:	62 f1 57 08 7b f0    	vcvtusi2sd %eax,%xmm5,%xmm6
 [ 	]*[a-f0-9]+:	62 f1 57 08 7b f5    	vcvtusi2sd %ebp,%xmm5,%xmm6
-[ 	]*[a-f0-9]+:	62 f1 57 08 7b 31    	vcvtusi2sdl \(%ecx\),%xmm5,%xmm6
-[ 	]*[a-f0-9]+:	62 f1 57 08 7b b4 f4 c0 1d fe ff 	vcvtusi2sdl -0x1e240\(%esp,%esi,8\),%xmm5,%xmm6
-[ 	]*[a-f0-9]+:	62 f1 57 08 7b 72 7f 	vcvtusi2sdl 0x1fc\(%edx\),%xmm5,%xmm6
-[ 	]*[a-f0-9]+:	62 f1 57 08 7b b2 00 02 00 00 	vcvtusi2sdl 0x200\(%edx\),%xmm5,%xmm6
-[ 	]*[a-f0-9]+:	62 f1 57 08 7b 72 80 	vcvtusi2sdl -0x200\(%edx\),%xmm5,%xmm6
-[ 	]*[a-f0-9]+:	62 f1 57 08 7b b2 fc fd ff ff 	vcvtusi2sdl -0x204\(%edx\),%xmm5,%xmm6
+[ 	]*[a-f0-9]+:	62 f1 57 08 7b 31    	vcvtusi2sd \(%ecx\),%xmm5,%xmm6
+[ 	]*[a-f0-9]+:	62 f1 57 08 7b b4 f4 c0 1d fe ff 	vcvtusi2sd -0x1e240\(%esp,%esi,8\),%xmm5,%xmm6
+[ 	]*[a-f0-9]+:	62 f1 57 08 7b 72 7f 	vcvtusi2sd 0x1fc\(%edx\),%xmm5,%xmm6
+[ 	]*[a-f0-9]+:	62 f1 57 08 7b b2 00 02 00 00 	vcvtusi2sd 0x200\(%edx\),%xmm5,%xmm6
+[ 	]*[a-f0-9]+:	62 f1 57 08 7b 72 80 	vcvtusi2sd -0x200\(%edx\),%xmm5,%xmm6
+[ 	]*[a-f0-9]+:	62 f1 57 08 7b b2 fc fd ff ff 	vcvtusi2sd -0x204\(%edx\),%xmm5,%xmm6
 [ 	]*[a-f0-9]+:	62 f1 56 08 7b f0    	vcvtusi2ss %eax,%xmm5,%xmm6
 [ 	]*[a-f0-9]+:	62 f1 56 18 7b f0    	vcvtusi2ss %eax,\{rn-sae\},%xmm5,%xmm6
 [ 	]*[a-f0-9]+:	62 f1 56 58 7b f0    	vcvtusi2ss %eax,\{ru-sae\},%xmm5,%xmm6
@@ -5919,12 +5919,12 @@ Disassembly of section .text:
 [ 	]*[a-f0-9]+:	62 f1 56 58 7b f5    	vcvtusi2ss %ebp,\{ru-sae\},%xmm5,%xmm6
 [ 	]*[a-f0-9]+:	62 f1 56 38 7b f5    	vcvtusi2ss %ebp,\{rd-sae\},%xmm5,%xmm6
 [ 	]*[a-f0-9]+:	62 f1 56 78 7b f5    	vcvtusi2ss %ebp,\{rz-sae\},%xmm5,%xmm6
-[ 	]*[a-f0-9]+:	62 f1 56 08 7b 31    	vcvtusi2ssl \(%ecx\),%xmm5,%xmm6
-[ 	]*[a-f0-9]+:	62 f1 56 08 7b b4 f4 c0 1d fe ff 	vcvtusi2ssl -0x1e240\(%esp,%esi,8\),%xmm5,%xmm6
-[ 	]*[a-f0-9]+:	62 f1 56 08 7b 72 7f 	vcvtusi2ssl 0x1fc\(%edx\),%xmm5,%xmm6
-[ 	]*[a-f0-9]+:	62 f1 56 08 7b b2 00 02 00 00 	vcvtusi2ssl 0x200\(%edx\),%xmm5,%xmm6
-[ 	]*[a-f0-9]+:	62 f1 56 08 7b 72 80 	vcvtusi2ssl -0x200\(%edx\),%xmm5,%xmm6
-[ 	]*[a-f0-9]+:	62 f1 56 08 7b b2 fc fd ff ff 	vcvtusi2ssl -0x204\(%edx\),%xmm5,%xmm6
+[ 	]*[a-f0-9]+:	62 f1 56 08 7b 31    	vcvtusi2ss \(%ecx\),%xmm5,%xmm6
+[ 	]*[a-f0-9]+:	62 f1 56 08 7b b4 f4 c0 1d fe ff 	vcvtusi2ss -0x1e240\(%esp,%esi,8\),%xmm5,%xmm6
+[ 	]*[a-f0-9]+:	62 f1 56 08 7b 72 7f 	vcvtusi2ss 0x1fc\(%edx\),%xmm5,%xmm6
+[ 	]*[a-f0-9]+:	62 f1 56 08 7b b2 00 02 00 00 	vcvtusi2ss 0x200\(%edx\),%xmm5,%xmm6
+[ 	]*[a-f0-9]+:	62 f1 56 08 7b 72 80 	vcvtusi2ss -0x200\(%edx\),%xmm5,%xmm6
+[ 	]*[a-f0-9]+:	62 f1 56 08 7b b2 fc fd ff ff 	vcvtusi2ss -0x204\(%edx\),%xmm5,%xmm6
 [ 	]*[a-f0-9]+:	62 f2 d5 48 2c f4    	vscalefpd %zmm4,%zmm5,%zmm6
 [ 	]*[a-f0-9]+:	62 f2 d5 4f 2c f4    	vscalefpd %zmm4,%zmm5,%zmm6\{%k7\}
 [ 	]*[a-f0-9]+:	62 f2 d5 cf 2c f4    	vscalefpd %zmm4,%zmm5,%zmm6\{%k7\}\{z\}
@@ -12546,12 +12546,12 @@ Disassembly of section .text:
 [ 	]*[a-f0-9]+:	62 f1 7e 08 79 aa fc fd ff ff 	vcvtss2usi -0x204\(%edx\),%ebp
 [ 	]*[a-f0-9]+:	62 f1 57 08 7b f0    	vcvtusi2sd %eax,%xmm5,%xmm6
 [ 	]*[a-f0-9]+:	62 f1 57 08 7b f5    	vcvtusi2sd %ebp,%xmm5,%xmm6
-[ 	]*[a-f0-9]+:	62 f1 57 08 7b 31    	vcvtusi2sdl \(%ecx\),%xmm5,%xmm6
-[ 	]*[a-f0-9]+:	62 f1 57 08 7b b4 f4 c0 1d fe ff 	vcvtusi2sdl -0x1e240\(%esp,%esi,8\),%xmm5,%xmm6
-[ 	]*[a-f0-9]+:	62 f1 57 08 7b 72 7f 	vcvtusi2sdl 0x1fc\(%edx\),%xmm5,%xmm6
-[ 	]*[a-f0-9]+:	62 f1 57 08 7b b2 00 02 00 00 	vcvtusi2sdl 0x200\(%edx\),%xmm5,%xmm6
-[ 	]*[a-f0-9]+:	62 f1 57 08 7b 72 80 	vcvtusi2sdl -0x200\(%edx\),%xmm5,%xmm6
-[ 	]*[a-f0-9]+:	62 f1 57 08 7b b2 fc fd ff ff 	vcvtusi2sdl -0x204\(%edx\),%xmm5,%xmm6
+[ 	]*[a-f0-9]+:	62 f1 57 08 7b 31    	vcvtusi2sd \(%ecx\),%xmm5,%xmm6
+[ 	]*[a-f0-9]+:	62 f1 57 08 7b b4 f4 c0 1d fe ff 	vcvtusi2sd -0x1e240\(%esp,%esi,8\),%xmm5,%xmm6
+[ 	]*[a-f0-9]+:	62 f1 57 08 7b 72 7f 	vcvtusi2sd 0x1fc\(%edx\),%xmm5,%xmm6
+[ 	]*[a-f0-9]+:	62 f1 57 08 7b b2 00 02 00 00 	vcvtusi2sd 0x200\(%edx\),%xmm5,%xmm6
+[ 	]*[a-f0-9]+:	62 f1 57 08 7b 72 80 	vcvtusi2sd -0x200\(%edx\),%xmm5,%xmm6
+[ 	]*[a-f0-9]+:	62 f1 57 08 7b b2 fc fd ff ff 	vcvtusi2sd -0x204\(%edx\),%xmm5,%xmm6
 [ 	]*[a-f0-9]+:	62 f1 56 08 7b f0    	vcvtusi2ss %eax,%xmm5,%xmm6
 [ 	]*[a-f0-9]+:	62 f1 56 18 7b f0    	vcvtusi2ss %eax,\{rn-sae\},%xmm5,%xmm6
 [ 	]*[a-f0-9]+:	62 f1 56 58 7b f0    	vcvtusi2ss %eax,\{ru-sae\},%xmm5,%xmm6
@@ -12562,12 +12562,12 @@ Disassembly of section .text:
 [ 	]*[a-f0-9]+:	62 f1 56 58 7b f5    	vcvtusi2ss %ebp,\{ru-sae\},%xmm5,%xmm6
 [ 	]*[a-f0-9]+:	62 f1 56 38 7b f5    	vcvtusi2ss %ebp,\{rd-sae\},%xmm5,%xmm6
 [ 	]*[a-f0-9]+:	62 f1 56 78 7b f5    	vcvtusi2ss %ebp,\{rz-sae\},%xmm5,%xmm6
-[ 	]*[a-f0-9]+:	62 f1 56 08 7b 31    	vcvtusi2ssl \(%ecx\),%xmm5,%xmm6
-[ 	]*[a-f0-9]+:	62 f1 56 08 7b b4 f4 c0 1d fe ff 	vcvtusi2ssl -0x1e240\(%esp,%esi,8\),%xmm5,%xmm6
-[ 	]*[a-f0-9]+:	62 f1 56 08 7b 72 7f 	vcvtusi2ssl 0x1fc\(%edx\),%xmm5,%xmm6
-[ 	]*[a-f0-9]+:	62 f1 56 08 7b b2 00 02 00 00 	vcvtusi2ssl 0x200\(%edx\),%xmm5,%xmm6
-[ 	]*[a-f0-9]+:	62 f1 56 08 7b 72 80 	vcvtusi2ssl -0x200\(%edx\),%xmm5,%xmm6
-[ 	]*[a-f0-9]+:	62 f1 56 08 7b b2 fc fd ff ff 	vcvtusi2ssl -0x204\(%edx\),%xmm5,%xmm6
+[ 	]*[a-f0-9]+:	62 f1 56 08 7b 31    	vcvtusi2ss \(%ecx\),%xmm5,%xmm6
+[ 	]*[a-f0-9]+:	62 f1 56 08 7b b4 f4 c0 1d fe ff 	vcvtusi2ss -0x1e240\(%esp,%esi,8\),%xmm5,%xmm6
+[ 	]*[a-f0-9]+:	62 f1 56 08 7b 72 7f 	vcvtusi2ss 0x1fc\(%edx\),%xmm5,%xmm6
+[ 	]*[a-f0-9]+:	62 f1 56 08 7b b2 00 02 00 00 	vcvtusi2ss 0x200\(%edx\),%xmm5,%xmm6
+[ 	]*[a-f0-9]+:	62 f1 56 08 7b 72 80 	vcvtusi2ss -0x200\(%edx\),%xmm5,%xmm6
+[ 	]*[a-f0-9]+:	62 f1 56 08 7b b2 fc fd ff ff 	vcvtusi2ss -0x204\(%edx\),%xmm5,%xmm6
 [ 	]*[a-f0-9]+:	62 f2 d5 48 2c f4    	vscalefpd %zmm4,%zmm5,%zmm6
 [ 	]*[a-f0-9]+:	62 f2 d5 4f 2c f4    	vscalefpd %zmm4,%zmm5,%zmm6\{%k7\}
 [ 	]*[a-f0-9]+:	62 f2 d5 cf 2c f4    	vscalefpd %zmm4,%zmm5,%zmm6\{%k7\}\{z\}
diff --git a/gas/testsuite/gas/i386/evex-lig256.d b/gas/testsuite/gas/i386/evex-lig256.d
index 79fe6f7..7e99258 100644
--- a/gas/testsuite/gas/i386/evex-lig256.d
+++ b/gas/testsuite/gas/i386/evex-lig256.d
@@ -1446,12 +1446,12 @@ Disassembly of section .text:
 [ 	]*[a-f0-9]+:	62 f1 7e 28 79 aa fc fd ff ff 	vcvtss2usi -0x204\(%edx\),%ebp
 [ 	]*[a-f0-9]+:	62 f1 57 28 7b f0    	vcvtusi2sd %eax,%xmm5,%xmm6
 [ 	]*[a-f0-9]+:	62 f1 57 28 7b f5    	vcvtusi2sd %ebp,%xmm5,%xmm6
-[ 	]*[a-f0-9]+:	62 f1 57 28 7b 31    	vcvtusi2sdl \(%ecx\),%xmm5,%xmm6
-[ 	]*[a-f0-9]+:	62 f1 57 28 7b b4 f4 c0 1d fe ff 	vcvtusi2sdl -0x1e240\(%esp,%esi,8\),%xmm5,%xmm6
-[ 	]*[a-f0-9]+:	62 f1 57 28 7b 72 7f 	vcvtusi2sdl 0x1fc\(%edx\),%xmm5,%xmm6
-[ 	]*[a-f0-9]+:	62 f1 57 28 7b b2 00 02 00 00 	vcvtusi2sdl 0x200\(%edx\),%xmm5,%xmm6
-[ 	]*[a-f0-9]+:	62 f1 57 28 7b 72 80 	vcvtusi2sdl -0x200\(%edx\),%xmm5,%xmm6
-[ 	]*[a-f0-9]+:	62 f1 57 28 7b b2 fc fd ff ff 	vcvtusi2sdl -0x204\(%edx\),%xmm5,%xmm6
+[ 	]*[a-f0-9]+:	62 f1 57 28 7b 31    	vcvtusi2sd \(%ecx\),%xmm5,%xmm6
+[ 	]*[a-f0-9]+:	62 f1 57 28 7b b4 f4 c0 1d fe ff 	vcvtusi2sd -0x1e240\(%esp,%esi,8\),%xmm5,%xmm6
+[ 	]*[a-f0-9]+:	62 f1 57 28 7b 72 7f 	vcvtusi2sd 0x1fc\(%edx\),%xmm5,%xmm6
+[ 	]*[a-f0-9]+:	62 f1 57 28 7b b2 00 02 00 00 	vcvtusi2sd 0x200\(%edx\),%xmm5,%xmm6
+[ 	]*[a-f0-9]+:	62 f1 57 28 7b 72 80 	vcvtusi2sd -0x200\(%edx\),%xmm5,%xmm6
+[ 	]*[a-f0-9]+:	62 f1 57 28 7b b2 fc fd ff ff 	vcvtusi2sd -0x204\(%edx\),%xmm5,%xmm6
 [ 	]*[a-f0-9]+:	62 f1 56 28 7b f0    	vcvtusi2ss %eax,%xmm5,%xmm6
 [ 	]*[a-f0-9]+:	62 f1 56 18 7b f0    	vcvtusi2ss %eax,\{rn-sae\},%xmm5,%xmm6
 [ 	]*[a-f0-9]+:	62 f1 56 58 7b f0    	vcvtusi2ss %eax,\{ru-sae\},%xmm5,%xmm6
@@ -1462,12 +1462,12 @@ Disassembly of section .text:
 [ 	]*[a-f0-9]+:	62 f1 56 58 7b f5    	vcvtusi2ss %ebp,\{ru-sae\},%xmm5,%xmm6
 [ 	]*[a-f0-9]+:	62 f1 56 38 7b f5    	vcvtusi2ss %ebp,\{rd-sae\},%xmm5,%xmm6
 [ 	]*[a-f0-9]+:	62 f1 56 78 7b f5    	vcvtusi2ss %ebp,\{rz-sae\},%xmm5,%xmm6
-[ 	]*[a-f0-9]+:	62 f1 56 28 7b 31    	vcvtusi2ssl \(%ecx\),%xmm5,%xmm6
-[ 	]*[a-f0-9]+:	62 f1 56 28 7b b4 f4 c0 1d fe ff 	vcvtusi2ssl -0x1e240\(%esp,%esi,8\),%xmm5,%xmm6
-[ 	]*[a-f0-9]+:	62 f1 56 28 7b 72 7f 	vcvtusi2ssl 0x1fc\(%edx\),%xmm5,%xmm6
-[ 	]*[a-f0-9]+:	62 f1 56 28 7b b2 00 02 00 00 	vcvtusi2ssl 0x200\(%edx\),%xmm5,%xmm6
-[ 	]*[a-f0-9]+:	62 f1 56 28 7b 72 80 	vcvtusi2ssl -0x200\(%edx\),%xmm5,%xmm6
-[ 	]*[a-f0-9]+:	62 f1 56 28 7b b2 fc fd ff ff 	vcvtusi2ssl -0x204\(%edx\),%xmm5,%xmm6
+[ 	]*[a-f0-9]+:	62 f1 56 28 7b 31    	vcvtusi2ss \(%ecx\),%xmm5,%xmm6
+[ 	]*[a-f0-9]+:	62 f1 56 28 7b b4 f4 c0 1d fe ff 	vcvtusi2ss -0x1e240\(%esp,%esi,8\),%xmm5,%xmm6
+[ 	]*[a-f0-9]+:	62 f1 56 28 7b 72 7f 	vcvtusi2ss 0x1fc\(%edx\),%xmm5,%xmm6
+[ 	]*[a-f0-9]+:	62 f1 56 28 7b b2 00 02 00 00 	vcvtusi2ss 0x200\(%edx\),%xmm5,%xmm6
+[ 	]*[a-f0-9]+:	62 f1 56 28 7b 72 80 	vcvtusi2ss -0x200\(%edx\),%xmm5,%xmm6
+[ 	]*[a-f0-9]+:	62 f1 56 28 7b b2 fc fd ff ff 	vcvtusi2ss -0x204\(%edx\),%xmm5,%xmm6
 [ 	]*[a-f0-9]+:	62 f2 d5 2f 2d f4    	vscalefsd %xmm4,%xmm5,%xmm6\{%k7\}
 [ 	]*[a-f0-9]+:	62 f2 d5 af 2d f4    	vscalefsd %xmm4,%xmm5,%xmm6\{%k7\}\{z\}
 [ 	]*[a-f0-9]+:	62 f2 d5 1f 2d f4    	vscalefsd \{rn-sae\},%xmm4,%xmm5,%xmm6\{%k7\}
@@ -2973,12 +2973,12 @@ Disassembly of section .text:
 [ 	]*[a-f0-9]+:	62 f1 7e 28 79 aa fc fd ff ff 	vcvtss2usi -0x204\(%edx\),%ebp
 [ 	]*[a-f0-9]+:	62 f1 57 28 7b f0    	vcvtusi2sd %eax,%xmm5,%xmm6
 [ 	]*[a-f0-9]+:	62 f1 57 28 7b f5    	vcvtusi2sd %ebp,%xmm5,%xmm6
-[ 	]*[a-f0-9]+:	62 f1 57 28 7b 31    	vcvtusi2sdl \(%ecx\),%xmm5,%xmm6
-[ 	]*[a-f0-9]+:	62 f1 57 28 7b b4 f4 c0 1d fe ff 	vcvtusi2sdl -0x1e240\(%esp,%esi,8\),%xmm5,%xmm6
-[ 	]*[a-f0-9]+:	62 f1 57 28 7b 72 7f 	vcvtusi2sdl 0x1fc\(%edx\),%xmm5,%xmm6
-[ 	]*[a-f0-9]+:	62 f1 57 28 7b b2 00 02 00 00 	vcvtusi2sdl 0x200\(%edx\),%xmm5,%xmm6
-[ 	]*[a-f0-9]+:	62 f1 57 28 7b 72 80 	vcvtusi2sdl -0x200\(%edx\),%xmm5,%xmm6
-[ 	]*[a-f0-9]+:	62 f1 57 28 7b b2 fc fd ff ff 	vcvtusi2sdl -0x204\(%edx\),%xmm5,%xmm6
+[ 	]*[a-f0-9]+:	62 f1 57 28 7b 31    	vcvtusi2sd \(%ecx\),%xmm5,%xmm6
+[ 	]*[a-f0-9]+:	62 f1 57 28 7b b4 f4 c0 1d fe ff 	vcvtusi2sd -0x1e240\(%esp,%esi,8\),%xmm5,%xmm6
+[ 	]*[a-f0-9]+:	62 f1 57 28 7b 72 7f 	vcvtusi2sd 0x1fc\(%edx\),%xmm5,%xmm6
+[ 	]*[a-f0-9]+:	62 f1 57 28 7b b2 00 02 00 00 	vcvtusi2sd 0x200\(%edx\),%xmm5,%xmm6
+[ 	]*[a-f0-9]+:	62 f1 57 28 7b 72 80 	vcvtusi2sd -0x200\(%edx\),%xmm5,%xmm6
+[ 	]*[a-f0-9]+:	62 f1 57 28 7b b2 fc fd ff ff 	vcvtusi2sd -0x204\(%edx\),%xmm5,%xmm6
 [ 	]*[a-f0-9]+:	62 f1 56 28 7b f0    	vcvtusi2ss %eax,%xmm5,%xmm6
 [ 	]*[a-f0-9]+:	62 f1 56 18 7b f0    	vcvtusi2ss %eax,\{rn-sae\},%xmm5,%xmm6
 [ 	]*[a-f0-9]+:	62 f1 56 58 7b f0    	vcvtusi2ss %eax,\{ru-sae\},%xmm5,%xmm6
@@ -2989,12 +2989,12 @@ Disassembly of section .text:
 [ 	]*[a-f0-9]+:	62 f1 56 58 7b f5    	vcvtusi2ss %ebp,\{ru-sae\},%xmm5,%xmm6
 [ 	]*[a-f0-9]+:	62 f1 56 38 7b f5    	vcvtusi2ss %ebp,\{rd-sae\},%xmm5,%xmm6
 [ 	]*[a-f0-9]+:	62 f1 56 78 7b f5    	vcvtusi2ss %ebp,\{rz-sae\},%xmm5,%xmm6
-[ 	]*[a-f0-9]+:	62 f1 56 28 7b 31    	vcvtusi2ssl \(%ecx\),%xmm5,%xmm6
-[ 	]*[a-f0-9]+:	62 f1 56 28 7b b4 f4 c0 1d fe ff 	vcvtusi2ssl -0x1e240\(%esp,%esi,8\),%xmm5,%xmm6
-[ 	]*[a-f0-9]+:	62 f1 56 28 7b 72 7f 	vcvtusi2ssl 0x1fc\(%edx\),%xmm5,%xmm6
-[ 	]*[a-f0-9]+:	62 f1 56 28 7b b2 00 02 00 00 	vcvtusi2ssl 0x200\(%edx\),%xmm5,%xmm6
-[ 	]*[a-f0-9]+:	62 f1 56 28 7b 72 80 	vcvtusi2ssl -0x200\(%edx\),%xmm5,%xmm6
-[ 	]*[a-f0-9]+:	62 f1 56 28 7b b2 fc fd ff ff 	vcvtusi2ssl -0x204\(%edx\),%xmm5,%xmm6
+[ 	]*[a-f0-9]+:	62 f1 56 28 7b 31    	vcvtusi2ss \(%ecx\),%xmm5,%xmm6
+[ 	]*[a-f0-9]+:	62 f1 56 28 7b b4 f4 c0 1d fe ff 	vcvtusi2ss -0x1e240\(%esp,%esi,8\),%xmm5,%xmm6
+[ 	]*[a-f0-9]+:	62 f1 56 28 7b 72 7f 	vcvtusi2ss 0x1fc\(%edx\),%xmm5,%xmm6
+[ 	]*[a-f0-9]+:	62 f1 56 28 7b b2 00 02 00 00 	vcvtusi2ss 0x200\(%edx\),%xmm5,%xmm6
+[ 	]*[a-f0-9]+:	62 f1 56 28 7b 72 80 	vcvtusi2ss -0x200\(%edx\),%xmm5,%xmm6
+[ 	]*[a-f0-9]+:	62 f1 56 28 7b b2 fc fd ff ff 	vcvtusi2ss -0x204\(%edx\),%xmm5,%xmm6
 [ 	]*[a-f0-9]+:	62 f2 d5 2f 2d f4    	vscalefsd %xmm4,%xmm5,%xmm6\{%k7\}
 [ 	]*[a-f0-9]+:	62 f2 d5 af 2d f4    	vscalefsd %xmm4,%xmm5,%xmm6\{%k7\}\{z\}
 [ 	]*[a-f0-9]+:	62 f2 d5 1f 2d f4    	vscalefsd \{rn-sae\},%xmm4,%xmm5,%xmm6\{%k7\}
diff --git a/gas/testsuite/gas/i386/evex-lig512.d b/gas/testsuite/gas/i386/evex-lig512.d
index a0638f0..a3c85b8 100644
--- a/gas/testsuite/gas/i386/evex-lig512.d
+++ b/gas/testsuite/gas/i386/evex-lig512.d
@@ -1446,12 +1446,12 @@ Disassembly of section .text:
 [ 	]*[a-f0-9]+:	62 f1 7e 48 79 aa fc fd ff ff 	vcvtss2usi -0x204\(%edx\),%ebp
 [ 	]*[a-f0-9]+:	62 f1 57 48 7b f0    	vcvtusi2sd %eax,%xmm5,%xmm6
 [ 	]*[a-f0-9]+:	62 f1 57 48 7b f5    	vcvtusi2sd %ebp,%xmm5,%xmm6
-[ 	]*[a-f0-9]+:	62 f1 57 48 7b 31    	vcvtusi2sdl \(%ecx\),%xmm5,%xmm6
-[ 	]*[a-f0-9]+:	62 f1 57 48 7b b4 f4 c0 1d fe ff 	vcvtusi2sdl -0x1e240\(%esp,%esi,8\),%xmm5,%xmm6
-[ 	]*[a-f0-9]+:	62 f1 57 48 7b 72 7f 	vcvtusi2sdl 0x1fc\(%edx\),%xmm5,%xmm6
-[ 	]*[a-f0-9]+:	62 f1 57 48 7b b2 00 02 00 00 	vcvtusi2sdl 0x200\(%edx\),%xmm5,%xmm6
-[ 	]*[a-f0-9]+:	62 f1 57 48 7b 72 80 	vcvtusi2sdl -0x200\(%edx\),%xmm5,%xmm6
-[ 	]*[a-f0-9]+:	62 f1 57 48 7b b2 fc fd ff ff 	vcvtusi2sdl -0x204\(%edx\),%xmm5,%xmm6
+[ 	]*[a-f0-9]+:	62 f1 57 48 7b 31    	vcvtusi2sd \(%ecx\),%xmm5,%xmm6
+[ 	]*[a-f0-9]+:	62 f1 57 48 7b b4 f4 c0 1d fe ff 	vcvtusi2sd -0x1e240\(%esp,%esi,8\),%xmm5,%xmm6
+[ 	]*[a-f0-9]+:	62 f1 57 48 7b 72 7f 	vcvtusi2sd 0x1fc\(%edx\),%xmm5,%xmm6
+[ 	]*[a-f0-9]+:	62 f1 57 48 7b b2 00 02 00 00 	vcvtusi2sd 0x200\(%edx\),%xmm5,%xmm6
+[ 	]*[a-f0-9]+:	62 f1 57 48 7b 72 80 	vcvtusi2sd -0x200\(%edx\),%xmm5,%xmm6
+[ 	]*[a-f0-9]+:	62 f1 57 48 7b b2 fc fd ff ff 	vcvtusi2sd -0x204\(%edx\),%xmm5,%xmm6
 [ 	]*[a-f0-9]+:	62 f1 56 48 7b f0    	vcvtusi2ss %eax,%xmm5,%xmm6
 [ 	]*[a-f0-9]+:	62 f1 56 18 7b f0    	vcvtusi2ss %eax,\{rn-sae\},%xmm5,%xmm6
 [ 	]*[a-f0-9]+:	62 f1 56 58 7b f0    	vcvtusi2ss %eax,\{ru-sae\},%xmm5,%xmm6
@@ -1462,12 +1462,12 @@ Disassembly of section .text:
 [ 	]*[a-f0-9]+:	62 f1 56 58 7b f5    	vcvtusi2ss %ebp,\{ru-sae\},%xmm5,%xmm6
 [ 	]*[a-f0-9]+:	62 f1 56 38 7b f5    	vcvtusi2ss %ebp,\{rd-sae\},%xmm5,%xmm6
 [ 	]*[a-f0-9]+:	62 f1 56 78 7b f5    	vcvtusi2ss %ebp,\{rz-sae\},%xmm5,%xmm6
-[ 	]*[a-f0-9]+:	62 f1 56 48 7b 31    	vcvtusi2ssl \(%ecx\),%xmm5,%xmm6
-[ 	]*[a-f0-9]+:	62 f1 56 48 7b b4 f4 c0 1d fe ff 	vcvtusi2ssl -0x1e240\(%esp,%esi,8\),%xmm5,%xmm6
-[ 	]*[a-f0-9]+:	62 f1 56 48 7b 72 7f 	vcvtusi2ssl 0x1fc\(%edx\),%xmm5,%xmm6
-[ 	]*[a-f0-9]+:	62 f1 56 48 7b b2 00 02 00 00 	vcvtusi2ssl 0x200\(%edx\),%xmm5,%xmm6
-[ 	]*[a-f0-9]+:	62 f1 56 48 7b 72 80 	vcvtusi2ssl -0x200\(%edx\),%xmm5,%xmm6
-[ 	]*[a-f0-9]+:	62 f1 56 48 7b b2 fc fd ff ff 	vcvtusi2ssl -0x204\(%edx\),%xmm5,%xmm6
+[ 	]*[a-f0-9]+:	62 f1 56 48 7b 31    	vcvtusi2ss \(%ecx\),%xmm5,%xmm6
+[ 	]*[a-f0-9]+:	62 f1 56 48 7b b4 f4 c0 1d fe ff 	vcvtusi2ss -0x1e240\(%esp,%esi,8\),%xmm5,%xmm6
+[ 	]*[a-f0-9]+:	62 f1 56 48 7b 72 7f 	vcvtusi2ss 0x1fc\(%edx\),%xmm5,%xmm6
+[ 	]*[a-f0-9]+:	62 f1 56 48 7b b2 00 02 00 00 	vcvtusi2ss 0x200\(%edx\),%xmm5,%xmm6
+[ 	]*[a-f0-9]+:	62 f1 56 48 7b 72 80 	vcvtusi2ss -0x200\(%edx\),%xmm5,%xmm6
+[ 	]*[a-f0-9]+:	62 f1 56 48 7b b2 fc fd ff ff 	vcvtusi2ss -0x204\(%edx\),%xmm5,%xmm6
 [ 	]*[a-f0-9]+:	62 f2 d5 4f 2d f4    	vscalefsd %xmm4,%xmm5,%xmm6\{%k7\}
 [ 	]*[a-f0-9]+:	62 f2 d5 cf 2d f4    	vscalefsd %xmm4,%xmm5,%xmm6\{%k7\}\{z\}
 [ 	]*[a-f0-9]+:	62 f2 d5 1f 2d f4    	vscalefsd \{rn-sae\},%xmm4,%xmm5,%xmm6\{%k7\}
@@ -2973,12 +2973,12 @@ Disassembly of section .text:
 [ 	]*[a-f0-9]+:	62 f1 7e 48 79 aa fc fd ff ff 	vcvtss2usi -0x204\(%edx\),%ebp
 [ 	]*[a-f0-9]+:	62 f1 57 48 7b f0    	vcvtusi2sd %eax,%xmm5,%xmm6
 [ 	]*[a-f0-9]+:	62 f1 57 48 7b f5    	vcvtusi2sd %ebp,%xmm5,%xmm6
-[ 	]*[a-f0-9]+:	62 f1 57 48 7b 31    	vcvtusi2sdl \(%ecx\),%xmm5,%xmm6
-[ 	]*[a-f0-9]+:	62 f1 57 48 7b b4 f4 c0 1d fe ff 	vcvtusi2sdl -0x1e240\(%esp,%esi,8\),%xmm5,%xmm6
-[ 	]*[a-f0-9]+:	62 f1 57 48 7b 72 7f 	vcvtusi2sdl 0x1fc\(%edx\),%xmm5,%xmm6
-[ 	]*[a-f0-9]+:	62 f1 57 48 7b b2 00 02 00 00 	vcvtusi2sdl 0x200\(%edx\),%xmm5,%xmm6
-[ 	]*[a-f0-9]+:	62 f1 57 48 7b 72 80 	vcvtusi2sdl -0x200\(%edx\),%xmm5,%xmm6
-[ 	]*[a-f0-9]+:	62 f1 57 48 7b b2 fc fd ff ff 	vcvtusi2sdl -0x204\(%edx\),%xmm5,%xmm6
+[ 	]*[a-f0-9]+:	62 f1 57 48 7b 31    	vcvtusi2sd \(%ecx\),%xmm5,%xmm6
+[ 	]*[a-f0-9]+:	62 f1 57 48 7b b4 f4 c0 1d fe ff 	vcvtusi2sd -0x1e240\(%esp,%esi,8\),%xmm5,%xmm6
+[ 	]*[a-f0-9]+:	62 f1 57 48 7b 72 7f 	vcvtusi2sd 0x1fc\(%edx\),%xmm5,%xmm6
+[ 	]*[a-f0-9]+:	62 f1 57 48 7b b2 00 02 00 00 	vcvtusi2sd 0x200\(%edx\),%xmm5,%xmm6
+[ 	]*[a-f0-9]+:	62 f1 57 48 7b 72 80 	vcvtusi2sd -0x200\(%edx\),%xmm5,%xmm6
+[ 	]*[a-f0-9]+:	62 f1 57 48 7b b2 fc fd ff ff 	vcvtusi2sd -0x204\(%edx\),%xmm5,%xmm6
 [ 	]*[a-f0-9]+:	62 f1 56 48 7b f0    	vcvtusi2ss %eax,%xmm5,%xmm6
 [ 	]*[a-f0-9]+:	62 f1 56 18 7b f0    	vcvtusi2ss %eax,\{rn-sae\},%xmm5,%xmm6
 [ 	]*[a-f0-9]+:	62 f1 56 58 7b f0    	vcvtusi2ss %eax,\{ru-sae\},%xmm5,%xmm6
@@ -2989,12 +2989,12 @@ Disassembly of section .text:
 [ 	]*[a-f0-9]+:	62 f1 56 58 7b f5    	vcvtusi2ss %ebp,\{ru-sae\},%xmm5,%xmm6
 [ 	]*[a-f0-9]+:	62 f1 56 38 7b f5    	vcvtusi2ss %ebp,\{rd-sae\},%xmm5,%xmm6
 [ 	]*[a-f0-9]+:	62 f1 56 78 7b f5    	vcvtusi2ss %ebp,\{rz-sae\},%xmm5,%xmm6
-[ 	]*[a-f0-9]+:	62 f1 56 48 7b 31    	vcvtusi2ssl \(%ecx\),%xmm5,%xmm6
-[ 	]*[a-f0-9]+:	62 f1 56 48 7b b4 f4 c0 1d fe ff 	vcvtusi2ssl -0x1e240\(%esp,%esi,8\),%xmm5,%xmm6
-[ 	]*[a-f0-9]+:	62 f1 56 48 7b 72 7f 	vcvtusi2ssl 0x1fc\(%edx\),%xmm5,%xmm6
-[ 	]*[a-f0-9]+:	62 f1 56 48 7b b2 00 02 00 00 	vcvtusi2ssl 0x200\(%edx\),%xmm5,%xmm6
-[ 	]*[a-f0-9]+:	62 f1 56 48 7b 72 80 	vcvtusi2ssl -0x200\(%edx\),%xmm5,%xmm6
-[ 	]*[a-f0-9]+:	62 f1 56 48 7b b2 fc fd ff ff 	vcvtusi2ssl -0x204\(%edx\),%xmm5,%xmm6
+[ 	]*[a-f0-9]+:	62 f1 56 48 7b 31    	vcvtusi2ss \(%ecx\),%xmm5,%xmm6
+[ 	]*[a-f0-9]+:	62 f1 56 48 7b b4 f4 c0 1d fe ff 	vcvtusi2ss -0x1e240\(%esp,%esi,8\),%xmm5,%xmm6
+[ 	]*[a-f0-9]+:	62 f1 56 48 7b 72 7f 	vcvtusi2ss 0x1fc\(%edx\),%xmm5,%xmm6
+[ 	]*[a-f0-9]+:	62 f1 56 48 7b b2 00 02 00 00 	vcvtusi2ss 0x200\(%edx\),%xmm5,%xmm6
+[ 	]*[a-f0-9]+:	62 f1 56 48 7b 72 80 	vcvtusi2ss -0x200\(%edx\),%xmm5,%xmm6
+[ 	]*[a-f0-9]+:	62 f1 56 48 7b b2 fc fd ff ff 	vcvtusi2ss -0x204\(%edx\),%xmm5,%xmm6
 [ 	]*[a-f0-9]+:	62 f2 d5 4f 2d f4    	vscalefsd %xmm4,%xmm5,%xmm6\{%k7\}
 [ 	]*[a-f0-9]+:	62 f2 d5 cf 2d f4    	vscalefsd %xmm4,%xmm5,%xmm6\{%k7\}\{z\}
 [ 	]*[a-f0-9]+:	62 f2 d5 1f 2d f4    	vscalefsd \{rn-sae\},%xmm4,%xmm5,%xmm6\{%k7\}
diff --git a/gas/testsuite/gas/i386/evex-wig1.d b/gas/testsuite/gas/i386/evex-wig1.d
index 45366c1..def41b3 100644
--- a/gas/testsuite/gas/i386/evex-wig1.d
+++ b/gas/testsuite/gas/i386/evex-wig1.d
@@ -10,17 +10,17 @@ Disassembly of section .text:
 
 0+ <_start>:
 [ 	]*[a-f0-9]+:	62 f1 fe 08 2a c0    	vcvtsi2ss %eax,%xmm0,%xmm0
-[ 	]*[a-f0-9]+:	62 f1 fe 08 2a 40 01 	vcvtsi2ssl 0x4\(%eax\),%xmm0,%xmm0
+[ 	]*[a-f0-9]+:	62 f1 fe 08 2a 40 01 	vcvtsi2ss 0x4\(%eax\),%xmm0,%xmm0
 [ 	]*[a-f0-9]+:	62 f1 ff 08 2a c0    	vcvtsi2sd %eax,%xmm0,%xmm0
-[ 	]*[a-f0-9]+:	62 f1 ff 08 2a 40 01 	vcvtsi2sdl 0x4\(%eax\),%xmm0,%xmm0
+[ 	]*[a-f0-9]+:	62 f1 ff 08 2a 40 01 	vcvtsi2sd 0x4\(%eax\),%xmm0,%xmm0
 [ 	]*[a-f0-9]+:	62 f1 fe 08 2d c0    	vcvtss2si %xmm0,%eax
 [ 	]*[a-f0-9]+:	62 f1 ff 08 2d c0    	vcvtsd2si %xmm0,%eax
 [ 	]*[a-f0-9]+:	62 f1 fe 08 2c c0    	vcvttss2si %xmm0,%eax
 [ 	]*[a-f0-9]+:	62 f1 ff 08 2c c0    	vcvttsd2si %xmm0,%eax
 [ 	]*[a-f0-9]+:	62 f1 fe 08 7b c0    	vcvtusi2ss %eax,%xmm0,%xmm0
-[ 	]*[a-f0-9]+:	62 f1 fe 08 7b 40 01 	vcvtusi2ssl 0x4\(%eax\),%xmm0,%xmm0
+[ 	]*[a-f0-9]+:	62 f1 fe 08 7b 40 01 	vcvtusi2ss 0x4\(%eax\),%xmm0,%xmm0
 [ 	]*[a-f0-9]+:	62 f1 ff 08 7b c0    	vcvtusi2sd %eax,%xmm0,%xmm0
-[ 	]*[a-f0-9]+:	62 f1 ff 08 7b 40 01 	vcvtusi2sdl 0x4\(%eax\),%xmm0,%xmm0
+[ 	]*[a-f0-9]+:	62 f1 ff 08 7b 40 01 	vcvtusi2sd 0x4\(%eax\),%xmm0,%xmm0
 [ 	]*[a-f0-9]+:	62 f1 fe 08 79 c0    	vcvtss2usi %xmm0,%eax
 [ 	]*[a-f0-9]+:	62 f1 ff 08 79 c0    	vcvtsd2usi %xmm0,%eax
 [ 	]*[a-f0-9]+:	62 f1 fe 08 78 c0    	vcvttss2usi %xmm0,%eax
diff --git a/gas/testsuite/gas/i386/katmai.d b/gas/testsuite/gas/i386/katmai.d
index 50e573f..aabb399 100644
--- a/gas/testsuite/gas/i386/katmai.d
+++ b/gas/testsuite/gas/i386/katmai.d
@@ -59,7 +59,7 @@ Disassembly of section .text:
   da:	0f 2a d3 [ 	]*cvtpi2ps %mm3,%xmm2
   dd:	0f 2a 1c 24 [ 	]*cvtpi2ps \(%esp\),%xmm3
   e1:	f3 0f 2a e5 [ 	]*cvtsi2ss %ebp,%xmm4
-  e5:	f3 0f 2a 2e [ 	]*cvtsi2ssl \(%esi\),%xmm5
+  e5:	f3 0f 2a 2e [ 	]*cvtsi2ss \(%esi\),%xmm5
   e9:	0f 2d f7 [ 	]*cvtps2pi %xmm7,%mm6
   ec:	0f 2d 38 [ 	]*cvtps2pi \(%eax\),%mm7
   ef:	f3 0f 2d 01 [ 	]*cvtss2si \(%ecx\),%eax
diff --git a/gas/testsuite/gas/i386/noreg16.d b/gas/testsuite/gas/i386/noreg16.d
index e127c92..5a73e4b 100644
--- a/gas/testsuite/gas/i386/noreg16.d
+++ b/gas/testsuite/gas/i386/noreg16.d
@@ -27,8 +27,8 @@ Disassembly of section .text:
  *[a-f0-9]+:	a7                   	cmpsw  %es:\(%di\),%ds:\(%si\)
  *[a-f0-9]+:	67 a7                	cmpsw  %es:\(%edi\),%ds:\(%esi\)
  *[a-f0-9]+:	f2 0f 38 f1 07       	crc32w \(%bx\),%eax
- *[a-f0-9]+:	f2 0f 2a 07          	cvtsi2sdl \(%bx\),%xmm0
- *[a-f0-9]+:	f3 0f 2a 07          	cvtsi2ssl \(%bx\),%xmm0
+ *[a-f0-9]+:	f2 0f 2a 07          	cvtsi2sd \(%bx\),%xmm0
+ *[a-f0-9]+:	f3 0f 2a 07          	cvtsi2ss \(%bx\),%xmm0
  *[a-f0-9]+:	ff 0f                	decw   \(%bx\)
  *[a-f0-9]+:	f7 37                	divw   \(%bx\)
  *[a-f0-9]+:	d8 07                	fadds  \(%bx\)
@@ -92,7 +92,7 @@ Disassembly of section .text:
  *[a-f0-9]+:	67 6f                	outsw  %ds:\(%esi\),\(%dx\)
  *[a-f0-9]+:	8f 07                	popw   \(%bx\)
  *[a-f0-9]+:	07                   	pop    %es
- *[a-f0-9]+:	f3 0f ae 27          	ptwritel \(%bx\)
+ *[a-f0-9]+:	f3 0f ae 27          	ptwrite \(%bx\)
  *[a-f0-9]+:	ff 37                	pushw  \(%bx\)
  *[a-f0-9]+:	06                   	push   %es
  *[a-f0-9]+:	d1 17                	rclw   \(%bx\)
@@ -139,12 +139,12 @@ Disassembly of section .text:
  *[a-f0-9]+:	81 2f 34 12          	subw   \$0x1234,\(%bx\)
  *[a-f0-9]+:	f7 07 89 00          	testw  \$0x89,\(%bx\)
  *[a-f0-9]+:	f7 07 34 12          	testw  \$0x1234,\(%bx\)
- *[a-f0-9]+:	c5 fb 2a 07          	vcvtsi2sdl \(%bx\),%xmm0,%xmm0
- *[a-f0-9]+:	62 f1 7f 08 2a 07    	vcvtsi2sdl \(%bx\),%xmm0,%xmm0
- *[a-f0-9]+:	c5 fa 2a 07          	vcvtsi2ssl \(%bx\),%xmm0,%xmm0
- *[a-f0-9]+:	62 f1 7e 08 2a 07    	vcvtsi2ssl \(%bx\),%xmm0,%xmm0
- *[a-f0-9]+:	62 f1 7f 08 7b 07    	vcvtusi2sdl \(%bx\),%xmm0,%xmm0
- *[a-f0-9]+:	62 f1 7e 08 7b 07    	vcvtusi2ssl \(%bx\),%xmm0,%xmm0
+ *[a-f0-9]+:	c5 fb 2a 07          	vcvtsi2sd \(%bx\),%xmm0,%xmm0
+ *[a-f0-9]+:	62 f1 7f 08 2a 07    	vcvtsi2sd \(%bx\),%xmm0,%xmm0
+ *[a-f0-9]+:	c5 fa 2a 07          	vcvtsi2ss \(%bx\),%xmm0,%xmm0
+ *[a-f0-9]+:	62 f1 7e 08 2a 07    	vcvtsi2ss \(%bx\),%xmm0,%xmm0
+ *[a-f0-9]+:	62 f1 7f 08 7b 07    	vcvtusi2sd \(%bx\),%xmm0,%xmm0
+ *[a-f0-9]+:	62 f1 7e 08 7b 07    	vcvtusi2ss \(%bx\),%xmm0,%xmm0
  *[a-f0-9]+:	83 37 01             	xorw   \$0x1,\(%bx\)
  *[a-f0-9]+:	81 37 89 00          	xorw   \$0x89,\(%bx\)
  *[a-f0-9]+:	81 37 34 12          	xorw   \$0x1234,\(%bx\)
diff --git a/gas/testsuite/gas/i386/noreg32.d b/gas/testsuite/gas/i386/noreg32.d
index 6e663ba..5de78e8 100644
--- a/gas/testsuite/gas/i386/noreg32.d
+++ b/gas/testsuite/gas/i386/noreg32.d
@@ -31,8 +31,8 @@ Disassembly of section .text:
  *[a-f0-9]+:	a7                   	cmpsl  %es:\(%edi\),%ds:\(%esi\)
  *[a-f0-9]+:	a7                   	cmpsl  %es:\(%edi\),%ds:\(%esi\)
  *[a-f0-9]+:	f2 0f 38 f1 00       	crc32l \(%eax\),%eax
- *[a-f0-9]+:	f2 0f 2a 00          	cvtsi2sdl \(%eax\),%xmm0
- *[a-f0-9]+:	f3 0f 2a 00          	cvtsi2ssl \(%eax\),%xmm0
+ *[a-f0-9]+:	f2 0f 2a 00          	cvtsi2sd \(%eax\),%xmm0
+ *[a-f0-9]+:	f3 0f 2a 00          	cvtsi2ss \(%eax\),%xmm0
  *[a-f0-9]+:	ff 08                	decl   \(%eax\)
  *[a-f0-9]+:	f7 30                	divl   \(%eax\)
  *[a-f0-9]+:	d8 00                	fadds  \(%eax\)
@@ -98,7 +98,7 @@ Disassembly of section .text:
  *[a-f0-9]+:	6f                   	outsl  %ds:\(%esi\),\(%dx\)
  *[a-f0-9]+:	8f 00                	popl   \(%eax\)
  *[a-f0-9]+:	07                   	pop    %es
- *[a-f0-9]+:	f3 0f ae 20          	ptwritel \(%eax\)
+ *[a-f0-9]+:	f3 0f ae 20          	ptwrite \(%eax\)
  *[a-f0-9]+:	ff 30                	pushl  \(%eax\)
  *[a-f0-9]+:	06                   	push   %es
  *[a-f0-9]+:	d1 10                	rcll   \(%eax\)
@@ -148,12 +148,12 @@ Disassembly of section .text:
  *[a-f0-9]+:	f7 00 89 00 00 00    	testl  \$0x89,\(%eax\)
  *[a-f0-9]+:	f7 00 34 12 00 00    	testl  \$0x1234,\(%eax\)
  *[a-f0-9]+:	f7 00 78 56 34 12    	testl  \$0x12345678,\(%eax\)
- *[a-f0-9]+:	c5 fb 2a 00          	vcvtsi2sdl \(%eax\),%xmm0,%xmm0
- *[a-f0-9]+:	62 f1 7f 08 2a 00    	vcvtsi2sdl \(%eax\),%xmm0,%xmm0
- *[a-f0-9]+:	c5 fa 2a 00          	vcvtsi2ssl \(%eax\),%xmm0,%xmm0
- *[a-f0-9]+:	62 f1 7e 08 2a 00    	vcvtsi2ssl \(%eax\),%xmm0,%xmm0
- *[a-f0-9]+:	62 f1 7f 08 7b 00    	vcvtusi2sdl \(%eax\),%xmm0,%xmm0
- *[a-f0-9]+:	62 f1 7e 08 7b 00    	vcvtusi2ssl \(%eax\),%xmm0,%xmm0
+ *[a-f0-9]+:	c5 fb 2a 00          	vcvtsi2sd \(%eax\),%xmm0,%xmm0
+ *[a-f0-9]+:	62 f1 7f 08 2a 00    	vcvtsi2sd \(%eax\),%xmm0,%xmm0
+ *[a-f0-9]+:	c5 fa 2a 00          	vcvtsi2ss \(%eax\),%xmm0,%xmm0
+ *[a-f0-9]+:	62 f1 7e 08 2a 00    	vcvtsi2ss \(%eax\),%xmm0,%xmm0
+ *[a-f0-9]+:	62 f1 7f 08 7b 00    	vcvtusi2sd \(%eax\),%xmm0,%xmm0
+ *[a-f0-9]+:	62 f1 7e 08 7b 00    	vcvtusi2ss \(%eax\),%xmm0,%xmm0
  *[a-f0-9]+:	83 30 01             	xorl   \$0x1,\(%eax\)
  *[a-f0-9]+:	81 30 89 00 00 00    	xorl   \$0x89,\(%eax\)
  *[a-f0-9]+:	81 30 34 12 00 00    	xorl   \$0x1234,\(%eax\)
diff --git a/gas/testsuite/gas/i386/ptwrite.d b/gas/testsuite/gas/i386/ptwrite.d
index a234924..eefc6d3 100644
--- a/gas/testsuite/gas/i386/ptwrite.d
+++ b/gas/testsuite/gas/i386/ptwrite.d
@@ -11,16 +11,16 @@ Disassembly of section \.text:
 0+ <_start>:
  +[a-f0-9]+:	f3 0f ae e1          	ptwrite %ecx
  +[a-f0-9]+:	f3 0f ae e1          	ptwrite %ecx
- +[a-f0-9]+:	f3 0f ae 21          	ptwritel \(%ecx\)
- +[a-f0-9]+:	f3 0f ae 21          	ptwritel \(%ecx\)
+ +[a-f0-9]+:	f3 0f ae 21          	ptwrite \(%ecx\)
+ +[a-f0-9]+:	f3 0f ae 21          	ptwrite \(%ecx\)
  +[a-f0-9]+:	f3 0f ae e1          	ptwrite %ecx
- +[a-f0-9]+:	f3 0f ae 21          	ptwritel \(%ecx\)
- +[a-f0-9]+:	f3 0f ae 21          	ptwritel \(%ecx\)
+ +[a-f0-9]+:	f3 0f ae 21          	ptwrite \(%ecx\)
+ +[a-f0-9]+:	f3 0f ae 21          	ptwrite \(%ecx\)
  +[a-f0-9]+:	f3 0f ae e1          	ptwrite %ecx
  +[a-f0-9]+:	f3 0f ae e1          	ptwrite %ecx
- +[a-f0-9]+:	67 f3 0f ae 21       	ptwritel \(%bx,%di\)
- +[a-f0-9]+:	67 f3 0f ae 21       	ptwritel \(%bx,%di\)
+ +[a-f0-9]+:	67 f3 0f ae 21       	ptwrite \(%bx,%di\)
+ +[a-f0-9]+:	67 f3 0f ae 21       	ptwrite \(%bx,%di\)
  +[a-f0-9]+:	f3 0f ae e1          	ptwrite %ecx
- +[a-f0-9]+:	67 f3 0f ae 21       	ptwritel \(%bx,%di\)
- +[a-f0-9]+:	67 f3 0f ae 21       	ptwritel \(%bx,%di\)
+ +[a-f0-9]+:	67 f3 0f ae 21       	ptwrite \(%bx,%di\)
+ +[a-f0-9]+:	67 f3 0f ae 21       	ptwrite \(%bx,%di\)
 #pass
diff --git a/gas/testsuite/gas/i386/simd.d b/gas/testsuite/gas/i386/simd.d
index 2567612..4e70950 100644
--- a/gas/testsuite/gas/i386/simd.d
+++ b/gas/testsuite/gas/i386/simd.d
@@ -96,10 +96,10 @@ Disassembly of section .text:
 [ 	]*[a-f0-9]+:	f2 0f 2a c8          	cvtsi2sd %eax,%xmm1
 [ 	]*[a-f0-9]+:	f3 0f 2a c8          	cvtsi2ss %eax,%xmm1
 [ 	]*[a-f0-9]+:	f2 0f 2a c8          	cvtsi2sd %eax,%xmm1
-[ 	]*[a-f0-9]+:	f3 0f 2a 08          	cvtsi2ssl \(%eax\),%xmm1
-[ 	]*[a-f0-9]+:	f2 0f 2a 08          	cvtsi2sdl \(%eax\),%xmm1
-[ 	]*[a-f0-9]+:	f3 0f 2a 08          	cvtsi2ssl \(%eax\),%xmm1
-[ 	]*[a-f0-9]+:	f2 0f 2a 08          	cvtsi2sdl \(%eax\),%xmm1
+[ 	]*[a-f0-9]+:	f3 0f 2a 08          	cvtsi2ss \(%eax\),%xmm1
+[ 	]*[a-f0-9]+:	f2 0f 2a 08          	cvtsi2sd \(%eax\),%xmm1
+[ 	]*[a-f0-9]+:	f3 0f 2a 08          	cvtsi2ss \(%eax\),%xmm1
+[ 	]*[a-f0-9]+:	f2 0f 2a 08          	cvtsi2sd \(%eax\),%xmm1
 [ 	]*[a-f0-9]+:	f2 0f d0 0d 78 56 34 12 	addsubps 0x12345678,%xmm1
 [ 	]*[a-f0-9]+:	66 0f 2f 0d 78 56 34 12 	comisd 0x12345678,%xmm1
 [ 	]*[a-f0-9]+:	0f 2f 0d 78 56 34 12 	comiss 0x12345678,%xmm1
@@ -189,11 +189,11 @@ Disassembly of section .text:
 [ 	]*[a-f0-9]+:	f2 0f 2a c8          	cvtsi2sd %eax,%xmm1
 [ 	]*[a-f0-9]+:	f3 0f 2a c8          	cvtsi2ss %eax,%xmm1
 [ 	]*[a-f0-9]+:	f2 0f 2a c8          	cvtsi2sd %eax,%xmm1
-[ 	]*[a-f0-9]+:	f3 0f 2a 08          	cvtsi2ssl \(%eax\),%xmm1
-[ 	]*[a-f0-9]+:	f3 0f 2a 08          	cvtsi2ssl \(%eax\),%xmm1
-[ 	]*[a-f0-9]+:	f2 0f 2a 08          	cvtsi2sdl \(%eax\),%xmm1
-[ 	]*[a-f0-9]+:	f2 0f 2a 08          	cvtsi2sdl \(%eax\),%xmm1
-[ 	]*[a-f0-9]+:	f3 0f 2a 08          	cvtsi2ssl \(%eax\),%xmm1
-[ 	]*[a-f0-9]+:	f2 0f 2a 08          	cvtsi2sdl \(%eax\),%xmm1
+[ 	]*[a-f0-9]+:	f3 0f 2a 08          	cvtsi2ss \(%eax\),%xmm1
+[ 	]*[a-f0-9]+:	f3 0f 2a 08          	cvtsi2ss \(%eax\),%xmm1
+[ 	]*[a-f0-9]+:	f2 0f 2a 08          	cvtsi2sd \(%eax\),%xmm1
+[ 	]*[a-f0-9]+:	f2 0f 2a 08          	cvtsi2sd \(%eax\),%xmm1
+[ 	]*[a-f0-9]+:	f3 0f 2a 08          	cvtsi2ss \(%eax\),%xmm1
+[ 	]*[a-f0-9]+:	f2 0f 2a 08          	cvtsi2sd \(%eax\),%xmm1
 [ 	]*[a-f0-9]+:	0f 2c 00             	cvttps2pi \(%eax\),%mm0
 #pass
diff --git a/gas/testsuite/gas/i386/sse2-16bit.d b/gas/testsuite/gas/i386/sse2-16bit.d
index 5b9fc2c..a097036 100644
--- a/gas/testsuite/gas/i386/sse2-16bit.d
+++ b/gas/testsuite/gas/i386/sse2-16bit.d
@@ -64,7 +64,7 @@ Disassembly of section .text:
 [ 	]*[a-f0-9]+:	66 0f 2a d3          	cvtpi2pd %mm3,%xmm2
 [ 	]*[a-f0-9]+:	67 66 0f 2a 1c 24    	cvtpi2pd \(%esp\),%xmm3
 [ 	]*[a-f0-9]+:	f2 0f 2a e5          	cvtsi2sd %ebp,%xmm4
-[ 	]*[a-f0-9]+:	67 f2 0f 2a 2e       	cvtsi2sdl \(%esi\),%xmm5
+[ 	]*[a-f0-9]+:	67 f2 0f 2a 2e       	cvtsi2sd \(%esi\),%xmm5
 [ 	]*[a-f0-9]+:	66 0f 2d f7          	cvtpd2pi %xmm7,%mm6
 [ 	]*[a-f0-9]+:	67 66 0f 2d 38       	cvtpd2pi \(%eax\),%mm7
 [ 	]*[a-f0-9]+:	67 f2 0f 2d 01       	cvtsd2si \(%ecx\),%eax
@@ -178,7 +178,7 @@ Disassembly of section .text:
 [ 	]*[a-f0-9]+:	0f c4 d1 00          	pinsrw \$0x0,%ecx,%mm2
 [ 	]*[a-f0-9]+:	66 0f c4 d1 00       	pinsrw \$0x0,%ecx,%xmm2
 [ 	]*[a-f0-9]+:	66 0f d7 d3          	pmovmskb %xmm3,%edx
-[ 	]*[a-f0-9]+:	f3 0f 2a 05          	cvtsi2ssl? \(%di\),%xmm0
+[ 	]*[a-f0-9]+:	f3 0f 2a 05          	cvtsi2ss \(%di\),%xmm0
 [ 	]*[a-f0-9]+:	66 0f 3a 17 0d 00    	extractps \$0x0,%xmm1,\(%di\)
 [ 	]*[a-f0-9]+:	66 0f 3a 21 05 00    	insertps \$0x0,\(%di\),%xmm0
 [ 	]*[a-f0-9]+:	66 0f 3a 16 0d 00    	pextrd \$0x0,%xmm1,\(%di\)
diff --git a/gas/testsuite/gas/i386/sse2.d b/gas/testsuite/gas/i386/sse2.d
index 0c87e86..23f7b43 100644
--- a/gas/testsuite/gas/i386/sse2.d
+++ b/gas/testsuite/gas/i386/sse2.d
@@ -64,7 +64,7 @@ Disassembly of section .text:
 [ 	]*[a-f0-9]+:	66 0f 2a d3          	cvtpi2pd %mm3,%xmm2
 [ 	]*[a-f0-9]+:	66 0f 2a 1c 24       	cvtpi2pd \(%esp\),%xmm3
 [ 	]*[a-f0-9]+:	f2 0f 2a e5          	cvtsi2sd %ebp,%xmm4
-[ 	]*[a-f0-9]+:	f2 0f 2a 2e          	cvtsi2sdl \(%esi\),%xmm5
+[ 	]*[a-f0-9]+:	f2 0f 2a 2e          	cvtsi2sd \(%esi\),%xmm5
 [ 	]*[a-f0-9]+:	66 0f 2d f7          	cvtpd2pi %xmm7,%mm6
 [ 	]*[a-f0-9]+:	66 0f 2d 38          	cvtpd2pi \(%eax\),%mm7
 [ 	]*[a-f0-9]+:	f2 0f 2d 01          	cvtsd2si \(%ecx\),%eax
diff --git a/gas/testsuite/gas/i386/sse2avx.d b/gas/testsuite/gas/i386/sse2avx.d
index 1a7df71..366bf76 100644
--- a/gas/testsuite/gas/i386/sse2avx.d
+++ b/gas/testsuite/gas/i386/sse2avx.d
@@ -542,9 +542,9 @@ Disassembly of section .text:
 [ 	]*[a-f0-9]+:	c4 e3 79 17 e1 64    	vextractps \$0x64,%xmm4,%ecx
 [ 	]*[a-f0-9]+:	c4 e3 79 17 21 64    	vextractps \$0x64,%xmm4,\(%ecx\)
 [ 	]*[a-f0-9]+:	c5 db 2a e1          	vcvtsi2sd %ecx,%xmm4,%xmm4
-[ 	]*[a-f0-9]+:	c5 db 2a 21          	vcvtsi2sdl \(%ecx\),%xmm4,%xmm4
+[ 	]*[a-f0-9]+:	c5 db 2a 21          	vcvtsi2sd \(%ecx\),%xmm4,%xmm4
 [ 	]*[a-f0-9]+:	c5 da 2a e1          	vcvtsi2ss %ecx,%xmm4,%xmm4
-[ 	]*[a-f0-9]+:	c5 da 2a 21          	vcvtsi2ssl \(%ecx\),%xmm4,%xmm4
+[ 	]*[a-f0-9]+:	c5 da 2a 21          	vcvtsi2ss \(%ecx\),%xmm4,%xmm4
 [ 	]*[a-f0-9]+:	c5 ca c2 f4 64       	vcmpss \$0x64,%xmm4,%xmm6,%xmm6
 [ 	]*[a-f0-9]+:	c5 ca c2 31 64       	vcmpss \$0x64,\(%ecx\),%xmm6,%xmm6
 [ 	]*[a-f0-9]+:	c4 e3 49 21 f4 64    	vinsertps \$0x64,%xmm4,%xmm6,%xmm6
@@ -1120,9 +1120,9 @@ Disassembly of section .text:
 [ 	]*[a-f0-9]+:	c4 e3 79 17 e1 64    	vextractps \$0x64,%xmm4,%ecx
 [ 	]*[a-f0-9]+:	c4 e3 79 17 21 64    	vextractps \$0x64,%xmm4,\(%ecx\)
 [ 	]*[a-f0-9]+:	c5 db 2a e1          	vcvtsi2sd %ecx,%xmm4,%xmm4
-[ 	]*[a-f0-9]+:	c5 db 2a 21          	vcvtsi2sdl \(%ecx\),%xmm4,%xmm4
+[ 	]*[a-f0-9]+:	c5 db 2a 21          	vcvtsi2sd \(%ecx\),%xmm4,%xmm4
 [ 	]*[a-f0-9]+:	c5 da 2a e1          	vcvtsi2ss %ecx,%xmm4,%xmm4
-[ 	]*[a-f0-9]+:	c5 da 2a 21          	vcvtsi2ssl \(%ecx\),%xmm4,%xmm4
+[ 	]*[a-f0-9]+:	c5 da 2a 21          	vcvtsi2ss \(%ecx\),%xmm4,%xmm4
 [ 	]*[a-f0-9]+:	c5 ca c2 f4 64       	vcmpss \$0x64,%xmm4,%xmm6,%xmm6
 [ 	]*[a-f0-9]+:	c5 ca c2 31 64       	vcmpss \$0x64,\(%ecx\),%xmm6,%xmm6
 [ 	]*[a-f0-9]+:	c4 e3 49 21 f4 64    	vinsertps \$0x64,%xmm4,%xmm6,%xmm6
diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog
index ba0febe..a973b26 100644
--- a/opcodes/ChangeLog
+++ b/opcodes/ChangeLog
@@ -1,3 +1,9 @@
+2020-06-25  Jan Beulich  <jbeulich@suse.com>
+
+	* i386-dis.c: Adjust description of "LQ" macro.
+	(dis386_twobyte): Use LQ for sysret.
+	(putop): Adjust handling of LQ.
+
 2020-06-22  Nelson Chu  <nelson.chu@sifive.com>
 
 	* riscv-opc.c: Move the structures and functions to bfd/elfxx-riscv.c.
diff --git a/opcodes/i386-dis.c b/opcodes/i386-dis.c
index 441866d..28a9058 100644
--- a/opcodes/i386-dis.c
+++ b/opcodes/i386-dis.c
@@ -2290,8 +2290,9 @@ struct dis386 {
    "XZ" => print 'x', 'y', or 'z' if suffix_always is true or no
 	   register operands and no broadcast.
    "XW" => print 's', 'd' depending on the VEX.W bit (for FMA)
-   "LQ" => print 'l' ('d' in Intel mode) or 'q' for memory operand
-	   or suffix_always is true
+   "LQ" => print 'l' ('d' in Intel mode) or 'q' for memory
+	   operand or no operand at all in 64bit mode, or if suffix_always
+	   is true.
    "LB" => print "abs" in 64bit mode and behave as 'B' otherwise
    "LS" => print "abs" in 64bit mode and behave as 'S' otherwise
    "LV" => print "abs" for 64bit operand and behave as 'S' otherwise
@@ -2606,7 +2607,7 @@ static const struct dis386 dis386_twobyte[] = {
   { Bad_Opcode },
   { "syscall",		{ XX }, 0 },
   { "clts",		{ XX }, 0 },
-  { "sysret%LP",		{ XX }, 0 },
+  { "sysret%LQ",		{ XX }, 0 },
   /* 08 */
   { "invd",		{ XX }, 0 },
   { PREFIX_TABLE (PREFIX_0F09) },
@@ -13066,7 +13067,7 @@ putop (const char *in_template, int sizeflag)
 		  SAVE_LAST (*p);
 		  break;
 		}
-	      if (intel_syntax
+	      if ((intel_syntax && need_modrm)
 		  || (modrm.mod == 3 && !(sizeflag & SUFFIX_ALWAYS)))
 		break;
 	      if ((rex & REX_W))
@@ -13074,8 +13075,9 @@ putop (const char *in_template, int sizeflag)
 		  USED_REX (REX_W);
 		  *obufp++ = 'q';
 		}
-	      else
-		*obufp++ = 'l';
+	      else if((address_mode == mode_64bit && need_modrm)
+		      || (sizeflag & SUFFIX_ALWAYS))
+		*obufp++ = intel_syntax? 'd' : 'l';
 	    }
 	  break;
 	case 'R':