gas/

2008-01-22  H.J. Lu  <hongjiu.lu@intel.com>

	* config/tc-i386.c (XXX_PREFIX): Moved from tc-i386.h.
	(XXX_MNEM_SUFFIX): Likewise.
	(END_OF_INSN): Likewise.
	(templates): Likewise.
	(modrm_byte): Likewise.
	(rex_byte): Likewise.
	(DREX_XXX): Likewise.
	(drex_byte): Likewise.
	(sib_byte): Likewise.
	(processor_type): Likewise.
	(arch_entry): Likewise.
	(cpu_sub_arch_name): Remove const.
	(cpu_arch): Add .vmx and .smx.
	(set_cpu_arch): Append cpu_sub_arch_name.
	(md_parse_option): Support -march=CPU[,+EXTENSION...].
	(md_show_usage): Updated.

	* config/tc-i386.h (XXX_PREFIX): Moved to tc-i386.c.
	(XXX_MNEM_SUFFIX): Likewise.
	(END_OF_INSN): Likewise.
	(templates): Likewise.
	(modrm_byte): Likewise.
	(rex_byte): Likewise.
	(DREX_XXX): Likewise.
	(drex_byte): Likewise.
	(sib_byte): Likewise.
	(processor_type): Likewise.
	(arch_entry): Likewise.

	* doc/as.texinfo: Update i386 -march option.

	* doc/c-i386.texi: Update -march= for ISA.

gas/testsuite/

2008-01-22  H.J. Lu  <hongjiu.lu@intel.com>

	* gas/i386/arch-10-1.l: New.
	* gas/i386/arch-10-1.s: Likewise.
	* gas/i386/arch-10-2.l: Likewise.
	* gas/i386/arch-10-2.s: Likewise.
	* gas/i386/arch-10-3.l: Likewise.
	* gas/i386/arch-10-3.s: Likewise.
	* gas/i386/arch-10-4.l: Likewise.
	* gas/i386/arch-10-4.s: Likewise.
	* gas/i386/arch-10.d: Likewise.
	* gas/i386/arch-10.s: Likewise.

	* gas/i386/i386.exp: Run arch-10, arch-10-1, arch-10-2,
	arch-10-3 and arch-10-4.

	* gas/i386/nops-2.s: Use movsbl instead of cmove.
	* gas/i386/nops-2-i386.d: Updated.
	* gas/i386/nops-2-merom.d: Likewise.
	* gas/i386/nops-2.d: Likewise.
	* gas/i386/x86-64-nops-2.d: Likewise.

opcodes/

2008-01-22  H.J. Lu  <hongjiu.lu@intel.com>

	* i386-gen.c (cpu_flag_init): Add CPU_VMX_FLAGS and
	CPU_SMX_FLAGS.
	* i386-init.h: Regenerated.

17 files changed, 318 insertions, 5 deletions

diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog
index 5f2f9f0..dc1721c 100644
--- a/gas/testsuite/ChangeLog
+++ b/gas/testsuite/ChangeLog
@@ -1,3 +1,25 @@
+2008-01-22  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* gas/i386/arch-10-1.l: New.
+	* gas/i386/arch-10-1.s: Likewise.
+	* gas/i386/arch-10-2.l: Likewise.
+	* gas/i386/arch-10-2.s: Likewise.
+	* gas/i386/arch-10-3.l: Likewise.
+	* gas/i386/arch-10-3.s: Likewise.
+	* gas/i386/arch-10-4.l: Likewise.
+	* gas/i386/arch-10-4.s: Likewise.
+	* gas/i386/arch-10.d: Likewise.
+	* gas/i386/arch-10.s: Likewise.
+
+	* gas/i386/i386.exp: Run arch-10, arch-10-1, arch-10-2,
+	arch-10-3 and arch-10-4.
+
+	* gas/i386/nops-2.s: Use movsbl instead of cmove.
+	* gas/i386/nops-2-i386.d: Updated.
+	* gas/i386/nops-2-merom.d: Likewise.
+	* gas/i386/nops-2.d: Likewise.
+	* gas/i386/x86-64-nops-2.d: Likewise.
+
 2008-01-15  H.J. Lu  <hongjiu.lu@intel.com>
 
 	* gas/i386/prescott.s: Add tests for movddup in Intel syntax.
diff --git a/gas/testsuite/gas/i386/arch-10-1.l b/gas/testsuite/gas/i386/arch-10-1.l
new file mode 100644
index 0000000..c5fc40e
--- /dev/null
+++ b/gas/testsuite/gas/i386/arch-10-1.l
@@ -0,0 +1,58 @@
+.*: Assembler messages:
+.*:4: Error: .*
+.*:6: Error: .*
+.*:8: Error: .*
+.*:10: Error: .*
+.*:12: Error: .*
+.*:14: Error: .*
+.*:16: Error: .*
+.*:18: Error: .*
+.*:20: Error: .*
+.*:22: Error: .*
+.*:24: Error: .*
+.*:26: Error: .*
+.*:28: Error: .*
+.*:30: Error: .*
+.*:32: Error: .*
+.*:34: Error: .*
+.*:36: Error: .*
+GAS LISTING .*
+
+
+[ 	]*1[ 	]+\.include "arch-10\.s"
+[ 	]*1[ 	]+\# Test -march=
+[ 	]*2[ 	]+\.text
+[ 	]*3[ 	]+\# cmov feature 
+[ 	]*4[ 	]+cmove	%eax,%ebx
+[ 	]*5[ 	]+\# MMX
+[ 	]*6[ 	]+paddb %mm4,%mm3
+[ 	]*7[ 	]+\# SSE
+[ 	]*8[ 	]+addss %xmm4,%xmm3
+[ 	]*9[ 	]+\# SSE2
+[ 	]*10[ 	]+addsd %xmm4,%xmm3
+[ 	]*11[ 	]+\# SSE3
+[ 	]*12[ 	]+addsubpd %xmm4,%xmm3
+[ 	]*13[ 	]+\# SSSE3
+[ 	]*14[ 	]+phaddw %xmm4,%xmm3
+[ 	]*15[ 	]+\# SSE4\.1
+[ 	]*16[ 	]+phminposuw  %xmm1,%xmm3
+[ 	]*17[ 	]+\# SSE4\.2
+[ 	]*18[ 	]+crc32   %ecx,%ebx
+[ 	]*19[ 	]+\# VMX
+[ 	]*20[ 	]+vmxoff
+[ 	]*21[ 	]+\# SMX
+[ 	]*22[ 	]+getsec
+[ 	]*23[ 	]+\# 3DNow
+[ 	]*24[ 	]+pmulhrw %mm4,%mm3
+[ 	]*25[ 	]+\# 3DNow Extensions
+[ 	]*26[ 	]+pswapd %mm4,%mm3
+[ 	]*27[ 	]+\# SSE4a
+[ 	]*28[ 	]+insertq %xmm2,%xmm1
+[ 	]*29[ 	]+\# SVME
+[ 	]*30[ 	]+vmload
+[ 	]*31[ 	]+\# ABM
+[ 	]*32[ 	]+lzcnt %ecx,%ebx
+[ 	]*33[ 	]+\# SSE5
+[ 	]*34[ 	]+frczss          %xmm2, %xmm1
+[ 	]*35[ 	]+\# PadLock
+[ 	]*36[ 	]+xstorerng
diff --git a/gas/testsuite/gas/i386/arch-10-1.s b/gas/testsuite/gas/i386/arch-10-1.s
new file mode 100644
index 0000000..6805c7a
--- /dev/null
+++ b/gas/testsuite/gas/i386/arch-10-1.s
@@ -0,0 +1 @@
+.include "arch-10.s"
diff --git a/gas/testsuite/gas/i386/arch-10-2.l b/gas/testsuite/gas/i386/arch-10-2.l
new file mode 100644
index 0000000..5c174dd
--- /dev/null
+++ b/gas/testsuite/gas/i386/arch-10-2.l
@@ -0,0 +1,57 @@
+.*: Assembler messages:
+.*:6: Error: .*
+.*:8: Error: .*
+.*:10: Error: .*
+.*:12: Error: .*
+.*:14: Error: .*
+.*:16: Error: .*
+.*:18: Error: .*
+.*:20: Error: .*
+.*:22: Error: .*
+.*:24: Error: .*
+.*:26: Error: .*
+.*:28: Error: .*
+.*:30: Error: .*
+.*:32: Error: .*
+.*:34: Error: .*
+.*:36: Error: .*
+GAS LISTING .*
+
+
+[ 	]*1[ 	]+\.include "arch-10\.s"
+[ 	]*1[ 	]+\# Test -march=
+[ 	]*2[ 	]+\.text
+[ 	]*3[ 	]+\# cmov feature 
+[ 	]*4[ 	]+\?\?\?\? 0F44D8   	cmove	%eax,%ebx
+[ 	]*5[ 	]+\# MMX
+[ 	]*6[ 	]+paddb %mm4,%mm3
+[ 	]*7[ 	]+\# SSE
+[ 	]*8[ 	]+addss %xmm4,%xmm3
+[ 	]*9[ 	]+\# SSE2
+[ 	]*10[ 	]+addsd %xmm4,%xmm3
+[ 	]*11[ 	]+\# SSE3
+[ 	]*12[ 	]+addsubpd %xmm4,%xmm3
+[ 	]*13[ 	]+\# SSSE3
+[ 	]*14[ 	]+phaddw %xmm4,%xmm3
+[ 	]*15[ 	]+\# SSE4\.1
+[ 	]*16[ 	]+phminposuw  %xmm1,%xmm3
+[ 	]*17[ 	]+\# SSE4\.2
+[ 	]*18[ 	]+crc32   %ecx,%ebx
+[ 	]*19[ 	]+\# VMX
+[ 	]*20[ 	]+vmxoff
+[ 	]*21[ 	]+\# SMX
+[ 	]*22[ 	]+getsec
+[ 	]*23[ 	]+\# 3DNow
+[ 	]*24[ 	]+pmulhrw %mm4,%mm3
+[ 	]*25[ 	]+\# 3DNow Extensions
+[ 	]*26[ 	]+pswapd %mm4,%mm3
+[ 	]*27[ 	]+\# SSE4a
+[ 	]*28[ 	]+insertq %xmm2,%xmm1
+[ 	]*29[ 	]+\# SVME
+[ 	]*30[ 	]+vmload
+[ 	]*31[ 	]+\# ABM
+[ 	]*32[ 	]+lzcnt %ecx,%ebx
+[ 	]*33[ 	]+\# SSE5
+[ 	]*34[ 	]+frczss          %xmm2, %xmm1
+[ 	]*35[ 	]+\# PadLock
+[ 	]*36[ 	]+xstorerng
diff --git a/gas/testsuite/gas/i386/arch-10-2.s b/gas/testsuite/gas/i386/arch-10-2.s
new file mode 100644
index 0000000..6805c7a
--- /dev/null
+++ b/gas/testsuite/gas/i386/arch-10-2.s
@@ -0,0 +1 @@
+.include "arch-10.s"
diff --git a/gas/testsuite/gas/i386/arch-10-3.l b/gas/testsuite/gas/i386/arch-10-3.l
new file mode 100644
index 0000000..e628e8b
--- /dev/null
+++ b/gas/testsuite/gas/i386/arch-10-3.l
@@ -0,0 +1,53 @@
+.*: Assembler messages:
+.*:20: Error: .*
+.*:22: Error: .*
+.*:24: Error: .*
+.*:26: Error: .*
+.*:28: Error: .*
+.*:30: Error: .*
+.*:32: Error: .*
+.*:34: Error: .*
+.*:36: Error: .*
+GAS LISTING .*
+
+
+[ 	]*1[ 	]+\.include "arch-10\.s"
+[ 	]*1[ 	]+\# Test -march=
+[ 	]*2[ 	]+\.text
+[ 	]*3[ 	]+\# cmov feature 
+[ 	]*4[ 	]+\?\?\?\? 0F44D8   	cmove	%eax,%ebx
+[ 	]*5[ 	]+\# MMX
+[ 	]*6[ 	]+\?\?\?\? 0FFCDC   	paddb %mm4,%mm3
+[ 	]*7[ 	]+\# SSE
+[ 	]*8[ 	]+\?\?\?\? F30F58DC 	addss %xmm4,%xmm3
+[ 	]*9[ 	]+\# SSE2
+[ 	]*10[ 	]+\?\?\?\? F20F58DC 	addsd %xmm4,%xmm3
+[ 	]*11[ 	]+\# SSE3
+[ 	]*12[ 	]+\?\?\?\? 660FD0DC 	addsubpd %xmm4,%xmm3
+[ 	]*13[ 	]+\# SSSE3
+[ 	]*14[ 	]+\?\?\?\? 660F3801 	phaddw %xmm4,%xmm3
+[ 	]*14[ 	]+DC
+[ 	]*15[ 	]+\# SSE4\.1
+[ 	]*16[ 	]+\?\?\?\? 660F3841 	phminposuw  %xmm1,%xmm3
+[ 	]*16[ 	]+D9
+[ 	]*17[ 	]+\# SSE4\.2
+[ 	]*18[ 	]+\?\?\?\? F20F38F1 	crc32   %ecx,%ebx
+[ 	]*18[ 	]+D9
+[ 	]*19[ 	]+\# VMX
+[ 	]*20[ 	]+vmxoff
+[ 	]*21[ 	]+\# SMX
+[ 	]*22[ 	]+getsec
+[ 	]*23[ 	]+\# 3DNow
+[ 	]*24[ 	]+pmulhrw %mm4,%mm3
+[ 	]*25[ 	]+\# 3DNow Extensions
+[ 	]*26[ 	]+pswapd %mm4,%mm3
+[ 	]*27[ 	]+\# SSE4a
+[ 	]*28[ 	]+insertq %xmm2,%xmm1
+[ 	]*29[ 	]+\# SVME
+[ 	]*30[ 	]+vmload
+[ 	]*31[ 	]+\# ABM
+[ 	]*32[ 	]+lzcnt %ecx,%ebx
+[ 	]*33[ 	]+\# SSE5
+[ 	]*34[ 	]+frczss          %xmm2, %xmm1
+[ 	]*35[ 	]+\# PadLock
+[ 	]*36[ 	]+xstorerng
diff --git a/gas/testsuite/gas/i386/arch-10-3.s b/gas/testsuite/gas/i386/arch-10-3.s
new file mode 100644
index 0000000..6805c7a
--- /dev/null
+++ b/gas/testsuite/gas/i386/arch-10-3.s
@@ -0,0 +1 @@
+.include "arch-10.s"
diff --git a/gas/testsuite/gas/i386/arch-10-4.l b/gas/testsuite/gas/i386/arch-10-4.l
new file mode 100644
index 0000000..670f8e7
--- /dev/null
+++ b/gas/testsuite/gas/i386/arch-10-4.l
@@ -0,0 +1,51 @@
+.*: Assembler messages:
+.*:24: Error: .*
+.*:26: Error: .*
+.*:28: Error: .*
+.*:30: Error: .*
+.*:32: Error: .*
+.*:34: Error: .*
+.*:36: Error: .*
+GAS LISTING .*
+
+
+[ 	]*1[ 	]+\.include "arch-10\.s"
+[ 	]*1[ 	]+\# Test -march=
+[ 	]*2[ 	]+\.text
+[ 	]*3[ 	]+\# cmov feature 
+[ 	]*4[ 	]+\?\?\?\? 0F44D8   	cmove	%eax,%ebx
+[ 	]*5[ 	]+\# MMX
+[ 	]*6[ 	]+\?\?\?\? 0FFCDC   	paddb %mm4,%mm3
+[ 	]*7[ 	]+\# SSE
+[ 	]*8[ 	]+\?\?\?\? F30F58DC 	addss %xmm4,%xmm3
+[ 	]*9[ 	]+\# SSE2
+[ 	]*10[ 	]+\?\?\?\? F20F58DC 	addsd %xmm4,%xmm3
+[ 	]*11[ 	]+\# SSE3
+[ 	]*12[ 	]+\?\?\?\? 660FD0DC 	addsubpd %xmm4,%xmm3
+[ 	]*13[ 	]+\# SSSE3
+[ 	]*14[ 	]+\?\?\?\? 660F3801 	phaddw %xmm4,%xmm3
+[ 	]*14[ 	]+DC
+[ 	]*15[ 	]+\# SSE4\.1
+[ 	]*16[ 	]+\?\?\?\? 660F3841 	phminposuw  %xmm1,%xmm3
+[ 	]*16[ 	]+D9
+[ 	]*17[ 	]+\# SSE4\.2
+[ 	]*18[ 	]+\?\?\?\? F20F38F1 	crc32   %ecx,%ebx
+[ 	]*18[ 	]+D9
+[ 	]*19[ 	]+\# VMX
+[ 	]*20[ 	]+\?\?\?\? 0F01C4   	vmxoff
+[ 	]*21[ 	]+\# SMX
+[ 	]*22[ 	]+\?\?\?\? 0F37     	getsec
+[ 	]*23[ 	]+\# 3DNow
+[ 	]*24[ 	]+pmulhrw %mm4,%mm3
+[ 	]*25[ 	]+\# 3DNow Extensions
+[ 	]*26[ 	]+pswapd %mm4,%mm3
+[ 	]*27[ 	]+\# SSE4a
+[ 	]*28[ 	]+insertq %xmm2,%xmm1
+[ 	]*29[ 	]+\# SVME
+[ 	]*30[ 	]+vmload
+[ 	]*31[ 	]+\# ABM
+[ 	]*32[ 	]+lzcnt %ecx,%ebx
+[ 	]*33[ 	]+\# SSE5
+[ 	]*34[ 	]+frczss          %xmm2, %xmm1
+[ 	]*35[ 	]+\# PadLock
+[ 	]*36[ 	]+xstorerng
diff --git a/gas/testsuite/gas/i386/arch-10-4.s b/gas/testsuite/gas/i386/arch-10-4.s
new file mode 100644
index 0000000..6805c7a
--- /dev/null
+++ b/gas/testsuite/gas/i386/arch-10-4.s
@@ -0,0 +1 @@
+.include "arch-10.s"
diff --git a/gas/testsuite/gas/i386/arch-10.d b/gas/testsuite/gas/i386/arch-10.d
new file mode 100644
index 0000000..c089b76
--- /dev/null
+++ b/gas/testsuite/gas/i386/arch-10.d
@@ -0,0 +1,27 @@
+#as: -march=i686+sse4+vmx+smx+sse5+3dnowa+svme+padlock
+#objdump: -dw
+#name: i386 arch 10
+
+.*:     file format .*
+
+Disassembly of section .text:
+
+0+ <.text>:
+[ 	]*[a-f0-9]+:	0f 44 d8             	cmove  %eax,%ebx
+[ 	]*[a-f0-9]+:	0f fc dc             	paddb  %mm4,%mm3
+[ 	]*[a-f0-9]+:	f3 0f 58 dc          	addss  %xmm4,%xmm3
+[ 	]*[a-f0-9]+:	f2 0f 58 dc          	addsd  %xmm4,%xmm3
+[ 	]*[a-f0-9]+:	66 0f d0 dc          	addsubpd %xmm4,%xmm3
+[ 	]*[a-f0-9]+:	66 0f 38 01 dc       	phaddw %xmm4,%xmm3
+[ 	]*[a-f0-9]+:	66 0f 38 41 d9       	phminposuw %xmm1,%xmm3
+[ 	]*[a-f0-9]+:	f2 0f 38 f1 d9       	crc32l %ecx,%ebx
+[ 	]*[a-f0-9]+:	0f 01 c4             	vmxoff 
+[ 	]*[a-f0-9]+:	0f 37                	getsec 
+[ 	]*[a-f0-9]+:	0f 0f dc b7          	pmulhrw %mm4,%mm3
+[ 	]*[a-f0-9]+:	0f 0f dc bb          	pswapd %mm4,%mm3
+[ 	]*[a-f0-9]+:	f2 0f 79 ca          	insertq %xmm2,%xmm1
+[ 	]*[a-f0-9]+:	0f 01 da             	vmload 
+[ 	]*[a-f0-9]+:	f3 0f bd d9          	lzcnt  %ecx,%ebx
+[ 	]*[a-f0-9]+:	0f 7a 12 ca          	frczss %xmm2,%xmm1
+[ 	]*[a-f0-9]+:	0f a7 c0             	xstore-rng 
+#pass
diff --git a/gas/testsuite/gas/i386/arch-10.s b/gas/testsuite/gas/i386/arch-10.s
new file mode 100644
index 0000000..97478ed
--- /dev/null
+++ b/gas/testsuite/gas/i386/arch-10.s
@@ -0,0 +1,36 @@
+# Test -march=
+	.text
+# cmov feature 
+cmove	%eax,%ebx
+# MMX
+paddb %mm4,%mm3
+# SSE
+addss %xmm4,%xmm3
+# SSE2
+addsd %xmm4,%xmm3
+# SSE3
+addsubpd %xmm4,%xmm3
+# SSSE3
+phaddw %xmm4,%xmm3
+# SSE4.1
+phminposuw  %xmm1,%xmm3
+# SSE4.2
+crc32   %ecx,%ebx
+# VMX
+vmxoff
+# SMX
+getsec
+# 3DNow
+pmulhrw %mm4,%mm3
+# 3DNow Extensions
+pswapd %mm4,%mm3
+# SSE4a
+insertq %xmm2,%xmm1
+# SVME
+vmload
+# ABM
+lzcnt %ecx,%ebx
+# SSE5
+frczss          %xmm2, %xmm1
+# PadLock
+xstorerng
diff --git a/gas/testsuite/gas/i386/i386.exp b/gas/testsuite/gas/i386/i386.exp
index 12f64c1..9569f13 100644
--- a/gas/testsuite/gas/i386/i386.exp
+++ b/gas/testsuite/gas/i386/i386.exp
@@ -107,6 +107,11 @@ if [expr ([istarget "i*86-*-*"] ||  [istarget "x86_64-*-*"]) && [gas_32_check]]
     run_dump_test "arch-7"
     run_dump_test "arch-8"
     run_dump_test "arch-9"
+    run_dump_test "arch-10"
+    run_list_test "arch-10-1" "-march=generic32 -I${srcdir}/$subdir -al"
+    run_list_test "arch-10-2" "-march=i686 -I${srcdir}/$subdir -al"
+    run_list_test "arch-10-3" "-march=i686+sse4.2 -I${srcdir}/$subdir -al"
+    run_list_test "arch-10-4" "-march=i686+sse4+vmx+smx -I${srcdir}/$subdir -al"
 
     # These tests require support for 8 and 16 bit relocs,
     # so we only run them for ELF and COFF targets.
diff --git a/gas/testsuite/gas/i386/nops-2-i386.d b/gas/testsuite/gas/i386/nops-2-i386.d
index 57f8dda..468a336 100644
--- a/gas/testsuite/gas/i386/nops-2-i386.d
+++ b/gas/testsuite/gas/i386/nops-2-i386.d
@@ -8,7 +8,7 @@
 Disassembly of section .text:
 
 0+ <nop>:
-[	 ]*0:[	 ]+0f 44 c0[	 ]+cmove[ 	]+%eax,%eax
+[	 ]*0:[	 ]+0f be f0[	 ]+movsbl[ 	]+%al,%esi
 [	 ]*3:[	 ]+8d b6 00 00 00 00[	 ]+lea[ 	]+0x0\(%esi\),%esi
 [	 ]*9:[	 ]+8d bc 27 00 00 00 00[	 ]+lea[ 	]+0x0\(%edi,%eiz,1\),%edi
 
diff --git a/gas/testsuite/gas/i386/nops-2-merom.d b/gas/testsuite/gas/i386/nops-2-merom.d
index 7a54411..6cf50d0 100644
--- a/gas/testsuite/gas/i386/nops-2-merom.d
+++ b/gas/testsuite/gas/i386/nops-2-merom.d
@@ -8,7 +8,7 @@
 Disassembly of section .text:
 
 0+ <nop>:
-[	 ]*0:[	 ]+0f 44 c0[	 ]+cmove[ 	]+%eax,%eax
+[	 ]*0:[	 ]+0f be f0[	 ]+movsbl[ 	]+%al,%esi
 [	 ]*3:[	 ]+8d b6 00 00 00 00[	 ]+lea[ 	]+0x0\(%esi\),%esi
 [	 ]*9:[	 ]+8d bc 27 00 00 00 00[	 ]+lea[ 	]+0x0\(%edi,%eiz,1\),%edi
 
diff --git a/gas/testsuite/gas/i386/nops-2.d b/gas/testsuite/gas/i386/nops-2.d
index 003a4eb..6cfbcfb 100644
--- a/gas/testsuite/gas/i386/nops-2.d
+++ b/gas/testsuite/gas/i386/nops-2.d
@@ -7,7 +7,7 @@
 Disassembly of section .text:
 
 0+ <nop>:
-[	 ]*0:[	 ]+0f 44 c0[	 ]+cmove[ 	]+%eax,%eax
+[	 ]*0:[	 ]+0f be f0[	 ]+movsbl[ 	]+%al,%esi
 [	 ]*3:[	 ]+8d b6 00 00 00 00[	 ]+lea[ 	]+0x0\(%esi\),%esi
 [	 ]*9:[	 ]+8d bc 27 00 00 00 00[	 ]+lea[ 	]+0x0\(%edi,%eiz,1\),%edi
 
diff --git a/gas/testsuite/gas/i386/nops-2.s b/gas/testsuite/gas/i386/nops-2.s
index afbb87e..6de16f2 100644
--- a/gas/testsuite/gas/i386/nops-2.s
+++ b/gas/testsuite/gas/i386/nops-2.s
@@ -1,6 +1,6 @@
 	.text
 nop:
-	cmove	%eax,%eax
+	movsbl %al,%esi
 	.p2align 4
 
 nop15:
diff --git a/gas/testsuite/gas/i386/x86-64-nops-2.d b/gas/testsuite/gas/i386/x86-64-nops-2.d
index 2432b59..858c4c9 100644
--- a/gas/testsuite/gas/i386/x86-64-nops-2.d
+++ b/gas/testsuite/gas/i386/x86-64-nops-2.d
@@ -7,7 +7,7 @@
 Disassembly of section .text:
 
 0+ <nop>:
-[ 	]*[a-f0-9]+:	0f 44 c0             	cmove  %eax,%eax
+[ 	]*[a-f0-9]+:	0f be f0             	movsbl %al,%esi
 [ 	]*[a-f0-9]+:	66 66 66 66 2e 0f 1f 84 00 00 00 00 00 	nopw   %cs:0x0\(%rax,%rax,1\)
 
 0+10 <nop15>: