From 2210942396dab942a86cb6777c705554b84ebb0e Mon Sep 17 00:00:00 2001 From: "H.J. Lu" Date: Fri, 6 Aug 2010 18:22:50 +0000 Subject: Don't generate multi-byte NOPs for i686. gas/ 2010-08-06 Quentin Neill * config/tc-i386.c (arch_entry): Add negated bit to disambiguate flag names starting with "no". (cpu_arch): Add negated bit definitions. Add ".nop" CPU extension. (i386_align_code): Use new .cpunop bit to decide when to generate alignment using nops. (set_cpu_arch): Use negated bit instead to decide when to use cpu_flags or vs. cpu_flags_and_not. (md_parse_option): Likewise. gas/testsuite/ 2010-08-06 Quentin Neill * gas/i386/arch-10-1.l: Add nopl instruction. * gas/i386/arch-10-2.l: Likewise. * gas/i386/arch-10-3.l: Likewise. * gas/i386/arch-10-4.l: Likewise. * gas/i386/arch-10.s: Likewise. * gas/i386/arch-10.d: Add nopl instruction, and +nopl extension flag to as flags. * gas/i386/nops-5-i686.d: Change alignment code generated for -mtune=i686. * gas/i386/nops-5.d: Change alignment code generated for .arch i686. * gas/i386/x86-64-nops-5-k8.d: Likewise. * gas/i386/x86-64-nops-5.d: Likewise. opcodes/ 2010-08-06 Quentin Neill * i386-gen.c (cpu_flag_init): Define CpuNop extension flag, add to processor flags for PENTIUMPRO processors and later. * i386-opc.h (enum): Add CpuNop. (i386_cpu_flags): Add cpunop bit. * i386-opc.tbl: Change nop cpu_flags. * i386-init.h: Regenerated. * i386-tbl.h: Likewise. --- gas/ChangeLog | 12 +++ gas/config/tc-i386.c | 167 +++++++++++++++--------------- gas/testsuite/ChangeLog | 16 +++ gas/testsuite/gas/i386/arch-10-1.l | 3 + gas/testsuite/gas/i386/arch-10-2.l | 3 + gas/testsuite/gas/i386/arch-10-3.l | 3 + gas/testsuite/gas/i386/arch-10-4.l | 3 + gas/testsuite/gas/i386/arch-10.d | 3 +- gas/testsuite/gas/i386/arch-10.s | 2 + gas/testsuite/gas/i386/nops-5-i686.d | 3 +- gas/testsuite/gas/i386/nops-5.d | 3 +- gas/testsuite/gas/i386/x86-64-nops-5-k8.d | 3 +- gas/testsuite/gas/i386/x86-64-nops-5.d | 3 +- 13 files changed, 137 insertions(+), 87 deletions(-) (limited to 'gas') diff --git a/gas/ChangeLog b/gas/ChangeLog index 54a88f6..56d6a02 100644 --- a/gas/ChangeLog +++ b/gas/ChangeLog @@ -1,3 +1,15 @@ +2010-08-06 Quentin Neill + + * config/tc-i386.c (arch_entry): Add negated bit to + disambiguate flag names starting with "no". + (cpu_arch): Add negated bit definitions. Add + ".nop" CPU extension. + (i386_align_code): Use new .cpunop bit to decide + when to generate alignment using nops. + (set_cpu_arch): Use negated bit instead to decide + when to use cpu_flags or vs. cpu_flags_and_not. + (md_parse_option): Likewise. + 2010-08-04 H.J. Lu * config/tc-i386.c (match_template): Move the first i.error diff --git a/gas/config/tc-i386.c b/gas/config/tc-i386.c index 03ea562..be619b8 100644 --- a/gas/config/tc-i386.c +++ b/gas/config/tc-i386.c @@ -132,6 +132,7 @@ typedef struct enum processor_type type; /* arch type */ i386_cpu_flags flags; /* cpu feature flags */ unsigned int skip; /* show_arch should skip this. */ + unsigned int negated; /* turn off indicated flags. */ } arch_entry; @@ -566,149 +567,151 @@ static const arch_entry cpu_arch[] = /* Do not replace the first two entries - i386_target_format() relies on them being there in this order. */ { STRING_COMMA_LEN ("generic32"), PROCESSOR_GENERIC32, - CPU_GENERIC32_FLAGS, 0 }, + CPU_GENERIC32_FLAGS, 0, 0 }, { STRING_COMMA_LEN ("generic64"), PROCESSOR_GENERIC64, - CPU_GENERIC64_FLAGS, 0 }, + CPU_GENERIC64_FLAGS, 0, 0 }, { STRING_COMMA_LEN ("i8086"), PROCESSOR_UNKNOWN, - CPU_NONE_FLAGS, 0 }, + CPU_NONE_FLAGS, 0, 0 }, { STRING_COMMA_LEN ("i186"), PROCESSOR_UNKNOWN, - CPU_I186_FLAGS, 0 }, + CPU_I186_FLAGS, 0, 0 }, { STRING_COMMA_LEN ("i286"), PROCESSOR_UNKNOWN, - CPU_I286_FLAGS, 0 }, + CPU_I286_FLAGS, 0, 0 }, { STRING_COMMA_LEN ("i386"), PROCESSOR_I386, - CPU_I386_FLAGS, 0 }, + CPU_I386_FLAGS, 0, 0 }, { STRING_COMMA_LEN ("i486"), PROCESSOR_I486, - CPU_I486_FLAGS, 0 }, + CPU_I486_FLAGS, 0, 0 }, { STRING_COMMA_LEN ("i586"), PROCESSOR_PENTIUM, - CPU_I586_FLAGS, 0 }, + CPU_I586_FLAGS, 0, 0 }, { STRING_COMMA_LEN ("i686"), PROCESSOR_PENTIUMPRO, - CPU_I686_FLAGS, 0 }, + CPU_I686_FLAGS, 0, 0 }, { STRING_COMMA_LEN ("pentium"), PROCESSOR_PENTIUM, - CPU_I586_FLAGS, 0 }, + CPU_I586_FLAGS, 0, 0 }, { STRING_COMMA_LEN ("pentiumpro"), PROCESSOR_PENTIUMPRO, - CPU_I686_FLAGS, 0 }, + CPU_PENTIUMPRO_FLAGS, 0, 0 }, { STRING_COMMA_LEN ("pentiumii"), PROCESSOR_PENTIUMPRO, - CPU_P2_FLAGS, 0 }, + CPU_P2_FLAGS, 0, 0 }, { STRING_COMMA_LEN ("pentiumiii"),PROCESSOR_PENTIUMPRO, - CPU_P3_FLAGS, 0 }, + CPU_P3_FLAGS, 0, 0 }, { STRING_COMMA_LEN ("pentium4"), PROCESSOR_PENTIUM4, - CPU_P4_FLAGS, 0 }, + CPU_P4_FLAGS, 0, 0 }, { STRING_COMMA_LEN ("prescott"), PROCESSOR_NOCONA, - CPU_CORE_FLAGS, 0 }, + CPU_CORE_FLAGS, 0, 0 }, { STRING_COMMA_LEN ("nocona"), PROCESSOR_NOCONA, - CPU_NOCONA_FLAGS, 0 }, + CPU_NOCONA_FLAGS, 0, 0 }, { STRING_COMMA_LEN ("yonah"), PROCESSOR_CORE, - CPU_CORE_FLAGS, 1 }, + CPU_CORE_FLAGS, 1, 0 }, { STRING_COMMA_LEN ("core"), PROCESSOR_CORE, - CPU_CORE_FLAGS, 0 }, + CPU_CORE_FLAGS, 0, 0 }, { STRING_COMMA_LEN ("merom"), PROCESSOR_CORE2, - CPU_CORE2_FLAGS, 1 }, + CPU_CORE2_FLAGS, 1, 0 }, { STRING_COMMA_LEN ("core2"), PROCESSOR_CORE2, - CPU_CORE2_FLAGS, 0 }, + CPU_CORE2_FLAGS, 0, 0 }, { STRING_COMMA_LEN ("corei7"), PROCESSOR_COREI7, - CPU_COREI7_FLAGS, 0 }, + CPU_COREI7_FLAGS, 0, 0 }, { STRING_COMMA_LEN ("l1om"), PROCESSOR_L1OM, - CPU_L1OM_FLAGS, 0 }, + CPU_L1OM_FLAGS, 0, 0 }, { STRING_COMMA_LEN ("k6"), PROCESSOR_K6, - CPU_K6_FLAGS, 0 }, + CPU_K6_FLAGS, 0, 0 }, { STRING_COMMA_LEN ("k6_2"), PROCESSOR_K6, - CPU_K6_2_FLAGS, 0 }, + CPU_K6_2_FLAGS, 0, 0 }, { STRING_COMMA_LEN ("athlon"), PROCESSOR_ATHLON, - CPU_ATHLON_FLAGS, 0 }, + CPU_ATHLON_FLAGS, 0, 0 }, { STRING_COMMA_LEN ("sledgehammer"), PROCESSOR_K8, - CPU_K8_FLAGS, 1 }, + CPU_K8_FLAGS, 1, 0 }, { STRING_COMMA_LEN ("opteron"), PROCESSOR_K8, - CPU_K8_FLAGS, 0 }, + CPU_K8_FLAGS, 0, 0 }, { STRING_COMMA_LEN ("k8"), PROCESSOR_K8, - CPU_K8_FLAGS, 0 }, + CPU_K8_FLAGS, 0, 0 }, { STRING_COMMA_LEN ("amdfam10"), PROCESSOR_AMDFAM10, - CPU_AMDFAM10_FLAGS, 0 }, + CPU_AMDFAM10_FLAGS, 0, 0 }, { STRING_COMMA_LEN ("bdver1"), PROCESSOR_BDVER1, - CPU_BDVER1_FLAGS, 0 }, + CPU_BDVER1_FLAGS, 0, 0 }, { STRING_COMMA_LEN (".8087"), PROCESSOR_UNKNOWN, - CPU_8087_FLAGS, 0 }, + CPU_8087_FLAGS, 0, 0 }, { STRING_COMMA_LEN (".287"), PROCESSOR_UNKNOWN, - CPU_287_FLAGS, 0 }, + CPU_287_FLAGS, 0, 0 }, { STRING_COMMA_LEN (".387"), PROCESSOR_UNKNOWN, - CPU_387_FLAGS, 0 }, + CPU_387_FLAGS, 0, 0 }, { STRING_COMMA_LEN (".no87"), PROCESSOR_UNKNOWN, - CPU_ANY87_FLAGS, 0 }, + CPU_ANY87_FLAGS, 0, 1 }, { STRING_COMMA_LEN (".mmx"), PROCESSOR_UNKNOWN, - CPU_MMX_FLAGS, 0 }, + CPU_MMX_FLAGS, 0, 0 }, { STRING_COMMA_LEN (".nommx"), PROCESSOR_UNKNOWN, - CPU_3DNOWA_FLAGS, 0 }, + CPU_3DNOWA_FLAGS, 0, 1 }, { STRING_COMMA_LEN (".sse"), PROCESSOR_UNKNOWN, - CPU_SSE_FLAGS, 0 }, + CPU_SSE_FLAGS, 0, 0 }, { STRING_COMMA_LEN (".sse2"), PROCESSOR_UNKNOWN, - CPU_SSE2_FLAGS, 0 }, + CPU_SSE2_FLAGS, 0, 0 }, { STRING_COMMA_LEN (".sse3"), PROCESSOR_UNKNOWN, - CPU_SSE3_FLAGS, 0 }, + CPU_SSE3_FLAGS, 0, 0 }, { STRING_COMMA_LEN (".ssse3"), PROCESSOR_UNKNOWN, - CPU_SSSE3_FLAGS, 0 }, + CPU_SSSE3_FLAGS, 0, 0 }, { STRING_COMMA_LEN (".sse4.1"), PROCESSOR_UNKNOWN, - CPU_SSE4_1_FLAGS, 0 }, + CPU_SSE4_1_FLAGS, 0, 0 }, { STRING_COMMA_LEN (".sse4.2"), PROCESSOR_UNKNOWN, - CPU_SSE4_2_FLAGS, 0 }, + CPU_SSE4_2_FLAGS, 0, 0 }, { STRING_COMMA_LEN (".sse4"), PROCESSOR_UNKNOWN, - CPU_SSE4_2_FLAGS, 0 }, + CPU_SSE4_2_FLAGS, 0, 0 }, { STRING_COMMA_LEN (".nosse"), PROCESSOR_UNKNOWN, - CPU_ANY_SSE_FLAGS, 0 }, + CPU_ANY_SSE_FLAGS, 0, 1 }, { STRING_COMMA_LEN (".avx"), PROCESSOR_UNKNOWN, - CPU_AVX_FLAGS, 0 }, + CPU_AVX_FLAGS, 0, 0 }, { STRING_COMMA_LEN (".noavx"), PROCESSOR_UNKNOWN, - CPU_ANY_AVX_FLAGS, 0 }, + CPU_ANY_AVX_FLAGS, 0, 1 }, { STRING_COMMA_LEN (".vmx"), PROCESSOR_UNKNOWN, - CPU_VMX_FLAGS, 0 }, + CPU_VMX_FLAGS, 0, 0 }, { STRING_COMMA_LEN (".smx"), PROCESSOR_UNKNOWN, - CPU_SMX_FLAGS, 0 }, + CPU_SMX_FLAGS, 0, 0 }, { STRING_COMMA_LEN (".xsave"), PROCESSOR_UNKNOWN, - CPU_XSAVE_FLAGS, 0 }, + CPU_XSAVE_FLAGS, 0, 0 }, { STRING_COMMA_LEN (".xsaveopt"), PROCESSOR_UNKNOWN, - CPU_XSAVEOPT_FLAGS, 0 }, + CPU_XSAVEOPT_FLAGS, 0, 0 }, { STRING_COMMA_LEN (".aes"), PROCESSOR_UNKNOWN, - CPU_AES_FLAGS, 0 }, + CPU_AES_FLAGS, 0, 0 }, { STRING_COMMA_LEN (".pclmul"), PROCESSOR_UNKNOWN, - CPU_PCLMUL_FLAGS, 0 }, + CPU_PCLMUL_FLAGS, 0, 0 }, { STRING_COMMA_LEN (".clmul"), PROCESSOR_UNKNOWN, - CPU_PCLMUL_FLAGS, 1 }, + CPU_PCLMUL_FLAGS, 1, 0 }, { STRING_COMMA_LEN (".fsgsbase"), PROCESSOR_UNKNOWN, - CPU_FSGSBASE_FLAGS, 0 }, + CPU_FSGSBASE_FLAGS, 0, 0 }, { STRING_COMMA_LEN (".rdrnd"), PROCESSOR_UNKNOWN, - CPU_RDRND_FLAGS, 0 }, + CPU_RDRND_FLAGS, 0, 0 }, { STRING_COMMA_LEN (".f16c"), PROCESSOR_UNKNOWN, - CPU_F16C_FLAGS, 0 }, + CPU_F16C_FLAGS, 0, 0 }, { STRING_COMMA_LEN (".fma"), PROCESSOR_UNKNOWN, - CPU_FMA_FLAGS, 0 }, + CPU_FMA_FLAGS, 0, 0 }, { STRING_COMMA_LEN (".fma4"), PROCESSOR_UNKNOWN, - CPU_FMA4_FLAGS, 0 }, + CPU_FMA4_FLAGS, 0, 0 }, { STRING_COMMA_LEN (".xop"), PROCESSOR_UNKNOWN, - CPU_XOP_FLAGS, 0 }, + CPU_XOP_FLAGS, 0, 0 }, { STRING_COMMA_LEN (".lwp"), PROCESSOR_UNKNOWN, - CPU_LWP_FLAGS, 0 }, + CPU_LWP_FLAGS, 0, 0 }, { STRING_COMMA_LEN (".movbe"), PROCESSOR_UNKNOWN, - CPU_MOVBE_FLAGS, 0 }, + CPU_MOVBE_FLAGS, 0, 0 }, { STRING_COMMA_LEN (".ept"), PROCESSOR_UNKNOWN, - CPU_EPT_FLAGS, 0 }, + CPU_EPT_FLAGS, 0, 0 }, { STRING_COMMA_LEN (".clflush"), PROCESSOR_UNKNOWN, - CPU_CLFLUSH_FLAGS, 0 }, + CPU_CLFLUSH_FLAGS, 0, 0 }, + { STRING_COMMA_LEN (".nop"), PROCESSOR_UNKNOWN, + CPU_NOP_FLAGS, 0, 0 }, { STRING_COMMA_LEN (".syscall"), PROCESSOR_UNKNOWN, - CPU_SYSCALL_FLAGS, 0 }, + CPU_SYSCALL_FLAGS, 0, 0 }, { STRING_COMMA_LEN (".rdtscp"), PROCESSOR_UNKNOWN, - CPU_RDTSCP_FLAGS, 0 }, + CPU_RDTSCP_FLAGS, 0, 0 }, { STRING_COMMA_LEN (".3dnow"), PROCESSOR_UNKNOWN, - CPU_3DNOW_FLAGS, 0 }, + CPU_3DNOW_FLAGS, 0, 0 }, { STRING_COMMA_LEN (".3dnowa"), PROCESSOR_UNKNOWN, - CPU_3DNOWA_FLAGS, 0 }, + CPU_3DNOWA_FLAGS, 0, 0 }, { STRING_COMMA_LEN (".padlock"), PROCESSOR_UNKNOWN, - CPU_PADLOCK_FLAGS, 0 }, + CPU_PADLOCK_FLAGS, 0, 0 }, { STRING_COMMA_LEN (".pacifica"), PROCESSOR_UNKNOWN, - CPU_SVME_FLAGS, 1 }, + CPU_SVME_FLAGS, 1, 0 }, { STRING_COMMA_LEN (".svme"), PROCESSOR_UNKNOWN, - CPU_SVME_FLAGS, 0 }, + CPU_SVME_FLAGS, 0, 0 }, { STRING_COMMA_LEN (".sse4a"), PROCESSOR_UNKNOWN, - CPU_SSE4A_FLAGS, 0 }, + CPU_SSE4A_FLAGS, 0, 0 }, { STRING_COMMA_LEN (".abm"), PROCESSOR_UNKNOWN, - CPU_ABM_FLAGS, 0 }, + CPU_ABM_FLAGS, 0, 0 }, }; #ifdef I386COFF @@ -998,7 +1001,7 @@ i386_align_code (fragS *fragP, int count) will be used. When -mtune= isn't used, alt_long_patt will be used if - cpu_arch_isa_flags has Cpu686. Otherwise, f32_patt will + cpu_arch_isa_flags has CpuNop. Otherwise, f32_patt will be used. When -march= or .arch is used, we can't use anything beyond @@ -1028,8 +1031,8 @@ i386_align_code (fragS *fragP, int count) { case PROCESSOR_UNKNOWN: /* We use cpu_arch_isa_flags to check if we SHOULD - optimize for Cpu686. */ - if (fragP->tc_frag_data.isa_flags.bitfield.cpui686) + optimize with nops. */ + if (fragP->tc_frag_data.isa_flags.bitfield.cpunop) patt = alt_long_patt; else patt = f32_patt; @@ -1079,8 +1082,8 @@ i386_align_code (fragS *fragP, int count) case PROCESSOR_BDVER1: case PROCESSOR_GENERIC32: /* We use cpu_arch_isa_flags to check if we CAN optimize - for Cpu686. */ - if (fragP->tc_frag_data.isa_flags.bitfield.cpui686) + with nops. */ + if (fragP->tc_frag_data.isa_flags.bitfield.cpunop) patt = alt_short_patt; else patt = f32_patt; @@ -1092,7 +1095,7 @@ i386_align_code (fragS *fragP, int count) case PROCESSOR_CORE2: case PROCESSOR_COREI7: case PROCESSOR_L1OM: - if (fragP->tc_frag_data.isa_flags.bitfield.cpui686) + if (fragP->tc_frag_data.isa_flags.bitfield.cpunop) patt = alt_long_patt; else patt = f32_patt; @@ -2131,12 +2134,12 @@ set_cpu_arch (int dummy ATTRIBUTE_UNUSED) break; } - if (strncmp (string + 1, "no", 2)) + if (!cpu_arch[j].negated) flags = cpu_flags_or (cpu_arch_flags, cpu_arch[j].flags); else flags = cpu_flags_and_not (cpu_arch_flags, - cpu_arch[j].flags); + cpu_arch[j].flags); if (!cpu_flags_equal (&flags, &cpu_arch_flags)) { if (cpu_sub_arch_name) @@ -8218,12 +8221,12 @@ md_parse_option (int c, char *arg) /* ISA entension. */ i386_cpu_flags flags; - if (strncmp (arch, "no", 2)) + if (!cpu_arch[j].negated) flags = cpu_flags_or (cpu_arch_flags, cpu_arch[j].flags); else flags = cpu_flags_and_not (cpu_arch_flags, - cpu_arch[j].flags); + cpu_arch[j].flags); if (!cpu_flags_equal (&flags, &cpu_arch_flags)) { if (cpu_sub_arch_name) diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog index 221938f..8e7d074 100644 --- a/gas/testsuite/ChangeLog +++ b/gas/testsuite/ChangeLog @@ -1,3 +1,19 @@ +2010-08-06 Quentin Neill + + * gas/i386/arch-10-1.l: Add nopl instruction. + * gas/i386/arch-10-2.l: Likewise. + * gas/i386/arch-10-3.l: Likewise. + * gas/i386/arch-10-4.l: Likewise. + * gas/i386/arch-10.s: Likewise. + * gas/i386/arch-10.d: Add nopl instruction, and +nopl extension + flag to as flags. + * gas/i386/nops-5-i686.d: Change alignment code generated for + -mtune=i686. + * gas/i386/nops-5.d: Change alignment code generated for + .arch i686. + * gas/i386/x86-64-nops-5-k8.d: Likewise. + * gas/i386/x86-64-nops-5.d: Likewise. + 2010-08-05 H.J. Lu * gas/i386/i386.exp: Run arch-4. diff --git a/gas/testsuite/gas/i386/arch-10-1.l b/gas/testsuite/gas/i386/arch-10-1.l index c0e98bb..0b78958 100644 --- a/gas/testsuite/gas/i386/arch-10-1.l +++ b/gas/testsuite/gas/i386/arch-10-1.l @@ -28,6 +28,7 @@ .*:56: Error: .* .*:58: Error: .* .*:60: Error: .* +.*:62: Error: .* GAS LISTING .* @@ -95,3 +96,5 @@ GAS LISTING .* [ ]*58[ ]+lzcnt %ecx,%ebx [ ]*59[ ]+\# PadLock [ ]*60[ ]+xstorerng +[ ]*61[ ]+\# nop +[ ]*62[ ]+nopl \(%eax\) diff --git a/gas/testsuite/gas/i386/arch-10-2.l b/gas/testsuite/gas/i386/arch-10-2.l index 8076b7a..d9e1b51 100644 --- a/gas/testsuite/gas/i386/arch-10-2.l +++ b/gas/testsuite/gas/i386/arch-10-2.l @@ -27,6 +27,7 @@ .*:56: Error: .* .*:58: Error: .* .*:60: Error: .* +.*:62: Error: .* GAS LISTING .* @@ -94,3 +95,5 @@ GAS LISTING .* [ ]*58[ ]+lzcnt %ecx,%ebx [ ]*59[ ]+\# PadLock [ ]*60[ ]+xstorerng +[ ]*61[ ]+\# nop +[ ]*62[ ]+nopl \(%eax\) diff --git a/gas/testsuite/gas/i386/arch-10-3.l b/gas/testsuite/gas/i386/arch-10-3.l index c4c3d34..75c07ec 100644 --- a/gas/testsuite/gas/i386/arch-10-3.l +++ b/gas/testsuite/gas/i386/arch-10-3.l @@ -20,6 +20,7 @@ .*:56: Error: .* .*:58: Error: .* .*:60: Error: .* +.*:62: Error: .* GAS LISTING .* @@ -90,3 +91,5 @@ GAS LISTING .* [ ]*58[ ]+lzcnt %ecx,%ebx [ ]*59[ ]+\# PadLock [ ]*60[ ]+xstorerng +[ ]*61[ ]+\# nop +[ ]*62[ ]+nopl \(%eax\) diff --git a/gas/testsuite/gas/i386/arch-10-4.l b/gas/testsuite/gas/i386/arch-10-4.l index e09167b..3c40045 100644 --- a/gas/testsuite/gas/i386/arch-10-4.l +++ b/gas/testsuite/gas/i386/arch-10-4.l @@ -18,6 +18,7 @@ .*:56: Error: .* .*:58: Error: .* .*:60: Error: .* +.*:62: Error: .* GAS LISTING .* @@ -88,3 +89,5 @@ GAS LISTING .* [ ]*58[ ]+lzcnt %ecx,%ebx [ ]*59[ ]+\# PadLock [ ]*60[ ]+xstorerng +[ ]*61[ ]+\# nop +[ ]*62[ ]+nopl \(%eax\) diff --git a/gas/testsuite/gas/i386/arch-10.d b/gas/testsuite/gas/i386/arch-10.d index 1fe9f16..3efd52d 100644 --- a/gas/testsuite/gas/i386/arch-10.d +++ b/gas/testsuite/gas/i386/arch-10.d @@ -1,4 +1,4 @@ -#as: -march=i686+avx+vmx+smx+xsave+xsaveopt+aes+pclmul+fma+movbe+ept+clflush+syscall+rdtscp+3dnowa+sse4a+svme+abm+padlock +#as: -march=i686+avx+vmx+smx+xsave+xsaveopt+aes+pclmul+fma+movbe+ept+clflush+nop+syscall+rdtscp+3dnowa+sse4a+svme+abm+padlock #objdump: -dw #name: i386 arch 10 @@ -36,4 +36,5 @@ Disassembly of section .text: [ ]*[a-f0-9]+: 0f 01 da vmload [ ]*[a-f0-9]+: f3 0f bd d9 lzcnt %ecx,%ebx [ ]*[a-f0-9]+: 0f a7 c0 xstore-rng +[ ]*[a-f0-9]+: 0f 1f 00 nopl \(%eax\) #pass diff --git a/gas/testsuite/gas/i386/arch-10.s b/gas/testsuite/gas/i386/arch-10.s index 0f0218d..d0fb12b 100644 --- a/gas/testsuite/gas/i386/arch-10.s +++ b/gas/testsuite/gas/i386/arch-10.s @@ -58,3 +58,5 @@ vmload lzcnt %ecx,%ebx # PadLock xstorerng +# nop +nopl (%eax) diff --git a/gas/testsuite/gas/i386/nops-5-i686.d b/gas/testsuite/gas/i386/nops-5-i686.d index 6262041..1d42128 100644 --- a/gas/testsuite/gas/i386/nops-5-i686.d +++ b/gas/testsuite/gas/i386/nops-5-i686.d @@ -24,7 +24,8 @@ Disassembly of section .text: 0+30 : [ ]*[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 data32 data32 data32 nopw %cs:0x0\(%eax,%eax,1\) +[ ]*[a-f0-9]+: 8d b6 00 00 00 00 lea 0x0\(%esi\),%esi +[ ]*[a-f0-9]+: 8d bc 27 00 00 00 00 lea 0x0\(%edi,%eiz,1\),%edi 0+40 : [ ]*[a-f0-9]+: 0f be f0 movsbl %al,%esi diff --git a/gas/testsuite/gas/i386/nops-5.d b/gas/testsuite/gas/i386/nops-5.d index 4d5aa03..abff3cc 100644 --- a/gas/testsuite/gas/i386/nops-5.d +++ b/gas/testsuite/gas/i386/nops-5.d @@ -22,7 +22,8 @@ Disassembly of section .text: 0+30 : [ ]*[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 data32 data32 data32 nopw %cs:0x0\(%eax,%eax,1\) +[ ]*[a-f0-9]+: 8d b6 00 00 00 00 lea 0x0\(%esi\),%esi +[ ]*[a-f0-9]+: 8d bc 27 00 00 00 00 lea 0x0\(%edi,%eiz,1\),%edi 0+40 : [ ]*[a-f0-9]+: 0f be f0 movsbl %al,%esi diff --git a/gas/testsuite/gas/i386/x86-64-nops-5-k8.d b/gas/testsuite/gas/i386/x86-64-nops-5-k8.d index b0bd3dc..ac86b27 100644 --- a/gas/testsuite/gas/i386/x86-64-nops-5-k8.d +++ b/gas/testsuite/gas/i386/x86-64-nops-5-k8.d @@ -25,7 +25,8 @@ Disassembly of section .text: 0+30 : [ ]*[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 data32 data32 data32 nopw %cs:0x0\(%rax,%rax,1\) +[ ]*[a-f0-9]+: 8d b6 00 00 00 00 lea 0x0\(%rsi\),%esi +[ ]*[a-f0-9]+: 8d bc 27 00 00 00 00 lea 0x0\(%rdi,%riz,1\),%edi 0+40 : [ ]*[a-f0-9]+: 0f be f0 movsbl %al,%esi diff --git a/gas/testsuite/gas/i386/x86-64-nops-5.d b/gas/testsuite/gas/i386/x86-64-nops-5.d index 475300d..db65c51 100644 --- a/gas/testsuite/gas/i386/x86-64-nops-5.d +++ b/gas/testsuite/gas/i386/x86-64-nops-5.d @@ -24,7 +24,8 @@ Disassembly of section .text: 0+30 : [ ]*[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 data32 data32 data32 nopw %cs:0x0\(%rax,%rax,1\) +[ ]*[a-f0-9]+: 8d b6 00 00 00 00 lea 0x0\(%rsi\),%esi +[ ]*[a-f0-9]+: 8d bc 27 00 00 00 00 lea 0x0\(%rdi,%riz,1\),%edi 0+40 : [ ]*[a-f0-9]+: 0f be f0 movsbl %al,%esi -- cgit v1.1