Limit multi-byte nop instructions to 10 bytes

author H.J. Lu <hjl.tools@gmail.com>

Fri, 20 Mar 2015 11:39:04 +0000 (04:39 -0700)

committer H.J. Lu <hjl.tools@gmail.com>

Fri, 20 Mar 2015 11:49:39 +0000 (04:49 -0700)
author H.J. Lu <hjl.tools@gmail.com>
Fri, 20 Mar 2015 11:39:04 +0000 (04:39 -0700)
committer H.J. Lu <hjl.tools@gmail.com>
Fri, 20 Mar 2015 11:49:39 +0000 (04:49 -0700)
diff --git a/gas/ChangeLog b/gas/ChangeLog

index fbf84896b4609d86edca0c5d7d98b24d5ccd823c..0a7f46ff9ca929e2c9a6e39d1a72961e7c8d849c 100644 (file)
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,8 @@
+2015-03-20  H.J. Lu  <hongjiu.lu@intel.com>
+
+       * config/tc-i386.c (i386_align_code): Limit multi-byte nop
+       instructions to 10 bytes.
+
  2015-03-19  Nick Clifton  <nickc@redhat.com>
  
         * config/tc-rl78.c (enum options): Add G13 and G14.
diff --git a/gas/config/tc-i386.c b/gas/config/tc-i386.c

index b6e8f5cebb37aa32162f25c566f4fb65beeba060..d7102163b778c980b5fef3d6b9701989aab3e32f 100644 (file)
--- a/gas/config/tc-i386.c
+++ b/gas/config/tc-i386.c
@@ -1138,85 +1138,9 @@ i386_align_code (fragS *fragP, int count)
    /* nopw %cs:0L(%[re]ax,%[re]ax,1) */
    static const char alt_10[] =
      {0x66,0x2e,0x0f,0x1f,0x84,0x00,0x00,0x00,0x00,0x00};
-  /* data16
-     nopw %cs:0L(%[re]ax,%[re]ax,1) */
-  static const char alt_long_11[] =
-    {0x66,
-     0x66,0x2e,0x0f,0x1f,0x84,0x00,0x00,0x00,0x00,0x00};
-  /* data16
-     data16
-     nopw %cs:0L(%[re]ax,%[re]ax,1) */
-  static const char alt_long_12[] =
-    {0x66,
-     0x66,
-     0x66,0x2e,0x0f,0x1f,0x84,0x00,0x00,0x00,0x00,0x00};
-  /* data16
-     data16
-     data16
-     nopw %cs:0L(%[re]ax,%[re]ax,1) */
-  static const char alt_long_13[] =
-    {0x66,
-     0x66,
-     0x66,
-     0x66,0x2e,0x0f,0x1f,0x84,0x00,0x00,0x00,0x00,0x00};
-  /* data16
-     data16
-     data16
-     data16
-     nopw %cs:0L(%[re]ax,%[re]ax,1) */
-  static const char alt_long_14[] =
-    {0x66,
-     0x66,
-     0x66,
-     0x66,
-     0x66,0x2e,0x0f,0x1f,0x84,0x00,0x00,0x00,0x00,0x00};
-  /* data16
-     data16
-     data16
-     data16
-     data16
-     nopw %cs:0L(%[re]ax,%[re]ax,1) */
-  static const char alt_long_15[] =
-    {0x66,
-     0x66,
-     0x66,
-     0x66,
-     0x66,
-     0x66,0x2e,0x0f,0x1f,0x84,0x00,0x00,0x00,0x00,0x00};
-  /* nopl 0(%[re]ax,%[re]ax,1)
-     nopw 0(%[re]ax,%[re]ax,1) */
-  static const char alt_short_11[] =
-    {0x0f,0x1f,0x44,0x00,0x00,
-     0x66,0x0f,0x1f,0x44,0x00,0x00};
-  /* nopw 0(%[re]ax,%[re]ax,1)
-     nopw 0(%[re]ax,%[re]ax,1) */
-  static const char alt_short_12[] =
-    {0x66,0x0f,0x1f,0x44,0x00,0x00,
-     0x66,0x0f,0x1f,0x44,0x00,0x00};
-  /* nopw 0(%[re]ax,%[re]ax,1)
-     nopl 0L(%[re]ax) */
-  static const char alt_short_13[] =
-    {0x66,0x0f,0x1f,0x44,0x00,0x00,
-     0x0f,0x1f,0x80,0x00,0x00,0x00,0x00};
-  /* nopl 0L(%[re]ax)
-     nopl 0L(%[re]ax) */
-  static const char alt_short_14[] =
-    {0x0f,0x1f,0x80,0x00,0x00,0x00,0x00,
-     0x0f,0x1f,0x80,0x00,0x00,0x00,0x00};
-  /* nopl 0L(%[re]ax)
-     nopl 0L(%[re]ax,%[re]ax,1) */
-  static const char alt_short_15[] =
-    {0x0f,0x1f,0x80,0x00,0x00,0x00,0x00,
-     0x0f,0x1f,0x84,0x00,0x00,0x00,0x00,0x00};
-  static const char *const alt_short_patt[] = {
+  static const char *const alt_patt[] = {
      f32_1, f32_2, alt_3, alt_4, alt_5, alt_6, alt_7, alt_8,
-    alt_9, alt_10, alt_short_11, alt_short_12, alt_short_13,
-    alt_short_14, alt_short_15
-  };
-  static const char *const alt_long_patt[] = {
-    f32_1, f32_2, alt_3, alt_4, alt_5, alt_6, alt_7, alt_8,
-    alt_9, alt_10, alt_long_11, alt_long_12, alt_long_13,
-    alt_long_14, alt_long_15
+    alt_9, alt_10
    };
  
    /* Only align for at least a positive non-zero boundary. */
@@ -1228,14 +1152,9 @@ i386_align_code (fragS *fragP, int count)
  
       1. For PROCESSOR_I386, PROCESSOR_I486, PROCESSOR_PENTIUM and
       PROCESSOR_GENERIC32, f32_patt will be used.
-     2. For PROCESSOR_PENTIUMPRO, PROCESSOR_PENTIUM4, PROCESSOR_NOCONA,
-     PROCESSOR_CORE, PROCESSOR_CORE2, PROCESSOR_COREI7, and
-     PROCESSOR_GENERIC64, alt_long_patt will be used.
-     3. For PROCESSOR_ATHLON, PROCESSOR_K6, PROCESSOR_K8 and
-     PROCESSOR_AMDFAM10, PROCESSOR_BD and PROCESSOR_BT, alt_short_patt
-     will be used.
-
-     When -mtune= isn't used, alt_long_patt will be used if
+     2. For the rest, alt_patt will be used.
+
+     When -mtune= isn't used, alt_patt will be used if
       cpu_arch_isa_flags has CpuNop.  Otherwise, f32_patt will
       be used.
  
@@ -1268,7 +1187,7 @@ i386_align_code (fragS *fragP, int count)
               /* We use cpu_arch_isa_flags to check if we SHOULD
                  optimize with nops.  */
               if (fragP->tc_frag_data.isa_flags.bitfield.cpunop)
-               patt = alt_long_patt;
+               patt = alt_patt;
               else
                 patt = f32_patt;
               break;
@@ -1280,8 +1199,6 @@ i386_align_code (fragS *fragP, int count)
             case PROCESSOR_L1OM:
             case PROCESSOR_K1OM:
             case PROCESSOR_GENERIC64:
-             patt = alt_long_patt;
-             break;
             case PROCESSOR_K6:
             case PROCESSOR_ATHLON:
             case PROCESSOR_K8:
@@ -1289,7 +1206,7 @@ i386_align_code (fragS *fragP, int count)
             case PROCESSOR_BD:
             case PROCESSOR_ZNVER:
             case PROCESSOR_BT:
-             patt = alt_short_patt;
+             patt = alt_patt;
               break;
             case PROCESSOR_I386:
             case PROCESSOR_I486:
@@ -1324,7 +1241,7 @@ i386_align_code (fragS *fragP, int count)
               /* We use cpu_arch_isa_flags to check if we CAN optimize
                  with nops.  */
               if (fragP->tc_frag_data.isa_flags.bitfield.cpunop)
-               patt = alt_short_patt;
+               patt = alt_patt;
               else
                 patt = f32_patt;
               break;
@@ -1337,12 +1254,12 @@ i386_align_code (fragS *fragP, int count)
             case PROCESSOR_L1OM:
             case PROCESSOR_K1OM:
               if (fragP->tc_frag_data.isa_flags.bitfield.cpunop)
-               patt = alt_long_patt;
+               patt = alt_patt;
               else
                 patt = f32_patt;
               break;
             case PROCESSOR_GENERIC64:
-             patt = alt_long_patt;
+             patt = alt_patt;
               break;
             }
         }
@@ -1373,15 +1290,15 @@ i386_align_code (fragS *fragP, int count)
         }
        else
         {
-         /* Maximum length of an instruction is 15 byte.  If the
-            padding is greater than 15 bytes and we don't use jump,
+         /* Maximum length of an instruction is 10 byte.  If the
+            padding is greater than 10 bytes and we don't use jump,
              we have to break it into smaller pieces.  */
           int padding = count;
-         while (padding > 15)
+         while (padding > 10)
             {
-             padding -= 15;
+             padding -= 10;
               memcpy (fragP->fr_literal + fragP->fr_fix + padding,
-                     patt [14], 15);
+                     patt [9], 10);
             }
  
           if (padding)
diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog

index 4e3b1ecae1f528a82b7f8657dff17aff5b8a3a0e..e26755ea1416bdd8a52d37bfeca23a39fbb850ae 100644 (file)
--- a/gas/testsuite/ChangeLog
+++ b/gas/testsuite/ChangeLog
@@ -1,3 +1,55 @@
+2015-03-20  H.J. Lu  <hongjiu.lu@intel.com>
+
+       * gas/i386/i386.exp: Don't run nops-1-bdver1, nops-1-bdver2,
+       nops-1-bdver3, nops-1-bdver4, nops-1-znver1, nops-1-btver1
+       nops-1-btver2, x86-64-nops-1-nocona, x86-64-nops-1-bdver1,
+       x86-64-nops-1-bdver2, x86-64-nops-1-bdver3, x86-64-nops-1-bdver4,
+       x86-64-nops-1-znver1, x86-64-nops-1-btver1 nor
+       x86-64-nops-1-btver2.
+       * gas/i386/nops-1-core2.d: Updated.
+       * gas/i386/nops-1-k8.d: Likewise.
+       * gas/i386/nops-4a-i686.d: Likewise.
+       * gas/i386/nops-5-i686.d: Likewise.
+       * gas/i386/nops-5.d: Likewise.
+       * gas/i386/nops-6.d: Likewise.
+       * gas/i386/x86-64-nops-1-core2.d: Likewise.
+       * gas/i386/x86-64-nops-1-g64.d: Likewise.
+       * gas/i386/x86-64-nops-1-k8.d: Likewise.
+       * gas/i386/x86-64-nops-1.d: Likewise.
+       * gas/i386/x86-64-nops-2.d: Likewise.
+       * gas/i386/x86-64-nops-3.d: Likewise.
+       * gas/i386/x86-64-nops-4-core2.d: Likewise.
+       * gas/i386/x86-64-nops-4-k8.d: Likewise.
+       * gas/i386/x86-64-nops-4.d: Likewise.
+       * gas/i386/x86-64-nops-5-k8.d: Likewise.
+       * gas/i386/x86-64-nops-5.d: Likewise.
+       * gas/i386/ilp32/x86-64-nops-1-core2.d: Likewise.
+       * gas/i386/ilp32/x86-64-nops-1-k8.d: Likewise.
+       * gas/i386/ilp32/x86-64-nops-1.d: Likewise.
+       * gas/i386/ilp32/x86-64-nops-2.d: Likewise.
+       * gas/i386/ilp32/x86-64-nops-3.d: Likewise.
+       * gas/i386/ilp32/x86-64-nops-4-core2.d: Likewise.
+       * gas/i386/ilp32/x86-64-nops-4-k8.d: Likewise.
+       * gas/i386/ilp32/x86-64-nops-4.d: Likewise.
+       * gas/i386/ilp32/x86-64-nops-5-k8.d: Likewise.
+       * gas/i386/ilp32/x86-64-nops-5.d: Likewise.
+       * gas/i386/nops-1-bdver1.d: Removed.
+       * gas/i386/nops-1-bdver2.d: Likewise.
+       * gas/i386/nops-1-bdver3.d: Likewise.
+       * gas/i386/nops-1-bdver4.d: Likewise.
+       * gas/i386/nops-1-btver1.d: Likewise.
+       * gas/i386/nops-1-btver2.d: Likewise.
+       * gas/i386/nops-1-znver1.d: Likewise.
+       * gas/i386/x86-64-nops-1-bdver1.d: Likewise.
+       * gas/i386/x86-64-nops-1-bdver2.d: Likewise.
+       * gas/i386/x86-64-nops-1-bdver3.d: Likewise.
+       * gas/i386/x86-64-nops-1-bdver4.d: Likewise.
+       * gas/i386/x86-64-nops-1-btver1.d: Likewise.
+       * gas/i386/x86-64-nops-1-btver2.d: Likewise.
+       * gas/i386/x86-64-nops-1-nocona.d: Likewise.
+       * gas/i386/x86-64-nops-1-znver1.d: Likewise.
+       * gas/i386/ilp32/x86-64-nops-1-nocona.d: Likewise.
+
  2015-03-19  Nick Clifton  <nickc@redhat.com>
  
         PR gas/18087
diff --git a/gas/testsuite/gas/i386/i386.exp b/gas/testsuite/gas/i386/i386.exp

index 19ef914b1dba80f4837218fb0a2bb0d14394eba7..92b44244fac593d93e4d2ac9a1ede932acb8619a 100644 (file)
--- a/gas/testsuite/gas/i386/i386.exp
+++ b/gas/testsuite/gas/i386/i386.exp
@@ -102,13 +102,6 @@ if [expr ([istarget "i*86-*-*"] ||  [istarget "x86_64-*-*"]) && [gas_32_check]]
      run_dump_test "nops-1-i686"
      run_dump_test "nops-1-k8"
      run_dump_test "nops-1-core2"
-    run_dump_test "nops-1-bdver1"
-    run_dump_test "nops-1-bdver2"
-    run_dump_test "nops-1-bdver3"
-    run_dump_test "nops-1-bdver4"
-    run_dump_test "nops-1-znver1"
-    run_dump_test "nops-1-btver1"
-    run_dump_test "nops-1-btver2"
      run_dump_test "nops-2"
      run_dump_test "nops-2-i386"
      run_dump_test "nops-2-core2"
@@ -488,16 +481,8 @@ if [expr ([istarget "i*86-*-*"] || [istarget "x86_64-*-*"]) && [gas_64_check]] t
      run_dump_test "x86-64-nops-1"
      run_dump_test "x86-64-nops-1-g64"
      run_dump_test "x86-64-nops-1-k8"
-    run_dump_test "x86-64-nops-1-nocona"
      run_dump_test "x86-64-nops-1-core2"
      run_dump_test "x86-64-nops-1-pentium"
-    run_dump_test "x86-64-nops-1-bdver1"
-    run_dump_test "x86-64-nops-1-bdver2"
-    run_dump_test "x86-64-nops-1-bdver3"
-    run_dump_test "x86-64-nops-1-bdver4"
-    run_dump_test "x86-64-nops-1-znver1"
-    run_dump_test "x86-64-nops-1-btver1"
-    run_dump_test "x86-64-nops-1-btver2"
      run_dump_test "x86-64-nops-2"
      run_dump_test "x86-64-nops-3"
      run_dump_test "x86-64-nops-4"
diff --git a/gas/testsuite/gas/i386/ilp32/x86-64-nops-1-core2.d b/gas/testsuite/gas/i386/ilp32/x86-64-nops-1-core2.d

index a174c7de2fcb36f177a4b0c7f0cc30263a4366f3..6921926bb30db5139cc88f05cba4946d1d6f9a12 100644 (file)
--- a/gas/testsuite/gas/i386/ilp32/x86-64-nops-1-core2.d
+++ b/gas/testsuite/gas/i386/ilp32/x86-64-nops-1-core2.d
@@ -9,25 +9,29 @@ Disassembly of section .text:
  
  0+ <nop15>:
  [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00    data16 data16 data16 data16 data16 nopw %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    0f 1f 44 00 00          nopl   0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%rax,%rax,1\)
  
  0+10 <nop14>:
  [      ]*[a-f0-9]+:    90                      nop
  [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00       data16 data16 data16 data16 nopw %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    0f 1f 40 00             nopl   0x0\(%rax\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%rax,%rax,1\)
  
  0+20 <nop13>:
  [      ]*[a-f0-9]+:    90                      nop
  [      ]*[a-f0-9]+:    90                      nop
  [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 66 66 66 2e 0f 1f 84 00 00 00 00 00  data16 data16 data16 nopw %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    0f 1f 00                nopl   \(%rax\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%rax,%rax,1\)
  
  0+30 <nop12>:
  [      ]*[a-f0-9]+:    90                      nop
  [      ]*[a-f0-9]+:    90                      nop
  [      ]*[a-f0-9]+:    90                      nop
  [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 66 66 2e 0f 1f 84 00 00 00 00 00     data16 data16 nopw %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 90                   xchg   %ax,%ax
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%rax,%rax,1\)
  
  0+40 <nop11>:
  [      ]*[a-f0-9]+:    90                      nop
@@ -35,7 +39,8 @@ Disassembly of section .text:
  [      ]*[a-f0-9]+:    90                      nop
  [      ]*[a-f0-9]+:    90                      nop
  [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%rax,%rax,1\)
  
  0+50 <nop10>:
  [      ]*[a-f0-9]+:    90                      nop
diff --git a/gas/testsuite/gas/i386/ilp32/x86-64-nops-1-k8.d b/gas/testsuite/gas/i386/ilp32/x86-64-nops-1-k8.d

index b79ccc1877da39226092dfe6a8304f99bc983266..308cc6fcfaebdc50329620700ece575bc1832ca6 100644 (file)
--- a/gas/testsuite/gas/i386/ilp32/x86-64-nops-1-k8.d
+++ b/gas/testsuite/gas/i386/ilp32/x86-64-nops-1-k8.d
@@ -8,154 +8,154 @@
  Disassembly of section .text:
  
  0+ <nop15>:
-[       ]*0:[   ]+90[   ]+nop[         ]*
-[       ]*1:[   ]+0f 1f 80 00 00 00 00[         ]+nopl[        ]+0x0\(%rax\)
-[       ]*8:[   ]+0f 1f 84 00 00 00 00 00[      ]+nopl[        ]+0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    0f 1f 44 00 00          nopl   0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%rax,%rax,1\)
  
  0+10 <nop14>:
-[       ]*10:[  ]+90[   ]+nop[         ]*
-[       ]*11:[  ]+90[   ]+nop[         ]*
-[       ]*12:[  ]+0f 1f 80 00 00 00 00[         ]+nopl[        ]+0x0\(%rax\)
-[       ]*19:[  ]+0f 1f 80 00 00 00 00[         ]+nopl[        ]+0x0\(%rax\)
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    0f 1f 40 00             nopl   0x0\(%rax\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%rax,%rax,1\)
  
  0+20 <nop13>:
-[       ]*20:[  ]+90[   ]+nop[         ]*
-[       ]*21:[  ]+90[   ]+nop[         ]*
-[       ]*22:[  ]+90[   ]+nop[         ]*
-[       ]*23:[  ]+66 0f 1f 44 00 00[    ]+nopw[        ]+0x0\(%rax,%rax,1\)
-[       ]*29:[  ]+0f 1f 80 00 00 00 00[         ]+nopl[        ]+0x0\(%rax\)
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    0f 1f 00                nopl   \(%rax\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%rax,%rax,1\)
  
  0+30 <nop12>:
-[       ]*30:[  ]+90[   ]+nop[         ]*
-[       ]*31:[  ]+90[   ]+nop[         ]*
-[       ]*32:[  ]+90[   ]+nop[         ]*
-[       ]*33:[  ]+90[   ]+nop[         ]*
-[       ]*34:[  ]+66 0f 1f 44 00 00[    ]+nopw[        ]+0x0\(%rax,%rax,1\)
-[       ]*3a:[  ]+66 0f 1f 44 00 00[    ]+nopw[        ]+0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    66 90                   xchg   %ax,%ax
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%rax,%rax,1\)
  
  0+40 <nop11>:
-[       ]*40:[  ]+90[   ]+nop[         ]*
-[       ]*41:[  ]+90[   ]+nop[         ]*
-[       ]*42:[  ]+90[   ]+nop[         ]*
-[       ]*43:[  ]+90[   ]+nop[         ]*
-[       ]*44:[  ]+90[   ]+nop[         ]*
-[       ]*45:[  ]+0f 1f 44 00 00[       ]+nopl[        ]+0x0\(%rax,%rax,1\)
-[       ]*4a:[  ]+66 0f 1f 44 00 00[    ]+nopw[        ]+0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%rax,%rax,1\)
  
  0+50 <nop10>:
-[       ]*50:[  ]+90[   ]+nop[         ]*
-[       ]*51:[  ]+90[   ]+nop[         ]*
-[       ]*52:[  ]+90[   ]+nop[         ]*
-[       ]*53:[  ]+90[   ]+nop[         ]*
-[       ]*54:[  ]+90[   ]+nop[         ]*
-[       ]*55:[  ]+90[   ]+nop[         ]*
-[       ]*56:[  ]+66 2e 0f 1f 84 00 00 00 00 00[        ]+nopw[        ]+%cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%rax,%rax,1\)
  
  0+60 <nop9>:
-[       ]*60:[  ]+90[   ]+nop[         ]*
-[       ]*61:[  ]+90[   ]+nop[         ]*
-[       ]*62:[  ]+90[   ]+nop[         ]*
-[       ]*63:[  ]+90[   ]+nop[         ]*
-[       ]*64:[  ]+90[   ]+nop[         ]*
-[       ]*65:[  ]+90[   ]+nop[         ]*
-[       ]*66:[  ]+90[   ]+nop[         ]*
-[       ]*67:[  ]+66 0f 1f 84 00 00 00 00 00[   ]+nopw[        ]+0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    66 0f 1f 84 00 00 00 00 00      nopw   0x0\(%rax,%rax,1\)
  
  0+70 <nop8>:
-[       ]*70:[  ]+90[   ]+nop[         ]*
-[       ]*71:[  ]+90[   ]+nop[         ]*
-[       ]*72:[  ]+90[   ]+nop[         ]*
-[       ]*73:[  ]+90[   ]+nop[         ]*
-[       ]*74:[  ]+90[   ]+nop[         ]*
-[       ]*75:[  ]+90[   ]+nop[         ]*
-[       ]*76:[  ]+90[   ]+nop[         ]*
-[       ]*77:[  ]+90[   ]+nop[         ]*
-[       ]*78:[  ]+0f 1f 84 00 00 00 00 00[      ]+nopl[        ]+0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    0f 1f 84 00 00 00 00 00         nopl   0x0\(%rax,%rax,1\)
  
  0+80 <nop7>:
-[       ]*80:[  ]+90[   ]+nop[         ]*
-[       ]*81:[  ]+90[   ]+nop[         ]*
-[       ]*82:[  ]+90[   ]+nop[         ]*
-[       ]*83:[  ]+90[   ]+nop[         ]*
-[       ]*84:[  ]+90[   ]+nop[         ]*
-[       ]*85:[  ]+90[   ]+nop[         ]*
-[       ]*86:[  ]+90[   ]+nop[         ]*
-[       ]*87:[  ]+90[   ]+nop[         ]*
-[       ]*88:[  ]+90[   ]+nop[         ]*
-[       ]*89:[  ]+0f 1f 80 00 00 00 00[         ]+nopl[        ]+0x0\(%rax\)
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    0f 1f 80 00 00 00 00    nopl   0x0\(%rax\)
  
  0+90 <nop6>:
-[       ]*90:[  ]+90[   ]+nop[         ]*
-[       ]*91:[  ]+90[   ]+nop[         ]*
-[       ]*92:[  ]+90[   ]+nop[         ]*
-[       ]*93:[  ]+90[   ]+nop[         ]*
-[       ]*94:[  ]+90[   ]+nop[         ]*
-[       ]*95:[  ]+90[   ]+nop[         ]*
-[       ]*96:[  ]+90[   ]+nop[         ]*
-[       ]*97:[  ]+90[   ]+nop[         ]*
-[       ]*98:[  ]+90[   ]+nop[         ]*
-[       ]*99:[  ]+90[   ]+nop[         ]*
-[       ]*9a:[  ]+66 0f 1f 44 00 00[    ]+nopw[        ]+0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    66 0f 1f 44 00 00       nopw   0x0\(%rax,%rax,1\)
  
  0+a0 <nop5>:
-[       ]*a0:[  ]+90[   ]+nop[         ]*
-[       ]*a1:[  ]+90[   ]+nop[         ]*
-[       ]*a2:[  ]+90[   ]+nop[         ]*
-[       ]*a3:[  ]+90[   ]+nop[         ]*
-[       ]*a4:[  ]+90[   ]+nop[         ]*
-[       ]*a5:[  ]+90[   ]+nop[         ]*
-[       ]*a6:[  ]+90[   ]+nop[         ]*
-[       ]*a7:[  ]+90[   ]+nop[         ]*
-[       ]*a8:[  ]+90[   ]+nop[         ]*
-[       ]*a9:[  ]+90[   ]+nop[         ]*
-[       ]*aa:[  ]+90[   ]+nop[         ]*
-[       ]*ab:[  ]+0f 1f 44 00 00[       ]+nopl[        ]+0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    0f 1f 44 00 00          nopl   0x0\(%rax,%rax,1\)
  
  0+b0 <nop4>:
-[       ]*b0:[  ]+90[   ]+nop[         ]*
-[       ]*b1:[  ]+90[   ]+nop[         ]*
-[       ]*b2:[  ]+90[   ]+nop[         ]*
-[       ]*b3:[  ]+90[   ]+nop[         ]*
-[       ]*b4:[  ]+90[   ]+nop[         ]*
-[       ]*b5:[  ]+90[   ]+nop[         ]*
-[       ]*b6:[  ]+90[   ]+nop[         ]*
-[       ]*b7:[  ]+90[   ]+nop[         ]*
-[       ]*b8:[  ]+90[   ]+nop[         ]*
-[       ]*b9:[  ]+90[   ]+nop[         ]*
-[       ]*ba:[  ]+90[   ]+nop[         ]*
-[       ]*bb:[  ]+90[   ]+nop[         ]*
-[       ]*bc:[  ]+0f 1f 40 00[  ]+nopl[        ]+0x0\(%rax\)
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    0f 1f 40 00             nopl   0x0\(%rax\)
  
  0+c0 <nop3>:
-[       ]*c0:[  ]+90[   ]+nop[         ]*
-[       ]*c1:[  ]+90[   ]+nop[         ]*
-[       ]*c2:[  ]+90[   ]+nop[         ]*
-[       ]*c3:[  ]+90[   ]+nop[         ]*
-[       ]*c4:[  ]+90[   ]+nop[         ]*
-[       ]*c5:[  ]+90[   ]+nop[         ]*
-[       ]*c6:[  ]+90[   ]+nop[         ]*
-[       ]*c7:[  ]+90[   ]+nop[         ]*
-[       ]*c8:[  ]+90[   ]+nop[         ]*
-[       ]*c9:[  ]+90[   ]+nop[         ]*
-[       ]*ca:[  ]+90[   ]+nop[         ]*
-[       ]*cb:[  ]+90[   ]+nop[         ]*
-[       ]*cc:[  ]+90[   ]+nop[         ]*
-[       ]*cd:[  ]+0f 1f 00[     ]+nopl[        ]+\(%rax\)
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    0f 1f 00                nopl   \(%rax\)
  
  0+d0 <nop2>:
-[       ]*d0:[  ]+90[   ]+nop[         ]*
-[       ]*d1:[  ]+90[   ]+nop[         ]*
-[       ]*d2:[  ]+90[   ]+nop[         ]*
-[       ]*d3:[  ]+90[   ]+nop[         ]*
-[       ]*d4:[  ]+90[   ]+nop[         ]*
-[       ]*d5:[  ]+90[   ]+nop[         ]*
-[       ]*d6:[  ]+90[   ]+nop[         ]*
-[       ]*d7:[  ]+90[   ]+nop[         ]*
-[       ]*d8:[  ]+90[   ]+nop[         ]*
-[       ]*d9:[  ]+90[   ]+nop[         ]*
-[       ]*da:[  ]+90[   ]+nop[         ]*
-[       ]*db:[  ]+90[   ]+nop[         ]*
-[       ]*dc:[  ]+90[   ]+nop[         ]*
-[       ]*dd:[  ]+90[   ]+nop[         ]*
-[       ]*de:[  ]+66 90[        ]+xchg[        ]+%ax,%ax
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    66 90                   xchg   %ax,%ax
  #pass
diff --git a/gas/testsuite/gas/i386/ilp32/x86-64-nops-1-nocona.d b/gas/testsuite/gas/i386/ilp32/x86-64-nops-1-nocona.d

deleted file mode 100644 (file)

index dbd6f7a..0000000
--- a/gas/testsuite/gas/i386/ilp32/x86-64-nops-1-nocona.d
+++ /dev/null
@@ -1,156 +0,0 @@
-#source: ../nops-1.s
-#as: -mtune=nocona
-#objdump: -drw
-#name: x86-64 (ILP32) -mtune=nocona nops 1
-
-.*: +file format .*
-
-Disassembly of section .text:
-
-0+ <nop15>:
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00    data16 data16 data16 data16 data16 nopw %cs:0x0\(%rax,%rax,1\)
-
-0+10 <nop14>:
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00       data16 data16 data16 data16 nopw %cs:0x0\(%rax,%rax,1\)
-
-0+20 <nop13>:
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 66 66 66 2e 0f 1f 84 00 00 00 00 00  data16 data16 data16 nopw %cs:0x0\(%rax,%rax,1\)
-
-0+30 <nop12>:
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 66 66 2e 0f 1f 84 00 00 00 00 00     data16 data16 nopw %cs:0x0\(%rax,%rax,1\)
-
-0+40 <nop11>:
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
-
-0+50 <nop10>:
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%rax,%rax,1\)
-
-0+60 <nop9>:
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 0f 1f 84 00 00 00 00 00      nopw   0x0\(%rax,%rax,1\)
-
-0+70 <nop8>:
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    0f 1f 84 00 00 00 00 00         nopl   0x0\(%rax,%rax,1\)
-
-0+80 <nop7>:
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    0f 1f 80 00 00 00 00    nopl   0x0\(%rax\)
-
-0+90 <nop6>:
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 0f 1f 44 00 00       nopw   0x0\(%rax,%rax,1\)
-
-0+a0 <nop5>:
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    0f 1f 44 00 00          nopl   0x0\(%rax,%rax,1\)
-
-0+b0 <nop4>:
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    0f 1f 40 00             nopl   0x0\(%rax\)
-
-0+c0 <nop3>:
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    0f 1f 00                nopl   \(%rax\)
-
-0+d0 <nop2>:
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 90                   xchg   %ax,%ax
-#pass
diff --git a/gas/testsuite/gas/i386/ilp32/x86-64-nops-1.d b/gas/testsuite/gas/i386/ilp32/x86-64-nops-1.d

index 772fd3e8583b43540f5062a371f42135e5fd978b..9ccce52cb19c575049a893f6f65c299e22380726 100644 (file)
--- a/gas/testsuite/gas/i386/ilp32/x86-64-nops-1.d
+++ b/gas/testsuite/gas/i386/ilp32/x86-64-nops-1.d
@@ -9,25 +9,29 @@ Disassembly of section .text:
  
  0+ <nop15>:
  [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00    data16 data16 data16 data16 data16 nopw %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    0f 1f 44 00 00          nopl   0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%rax,%rax,1\)
  
  0+10 <nop14>:
  [      ]*[a-f0-9]+:    90                      nop
  [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00       data16 data16 data16 data16 nopw %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    0f 1f 40 00             nopl   0x0\(%rax\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%rax,%rax,1\)
  
  0+20 <nop13>:
  [      ]*[a-f0-9]+:    90                      nop
  [      ]*[a-f0-9]+:    90                      nop
  [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 66 66 66 2e 0f 1f 84 00 00 00 00 00  data16 data16 data16 nopw %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    0f 1f 00                nopl   \(%rax\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%rax,%rax,1\)
  
  0+30 <nop12>:
  [      ]*[a-f0-9]+:    90                      nop
  [      ]*[a-f0-9]+:    90                      nop
  [      ]*[a-f0-9]+:    90                      nop
  [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 66 66 2e 0f 1f 84 00 00 00 00 00     data16 data16 nopw %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 90                   xchg   %ax,%ax
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%rax,%rax,1\)
  
  0+40 <nop11>:
  [      ]*[a-f0-9]+:    90                      nop
@@ -35,7 +39,8 @@ Disassembly of section .text:
  [      ]*[a-f0-9]+:    90                      nop
  [      ]*[a-f0-9]+:    90                      nop
  [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%rax,%rax,1\)
  
  0+50 <nop10>:
  [      ]*[a-f0-9]+:    90                      nop
diff --git a/gas/testsuite/gas/i386/ilp32/x86-64-nops-2.d b/gas/testsuite/gas/i386/ilp32/x86-64-nops-2.d

index 551cecae71198f8bc5a9fca675e2c03edcc6f773..4f97c6c4772b4b473e4603b82d3738874658738c 100644 (file)
--- a/gas/testsuite/gas/i386/ilp32/x86-64-nops-2.d
+++ b/gas/testsuite/gas/i386/ilp32/x86-64-nops-2.d
@@ -9,29 +9,34 @@ Disassembly of section .text:
  
  0+ <nop>:
  [      ]*[a-f0-9]+:    0f be f0                movsbl %al,%esi
-[      ]*[a-f0-9]+:    66 66 66 66 2e 0f 1f 84 00 00 00 00 00  data16 data16 data16 nopw %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    0f 1f 00                nopl   \(%rax\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%rax,%rax,1\)
  
  0+10 <nop15>:
  [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00    data16 data16 data16 data16 data16 nopw %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    0f 1f 44 00 00          nopl   0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%rax,%rax,1\)
  
  0+20 <nop14>:
  [      ]*[a-f0-9]+:    90                      nop
  [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00       data16 data16 data16 data16 nopw %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    0f 1f 40 00             nopl   0x0\(%rax\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%rax,%rax,1\)
  
  0+30 <nop13>:
  [      ]*[a-f0-9]+:    90                      nop
  [      ]*[a-f0-9]+:    90                      nop
  [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 66 66 66 2e 0f 1f 84 00 00 00 00 00  data16 data16 data16 nopw %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    0f 1f 00                nopl   \(%rax\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%rax,%rax,1\)
  
  0+40 <nop12>:
  [      ]*[a-f0-9]+:    90                      nop
  [      ]*[a-f0-9]+:    90                      nop
  [      ]*[a-f0-9]+:    90                      nop
  [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 66 66 2e 0f 1f 84 00 00 00 00 00     data16 data16 nopw %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 90                   xchg   %ax,%ax
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%rax,%rax,1\)
  
  0+50 <nop11>:
  [      ]*[a-f0-9]+:    90                      nop
@@ -39,7 +44,8 @@ Disassembly of section .text:
  [      ]*[a-f0-9]+:    90                      nop
  [      ]*[a-f0-9]+:    90                      nop
  [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%rax,%rax,1\)
  
  0+60 <nop10>:
  [      ]*[a-f0-9]+:    90                      nop
diff --git a/gas/testsuite/gas/i386/ilp32/x86-64-nops-3.d b/gas/testsuite/gas/i386/ilp32/x86-64-nops-3.d

index f59cd8aad583a11243f8518f2a3166416b754cf4..11a4a21e6b18e0777eac2be0e9d018519daef865 100644 (file)
--- a/gas/testsuite/gas/i386/ilp32/x86-64-nops-3.d
+++ b/gas/testsuite/gas/i386/ilp32/x86-64-nops-3.d
@@ -10,8 +10,10 @@ Disassembly of section .text:
  0+ <nop>:
  [      ]*[a-f0-9]+:    90                      nop
  [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00    data16 data16 data16 data16 data16 nopw %cs:0x0\(%rax,%rax,1\)
-[      ]*[a-f0-9]+:    66 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00    data16 data16 data16 data16 data16 nopw %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%rax,%rax,1\)
  [      ]*[a-f0-9]+:    89 c3                   mov    %eax,%ebx
-[      ]*[a-f0-9]+:    66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00       data16 data16 data16 data16 nopw %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    0f 1f 40 00             nopl   0x0\(%rax\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%rax,%rax,1\)
  #pass
diff --git a/gas/testsuite/gas/i386/ilp32/x86-64-nops-4-core2.d b/gas/testsuite/gas/i386/ilp32/x86-64-nops-4-core2.d

index 02a8a6351bf65d4957cdebc18502c081be841502..ab67ba80eeb0f58dd463140ec6834ff8dd0411eb 100644 (file)
--- a/gas/testsuite/gas/i386/ilp32/x86-64-nops-4-core2.d
+++ b/gas/testsuite/gas/i386/ilp32/x86-64-nops-4-core2.d
@@ -10,29 +10,33 @@ Disassembly of section .text:
  0+ <nop31>:
  [      ]*[a-f0-9]+:    90                      nop
  [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00    data16 data16 data16 data16 data16 nopw %cs:0x0\(%rax,%rax,1\)
-[      ]*[a-f0-9]+:    66 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00    data16 data16 data16 data16 data16 nopw %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%rax,%rax,1\)
  
  0+20 <nop30>:
  [      ]*[a-f0-9]+:    90                      nop
  [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00    data16 data16 data16 data16 data16 nopw %cs:0x0\(%rax,%rax,1\)
-[      ]*[a-f0-9]+:    66 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00    data16 data16 data16 data16 data16 nopw %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%rax,%rax,1\)
  
  0+40 <nop29>:
  [      ]*[a-f0-9]+:    90                      nop
  [      ]*[a-f0-9]+:    90                      nop
  [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00       data16 data16 data16 data16 nopw %cs:0x0\(%rax,%rax,1\)
-[      ]*[a-f0-9]+:    66 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00    data16 data16 data16 data16 data16 nopw %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 0f 1f 84 00 00 00 00 00      nopw   0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%rax,%rax,1\)
  
  0+60 <nop28>:
  [      ]*[a-f0-9]+:    90                      nop
  [      ]*[a-f0-9]+:    90                      nop
  [      ]*[a-f0-9]+:    90                      nop
  [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 66 66 66 2e 0f 1f 84 00 00 00 00 00  data16 data16 data16 nopw %cs:0x0\(%rax,%rax,1\)
-[      ]*[a-f0-9]+:    66 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00    data16 data16 data16 data16 data16 nopw %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    0f 1f 84 00 00 00 00 00         nopl   0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%rax,%rax,1\)
  
  0+80 <nop27>:
  [      ]*[a-f0-9]+:    90                      nop
@@ -40,8 +44,9 @@ Disassembly of section .text:
  [      ]*[a-f0-9]+:    90                      nop
  [      ]*[a-f0-9]+:    90                      nop
  [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 66 66 2e 0f 1f 84 00 00 00 00 00     data16 data16 nopw %cs:0x0\(%rax,%rax,1\)
-[      ]*[a-f0-9]+:    66 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00    data16 data16 data16 data16 data16 nopw %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    0f 1f 80 00 00 00 00    nopl   0x0\(%rax\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%rax,%rax,1\)
  
  0+a0 <nop26>:
  [      ]*[a-f0-9]+:    90                      nop
@@ -50,8 +55,9 @@ Disassembly of section .text:
  [      ]*[a-f0-9]+:    90                      nop
  [      ]*[a-f0-9]+:    90                      nop
  [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
-[      ]*[a-f0-9]+:    66 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00    data16 data16 data16 data16 data16 nopw %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 0f 1f 44 00 00       nopw   0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%rax,%rax,1\)
  
  0+c0 <nop25>:
  [      ]*[a-f0-9]+:    90                      nop
@@ -61,8 +67,9 @@ Disassembly of section .text:
  [      ]*[a-f0-9]+:    90                      nop
  [      ]*[a-f0-9]+:    90                      nop
  [      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    0f 1f 44 00 00          nopl   0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%rax,%rax,1\)
  [      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%rax,%rax,1\)
-[      ]*[a-f0-9]+:    66 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00    data16 data16 data16 data16 data16 nopw %cs:0x0\(%rax,%rax,1\)
  
  0+e0 <nop24>:
  [      ]*[a-f0-9]+:    90                      nop
@@ -73,8 +80,9 @@ Disassembly of section .text:
  [      ]*[a-f0-9]+:    90                      nop
  [      ]*[a-f0-9]+:    90                      nop
  [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 0f 1f 84 00 00 00 00 00      nopw   0x0\(%rax,%rax,1\)
-[      ]*[a-f0-9]+:    66 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00    data16 data16 data16 data16 data16 nopw %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    0f 1f 40 00             nopl   0x0\(%rax\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%rax,%rax,1\)
  
  0+100 <nop23>:
  [      ]*[a-f0-9]+:    90                      nop
@@ -86,8 +94,9 @@ Disassembly of section .text:
  [      ]*[a-f0-9]+:    90                      nop
  [      ]*[a-f0-9]+:    90                      nop
  [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    0f 1f 84 00 00 00 00 00         nopl   0x0\(%rax,%rax,1\)
-[      ]*[a-f0-9]+:    66 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00    data16 data16 data16 data16 data16 nopw %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    0f 1f 00                nopl   \(%rax\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%rax,%rax,1\)
  
  0+120 <nop22>:
  [      ]*[a-f0-9]+:    90                      nop
@@ -100,8 +109,9 @@ Disassembly of section .text:
  [      ]*[a-f0-9]+:    90                      nop
  [      ]*[a-f0-9]+:    90                      nop
  [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    0f 1f 80 00 00 00 00    nopl   0x0\(%rax\)
-[      ]*[a-f0-9]+:    66 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00    data16 data16 data16 data16 data16 nopw %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 90                   xchg   %ax,%ax
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%rax,%rax,1\)
  
  0+140 <nop21>:
  [      ]*[a-f0-9]+:    90                      nop
@@ -115,8 +125,9 @@ Disassembly of section .text:
  [      ]*[a-f0-9]+:    90                      nop
  [      ]*[a-f0-9]+:    90                      nop
  [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 0f 1f 44 00 00       nopw   0x0\(%rax,%rax,1\)
-[      ]*[a-f0-9]+:    66 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00    data16 data16 data16 data16 data16 nopw %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%rax,%rax,1\)
  
  0+160 <nop20>:
  [      ]*[a-f0-9]+:    90                      nop
@@ -131,8 +142,8 @@ Disassembly of section .text:
  [      ]*[a-f0-9]+:    90                      nop
  [      ]*[a-f0-9]+:    90                      nop
  [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    0f 1f 44 00 00          nopl   0x0\(%rax,%rax,1\)
-[      ]*[a-f0-9]+:    66 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00    data16 data16 data16 data16 data16 nopw %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%rax,%rax,1\)
  
  0+180 <nop19>:
  [      ]*[a-f0-9]+:    90                      nop
@@ -148,8 +159,8 @@ Disassembly of section .text:
  [      ]*[a-f0-9]+:    90                      nop
  [      ]*[a-f0-9]+:    90                      nop
  [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    0f 1f 40 00             nopl   0x0\(%rax\)
-[      ]*[a-f0-9]+:    66 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00    data16 data16 data16 data16 data16 nopw %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 0f 1f 84 00 00 00 00 00      nopw   0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%rax,%rax,1\)
  
  0+1a0 <nop18>:
  [      ]*[a-f0-9]+:    90                      nop
@@ -166,8 +177,8 @@ Disassembly of section .text:
  [      ]*[a-f0-9]+:    90                      nop
  [      ]*[a-f0-9]+:    90                      nop
  [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    0f 1f 00                nopl   \(%rax\)
-[      ]*[a-f0-9]+:    66 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00    data16 data16 data16 data16 data16 nopw %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    0f 1f 84 00 00 00 00 00         nopl   0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%rax,%rax,1\)
  
  0+1c0 <nop17>:
  [      ]*[a-f0-9]+:    90                      nop
@@ -185,8 +196,8 @@ Disassembly of section .text:
  [      ]*[a-f0-9]+:    90                      nop
  [      ]*[a-f0-9]+:    90                      nop
  [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 90                   xchg   %ax,%ax
-[      ]*[a-f0-9]+:    66 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00    data16 data16 data16 data16 data16 nopw %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    0f 1f 80 00 00 00 00    nopl   0x0\(%rax\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%rax,%rax,1\)
  
  0+1e0 <nop16>:
  [      ]*[a-f0-9]+:    90                      nop
@@ -205,6 +216,6 @@ Disassembly of section .text:
  [      ]*[a-f0-9]+:    90                      nop
  [      ]*[a-f0-9]+:    90                      nop
  [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00    data16 data16 data16 data16 data16 nopw %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 0f 1f 44 00 00       nopw   0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%rax,%rax,1\)
  #pass
diff --git a/gas/testsuite/gas/i386/ilp32/x86-64-nops-4-k8.d b/gas/testsuite/gas/i386/ilp32/x86-64-nops-4-k8.d

index a00424fe169a75201b25fa4e9319a2825990b392..aaddd5f348d2268b6771340bd74d6ea413dd6dea 100644 (file)
--- a/gas/testsuite/gas/i386/ilp32/x86-64-nops-4-k8.d
+++ b/gas/testsuite/gas/i386/ilp32/x86-64-nops-4-k8.d
@@ -10,37 +10,33 @@ Disassembly of section .text:
  0+ <nop31>:
  [      ]*[a-f0-9]+:    90                      nop
  [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    0f 1f 80 00 00 00 00    nopl   0x0\(%rax\)
-[      ]*[a-f0-9]+:    0f 1f 84 00 00 00 00 00         nopl   0x0\(%rax,%rax,1\)
-[      ]*[a-f0-9]+:    0f 1f 80 00 00 00 00    nopl   0x0\(%rax\)
-[      ]*[a-f0-9]+:    0f 1f 84 00 00 00 00 00         nopl   0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%rax,%rax,1\)
  
  0+20 <nop30>:
  [      ]*[a-f0-9]+:    90                      nop
  [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    0f 1f 80 00 00 00 00    nopl   0x0\(%rax\)
-[      ]*[a-f0-9]+:    0f 1f 84 00 00 00 00 00         nopl   0x0\(%rax,%rax,1\)
-[      ]*[a-f0-9]+:    0f 1f 80 00 00 00 00    nopl   0x0\(%rax\)
-[      ]*[a-f0-9]+:    0f 1f 84 00 00 00 00 00         nopl   0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%rax,%rax,1\)
  
  0+40 <nop29>:
  [      ]*[a-f0-9]+:    90                      nop
  [      ]*[a-f0-9]+:    90                      nop
  [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    0f 1f 80 00 00 00 00    nopl   0x0\(%rax\)
-[      ]*[a-f0-9]+:    0f 1f 80 00 00 00 00    nopl   0x0\(%rax\)
-[      ]*[a-f0-9]+:    0f 1f 80 00 00 00 00    nopl   0x0\(%rax\)
-[      ]*[a-f0-9]+:    0f 1f 84 00 00 00 00 00         nopl   0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 0f 1f 84 00 00 00 00 00      nopw   0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%rax,%rax,1\)
  
  0+60 <nop28>:
  [      ]*[a-f0-9]+:    90                      nop
  [      ]*[a-f0-9]+:    90                      nop
  [      ]*[a-f0-9]+:    90                      nop
  [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 0f 1f 44 00 00       nopw   0x0\(%rax,%rax,1\)
-[      ]*[a-f0-9]+:    0f 1f 80 00 00 00 00    nopl   0x0\(%rax\)
-[      ]*[a-f0-9]+:    0f 1f 80 00 00 00 00    nopl   0x0\(%rax\)
  [      ]*[a-f0-9]+:    0f 1f 84 00 00 00 00 00         nopl   0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%rax,%rax,1\)
  
  0+80 <nop27>:
  [      ]*[a-f0-9]+:    90                      nop
@@ -48,10 +44,9 @@ Disassembly of section .text:
  [      ]*[a-f0-9]+:    90                      nop
  [      ]*[a-f0-9]+:    90                      nop
  [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 0f 1f 44 00 00       nopw   0x0\(%rax,%rax,1\)
-[      ]*[a-f0-9]+:    66 0f 1f 44 00 00       nopw   0x0\(%rax,%rax,1\)
  [      ]*[a-f0-9]+:    0f 1f 80 00 00 00 00    nopl   0x0\(%rax\)
-[      ]*[a-f0-9]+:    0f 1f 84 00 00 00 00 00         nopl   0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%rax,%rax,1\)
  
  0+a0 <nop26>:
  [      ]*[a-f0-9]+:    90                      nop
@@ -60,10 +55,9 @@ Disassembly of section .text:
  [      ]*[a-f0-9]+:    90                      nop
  [      ]*[a-f0-9]+:    90                      nop
  [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    0f 1f 44 00 00          nopl   0x0\(%rax,%rax,1\)
  [      ]*[a-f0-9]+:    66 0f 1f 44 00 00       nopw   0x0\(%rax,%rax,1\)
-[      ]*[a-f0-9]+:    0f 1f 80 00 00 00 00    nopl   0x0\(%rax\)
-[      ]*[a-f0-9]+:    0f 1f 84 00 00 00 00 00         nopl   0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%rax,%rax,1\)
  
  0+c0 <nop25>:
  [      ]*[a-f0-9]+:    90                      nop
@@ -73,9 +67,9 @@ Disassembly of section .text:
  [      ]*[a-f0-9]+:    90                      nop
  [      ]*[a-f0-9]+:    90                      nop
  [      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    0f 1f 44 00 00          nopl   0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%rax,%rax,1\)
  [      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%rax,%rax,1\)
-[      ]*[a-f0-9]+:    0f 1f 80 00 00 00 00    nopl   0x0\(%rax\)
-[      ]*[a-f0-9]+:    0f 1f 84 00 00 00 00 00         nopl   0x0\(%rax,%rax,1\)
  
  0+e0 <nop24>:
  [      ]*[a-f0-9]+:    90                      nop
@@ -86,9 +80,9 @@ Disassembly of section .text:
  [      ]*[a-f0-9]+:    90                      nop
  [      ]*[a-f0-9]+:    90                      nop
  [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 0f 1f 84 00 00 00 00 00      nopw   0x0\(%rax,%rax,1\)
-[      ]*[a-f0-9]+:    0f 1f 80 00 00 00 00    nopl   0x0\(%rax\)
-[      ]*[a-f0-9]+:    0f 1f 84 00 00 00 00 00         nopl   0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    0f 1f 40 00             nopl   0x0\(%rax\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%rax,%rax,1\)
  
  0+100 <nop23>:
  [      ]*[a-f0-9]+:    90                      nop
@@ -100,9 +94,9 @@ Disassembly of section .text:
  [      ]*[a-f0-9]+:    90                      nop
  [      ]*[a-f0-9]+:    90                      nop
  [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    0f 1f 84 00 00 00 00 00         nopl   0x0\(%rax,%rax,1\)
-[      ]*[a-f0-9]+:    0f 1f 80 00 00 00 00    nopl   0x0\(%rax\)
-[      ]*[a-f0-9]+:    0f 1f 84 00 00 00 00 00         nopl   0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    0f 1f 00                nopl   \(%rax\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%rax,%rax,1\)
  
  0+120 <nop22>:
  [      ]*[a-f0-9]+:    90                      nop
@@ -115,9 +109,9 @@ Disassembly of section .text:
  [      ]*[a-f0-9]+:    90                      nop
  [      ]*[a-f0-9]+:    90                      nop
  [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    0f 1f 80 00 00 00 00    nopl   0x0\(%rax\)
-[      ]*[a-f0-9]+:    0f 1f 80 00 00 00 00    nopl   0x0\(%rax\)
-[      ]*[a-f0-9]+:    0f 1f 84 00 00 00 00 00         nopl   0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 90                   xchg   %ax,%ax
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%rax,%rax,1\)
  
  0+140 <nop21>:
  [      ]*[a-f0-9]+:    90                      nop
@@ -131,9 +125,9 @@ Disassembly of section .text:
  [      ]*[a-f0-9]+:    90                      nop
  [      ]*[a-f0-9]+:    90                      nop
  [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 0f 1f 44 00 00       nopw   0x0\(%rax,%rax,1\)
-[      ]*[a-f0-9]+:    0f 1f 80 00 00 00 00    nopl   0x0\(%rax\)
-[      ]*[a-f0-9]+:    0f 1f 84 00 00 00 00 00         nopl   0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%rax,%rax,1\)
  
  0+160 <nop20>:
  [      ]*[a-f0-9]+:    90                      nop
@@ -148,9 +142,8 @@ Disassembly of section .text:
  [      ]*[a-f0-9]+:    90                      nop
  [      ]*[a-f0-9]+:    90                      nop
  [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    0f 1f 44 00 00          nopl   0x0\(%rax,%rax,1\)
-[      ]*[a-f0-9]+:    0f 1f 80 00 00 00 00    nopl   0x0\(%rax\)
-[      ]*[a-f0-9]+:    0f 1f 84 00 00 00 00 00         nopl   0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%rax,%rax,1\)
  
  0+180 <nop19>:
  [      ]*[a-f0-9]+:    90                      nop
@@ -166,9 +159,8 @@ Disassembly of section .text:
  [      ]*[a-f0-9]+:    90                      nop
  [      ]*[a-f0-9]+:    90                      nop
  [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    0f 1f 40 00             nopl   0x0\(%rax\)
-[      ]*[a-f0-9]+:    0f 1f 80 00 00 00 00    nopl   0x0\(%rax\)
-[      ]*[a-f0-9]+:    0f 1f 84 00 00 00 00 00         nopl   0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 0f 1f 84 00 00 00 00 00      nopw   0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%rax,%rax,1\)
  
  0+1a0 <nop18>:
  [      ]*[a-f0-9]+:    90                      nop
@@ -185,9 +177,8 @@ Disassembly of section .text:
  [      ]*[a-f0-9]+:    90                      nop
  [      ]*[a-f0-9]+:    90                      nop
  [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    0f 1f 00                nopl   \(%rax\)
-[      ]*[a-f0-9]+:    0f 1f 80 00 00 00 00    nopl   0x0\(%rax\)
  [      ]*[a-f0-9]+:    0f 1f 84 00 00 00 00 00         nopl   0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%rax,%rax,1\)
  
  0+1c0 <nop17>:
  [      ]*[a-f0-9]+:    90                      nop
@@ -205,9 +196,8 @@ Disassembly of section .text:
  [      ]*[a-f0-9]+:    90                      nop
  [      ]*[a-f0-9]+:    90                      nop
  [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 90                   xchg   %ax,%ax
  [      ]*[a-f0-9]+:    0f 1f 80 00 00 00 00    nopl   0x0\(%rax\)
-[      ]*[a-f0-9]+:    0f 1f 84 00 00 00 00 00         nopl   0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%rax,%rax,1\)
  
  0+1e0 <nop16>:
  [      ]*[a-f0-9]+:    90                      nop
@@ -226,7 +216,6 @@ Disassembly of section .text:
  [      ]*[a-f0-9]+:    90                      nop
  [      ]*[a-f0-9]+:    90                      nop
  [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    0f 1f 80 00 00 00 00    nopl   0x0\(%rax\)
-[      ]*[a-f0-9]+:    0f 1f 84 00 00 00 00 00         nopl   0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 0f 1f 44 00 00       nopw   0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%rax,%rax,1\)
  #pass
diff --git a/gas/testsuite/gas/i386/ilp32/x86-64-nops-4.d b/gas/testsuite/gas/i386/ilp32/x86-64-nops-4.d

index 1419098d48ed7c481c324b8bc3a9d602e4f6203c..07054a71047d03035348ff3194a04d564711d234 100644 (file)
--- a/gas/testsuite/gas/i386/ilp32/x86-64-nops-4.d
+++ b/gas/testsuite/gas/i386/ilp32/x86-64-nops-4.d
@@ -10,29 +10,33 @@ Disassembly of section .text:
  0+ <nop31>:
  [      ]*[a-f0-9]+:    90                      nop
  [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00    data16 data16 data16 data16 data16 nopw %cs:0x0\(%rax,%rax,1\)
-[      ]*[a-f0-9]+:    66 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00    data16 data16 data16 data16 data16 nopw %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%rax,%rax,1\)
  
  0+20 <nop30>:
  [      ]*[a-f0-9]+:    90                      nop
  [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00    data16 data16 data16 data16 data16 nopw %cs:0x0\(%rax,%rax,1\)
-[      ]*[a-f0-9]+:    66 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00    data16 data16 data16 data16 data16 nopw %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%rax,%rax,1\)
  
  0+40 <nop29>:
  [      ]*[a-f0-9]+:    90                      nop
  [      ]*[a-f0-9]+:    90                      nop
  [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00       data16 data16 data16 data16 nopw %cs:0x0\(%rax,%rax,1\)
-[      ]*[a-f0-9]+:    66 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00    data16 data16 data16 data16 data16 nopw %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 0f 1f 84 00 00 00 00 00      nopw   0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%rax,%rax,1\)
  
  0+60 <nop28>:
  [      ]*[a-f0-9]+:    90                      nop
  [      ]*[a-f0-9]+:    90                      nop
  [      ]*[a-f0-9]+:    90                      nop
  [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 66 66 66 2e 0f 1f 84 00 00 00 00 00  data16 data16 data16 nopw %cs:0x0\(%rax,%rax,1\)
-[      ]*[a-f0-9]+:    66 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00    data16 data16 data16 data16 data16 nopw %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    0f 1f 84 00 00 00 00 00         nopl   0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%rax,%rax,1\)
  
  0+80 <nop27>:
  [      ]*[a-f0-9]+:    90                      nop
@@ -40,8 +44,9 @@ Disassembly of section .text:
  [      ]*[a-f0-9]+:    90                      nop
  [      ]*[a-f0-9]+:    90                      nop
  [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 66 66 2e 0f 1f 84 00 00 00 00 00     data16 data16 nopw %cs:0x0\(%rax,%rax,1\)
-[      ]*[a-f0-9]+:    66 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00    data16 data16 data16 data16 data16 nopw %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    0f 1f 80 00 00 00 00    nopl   0x0\(%rax\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%rax,%rax,1\)
  
  0+a0 <nop26>:
  [      ]*[a-f0-9]+:    90                      nop
@@ -50,8 +55,9 @@ Disassembly of section .text:
  [      ]*[a-f0-9]+:    90                      nop
  [      ]*[a-f0-9]+:    90                      nop
  [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
-[      ]*[a-f0-9]+:    66 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00    data16 data16 data16 data16 data16 nopw %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 0f 1f 44 00 00       nopw   0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%rax,%rax,1\)
  
  0+c0 <nop25>:
  [      ]*[a-f0-9]+:    90                      nop
@@ -61,8 +67,9 @@ Disassembly of section .text:
  [      ]*[a-f0-9]+:    90                      nop
  [      ]*[a-f0-9]+:    90                      nop
  [      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    0f 1f 44 00 00          nopl   0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%rax,%rax,1\)
  [      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%rax,%rax,1\)
-[      ]*[a-f0-9]+:    66 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00    data16 data16 data16 data16 data16 nopw %cs:0x0\(%rax,%rax,1\)
  
  0+e0 <nop24>:
  [      ]*[a-f0-9]+:    90                      nop
@@ -73,8 +80,9 @@ Disassembly of section .text:
  [      ]*[a-f0-9]+:    90                      nop
  [      ]*[a-f0-9]+:    90                      nop
  [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 0f 1f 84 00 00 00 00 00      nopw   0x0\(%rax,%rax,1\)
-[      ]*[a-f0-9]+:    66 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00    data16 data16 data16 data16 data16 nopw %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    0f 1f 40 00             nopl   0x0\(%rax\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%rax,%rax,1\)
  
  0+100 <nop23>:
  [      ]*[a-f0-9]+:    90                      nop
@@ -86,8 +94,9 @@ Disassembly of section .text:
  [      ]*[a-f0-9]+:    90                      nop
  [      ]*[a-f0-9]+:    90                      nop
  [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    0f 1f 84 00 00 00 00 00         nopl   0x0\(%rax,%rax,1\)
-[      ]*[a-f0-9]+:    66 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00    data16 data16 data16 data16 data16 nopw %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    0f 1f 00                nopl   \(%rax\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%rax,%rax,1\)
  
  0+120 <nop22>:
  [      ]*[a-f0-9]+:    90                      nop
@@ -100,8 +109,9 @@ Disassembly of section .text:
  [      ]*[a-f0-9]+:    90                      nop
  [      ]*[a-f0-9]+:    90                      nop
  [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    0f 1f 80 00 00 00 00    nopl   0x0\(%rax\)
-[      ]*[a-f0-9]+:    66 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00    data16 data16 data16 data16 data16 nopw %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 90                   xchg   %ax,%ax
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%rax,%rax,1\)
  
  0+140 <nop21>:
  [      ]*[a-f0-9]+:    90                      nop
@@ -115,8 +125,9 @@ Disassembly of section .text:
  [      ]*[a-f0-9]+:    90                      nop
  [      ]*[a-f0-9]+:    90                      nop
  [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 0f 1f 44 00 00       nopw   0x0\(%rax,%rax,1\)
-[      ]*[a-f0-9]+:    66 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00    data16 data16 data16 data16 data16 nopw %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%rax,%rax,1\)
  
  0+160 <nop20>:
  [      ]*[a-f0-9]+:    90                      nop
@@ -131,8 +142,8 @@ Disassembly of section .text:
  [      ]*[a-f0-9]+:    90                      nop
  [      ]*[a-f0-9]+:    90                      nop
  [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    0f 1f 44 00 00          nopl   0x0\(%rax,%rax,1\)
-[      ]*[a-f0-9]+:    66 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00    data16 data16 data16 data16 data16 nopw %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%rax,%rax,1\)
  
  0+180 <nop19>:
  [      ]*[a-f0-9]+:    90                      nop
@@ -148,8 +159,8 @@ Disassembly of section .text:
  [      ]*[a-f0-9]+:    90                      nop
  [      ]*[a-f0-9]+:    90                      nop
  [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    0f 1f 40 00             nopl   0x0\(%rax\)
-[      ]*[a-f0-9]+:    66 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00    data16 data16 data16 data16 data16 nopw %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 0f 1f 84 00 00 00 00 00      nopw   0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%rax,%rax,1\)
  
  0+1a0 <nop18>:
  [      ]*[a-f0-9]+:    90                      nop
@@ -166,8 +177,8 @@ Disassembly of section .text:
  [      ]*[a-f0-9]+:    90                      nop
  [      ]*[a-f0-9]+:    90                      nop
  [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    0f 1f 00                nopl   \(%rax\)
-[      ]*[a-f0-9]+:    66 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00    data16 data16 data16 data16 data16 nopw %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    0f 1f 84 00 00 00 00 00         nopl   0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%rax,%rax,1\)
  
  0+1c0 <nop17>:
  [      ]*[a-f0-9]+:    90                      nop
@@ -185,8 +196,8 @@ Disassembly of section .text:
  [      ]*[a-f0-9]+:    90                      nop
  [      ]*[a-f0-9]+:    90                      nop
  [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 90                   xchg   %ax,%ax
-[      ]*[a-f0-9]+:    66 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00    data16 data16 data16 data16 data16 nopw %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    0f 1f 80 00 00 00 00    nopl   0x0\(%rax\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%rax,%rax,1\)
  
  0+1e0 <nop16>:
  [      ]*[a-f0-9]+:    90                      nop
@@ -205,6 +216,6 @@ Disassembly of section .text:
  [      ]*[a-f0-9]+:    90                      nop
  [      ]*[a-f0-9]+:    90                      nop
  [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00    data16 data16 data16 data16 data16 nopw %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 0f 1f 44 00 00       nopw   0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%rax,%rax,1\)
  #pass
diff --git a/gas/testsuite/gas/i386/ilp32/x86-64-nops-5-k8.d b/gas/testsuite/gas/i386/ilp32/x86-64-nops-5-k8.d

index 9044e9998a4ac4ecf879f221306b886dd6bd9b9a..f77bdcc14250aa314ef1b51c24d9dcb13c543d1f 100644 (file)
--- a/gas/testsuite/gas/i386/ilp32/x86-64-nops-5-k8.d
+++ b/gas/testsuite/gas/i386/ilp32/x86-64-nops-5-k8.d
@@ -29,19 +29,23 @@ Disassembly of section .text:
  
  0+40 <pentium4>:
  [      ]*[a-f0-9]+:    0f be f0                movsbl %al,%esi
-[      ]*[a-f0-9]+:    66 66 66 66 2e 0f 1f 84 00 00 00 00 00  data16 data16 data16 nopw %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    0f 1f 00                nopl   \(%rax\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%rax,%rax,1\)
  
  0+50 <nocona>:
  [      ]*[a-f0-9]+:    0f be f0                movsbl %al,%esi
-[      ]*[a-f0-9]+:    66 66 66 66 2e 0f 1f 84 00 00 00 00 00  data16 data16 data16 nopw %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    0f 1f 00                nopl   \(%rax\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%rax,%rax,1\)
  
  0+60 <core>:
  [      ]*[a-f0-9]+:    0f be f0                movsbl %al,%esi
-[      ]*[a-f0-9]+:    66 66 66 66 2e 0f 1f 84 00 00 00 00 00  data16 data16 data16 nopw %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    0f 1f 00                nopl   \(%rax\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%rax,%rax,1\)
  
  0+70 <core2>:
  [      ]*[a-f0-9]+:    0f be f0                movsbl %al,%esi
-[      ]*[a-f0-9]+:    66 66 66 66 2e 0f 1f 84 00 00 00 00 00  data16 data16 data16 nopw %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    0f 1f 00                nopl   \(%rax\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%rax,%rax,1\)
  
  0+80 <k6>:
  [      ]*[a-f0-9]+:    0f be f0                movsbl %al,%esi
@@ -50,13 +54,13 @@ Disassembly of section .text:
  
  0+90 <athlon>:
  [      ]*[a-f0-9]+:    0f be f0                movsbl %al,%esi
-[      ]*[a-f0-9]+:    66 0f 1f 44 00 00       nopw   0x0\(%rax,%rax,1\)
-[      ]*[a-f0-9]+:    0f 1f 80 00 00 00 00    nopl   0x0\(%rax\)
+[      ]*[a-f0-9]+:    0f 1f 00                nopl   \(%rax\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%rax,%rax,1\)
  
  0+a0 <k8>:
  [      ]*[a-f0-9]+:    0f be f0                movsbl %al,%esi
-[      ]*[a-f0-9]+:    66 0f 1f 44 00 00       nopw   0x0\(%rax,%rax,1\)
-[      ]*[a-f0-9]+:    0f 1f 80 00 00 00 00    nopl   0x0\(%rax\)
+[      ]*[a-f0-9]+:    0f 1f 00                nopl   \(%rax\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%rax,%rax,1\)
  
  0+b0 <generic32>:
  [      ]*[a-f0-9]+:    0f be f0                movsbl %al,%esi
@@ -65,10 +69,11 @@ Disassembly of section .text:
  
  0+c0 <generic64>:
  [      ]*[a-f0-9]+:    0f be f0                movsbl %al,%esi
-[      ]*[a-f0-9]+:    66 66 66 66 2e 0f 1f 84 00 00 00 00 00  data16 data16 data16 nopw %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    0f 1f 00                nopl   \(%rax\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%rax,%rax,1\)
  
  0+d0 <amdfam10>:
  [      ]*[a-f0-9]+:    0f be f0                movsbl %al,%esi
-[      ]*[a-f0-9]+:    66 0f 1f 44 00 00       nopw   0x0\(%rax,%rax,1\)
-[      ]*[a-f0-9]+:    0f 1f 80 00 00 00 00    nopl   0x0\(%rax\)
+[      ]*[a-f0-9]+:    0f 1f 00                nopl   \(%rax\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%rax,%rax,1\)
  #pass
diff --git a/gas/testsuite/gas/i386/ilp32/x86-64-nops-5.d b/gas/testsuite/gas/i386/ilp32/x86-64-nops-5.d

index d1ec2c54a95640366feca06614d26e6b0a040659..65537b4071734bbc3049ef7c9dbff952636c2869 100644 (file)
--- a/gas/testsuite/gas/i386/ilp32/x86-64-nops-5.d
+++ b/gas/testsuite/gas/i386/ilp32/x86-64-nops-5.d
@@ -28,19 +28,23 @@ Disassembly of section .text:
  
  0+40 <pentium4>:
  [      ]*[a-f0-9]+:    0f be f0                movsbl %al,%esi
-[      ]*[a-f0-9]+:    66 66 66 66 2e 0f 1f 84 00 00 00 00 00  data16 data16 data16 nopw %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    0f 1f 00                nopl   \(%rax\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%rax,%rax,1\)
  
  0+50 <nocona>:
  [      ]*[a-f0-9]+:    0f be f0                movsbl %al,%esi
-[      ]*[a-f0-9]+:    66 66 66 66 2e 0f 1f 84 00 00 00 00 00  data16 data16 data16 nopw %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    0f 1f 00                nopl   \(%rax\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%rax,%rax,1\)
  
  0+60 <core>:
  [      ]*[a-f0-9]+:    0f be f0                movsbl %al,%esi
-[      ]*[a-f0-9]+:    66 66 66 66 2e 0f 1f 84 00 00 00 00 00  data16 data16 data16 nopw %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    0f 1f 00                nopl   \(%rax\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%rax,%rax,1\)
  
  0+70 <core2>:
  [      ]*[a-f0-9]+:    0f be f0                movsbl %al,%esi
-[      ]*[a-f0-9]+:    66 66 66 66 2e 0f 1f 84 00 00 00 00 00  data16 data16 data16 nopw %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    0f 1f 00                nopl   \(%rax\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%rax,%rax,1\)
  
  0+80 <k6>:
  [      ]*[a-f0-9]+:    0f be f0                movsbl %al,%esi
@@ -49,13 +53,13 @@ Disassembly of section .text:
  
  0+90 <athlon>:
  [      ]*[a-f0-9]+:    0f be f0                movsbl %al,%esi
-[      ]*[a-f0-9]+:    66 0f 1f 44 00 00       nopw   0x0\(%rax,%rax,1\)
-[      ]*[a-f0-9]+:    0f 1f 80 00 00 00 00    nopl   0x0\(%rax\)
+[      ]*[a-f0-9]+:    0f 1f 00                nopl   \(%rax\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%rax,%rax,1\)
  
  0+a0 <k8>:
  [      ]*[a-f0-9]+:    0f be f0                movsbl %al,%esi
-[      ]*[a-f0-9]+:    66 0f 1f 44 00 00       nopw   0x0\(%rax,%rax,1\)
-[      ]*[a-f0-9]+:    0f 1f 80 00 00 00 00    nopl   0x0\(%rax\)
+[      ]*[a-f0-9]+:    0f 1f 00                nopl   \(%rax\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%rax,%rax,1\)
  
  0+b0 <generic32>:
  [      ]*[a-f0-9]+:    0f be f0                movsbl %al,%esi
@@ -64,10 +68,11 @@ Disassembly of section .text:
  
  0+c0 <generic64>:
  [      ]*[a-f0-9]+:    0f be f0                movsbl %al,%esi
-[      ]*[a-f0-9]+:    66 66 66 66 2e 0f 1f 84 00 00 00 00 00  data16 data16 data16 nopw %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    0f 1f 00                nopl   \(%rax\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%rax,%rax,1\)
  
  0+d0 <amdfam10>:
  [      ]*[a-f0-9]+:    0f be f0                movsbl %al,%esi
-[      ]*[a-f0-9]+:    66 0f 1f 44 00 00       nopw   0x0\(%rax,%rax,1\)
-[      ]*[a-f0-9]+:    0f 1f 80 00 00 00 00    nopl   0x0\(%rax\)
+[      ]*[a-f0-9]+:    0f 1f 00                nopl   \(%rax\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%rax,%rax,1\)
  #pass
diff --git a/gas/testsuite/gas/i386/nops-1-bdver1.d b/gas/testsuite/gas/i386/nops-1-bdver1.d

deleted file mode 100644 (file)

index 32c9cef..0000000
--- a/gas/testsuite/gas/i386/nops-1-bdver1.d
+++ /dev/null
@@ -1,162 +0,0 @@
-#as: -mtune=bdver1
-#source: nops-1.s
-#objdump: -drw
-#name: i386 -mtune=bdver1 nops 1
-
-.*: +file format .*
-
-
-Disassembly of section .text:
-
-0+ <nop15>:
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    0f 1f 80 00 00 00 00    nopl   0x0\(%eax\)
-[      ]*[a-f0-9]+:    0f 1f 84 00 00 00 00 00         nopl   0x0\(%eax,%eax,1\)
-
-0+10 <nop14>:
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    0f 1f 80 00 00 00 00    nopl   0x0\(%eax\)
-[      ]*[a-f0-9]+:    0f 1f 80 00 00 00 00    nopl   0x0\(%eax\)
-
-0+20 <nop13>:
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 0f 1f 44 00 00       nopw   0x0\(%eax,%eax,1\)
-[      ]*[a-f0-9]+:    0f 1f 80 00 00 00 00    nopl   0x0\(%eax\)
-
-0+30 <nop12>:
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 0f 1f 44 00 00       nopw   0x0\(%eax,%eax,1\)
-[      ]*[a-f0-9]+:    66 0f 1f 44 00 00       nopw   0x0\(%eax,%eax,1\)
-
-0+40 <nop11>:
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    0f 1f 44 00 00          nopl   0x0\(%eax,%eax,1\)
-[      ]*[a-f0-9]+:    66 0f 1f 44 00 00       nopw   0x0\(%eax,%eax,1\)
-
-0+50 <nop10>:
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%eax,%eax,1\)
-
-0+60 <nop9>:
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 0f 1f 84 00 00 00 00 00      nopw   0x0\(%eax,%eax,1\)
-
-0+70 <nop8>:
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    0f 1f 84 00 00 00 00 00         nopl   0x0\(%eax,%eax,1\)
-
-0+80 <nop7>:
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    0f 1f 80 00 00 00 00    nopl   0x0\(%eax\)
-
-0+90 <nop6>:
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 0f 1f 44 00 00       nopw   0x0\(%eax,%eax,1\)
-
-0+a0 <nop5>:
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    0f 1f 44 00 00          nopl   0x0\(%eax,%eax,1\)
-
-0+b0 <nop4>:
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    0f 1f 40 00             nopl   0x0\(%eax\)
-
-0+c0 <nop3>:
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    0f 1f 00                nopl   \(%eax\)
-
-0+d0 <nop2>:
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 90                   xchg   %ax,%ax
-#pass
diff --git a/gas/testsuite/gas/i386/nops-1-bdver2.d b/gas/testsuite/gas/i386/nops-1-bdver2.d

deleted file mode 100644 (file)

index d33d6b7..0000000
--- a/gas/testsuite/gas/i386/nops-1-bdver2.d
+++ /dev/null
@@ -1,162 +0,0 @@
-#as: -mtune=bdver2
-#source: nops-1.s
-#objdump: -drw
-#name: i386 -mtune=bdver2 nops 1
-
-.*: +file format .*
-
-
-Disassembly of section .text:
-
-0+ <nop15>:
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    0f 1f 80 00 00 00 00    nopl   0x0\(%eax\)
-[      ]*[a-f0-9]+:    0f 1f 84 00 00 00 00 00         nopl   0x0\(%eax,%eax,1\)
-
-0+10 <nop14>:
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    0f 1f 80 00 00 00 00    nopl   0x0\(%eax\)
-[      ]*[a-f0-9]+:    0f 1f 80 00 00 00 00    nopl   0x0\(%eax\)
-
-0+20 <nop13>:
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 0f 1f 44 00 00       nopw   0x0\(%eax,%eax,1\)
-[      ]*[a-f0-9]+:    0f 1f 80 00 00 00 00    nopl   0x0\(%eax\)
-
-0+30 <nop12>:
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 0f 1f 44 00 00       nopw   0x0\(%eax,%eax,1\)
-[      ]*[a-f0-9]+:    66 0f 1f 44 00 00       nopw   0x0\(%eax,%eax,1\)
-
-0+40 <nop11>:
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    0f 1f 44 00 00          nopl   0x0\(%eax,%eax,1\)
-[      ]*[a-f0-9]+:    66 0f 1f 44 00 00       nopw   0x0\(%eax,%eax,1\)
-
-0+50 <nop10>:
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%eax,%eax,1\)
-
-0+60 <nop9>:
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 0f 1f 84 00 00 00 00 00      nopw   0x0\(%eax,%eax,1\)
-
-0+70 <nop8>:
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    0f 1f 84 00 00 00 00 00         nopl   0x0\(%eax,%eax,1\)
-
-0+80 <nop7>:
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    0f 1f 80 00 00 00 00    nopl   0x0\(%eax\)
-
-0+90 <nop6>:
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 0f 1f 44 00 00       nopw   0x0\(%eax,%eax,1\)
-
-0+a0 <nop5>:
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    0f 1f 44 00 00          nopl   0x0\(%eax,%eax,1\)
-
-0+b0 <nop4>:
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    0f 1f 40 00             nopl   0x0\(%eax\)
-
-0+c0 <nop3>:
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    0f 1f 00                nopl   \(%eax\)
-
-0+d0 <nop2>:
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 90                   xchg   %ax,%ax
-#pass
diff --git a/gas/testsuite/gas/i386/nops-1-bdver3.d b/gas/testsuite/gas/i386/nops-1-bdver3.d

deleted file mode 100644 (file)

index 1ed927f..0000000
--- a/gas/testsuite/gas/i386/nops-1-bdver3.d
+++ /dev/null
@@ -1,162 +0,0 @@
-#as: -mtune=bdver3
-#source: nops-1.s
-#objdump: -drw
-#name: i386 -mtune=bdver3 nops 1
-
-.*: +file format .*
-
-
-Disassembly of section .text:
-
-0+ <nop15>:
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    0f 1f 80 00 00 00 00    nopl   0x0\(%eax\)
-[      ]*[a-f0-9]+:    0f 1f 84 00 00 00 00 00         nopl   0x0\(%eax,%eax,1\)
-
-0+10 <nop14>:
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    0f 1f 80 00 00 00 00    nopl   0x0\(%eax\)
-[      ]*[a-f0-9]+:    0f 1f 80 00 00 00 00    nopl   0x0\(%eax\)
-
-0+20 <nop13>:
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 0f 1f 44 00 00       nopw   0x0\(%eax,%eax,1\)
-[      ]*[a-f0-9]+:    0f 1f 80 00 00 00 00    nopl   0x0\(%eax\)
-
-0+30 <nop12>:
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 0f 1f 44 00 00       nopw   0x0\(%eax,%eax,1\)
-[      ]*[a-f0-9]+:    66 0f 1f 44 00 00       nopw   0x0\(%eax,%eax,1\)
-
-0+40 <nop11>:
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    0f 1f 44 00 00          nopl   0x0\(%eax,%eax,1\)
-[      ]*[a-f0-9]+:    66 0f 1f 44 00 00       nopw   0x0\(%eax,%eax,1\)
-
-0+50 <nop10>:
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%eax,%eax,1\)
-
-0+60 <nop9>:
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 0f 1f 84 00 00 00 00 00      nopw   0x0\(%eax,%eax,1\)
-
-0+70 <nop8>:
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    0f 1f 84 00 00 00 00 00         nopl   0x0\(%eax,%eax,1\)
-
-0+80 <nop7>:
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    0f 1f 80 00 00 00 00    nopl   0x0\(%eax\)
-
-0+90 <nop6>:
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 0f 1f 44 00 00       nopw   0x0\(%eax,%eax,1\)
-
-0+a0 <nop5>:
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    0f 1f 44 00 00          nopl   0x0\(%eax,%eax,1\)
-
-0+b0 <nop4>:
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    0f 1f 40 00             nopl   0x0\(%eax\)
-
-0+c0 <nop3>:
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    0f 1f 00                nopl   \(%eax\)
-
-0+d0 <nop2>:
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 90                   xchg   %ax,%ax
-#pass
diff --git a/gas/testsuite/gas/i386/nops-1-bdver4.d b/gas/testsuite/gas/i386/nops-1-bdver4.d

deleted file mode 100644 (file)

index ad3bf98..0000000
--- a/gas/testsuite/gas/i386/nops-1-bdver4.d
+++ /dev/null
@@ -1,162 +0,0 @@
-#as: -mtune=bdver4
-#source: nops-1.s
-#objdump: -drw
-#name: i386 -mtune=bdver4 nops 1
-
-.*: +file format .*
-
-
-Disassembly of section .text:
-
-0+ <nop15>:
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    0f 1f 80 00 00 00 00    nopl   0x0\(%eax\)
-[      ]*[a-f0-9]+:    0f 1f 84 00 00 00 00 00         nopl   0x0\(%eax,%eax,1\)
-
-0+10 <nop14>:
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    0f 1f 80 00 00 00 00    nopl   0x0\(%eax\)
-[      ]*[a-f0-9]+:    0f 1f 80 00 00 00 00    nopl   0x0\(%eax\)
-
-0+20 <nop13>:
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 0f 1f 44 00 00       nopw   0x0\(%eax,%eax,1\)
-[      ]*[a-f0-9]+:    0f 1f 80 00 00 00 00    nopl   0x0\(%eax\)
-
-0+30 <nop12>:
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 0f 1f 44 00 00       nopw   0x0\(%eax,%eax,1\)
-[      ]*[a-f0-9]+:    66 0f 1f 44 00 00       nopw   0x0\(%eax,%eax,1\)
-
-0+40 <nop11>:
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    0f 1f 44 00 00          nopl   0x0\(%eax,%eax,1\)
-[      ]*[a-f0-9]+:    66 0f 1f 44 00 00       nopw   0x0\(%eax,%eax,1\)
-
-0+50 <nop10>:
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%eax,%eax,1\)
-
-0+60 <nop9>:
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 0f 1f 84 00 00 00 00 00      nopw   0x0\(%eax,%eax,1\)
-
-0+70 <nop8>:
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    0f 1f 84 00 00 00 00 00         nopl   0x0\(%eax,%eax,1\)
-
-0+80 <nop7>:
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    0f 1f 80 00 00 00 00    nopl   0x0\(%eax\)
-
-0+90 <nop6>:
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 0f 1f 44 00 00       nopw   0x0\(%eax,%eax,1\)
-
-0+a0 <nop5>:
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    0f 1f 44 00 00          nopl   0x0\(%eax,%eax,1\)
-
-0+b0 <nop4>:
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    0f 1f 40 00             nopl   0x0\(%eax\)
-
-0+c0 <nop3>:
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    0f 1f 00                nopl   \(%eax\)
-
-0+d0 <nop2>:
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 90                   xchg   %ax,%ax
-#pass
diff --git a/gas/testsuite/gas/i386/nops-1-btver1.d b/gas/testsuite/gas/i386/nops-1-btver1.d

deleted file mode 100644 (file)

index 4bc5fc5..0000000
--- a/gas/testsuite/gas/i386/nops-1-btver1.d
+++ /dev/null
@@ -1,162 +0,0 @@
-#as: -mtune=btver1
-#source: nops-1.s
-#objdump: -drw
-#name: i386 -mtune=btver1 nops 1
-
-.*: +file format .*
-
-
-Disassembly of section .text:
-
-0+ <nop15>:
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    0f 1f 80 00 00 00 00    nopl   0x0\(%eax\)
-[      ]*[a-f0-9]+:    0f 1f 84 00 00 00 00 00         nopl   0x0\(%eax,%eax,1\)
-
-0+10 <nop14>:
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    0f 1f 80 00 00 00 00    nopl   0x0\(%eax\)
-[      ]*[a-f0-9]+:    0f 1f 80 00 00 00 00    nopl   0x0\(%eax\)
-
-0+20 <nop13>:
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 0f 1f 44 00 00       nopw   0x0\(%eax,%eax,1\)
-[      ]*[a-f0-9]+:    0f 1f 80 00 00 00 00    nopl   0x0\(%eax\)
-
-0+30 <nop12>:
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 0f 1f 44 00 00       nopw   0x0\(%eax,%eax,1\)
-[      ]*[a-f0-9]+:    66 0f 1f 44 00 00       nopw   0x0\(%eax,%eax,1\)
-
-0+40 <nop11>:
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    0f 1f 44 00 00          nopl   0x0\(%eax,%eax,1\)
-[      ]*[a-f0-9]+:    66 0f 1f 44 00 00       nopw   0x0\(%eax,%eax,1\)
-
-0+50 <nop10>:
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%eax,%eax,1\)
-
-0+60 <nop9>:
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 0f 1f 84 00 00 00 00 00      nopw   0x0\(%eax,%eax,1\)
-
-0+70 <nop8>:
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    0f 1f 84 00 00 00 00 00         nopl   0x0\(%eax,%eax,1\)
-
-0+80 <nop7>:
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    0f 1f 80 00 00 00 00    nopl   0x0\(%eax\)
-
-0+90 <nop6>:
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 0f 1f 44 00 00       nopw   0x0\(%eax,%eax,1\)
-
-0+a0 <nop5>:
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    0f 1f 44 00 00          nopl   0x0\(%eax,%eax,1\)
-
-0+b0 <nop4>:
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    0f 1f 40 00             nopl   0x0\(%eax\)
-
-0+c0 <nop3>:
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    0f 1f 00                nopl   \(%eax\)
-
-0+d0 <nop2>:
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 90                   xchg   %ax,%ax
-#pass
diff --git a/gas/testsuite/gas/i386/nops-1-btver2.d b/gas/testsuite/gas/i386/nops-1-btver2.d

deleted file mode 100644 (file)

index 7e88b61..0000000
--- a/gas/testsuite/gas/i386/nops-1-btver2.d
+++ /dev/null
@@ -1,162 +0,0 @@
-#as: -mtune=btver2
-#source: nops-1.s
-#objdump: -drw
-#name: i386 -mtune=btver2 nops 1
-
-.*: +file format .*
-
-
-Disassembly of section .text:
-
-0+ <nop15>:
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    0f 1f 80 00 00 00 00    nopl   0x0\(%eax\)
-[      ]*[a-f0-9]+:    0f 1f 84 00 00 00 00 00         nopl   0x0\(%eax,%eax,1\)
-
-0+10 <nop14>:
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    0f 1f 80 00 00 00 00    nopl   0x0\(%eax\)
-[      ]*[a-f0-9]+:    0f 1f 80 00 00 00 00    nopl   0x0\(%eax\)
-
-0+20 <nop13>:
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 0f 1f 44 00 00       nopw   0x0\(%eax,%eax,1\)
-[      ]*[a-f0-9]+:    0f 1f 80 00 00 00 00    nopl   0x0\(%eax\)
-
-0+30 <nop12>:
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 0f 1f 44 00 00       nopw   0x0\(%eax,%eax,1\)
-[      ]*[a-f0-9]+:    66 0f 1f 44 00 00       nopw   0x0\(%eax,%eax,1\)
-
-0+40 <nop11>:
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    0f 1f 44 00 00          nopl   0x0\(%eax,%eax,1\)
-[      ]*[a-f0-9]+:    66 0f 1f 44 00 00       nopw   0x0\(%eax,%eax,1\)
-
-0+50 <nop10>:
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%eax,%eax,1\)
-
-0+60 <nop9>:
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 0f 1f 84 00 00 00 00 00      nopw   0x0\(%eax,%eax,1\)
-
-0+70 <nop8>:
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    0f 1f 84 00 00 00 00 00         nopl   0x0\(%eax,%eax,1\)
-
-0+80 <nop7>:
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    0f 1f 80 00 00 00 00    nopl   0x0\(%eax\)
-
-0+90 <nop6>:
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 0f 1f 44 00 00       nopw   0x0\(%eax,%eax,1\)
-
-0+a0 <nop5>:
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    0f 1f 44 00 00          nopl   0x0\(%eax,%eax,1\)
-
-0+b0 <nop4>:
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    0f 1f 40 00             nopl   0x0\(%eax\)
-
-0+c0 <nop3>:
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    0f 1f 00                nopl   \(%eax\)
-
-0+d0 <nop2>:
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 90                   xchg   %ax,%ax
-#pass
diff --git a/gas/testsuite/gas/i386/nops-1-core2.d b/gas/testsuite/gas/i386/nops-1-core2.d

index f9e2d43d84869e2049470aade205803d032f0f43..a5f0ba0fb4128ac301673bea73991f236c8781c8 100644 (file)
--- a/gas/testsuite/gas/i386/nops-1-core2.d
+++ b/gas/testsuite/gas/i386/nops-1-core2.d
@@ -10,25 +10,29 @@ Disassembly of section .text:
  
  0+ <nop15>:
  [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00    data16 data16 data16 data16 data16 nopw %cs:0x0\(%eax,%eax,1\)
+[      ]*[a-f0-9]+:    0f 1f 44 00 00          nopl   0x0\(%eax,%eax,1\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%eax,%eax,1\)
  
  0+10 <nop14>:
  [      ]*[a-f0-9]+:    90                      nop
  [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00       data16 data16 data16 data16 nopw %cs:0x0\(%eax,%eax,1\)
+[      ]*[a-f0-9]+:    0f 1f 40 00             nopl   0x0\(%eax\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%eax,%eax,1\)
  
  0+20 <nop13>:
  [      ]*[a-f0-9]+:    90                      nop
  [      ]*[a-f0-9]+:    90                      nop
  [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 66 66 66 2e 0f 1f 84 00 00 00 00 00  data16 data16 data16 nopw %cs:0x0\(%eax,%eax,1\)
+[      ]*[a-f0-9]+:    0f 1f 00                nopl   \(%eax\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%eax,%eax,1\)
  
  0+30 <nop12>:
  [      ]*[a-f0-9]+:    90                      nop
  [      ]*[a-f0-9]+:    90                      nop
  [      ]*[a-f0-9]+:    90                      nop
  [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 66 66 2e 0f 1f 84 00 00 00 00 00     data16 data16 nopw %cs:0x0\(%eax,%eax,1\)
+[      ]*[a-f0-9]+:    66 90                   xchg   %ax,%ax
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%eax,%eax,1\)
  
  0+40 <nop11>:
  [      ]*[a-f0-9]+:    90                      nop
@@ -36,7 +40,8 @@ Disassembly of section .text:
  [      ]*[a-f0-9]+:    90                      nop
  [      ]*[a-f0-9]+:    90                      nop
  [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%eax,%eax,1\)
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%eax,%eax,1\)
  
  0+50 <nop10>:
  [      ]*[a-f0-9]+:    90                      nop
diff --git a/gas/testsuite/gas/i386/nops-1-k8.d b/gas/testsuite/gas/i386/nops-1-k8.d

index 1a730520822b0ff9725b932e2698c52bafd9b8ac..b2f726059b27d1ec5e3daf18eeae94d9e90f5a97 100644 (file)
--- a/gas/testsuite/gas/i386/nops-1-k8.d
+++ b/gas/testsuite/gas/i386/nops-1-k8.d
@@ -8,154 +8,154 @@
  Disassembly of section .text:
  
  0+ <nop15>:
-[       ]*0:[   ]+90[   ]+nop[         ]*
-[       ]*1:[   ]+0f 1f 80 00 00 00 00[         ]+nopl[        ]+0x0\(%eax\)
-[       ]*8:[   ]+0f 1f 84 00 00 00 00 00[      ]+nopl[        ]+0x0\(%eax,%eax,1\)
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    0f 1f 44 00 00          nopl   0x0\(%eax,%eax,1\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%eax,%eax,1\)
  
  0+10 <nop14>:
-[       ]*10:[  ]+90[   ]+nop[         ]*
-[       ]*11:[  ]+90[   ]+nop[         ]*
-[       ]*12:[  ]+0f 1f 80 00 00 00 00[         ]+nopl[        ]+0x0\(%eax\)
-[       ]*19:[  ]+0f 1f 80 00 00 00 00[         ]+nopl[        ]+0x0\(%eax\)
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    0f 1f 40 00             nopl   0x0\(%eax\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%eax,%eax,1\)
  
  0+20 <nop13>:
-[       ]*20:[  ]+90[   ]+nop[         ]*
-[       ]*21:[  ]+90[   ]+nop[         ]*
-[       ]*22:[  ]+90[   ]+nop[         ]*
-[       ]*23:[  ]+66 0f 1f 44 00 00[    ]+nopw[        ]+0x0\(%eax,%eax,1\)
-[       ]*29:[  ]+0f 1f 80 00 00 00 00[         ]+nopl[        ]+0x0\(%eax\)
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    0f 1f 00                nopl   \(%eax\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%eax,%eax,1\)
  
  0+30 <nop12>:
-[       ]*30:[  ]+90[   ]+nop[         ]*
-[       ]*31:[  ]+90[   ]+nop[         ]*
-[       ]*32:[  ]+90[   ]+nop[         ]*
-[       ]*33:[  ]+90[   ]+nop[         ]*
-[       ]*34:[  ]+66 0f 1f 44 00 00[    ]+nopw[        ]+0x0\(%eax,%eax,1\)
-[       ]*3a:[  ]+66 0f 1f 44 00 00[    ]+nopw[        ]+0x0\(%eax,%eax,1\)
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    66 90                   xchg   %ax,%ax
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%eax,%eax,1\)
  
  0+40 <nop11>:
-[       ]*40:[  ]+90[   ]+nop[         ]*
-[       ]*41:[  ]+90[   ]+nop[         ]*
-[       ]*42:[  ]+90[   ]+nop[         ]*
-[       ]*43:[  ]+90[   ]+nop[         ]*
-[       ]*44:[  ]+90[   ]+nop[         ]*
-[       ]*45:[  ]+0f 1f 44 00 00[       ]+nopl[        ]+0x0\(%eax,%eax,1\)
-[       ]*4a:[  ]+66 0f 1f 44 00 00[    ]+nopw[        ]+0x0\(%eax,%eax,1\)
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%eax,%eax,1\)
  
  0+50 <nop10>:
-[       ]*50:[  ]+90[   ]+nop[         ]*
-[       ]*51:[  ]+90[   ]+nop[         ]*
-[       ]*52:[  ]+90[   ]+nop[         ]*
-[       ]*53:[  ]+90[   ]+nop[         ]*
-[       ]*54:[  ]+90[   ]+nop[         ]*
-[       ]*55:[  ]+90[   ]+nop[         ]*
-[       ]*56:[  ]+66 2e 0f 1f 84 00 00 00 00 00[        ]+nopw[        ]+%cs:0x0\(%eax,%eax,1\)
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%eax,%eax,1\)
  
  0+60 <nop9>:
-[       ]*60:[  ]+90[   ]+nop[         ]*
-[       ]*61:[  ]+90[   ]+nop[         ]*
-[       ]*62:[  ]+90[   ]+nop[         ]*
-[       ]*63:[  ]+90[   ]+nop[         ]*
-[       ]*64:[  ]+90[   ]+nop[         ]*
-[       ]*65:[  ]+90[   ]+nop[         ]*
-[       ]*66:[  ]+90[   ]+nop[         ]*
-[       ]*67:[  ]+66 0f 1f 84 00 00 00 00 00[   ]+nopw[        ]+0x0\(%eax,%eax,1\)
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    66 0f 1f 84 00 00 00 00 00      nopw   0x0\(%eax,%eax,1\)
  
  0+70 <nop8>:
-[       ]*70:[  ]+90[   ]+nop[         ]*
-[       ]*71:[  ]+90[   ]+nop[         ]*
-[       ]*72:[  ]+90[   ]+nop[         ]*
-[       ]*73:[  ]+90[   ]+nop[         ]*
-[       ]*74:[  ]+90[   ]+nop[         ]*
-[       ]*75:[  ]+90[   ]+nop[         ]*
-[       ]*76:[  ]+90[   ]+nop[         ]*
-[       ]*77:[  ]+90[   ]+nop[         ]*
-[       ]*78:[  ]+0f 1f 84 00 00 00 00 00[      ]+nopl[        ]+0x0\(%eax,%eax,1\)
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    0f 1f 84 00 00 00 00 00         nopl   0x0\(%eax,%eax,1\)
  
  0+80 <nop7>:
-[       ]*80:[  ]+90[   ]+nop[         ]*
-[       ]*81:[  ]+90[   ]+nop[         ]*
-[       ]*82:[  ]+90[   ]+nop[         ]*
-[       ]*83:[  ]+90[   ]+nop[         ]*
-[       ]*84:[  ]+90[   ]+nop[         ]*
-[       ]*85:[  ]+90[   ]+nop[         ]*
-[       ]*86:[  ]+90[   ]+nop[         ]*
-[       ]*87:[  ]+90[   ]+nop[         ]*
-[       ]*88:[  ]+90[   ]+nop[         ]*
-[       ]*89:[  ]+0f 1f 80 00 00 00 00[         ]+nopl[        ]+0x0\(%eax\)
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    0f 1f 80 00 00 00 00    nopl   0x0\(%eax\)
  
  0+90 <nop6>:
-[       ]*90:[  ]+90[   ]+nop[         ]*
-[       ]*91:[  ]+90[   ]+nop[         ]*
-[       ]*92:[  ]+90[   ]+nop[         ]*
-[       ]*93:[  ]+90[   ]+nop[         ]*
-[       ]*94:[  ]+90[   ]+nop[         ]*
-[       ]*95:[  ]+90[   ]+nop[         ]*
-[       ]*96:[  ]+90[   ]+nop[         ]*
-[       ]*97:[  ]+90[   ]+nop[         ]*
-[       ]*98:[  ]+90[   ]+nop[         ]*
-[       ]*99:[  ]+90[   ]+nop[         ]*
-[       ]*9a:[  ]+66 0f 1f 44 00 00[    ]+nopw[        ]+0x0\(%eax,%eax,1\)
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    66 0f 1f 44 00 00       nopw   0x0\(%eax,%eax,1\)
  
  0+a0 <nop5>:
-[       ]*a0:[  ]+90[   ]+nop[         ]*
-[       ]*a1:[  ]+90[   ]+nop[         ]*
-[       ]*a2:[  ]+90[   ]+nop[         ]*
-[       ]*a3:[  ]+90[   ]+nop[         ]*
-[       ]*a4:[  ]+90[   ]+nop[         ]*
-[       ]*a5:[  ]+90[   ]+nop[         ]*
-[       ]*a6:[  ]+90[   ]+nop[         ]*
-[       ]*a7:[  ]+90[   ]+nop[         ]*
-[       ]*a8:[  ]+90[   ]+nop[         ]*
-[       ]*a9:[  ]+90[   ]+nop[         ]*
-[       ]*aa:[  ]+90[   ]+nop[         ]*
-[       ]*ab:[  ]+0f 1f 44 00 00[       ]+nopl[        ]+0x0\(%eax,%eax,1\)
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    0f 1f 44 00 00          nopl   0x0\(%eax,%eax,1\)
  
  0+b0 <nop4>:
-[       ]*b0:[  ]+90[   ]+nop[         ]*
-[       ]*b1:[  ]+90[   ]+nop[         ]*
-[       ]*b2:[  ]+90[   ]+nop[         ]*
-[       ]*b3:[  ]+90[   ]+nop[         ]*
-[       ]*b4:[  ]+90[   ]+nop[         ]*
-[       ]*b5:[  ]+90[   ]+nop[         ]*
-[       ]*b6:[  ]+90[   ]+nop[         ]*
-[       ]*b7:[  ]+90[   ]+nop[         ]*
-[       ]*b8:[  ]+90[   ]+nop[         ]*
-[       ]*b9:[  ]+90[   ]+nop[         ]*
-[       ]*ba:[  ]+90[   ]+nop[         ]*
-[       ]*bb:[  ]+90[   ]+nop[         ]*
-[       ]*bc:[  ]+0f 1f 40 00[  ]+nopl[        ]+0x0\(%eax\)
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    0f 1f 40 00             nopl   0x0\(%eax\)
  
  0+c0 <nop3>:
-[       ]*c0:[  ]+90[   ]+nop[         ]*
-[       ]*c1:[  ]+90[   ]+nop[         ]*
-[       ]*c2:[  ]+90[   ]+nop[         ]*
-[       ]*c3:[  ]+90[   ]+nop[         ]*
-[       ]*c4:[  ]+90[   ]+nop[         ]*
-[       ]*c5:[  ]+90[   ]+nop[         ]*
-[       ]*c6:[  ]+90[   ]+nop[         ]*
-[       ]*c7:[  ]+90[   ]+nop[         ]*
-[       ]*c8:[  ]+90[   ]+nop[         ]*
-[       ]*c9:[  ]+90[   ]+nop[         ]*
-[       ]*ca:[  ]+90[   ]+nop[         ]*
-[       ]*cb:[  ]+90[   ]+nop[         ]*
-[       ]*cc:[  ]+90[   ]+nop[         ]*
-[       ]*cd:[  ]+0f 1f 00[     ]+nopl[        ]+\(%eax\)
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    0f 1f 00                nopl   \(%eax\)
  
  0+d0 <nop2>:
-[       ]*d0:[  ]+90[   ]+nop[         ]*
-[       ]*d1:[  ]+90[   ]+nop[         ]*
-[       ]*d2:[  ]+90[   ]+nop[         ]*
-[       ]*d3:[  ]+90[   ]+nop[         ]*
-[       ]*d4:[  ]+90[   ]+nop[         ]*
-[       ]*d5:[  ]+90[   ]+nop[         ]*
-[       ]*d6:[  ]+90[   ]+nop[         ]*
-[       ]*d7:[  ]+90[   ]+nop[         ]*
-[       ]*d8:[  ]+90[   ]+nop[         ]*
-[       ]*d9:[  ]+90[   ]+nop[         ]*
-[       ]*da:[  ]+90[   ]+nop[         ]*
-[       ]*db:[  ]+90[   ]+nop[         ]*
-[       ]*dc:[  ]+90[   ]+nop[         ]*
-[       ]*dd:[  ]+90[   ]+nop[         ]*
-[       ]*de:[  ]+66 90[        ]+xchg[        ]+%ax,%ax
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    66 90                   xchg   %ax,%ax
  #pass
diff --git a/gas/testsuite/gas/i386/nops-1-znver1.d b/gas/testsuite/gas/i386/nops-1-znver1.d

deleted file mode 100644 (file)

index 8624573..0000000
--- a/gas/testsuite/gas/i386/nops-1-znver1.d
+++ /dev/null
@@ -1,162 +0,0 @@
-#as: -mtune=znver1
-#source: nops-1.s
-#objdump: -drw
-#name: i386 -mtune=znver1 nops 1
-
-.*: +file format .*
-
-
-Disassembly of section .text:
-
-0+ <nop15>:
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    0f 1f 80 00 00 00 00    nopl   0x0\(%eax\)
-[      ]*[a-f0-9]+:    0f 1f 84 00 00 00 00 00         nopl   0x0\(%eax,%eax,1\)
-
-0+10 <nop14>:
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    0f 1f 80 00 00 00 00    nopl   0x0\(%eax\)
-[      ]*[a-f0-9]+:    0f 1f 80 00 00 00 00    nopl   0x0\(%eax\)
-
-0+20 <nop13>:
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 0f 1f 44 00 00       nopw   0x0\(%eax,%eax,1\)
-[      ]*[a-f0-9]+:    0f 1f 80 00 00 00 00    nopl   0x0\(%eax\)
-
-0+30 <nop12>:
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 0f 1f 44 00 00       nopw   0x0\(%eax,%eax,1\)
-[      ]*[a-f0-9]+:    66 0f 1f 44 00 00       nopw   0x0\(%eax,%eax,1\)
-
-0+40 <nop11>:
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    0f 1f 44 00 00          nopl   0x0\(%eax,%eax,1\)
-[      ]*[a-f0-9]+:    66 0f 1f 44 00 00       nopw   0x0\(%eax,%eax,1\)
-
-0+50 <nop10>:
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%eax,%eax,1\)
-
-0+60 <nop9>:
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 0f 1f 84 00 00 00 00 00      nopw   0x0\(%eax,%eax,1\)
-
-0+70 <nop8>:
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    0f 1f 84 00 00 00 00 00         nopl   0x0\(%eax,%eax,1\)
-
-0+80 <nop7>:
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    0f 1f 80 00 00 00 00    nopl   0x0\(%eax\)
-
-0+90 <nop6>:
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 0f 1f 44 00 00       nopw   0x0\(%eax,%eax,1\)
-
-0+a0 <nop5>:
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    0f 1f 44 00 00          nopl   0x0\(%eax,%eax,1\)
-
-0+b0 <nop4>:
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    0f 1f 40 00             nopl   0x0\(%eax\)
-
-0+c0 <nop3>:
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    0f 1f 00                nopl   \(%eax\)
-
-0+d0 <nop2>:
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 90                   xchg   %ax,%ax
-#pass
diff --git a/gas/testsuite/gas/i386/nops-4a-i686.d b/gas/testsuite/gas/i386/nops-4a-i686.d

index 14d88d4806955e891fb5a404d87f2e1e93987d4f..898139f9a8eef70a9f5f4b5e3fe0f91aa90dbada 100644 (file)
--- a/gas/testsuite/gas/i386/nops-4a-i686.d
+++ b/gas/testsuite/gas/i386/nops-4a-i686.d
@@ -10,29 +10,33 @@ Disassembly of section .text:
  0+ <nop31>:
  [      ]*[a-f0-9]+:    90                      nop
  [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00    data16 data16 data16 data16 data16 nopw %cs:0x0\(%eax,%eax,1\)
-[      ]*[a-f0-9]+:    66 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00    data16 data16 data16 data16 data16 nopw %cs:0x0\(%eax,%eax,1\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%eax,%eax,1\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%eax,%eax,1\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%eax,%eax,1\)
  
  0+20 <nop30>:
  [      ]*[a-f0-9]+:    90                      nop
  [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00    data16 data16 data16 data16 data16 nopw %cs:0x0\(%eax,%eax,1\)
-[      ]*[a-f0-9]+:    66 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00    data16 data16 data16 data16 data16 nopw %cs:0x0\(%eax,%eax,1\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%eax,%eax,1\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%eax,%eax,1\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%eax,%eax,1\)
  
  0+40 <nop29>:
  [      ]*[a-f0-9]+:    90                      nop
  [      ]*[a-f0-9]+:    90                      nop
  [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00       data16 data16 data16 data16 nopw %cs:0x0\(%eax,%eax,1\)
-[      ]*[a-f0-9]+:    66 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00    data16 data16 data16 data16 data16 nopw %cs:0x0\(%eax,%eax,1\)
+[      ]*[a-f0-9]+:    66 0f 1f 84 00 00 00 00 00      nopw   0x0\(%eax,%eax,1\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%eax,%eax,1\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%eax,%eax,1\)
  
  0+60 <nop28>:
  [      ]*[a-f0-9]+:    90                      nop
  [      ]*[a-f0-9]+:    90                      nop
  [      ]*[a-f0-9]+:    90                      nop
  [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 66 66 66 2e 0f 1f 84 00 00 00 00 00  data16 data16 data16 nopw %cs:0x0\(%eax,%eax,1\)
-[      ]*[a-f0-9]+:    66 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00    data16 data16 data16 data16 data16 nopw %cs:0x0\(%eax,%eax,1\)
+[      ]*[a-f0-9]+:    0f 1f 84 00 00 00 00 00         nopl   0x0\(%eax,%eax,1\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%eax,%eax,1\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%eax,%eax,1\)
  
  0+80 <nop27>:
  [      ]*[a-f0-9]+:    90                      nop
@@ -40,8 +44,9 @@ Disassembly of section .text:
  [      ]*[a-f0-9]+:    90                      nop
  [      ]*[a-f0-9]+:    90                      nop
  [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 66 66 2e 0f 1f 84 00 00 00 00 00     data16 data16 nopw %cs:0x0\(%eax,%eax,1\)
-[      ]*[a-f0-9]+:    66 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00    data16 data16 data16 data16 data16 nopw %cs:0x0\(%eax,%eax,1\)
+[      ]*[a-f0-9]+:    0f 1f 80 00 00 00 00    nopl   0x0\(%eax\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%eax,%eax,1\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%eax,%eax,1\)
  
  0+a0 <nop26>:
  [      ]*[a-f0-9]+:    90                      nop
@@ -50,8 +55,9 @@ Disassembly of section .text:
  [      ]*[a-f0-9]+:    90                      nop
  [      ]*[a-f0-9]+:    90                      nop
  [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%eax,%eax,1\)
-[      ]*[a-f0-9]+:    66 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00    data16 data16 data16 data16 data16 nopw %cs:0x0\(%eax,%eax,1\)
+[      ]*[a-f0-9]+:    66 0f 1f 44 00 00       nopw   0x0\(%eax,%eax,1\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%eax,%eax,1\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%eax,%eax,1\)
  
  0+c0 <nop25>:
  [      ]*[a-f0-9]+:    90                      nop
@@ -61,8 +67,9 @@ Disassembly of section .text:
  [      ]*[a-f0-9]+:    90                      nop
  [      ]*[a-f0-9]+:    90                      nop
  [      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    0f 1f 44 00 00          nopl   0x0\(%eax,%eax,1\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%eax,%eax,1\)
  [      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%eax,%eax,1\)
-[      ]*[a-f0-9]+:    66 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00    data16 data16 data16 data16 data16 nopw %cs:0x0\(%eax,%eax,1\)
  
  0+e0 <nop24>:
  [      ]*[a-f0-9]+:    90                      nop
@@ -73,8 +80,9 @@ Disassembly of section .text:
  [      ]*[a-f0-9]+:    90                      nop
  [      ]*[a-f0-9]+:    90                      nop
  [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 0f 1f 84 00 00 00 00 00      nopw   0x0\(%eax,%eax,1\)
-[      ]*[a-f0-9]+:    66 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00    data16 data16 data16 data16 data16 nopw %cs:0x0\(%eax,%eax,1\)
+[      ]*[a-f0-9]+:    0f 1f 40 00             nopl   0x0\(%eax\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%eax,%eax,1\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%eax,%eax,1\)
  
  0+100 <nop23>:
  [      ]*[a-f0-9]+:    90                      nop
@@ -86,8 +94,9 @@ Disassembly of section .text:
  [      ]*[a-f0-9]+:    90                      nop
  [      ]*[a-f0-9]+:    90                      nop
  [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    0f 1f 84 00 00 00 00 00         nopl   0x0\(%eax,%eax,1\)
-[      ]*[a-f0-9]+:    66 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00    data16 data16 data16 data16 data16 nopw %cs:0x0\(%eax,%eax,1\)
+[      ]*[a-f0-9]+:    0f 1f 00                nopl   \(%eax\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%eax,%eax,1\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%eax,%eax,1\)
  
  0+120 <nop22>:
  [      ]*[a-f0-9]+:    90                      nop
@@ -100,8 +109,9 @@ Disassembly of section .text:
  [      ]*[a-f0-9]+:    90                      nop
  [      ]*[a-f0-9]+:    90                      nop
  [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    0f 1f 80 00 00 00 00    nopl   0x0\(%eax\)
-[      ]*[a-f0-9]+:    66 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00    data16 data16 data16 data16 data16 nopw %cs:0x0\(%eax,%eax,1\)
+[      ]*[a-f0-9]+:    66 90                   xchg   %ax,%ax
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%eax,%eax,1\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%eax,%eax,1\)
  
  0+140 <nop21>:
  [      ]*[a-f0-9]+:    90                      nop
@@ -115,8 +125,9 @@ Disassembly of section .text:
  [      ]*[a-f0-9]+:    90                      nop
  [      ]*[a-f0-9]+:    90                      nop
  [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 0f 1f 44 00 00       nopw   0x0\(%eax,%eax,1\)
-[      ]*[a-f0-9]+:    66 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00    data16 data16 data16 data16 data16 nopw %cs:0x0\(%eax,%eax,1\)
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%eax,%eax,1\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%eax,%eax,1\)
  
  0+160 <nop20>:
  [      ]*[a-f0-9]+:    90                      nop
@@ -131,8 +142,8 @@ Disassembly of section .text:
  [      ]*[a-f0-9]+:    90                      nop
  [      ]*[a-f0-9]+:    90                      nop
  [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    0f 1f 44 00 00          nopl   0x0\(%eax,%eax,1\)
-[      ]*[a-f0-9]+:    66 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00    data16 data16 data16 data16 data16 nopw %cs:0x0\(%eax,%eax,1\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%eax,%eax,1\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%eax,%eax,1\)
  
  0+180 <nop19>:
  [      ]*[a-f0-9]+:    90                      nop
@@ -148,8 +159,8 @@ Disassembly of section .text:
  [      ]*[a-f0-9]+:    90                      nop
  [      ]*[a-f0-9]+:    90                      nop
  [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    0f 1f 40 00             nopl   0x0\(%eax\)
-[      ]*[a-f0-9]+:    66 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00    data16 data16 data16 data16 data16 nopw %cs:0x0\(%eax,%eax,1\)
+[      ]*[a-f0-9]+:    66 0f 1f 84 00 00 00 00 00      nopw   0x0\(%eax,%eax,1\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%eax,%eax,1\)
  
  0+1a0 <nop18>:
  [      ]*[a-f0-9]+:    90                      nop
@@ -166,8 +177,8 @@ Disassembly of section .text:
  [      ]*[a-f0-9]+:    90                      nop
  [      ]*[a-f0-9]+:    90                      nop
  [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    0f 1f 00                nopl   \(%eax\)
-[      ]*[a-f0-9]+:    66 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00    data16 data16 data16 data16 data16 nopw %cs:0x0\(%eax,%eax,1\)
+[      ]*[a-f0-9]+:    0f 1f 84 00 00 00 00 00         nopl   0x0\(%eax,%eax,1\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%eax,%eax,1\)
  
  0+1c0 <nop17>:
  [      ]*[a-f0-9]+:    90                      nop
@@ -185,8 +196,8 @@ Disassembly of section .text:
  [      ]*[a-f0-9]+:    90                      nop
  [      ]*[a-f0-9]+:    90                      nop
  [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 90                   xchg   %ax,%ax
-[      ]*[a-f0-9]+:    66 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00    data16 data16 data16 data16 data16 nopw %cs:0x0\(%eax,%eax,1\)
+[      ]*[a-f0-9]+:    0f 1f 80 00 00 00 00    nopl   0x0\(%eax\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%eax,%eax,1\)
  
  0+1e0 <nop16>:
  [      ]*[a-f0-9]+:    90                      nop
@@ -205,6 +216,6 @@ Disassembly of section .text:
  [      ]*[a-f0-9]+:    90                      nop
  [      ]*[a-f0-9]+:    90                      nop
  [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00    data16 data16 data16 data16 data16 nopw %cs:0x0\(%eax,%eax,1\)
+[      ]*[a-f0-9]+:    66 0f 1f 44 00 00       nopw   0x0\(%eax,%eax,1\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%eax,%eax,1\)
  #pass
diff --git a/gas/testsuite/gas/i386/nops-5-i686.d b/gas/testsuite/gas/i386/nops-5-i686.d

index b01844180749021f81ba4f8f75c00ba8f04ad997..b348cba3734004818c36144efc355aed218e32ab 100644 (file)
--- a/gas/testsuite/gas/i386/nops-5-i686.d
+++ b/gas/testsuite/gas/i386/nops-5-i686.d
@@ -29,19 +29,23 @@ Disassembly of section .text:
  
  0+40 <pentium4>:
  [      ]*[a-f0-9]+:    0f be f0                movsbl %al,%esi
-[      ]*[a-f0-9]+:    66 66 66 66 2e 0f 1f 84 00 00 00 00 00  data16 data16 data16 nopw %cs:0x0\(%eax,%eax,1\)
+[      ]*[a-f0-9]+:    0f 1f 00                nopl   \(%eax\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%eax,%eax,1\)
  
  0+50 <nocona>:
  [      ]*[a-f0-9]+:    0f be f0                movsbl %al,%esi
-[      ]*[a-f0-9]+:    66 66 66 66 2e 0f 1f 84 00 00 00 00 00  data16 data16 data16 nopw %cs:0x0\(%eax,%eax,1\)
+[      ]*[a-f0-9]+:    0f 1f 00                nopl   \(%eax\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%eax,%eax,1\)
  
  0+60 <core>:
  [      ]*[a-f0-9]+:    0f be f0                movsbl %al,%esi
-[      ]*[a-f0-9]+:    66 66 66 66 2e 0f 1f 84 00 00 00 00 00  data16 data16 data16 nopw %cs:0x0\(%eax,%eax,1\)
+[      ]*[a-f0-9]+:    0f 1f 00                nopl   \(%eax\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%eax,%eax,1\)
  
  0+70 <core2>:
  [      ]*[a-f0-9]+:    0f be f0                movsbl %al,%esi
-[      ]*[a-f0-9]+:    66 66 66 66 2e 0f 1f 84 00 00 00 00 00  data16 data16 data16 nopw %cs:0x0\(%eax,%eax,1\)
+[      ]*[a-f0-9]+:    0f 1f 00                nopl   \(%eax\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%eax,%eax,1\)
  
  0+80 <k6>:
  [      ]*[a-f0-9]+:    0f be f0                movsbl %al,%esi
@@ -50,13 +54,13 @@ Disassembly of section .text:
  
  0+90 <athlon>:
  [      ]*[a-f0-9]+:    0f be f0                movsbl %al,%esi
-[      ]*[a-f0-9]+:    66 0f 1f 44 00 00       nopw   0x0\(%eax,%eax,1\)
-[      ]*[a-f0-9]+:    0f 1f 80 00 00 00 00    nopl   0x0\(%eax\)
+[      ]*[a-f0-9]+:    0f 1f 00                nopl   \(%eax\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%eax,%eax,1\)
  
  0+a0 <k8>:
  [      ]*[a-f0-9]+:    0f be f0                movsbl %al,%esi
-[      ]*[a-f0-9]+:    66 0f 1f 44 00 00       nopw   0x0\(%eax,%eax,1\)
-[      ]*[a-f0-9]+:    0f 1f 80 00 00 00 00    nopl   0x0\(%eax\)
+[      ]*[a-f0-9]+:    0f 1f 00                nopl   \(%eax\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%eax,%eax,1\)
  
  0+b0 <generic32>:
  [      ]*[a-f0-9]+:    0f be f0                movsbl %al,%esi
@@ -65,10 +69,11 @@ Disassembly of section .text:
  
  0+c0 <generic64>:
  [      ]*[a-f0-9]+:    0f be f0                movsbl %al,%esi
-[      ]*[a-f0-9]+:    66 66 66 66 2e 0f 1f 84 00 00 00 00 00  data16 data16 data16 nopw %cs:0x0\(%eax,%eax,1\)
+[      ]*[a-f0-9]+:    0f 1f 00                nopl   \(%eax\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%eax,%eax,1\)
  
  0+d0 <amdfam10>:
  [      ]*[a-f0-9]+:    0f be f0                movsbl %al,%esi
-[      ]*[a-f0-9]+:    66 0f 1f 44 00 00       nopw   0x0\(%eax,%eax,1\)
-[      ]*[a-f0-9]+:    0f 1f 80 00 00 00 00    nopl   0x0\(%eax\)
+[      ]*[a-f0-9]+:    0f 1f 00                nopl   \(%eax\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%eax,%eax,1\)
  #pass
diff --git a/gas/testsuite/gas/i386/nops-5.d b/gas/testsuite/gas/i386/nops-5.d

index ff307086bf03c33254dfeae1c829c126057c951b..d596e00eb51885c9f5a7a58ba7b723647adb9a23 100644 (file)
--- a/gas/testsuite/gas/i386/nops-5.d
+++ b/gas/testsuite/gas/i386/nops-5.d
@@ -27,19 +27,23 @@ Disassembly of section .text:
  
  0+40 <pentium4>:
  [      ]*[a-f0-9]+:    0f be f0                movsbl %al,%esi
-[      ]*[a-f0-9]+:    66 66 66 66 2e 0f 1f 84 00 00 00 00 00  data16 data16 data16 nopw %cs:0x0\(%eax,%eax,1\)
+[      ]*[a-f0-9]+:    0f 1f 00                nopl   \(%eax\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%eax,%eax,1\)
  
  0+50 <nocona>:
  [      ]*[a-f0-9]+:    0f be f0                movsbl %al,%esi
-[      ]*[a-f0-9]+:    66 66 66 66 2e 0f 1f 84 00 00 00 00 00  data16 data16 data16 nopw %cs:0x0\(%eax,%eax,1\)
+[      ]*[a-f0-9]+:    0f 1f 00                nopl   \(%eax\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%eax,%eax,1\)
  
  0+60 <core>:
  [      ]*[a-f0-9]+:    0f be f0                movsbl %al,%esi
-[      ]*[a-f0-9]+:    66 66 66 66 2e 0f 1f 84 00 00 00 00 00  data16 data16 data16 nopw %cs:0x0\(%eax,%eax,1\)
+[      ]*[a-f0-9]+:    0f 1f 00                nopl   \(%eax\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%eax,%eax,1\)
  
  0+70 <core2>:
  [      ]*[a-f0-9]+:    0f be f0                movsbl %al,%esi
-[      ]*[a-f0-9]+:    66 66 66 66 2e 0f 1f 84 00 00 00 00 00  data16 data16 data16 nopw %cs:0x0\(%eax,%eax,1\)
+[      ]*[a-f0-9]+:    0f 1f 00                nopl   \(%eax\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%eax,%eax,1\)
  
  0+80 <k6>:
  [      ]*[a-f0-9]+:    0f be f0                movsbl %al,%esi
@@ -48,13 +52,13 @@ Disassembly of section .text:
  
  0+90 <athlon>:
  [      ]*[a-f0-9]+:    0f be f0                movsbl %al,%esi
-[      ]*[a-f0-9]+:    66 0f 1f 44 00 00       nopw   0x0\(%eax,%eax,1\)
-[      ]*[a-f0-9]+:    0f 1f 80 00 00 00 00    nopl   0x0\(%eax\)
+[      ]*[a-f0-9]+:    0f 1f 00                nopl   \(%eax\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%eax,%eax,1\)
  
  0+a0 <k8>:
  [      ]*[a-f0-9]+:    0f be f0                movsbl %al,%esi
-[      ]*[a-f0-9]+:    66 0f 1f 44 00 00       nopw   0x0\(%eax,%eax,1\)
-[      ]*[a-f0-9]+:    0f 1f 80 00 00 00 00    nopl   0x0\(%eax\)
+[      ]*[a-f0-9]+:    0f 1f 00                nopl   \(%eax\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%eax,%eax,1\)
  
  0+b0 <generic32>:
  [      ]*[a-f0-9]+:    0f be f0                movsbl %al,%esi
@@ -63,10 +67,11 @@ Disassembly of section .text:
  
  0+c0 <generic64>:
  [      ]*[a-f0-9]+:    0f be f0                movsbl %al,%esi
-[      ]*[a-f0-9]+:    66 66 66 66 2e 0f 1f 84 00 00 00 00 00  data16 data16 data16 nopw %cs:0x0\(%eax,%eax,1\)
+[      ]*[a-f0-9]+:    0f 1f 00                nopl   \(%eax\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%eax,%eax,1\)
  
  0+d0 <amdfam10>:
  [      ]*[a-f0-9]+:    0f be f0                movsbl %al,%esi
-[      ]*[a-f0-9]+:    66 0f 1f 44 00 00       nopw   0x0\(%eax,%eax,1\)
-[      ]*[a-f0-9]+:    0f 1f 80 00 00 00 00    nopl   0x0\(%eax\)
+[      ]*[a-f0-9]+:    0f 1f 00                nopl   \(%eax\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%eax,%eax,1\)
  #pass
diff --git a/gas/testsuite/gas/i386/nops-6.d b/gas/testsuite/gas/i386/nops-6.d

index 6b45d311f38bcdaf104c5bd58f7f280b670493d6..81be6af411cc5b17d7dac24cdfee59f4111ade55 100644 (file)
--- a/gas/testsuite/gas/i386/nops-6.d
+++ b/gas/testsuite/gas/i386/nops-6.d
@@ -12,6 +12,6 @@ Disassembly of section .text:
  
  0+10 <i386_nop>:
  [      ]*[a-f0-9]+:    0f be f0                movsbl %al,%esi
-[      ]*[a-f0-9]+:    66 0f 1f 44 00 00       nopw   0x0\(%eax,%eax,1\)
-[      ]*[a-f0-9]+:    0f 1f 80 00 00 00 00    nopl   0x0\(%eax\)
+[      ]*[a-f0-9]+:    0f 1f 00                nopl   \(%eax\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%eax,%eax,1\)
  #pass
diff --git a/gas/testsuite/gas/i386/x86-64-nops-1-bdver1.d b/gas/testsuite/gas/i386/x86-64-nops-1-bdver1.d

deleted file mode 100644 (file)

index a2e62bd..0000000
--- a/gas/testsuite/gas/i386/x86-64-nops-1-bdver1.d
+++ /dev/null
@@ -1,162 +0,0 @@
-#as: -mtune=bdver1
-#source: nops-1.s
-#objdump: -drw
-#name: x86-64 -mtune=bdver1 nops 1
-
-.*: +file format .*
-
-
-Disassembly of section .text:
-
-0+ <nop15>:
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    0f 1f 80 00 00 00 00    nopl   0x0\(%rax\)
-[      ]*[a-f0-9]+:    0f 1f 84 00 00 00 00 00         nopl   0x0\(%rax,%rax,1\)
-
-0+10 <nop14>:
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    0f 1f 80 00 00 00 00    nopl   0x0\(%rax\)
-[      ]*[a-f0-9]+:    0f 1f 80 00 00 00 00    nopl   0x0\(%rax\)
-
-0+20 <nop13>:
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 0f 1f 44 00 00       nopw   0x0\(%rax,%rax,1\)
-[      ]*[a-f0-9]+:    0f 1f 80 00 00 00 00    nopl   0x0\(%rax\)
-
-0+30 <nop12>:
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 0f 1f 44 00 00       nopw   0x0\(%rax,%rax,1\)
-[      ]*[a-f0-9]+:    66 0f 1f 44 00 00       nopw   0x0\(%rax,%rax,1\)
-
-0+40 <nop11>:
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    0f 1f 44 00 00          nopl   0x0\(%rax,%rax,1\)
-[      ]*[a-f0-9]+:    66 0f 1f 44 00 00       nopw   0x0\(%rax,%rax,1\)
-
-0+50 <nop10>:
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%rax,%rax,1\)
-
-0+60 <nop9>:
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 0f 1f 84 00 00 00 00 00      nopw   0x0\(%rax,%rax,1\)
-
-0+70 <nop8>:
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    0f 1f 84 00 00 00 00 00         nopl   0x0\(%rax,%rax,1\)
-
-0+80 <nop7>:
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    0f 1f 80 00 00 00 00    nopl   0x0\(%rax\)
-
-0+90 <nop6>:
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 0f 1f 44 00 00       nopw   0x0\(%rax,%rax,1\)
-
-0+a0 <nop5>:
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    0f 1f 44 00 00          nopl   0x0\(%rax,%rax,1\)
-
-0+b0 <nop4>:
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    0f 1f 40 00             nopl   0x0\(%rax\)
-
-0+c0 <nop3>:
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    0f 1f 00                nopl   \(%rax\)
-
-0+d0 <nop2>:
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 90                   xchg   %ax,%ax
-#pass
diff --git a/gas/testsuite/gas/i386/x86-64-nops-1-bdver2.d b/gas/testsuite/gas/i386/x86-64-nops-1-bdver2.d

deleted file mode 100644 (file)

index 99c3213..0000000
--- a/gas/testsuite/gas/i386/x86-64-nops-1-bdver2.d
+++ /dev/null
@@ -1,162 +0,0 @@
-#as: -mtune=bdver2
-#source: nops-1.s
-#objdump: -drw
-#name: x86-64 -mtune=bdver2 nops 1
-
-.*: +file format .*
-
-
-Disassembly of section .text:
-
-0+ <nop15>:
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    0f 1f 80 00 00 00 00    nopl   0x0\(%rax\)
-[      ]*[a-f0-9]+:    0f 1f 84 00 00 00 00 00         nopl   0x0\(%rax,%rax,1\)
-
-0+10 <nop14>:
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    0f 1f 80 00 00 00 00    nopl   0x0\(%rax\)
-[      ]*[a-f0-9]+:    0f 1f 80 00 00 00 00    nopl   0x0\(%rax\)
-
-0+20 <nop13>:
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 0f 1f 44 00 00       nopw   0x0\(%rax,%rax,1\)
-[      ]*[a-f0-9]+:    0f 1f 80 00 00 00 00    nopl   0x0\(%rax\)
-
-0+30 <nop12>:
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 0f 1f 44 00 00       nopw   0x0\(%rax,%rax,1\)
-[      ]*[a-f0-9]+:    66 0f 1f 44 00 00       nopw   0x0\(%rax,%rax,1\)
-
-0+40 <nop11>:
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    0f 1f 44 00 00          nopl   0x0\(%rax,%rax,1\)
-[      ]*[a-f0-9]+:    66 0f 1f 44 00 00       nopw   0x0\(%rax,%rax,1\)
-
-0+50 <nop10>:
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%rax,%rax,1\)
-
-0+60 <nop9>:
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 0f 1f 84 00 00 00 00 00      nopw   0x0\(%rax,%rax,1\)
-
-0+70 <nop8>:
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    0f 1f 84 00 00 00 00 00         nopl   0x0\(%rax,%rax,1\)
-
-0+80 <nop7>:
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    0f 1f 80 00 00 00 00    nopl   0x0\(%rax\)
-
-0+90 <nop6>:
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 0f 1f 44 00 00       nopw   0x0\(%rax,%rax,1\)
-
-0+a0 <nop5>:
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    0f 1f 44 00 00          nopl   0x0\(%rax,%rax,1\)
-
-0+b0 <nop4>:
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    0f 1f 40 00             nopl   0x0\(%rax\)
-
-0+c0 <nop3>:
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    0f 1f 00                nopl   \(%rax\)
-
-0+d0 <nop2>:
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 90                   xchg   %ax,%ax
-#pass
diff --git a/gas/testsuite/gas/i386/x86-64-nops-1-bdver3.d b/gas/testsuite/gas/i386/x86-64-nops-1-bdver3.d

deleted file mode 100644 (file)

index f0eead1..0000000
--- a/gas/testsuite/gas/i386/x86-64-nops-1-bdver3.d
+++ /dev/null
@@ -1,162 +0,0 @@
-#as: -mtune=bdver3
-#source: nops-1.s
-#objdump: -drw
-#name: x86-64 -mtune=bdver3 nops 1
-
-.*: +file format .*
-
-
-Disassembly of section .text:
-
-0+ <nop15>:
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    0f 1f 80 00 00 00 00    nopl   0x0\(%rax\)
-[      ]*[a-f0-9]+:    0f 1f 84 00 00 00 00 00         nopl   0x0\(%rax,%rax,1\)
-
-0+10 <nop14>:
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    0f 1f 80 00 00 00 00    nopl   0x0\(%rax\)
-[      ]*[a-f0-9]+:    0f 1f 80 00 00 00 00    nopl   0x0\(%rax\)
-
-0+20 <nop13>:
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 0f 1f 44 00 00       nopw   0x0\(%rax,%rax,1\)
-[      ]*[a-f0-9]+:    0f 1f 80 00 00 00 00    nopl   0x0\(%rax\)
-
-0+30 <nop12>:
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 0f 1f 44 00 00       nopw   0x0\(%rax,%rax,1\)
-[      ]*[a-f0-9]+:    66 0f 1f 44 00 00       nopw   0x0\(%rax,%rax,1\)
-
-0+40 <nop11>:
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    0f 1f 44 00 00          nopl   0x0\(%rax,%rax,1\)
-[      ]*[a-f0-9]+:    66 0f 1f 44 00 00       nopw   0x0\(%rax,%rax,1\)
-
-0+50 <nop10>:
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%rax,%rax,1\)
-
-0+60 <nop9>:
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 0f 1f 84 00 00 00 00 00      nopw   0x0\(%rax,%rax,1\)
-
-0+70 <nop8>:
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    0f 1f 84 00 00 00 00 00         nopl   0x0\(%rax,%rax,1\)
-
-0+80 <nop7>:
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    0f 1f 80 00 00 00 00    nopl   0x0\(%rax\)
-
-0+90 <nop6>:
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 0f 1f 44 00 00       nopw   0x0\(%rax,%rax,1\)
-
-0+a0 <nop5>:
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    0f 1f 44 00 00          nopl   0x0\(%rax,%rax,1\)
-
-0+b0 <nop4>:
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    0f 1f 40 00             nopl   0x0\(%rax\)
-
-0+c0 <nop3>:
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    0f 1f 00                nopl   \(%rax\)
-
-0+d0 <nop2>:
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 90                   xchg   %ax,%ax
-#pass
diff --git a/gas/testsuite/gas/i386/x86-64-nops-1-bdver4.d b/gas/testsuite/gas/i386/x86-64-nops-1-bdver4.d

deleted file mode 100644 (file)

index 25d5b05..0000000
--- a/gas/testsuite/gas/i386/x86-64-nops-1-bdver4.d
+++ /dev/null
@@ -1,162 +0,0 @@
-#as: -mtune=bdver4
-#source: nops-1.s
-#objdump: -drw
-#name: x86-64 -mtune=bdver4 nops 1
-
-.*: +file format .*
-
-
-Disassembly of section .text:
-
-0+ <nop15>:
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    0f 1f 80 00 00 00 00    nopl   0x0\(%rax\)
-[      ]*[a-f0-9]+:    0f 1f 84 00 00 00 00 00         nopl   0x0\(%rax,%rax,1\)
-
-0+10 <nop14>:
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    0f 1f 80 00 00 00 00    nopl   0x0\(%rax\)
-[      ]*[a-f0-9]+:    0f 1f 80 00 00 00 00    nopl   0x0\(%rax\)
-
-0+20 <nop13>:
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 0f 1f 44 00 00       nopw   0x0\(%rax,%rax,1\)
-[      ]*[a-f0-9]+:    0f 1f 80 00 00 00 00    nopl   0x0\(%rax\)
-
-0+30 <nop12>:
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 0f 1f 44 00 00       nopw   0x0\(%rax,%rax,1\)
-[      ]*[a-f0-9]+:    66 0f 1f 44 00 00       nopw   0x0\(%rax,%rax,1\)
-
-0+40 <nop11>:
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    0f 1f 44 00 00          nopl   0x0\(%rax,%rax,1\)
-[      ]*[a-f0-9]+:    66 0f 1f 44 00 00       nopw   0x0\(%rax,%rax,1\)
-
-0+50 <nop10>:
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%rax,%rax,1\)
-
-0+60 <nop9>:
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 0f 1f 84 00 00 00 00 00      nopw   0x0\(%rax,%rax,1\)
-
-0+70 <nop8>:
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    0f 1f 84 00 00 00 00 00         nopl   0x0\(%rax,%rax,1\)
-
-0+80 <nop7>:
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    0f 1f 80 00 00 00 00    nopl   0x0\(%rax\)
-
-0+90 <nop6>:
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 0f 1f 44 00 00       nopw   0x0\(%rax,%rax,1\)
-
-0+a0 <nop5>:
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    0f 1f 44 00 00          nopl   0x0\(%rax,%rax,1\)
-
-0+b0 <nop4>:
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    0f 1f 40 00             nopl   0x0\(%rax\)
-
-0+c0 <nop3>:
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    0f 1f 00                nopl   \(%rax\)
-
-0+d0 <nop2>:
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 90                   xchg   %ax,%ax
-#pass
diff --git a/gas/testsuite/gas/i386/x86-64-nops-1-btver1.d b/gas/testsuite/gas/i386/x86-64-nops-1-btver1.d

deleted file mode 100644 (file)

index a8f0295..0000000
--- a/gas/testsuite/gas/i386/x86-64-nops-1-btver1.d
+++ /dev/null
@@ -1,162 +0,0 @@
-#as: -mtune=btver1
-#source: nops-1.s
-#objdump: -drw
-#name: x86-64 -mtune=btver1 nops 1
-
-.*: +file format .*
-
-
-Disassembly of section .text:
-
-0+ <nop15>:
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    0f 1f 80 00 00 00 00    nopl   0x0\(%rax\)
-[      ]*[a-f0-9]+:    0f 1f 84 00 00 00 00 00         nopl   0x0\(%rax,%rax,1\)
-
-0+10 <nop14>:
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    0f 1f 80 00 00 00 00    nopl   0x0\(%rax\)
-[      ]*[a-f0-9]+:    0f 1f 80 00 00 00 00    nopl   0x0\(%rax\)
-
-0+20 <nop13>:
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 0f 1f 44 00 00       nopw   0x0\(%rax,%rax,1\)
-[      ]*[a-f0-9]+:    0f 1f 80 00 00 00 00    nopl   0x0\(%rax\)
-
-0+30 <nop12>:
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 0f 1f 44 00 00       nopw   0x0\(%rax,%rax,1\)
-[      ]*[a-f0-9]+:    66 0f 1f 44 00 00       nopw   0x0\(%rax,%rax,1\)
-
-0+40 <nop11>:
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    0f 1f 44 00 00          nopl   0x0\(%rax,%rax,1\)
-[      ]*[a-f0-9]+:    66 0f 1f 44 00 00       nopw   0x0\(%rax,%rax,1\)
-
-0+50 <nop10>:
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%rax,%rax,1\)
-
-0+60 <nop9>:
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 0f 1f 84 00 00 00 00 00      nopw   0x0\(%rax,%rax,1\)
-
-0+70 <nop8>:
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    0f 1f 84 00 00 00 00 00         nopl   0x0\(%rax,%rax,1\)
-
-0+80 <nop7>:
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    0f 1f 80 00 00 00 00    nopl   0x0\(%rax\)
-
-0+90 <nop6>:
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 0f 1f 44 00 00       nopw   0x0\(%rax,%rax,1\)
-
-0+a0 <nop5>:
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    0f 1f 44 00 00          nopl   0x0\(%rax,%rax,1\)
-
-0+b0 <nop4>:
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    0f 1f 40 00             nopl   0x0\(%rax\)
-
-0+c0 <nop3>:
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    0f 1f 00                nopl   \(%rax\)
-
-0+d0 <nop2>:
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 90                   xchg   %ax,%ax
-#pass
diff --git a/gas/testsuite/gas/i386/x86-64-nops-1-btver2.d b/gas/testsuite/gas/i386/x86-64-nops-1-btver2.d

deleted file mode 100644 (file)

index 8474dca..0000000
--- a/gas/testsuite/gas/i386/x86-64-nops-1-btver2.d
+++ /dev/null
@@ -1,162 +0,0 @@
-#as: -mtune=btver2
-#source: nops-1.s
-#objdump: -drw
-#name: x86-64 -mtune=btver2 nops 1
-
-.*: +file format .*
-
-
-Disassembly of section .text:
-
-0+ <nop15>:
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    0f 1f 80 00 00 00 00    nopl   0x0\(%rax\)
-[      ]*[a-f0-9]+:    0f 1f 84 00 00 00 00 00         nopl   0x0\(%rax,%rax,1\)
-
-0+10 <nop14>:
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    0f 1f 80 00 00 00 00    nopl   0x0\(%rax\)
-[      ]*[a-f0-9]+:    0f 1f 80 00 00 00 00    nopl   0x0\(%rax\)
-
-0+20 <nop13>:
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 0f 1f 44 00 00       nopw   0x0\(%rax,%rax,1\)
-[      ]*[a-f0-9]+:    0f 1f 80 00 00 00 00    nopl   0x0\(%rax\)
-
-0+30 <nop12>:
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 0f 1f 44 00 00       nopw   0x0\(%rax,%rax,1\)
-[      ]*[a-f0-9]+:    66 0f 1f 44 00 00       nopw   0x0\(%rax,%rax,1\)
-
-0+40 <nop11>:
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    0f 1f 44 00 00          nopl   0x0\(%rax,%rax,1\)
-[      ]*[a-f0-9]+:    66 0f 1f 44 00 00       nopw   0x0\(%rax,%rax,1\)
-
-0+50 <nop10>:
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%rax,%rax,1\)
-
-0+60 <nop9>:
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 0f 1f 84 00 00 00 00 00      nopw   0x0\(%rax,%rax,1\)
-
-0+70 <nop8>:
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    0f 1f 84 00 00 00 00 00         nopl   0x0\(%rax,%rax,1\)
-
-0+80 <nop7>:
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    0f 1f 80 00 00 00 00    nopl   0x0\(%rax\)
-
-0+90 <nop6>:
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 0f 1f 44 00 00       nopw   0x0\(%rax,%rax,1\)
-
-0+a0 <nop5>:
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    0f 1f 44 00 00          nopl   0x0\(%rax,%rax,1\)
-
-0+b0 <nop4>:
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    0f 1f 40 00             nopl   0x0\(%rax\)
-
-0+c0 <nop3>:
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    0f 1f 00                nopl   \(%rax\)
-
-0+d0 <nop2>:
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 90                   xchg   %ax,%ax
-#pass
diff --git a/gas/testsuite/gas/i386/x86-64-nops-1-core2.d b/gas/testsuite/gas/i386/x86-64-nops-1-core2.d

index 9240669e960259dc2ce2a708381197aa389c5896..33df7d4509e44ba9df3c3cb46e4d1a16171f9b85 100644 (file)
--- a/gas/testsuite/gas/i386/x86-64-nops-1-core2.d
+++ b/gas/testsuite/gas/i386/x86-64-nops-1-core2.d
@@ -10,25 +10,29 @@ Disassembly of section .text:
  
  0+ <nop15>:
  [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00    data16 data16 data16 data16 data16 nopw %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    0f 1f 44 00 00          nopl   0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%rax,%rax,1\)
  
  0+10 <nop14>:
  [      ]*[a-f0-9]+:    90                      nop
  [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00       data16 data16 data16 data16 nopw %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    0f 1f 40 00             nopl   0x0\(%rax\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%rax,%rax,1\)
  
  0+20 <nop13>:
  [      ]*[a-f0-9]+:    90                      nop
  [      ]*[a-f0-9]+:    90                      nop
  [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 66 66 66 2e 0f 1f 84 00 00 00 00 00  data16 data16 data16 nopw %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    0f 1f 00                nopl   \(%rax\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%rax,%rax,1\)
  
  0+30 <nop12>:
  [      ]*[a-f0-9]+:    90                      nop
  [      ]*[a-f0-9]+:    90                      nop
  [      ]*[a-f0-9]+:    90                      nop
  [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 66 66 2e 0f 1f 84 00 00 00 00 00     data16 data16 nopw %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 90                   xchg   %ax,%ax
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%rax,%rax,1\)
  
  0+40 <nop11>:
  [      ]*[a-f0-9]+:    90                      nop
@@ -36,7 +40,8 @@ Disassembly of section .text:
  [      ]*[a-f0-9]+:    90                      nop
  [      ]*[a-f0-9]+:    90                      nop
  [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%rax,%rax,1\)
  
  0+50 <nop10>:
  [      ]*[a-f0-9]+:    90                      nop
diff --git a/gas/testsuite/gas/i386/x86-64-nops-1-g64.d b/gas/testsuite/gas/i386/x86-64-nops-1-g64.d

index f197486456e33f2639d0235023a1565301f5d551..bc69f9956d098334bd94a26831ab0039409a9ffe 100644 (file)
--- a/gas/testsuite/gas/i386/x86-64-nops-1-g64.d
+++ b/gas/testsuite/gas/i386/x86-64-nops-1-g64.d
@@ -10,25 +10,29 @@ Disassembly of section .text:
  
  0+ <nop15>:
  [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00    data16 data16 data16 data16 data16 nopw %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    0f 1f 44 00 00          nopl   0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%rax,%rax,1\)
  
  0+10 <nop14>:
  [      ]*[a-f0-9]+:    90                      nop
  [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00       data16 data16 data16 data16 nopw %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    0f 1f 40 00             nopl   0x0\(%rax\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%rax,%rax,1\)
  
  0+20 <nop13>:
  [      ]*[a-f0-9]+:    90                      nop
  [      ]*[a-f0-9]+:    90                      nop
  [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 66 66 66 2e 0f 1f 84 00 00 00 00 00  data16 data16 data16 nopw %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    0f 1f 00                nopl   \(%rax\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%rax,%rax,1\)
  
  0+30 <nop12>:
  [      ]*[a-f0-9]+:    90                      nop
  [      ]*[a-f0-9]+:    90                      nop
  [      ]*[a-f0-9]+:    90                      nop
  [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 66 66 2e 0f 1f 84 00 00 00 00 00     data16 data16 nopw %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 90                   xchg   %ax,%ax
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%rax,%rax,1\)
  
  0+40 <nop11>:
  [      ]*[a-f0-9]+:    90                      nop
@@ -36,7 +40,8 @@ Disassembly of section .text:
  [      ]*[a-f0-9]+:    90                      nop
  [      ]*[a-f0-9]+:    90                      nop
  [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%rax,%rax,1\)
  
  0+50 <nop10>:
  [      ]*[a-f0-9]+:    90                      nop
diff --git a/gas/testsuite/gas/i386/x86-64-nops-1-k8.d b/gas/testsuite/gas/i386/x86-64-nops-1-k8.d

index c9d8028ab9681fdb1a626fb5169132e00fbbfa48..44beb3e5426ed974e845ce69a13404ce004a63ef 100644 (file)
--- a/gas/testsuite/gas/i386/x86-64-nops-1-k8.d
+++ b/gas/testsuite/gas/i386/x86-64-nops-1-k8.d
@@ -8,154 +8,154 @@
  Disassembly of section .text:
  
  0+ <nop15>:
-[       ]*0:[   ]+90[   ]+nop[         ]*
-[       ]*1:[   ]+0f 1f 80 00 00 00 00[         ]+nopl[        ]+0x0\(%rax\)
-[       ]*8:[   ]+0f 1f 84 00 00 00 00 00[      ]+nopl[        ]+0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    0f 1f 44 00 00          nopl   0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%rax,%rax,1\)
  
  0+10 <nop14>:
-[       ]*10:[  ]+90[   ]+nop[         ]*
-[       ]*11:[  ]+90[   ]+nop[         ]*
-[       ]*12:[  ]+0f 1f 80 00 00 00 00[         ]+nopl[        ]+0x0\(%rax\)
-[       ]*19:[  ]+0f 1f 80 00 00 00 00[         ]+nopl[        ]+0x0\(%rax\)
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    0f 1f 40 00             nopl   0x0\(%rax\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%rax,%rax,1\)
  
  0+20 <nop13>:
-[       ]*20:[  ]+90[   ]+nop[         ]*
-[       ]*21:[  ]+90[   ]+nop[         ]*
-[       ]*22:[  ]+90[   ]+nop[         ]*
-[       ]*23:[  ]+66 0f 1f 44 00 00[    ]+nopw[        ]+0x0\(%rax,%rax,1\)
-[       ]*29:[  ]+0f 1f 80 00 00 00 00[         ]+nopl[        ]+0x0\(%rax\)
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    0f 1f 00                nopl   \(%rax\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%rax,%rax,1\)
  
  0+30 <nop12>:
-[       ]*30:[  ]+90[   ]+nop[         ]*
-[       ]*31:[  ]+90[   ]+nop[         ]*
-[       ]*32:[  ]+90[   ]+nop[         ]*
-[       ]*33:[  ]+90[   ]+nop[         ]*
-[       ]*34:[  ]+66 0f 1f 44 00 00[    ]+nopw[        ]+0x0\(%rax,%rax,1\)
-[       ]*3a:[  ]+66 0f 1f 44 00 00[    ]+nopw[        ]+0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    66 90                   xchg   %ax,%ax
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%rax,%rax,1\)
  
  0+40 <nop11>:
-[       ]*40:[  ]+90[   ]+nop[         ]*
-[       ]*41:[  ]+90[   ]+nop[         ]*
-[       ]*42:[  ]+90[   ]+nop[         ]*
-[       ]*43:[  ]+90[   ]+nop[         ]*
-[       ]*44:[  ]+90[   ]+nop[         ]*
-[       ]*45:[  ]+0f 1f 44 00 00[       ]+nopl[        ]+0x0\(%rax,%rax,1\)
-[       ]*4a:[  ]+66 0f 1f 44 00 00[    ]+nopw[        ]+0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%rax,%rax,1\)
  
  0+50 <nop10>:
-[       ]*50:[  ]+90[   ]+nop[         ]*
-[       ]*51:[  ]+90[   ]+nop[         ]*
-[       ]*52:[  ]+90[   ]+nop[         ]*
-[       ]*53:[  ]+90[   ]+nop[         ]*
-[       ]*54:[  ]+90[   ]+nop[         ]*
-[       ]*55:[  ]+90[   ]+nop[         ]*
-[       ]*56:[  ]+66 2e 0f 1f 84 00 00 00 00 00[        ]+nopw[        ]+%cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%rax,%rax,1\)
  
  0+60 <nop9>:
-[       ]*60:[  ]+90[   ]+nop[         ]*
-[       ]*61:[  ]+90[   ]+nop[         ]*
-[       ]*62:[  ]+90[   ]+nop[         ]*
-[       ]*63:[  ]+90[   ]+nop[         ]*
-[       ]*64:[  ]+90[   ]+nop[         ]*
-[       ]*65:[  ]+90[   ]+nop[         ]*
-[       ]*66:[  ]+90[   ]+nop[         ]*
-[       ]*67:[  ]+66 0f 1f 84 00 00 00 00 00[   ]+nopw[        ]+0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    66 0f 1f 84 00 00 00 00 00      nopw   0x0\(%rax,%rax,1\)
  
  0+70 <nop8>:
-[       ]*70:[  ]+90[   ]+nop[         ]*
-[       ]*71:[  ]+90[   ]+nop[         ]*
-[       ]*72:[  ]+90[   ]+nop[         ]*
-[       ]*73:[  ]+90[   ]+nop[         ]*
-[       ]*74:[  ]+90[   ]+nop[         ]*
-[       ]*75:[  ]+90[   ]+nop[         ]*
-[       ]*76:[  ]+90[   ]+nop[         ]*
-[       ]*77:[  ]+90[   ]+nop[         ]*
-[       ]*78:[  ]+0f 1f 84 00 00 00 00 00[      ]+nopl[        ]+0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    0f 1f 84 00 00 00 00 00         nopl   0x0\(%rax,%rax,1\)
  
  0+80 <nop7>:
-[       ]*80:[  ]+90[   ]+nop[         ]*
-[       ]*81:[  ]+90[   ]+nop[         ]*
-[       ]*82:[  ]+90[   ]+nop[         ]*
-[       ]*83:[  ]+90[   ]+nop[         ]*
-[       ]*84:[  ]+90[   ]+nop[         ]*
-[       ]*85:[  ]+90[   ]+nop[         ]*
-[       ]*86:[  ]+90[   ]+nop[         ]*
-[       ]*87:[  ]+90[   ]+nop[         ]*
-[       ]*88:[  ]+90[   ]+nop[         ]*
-[       ]*89:[  ]+0f 1f 80 00 00 00 00[         ]+nopl[        ]+0x0\(%rax\)
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    0f 1f 80 00 00 00 00    nopl   0x0\(%rax\)
  
  0+90 <nop6>:
-[       ]*90:[  ]+90[   ]+nop[         ]*
-[       ]*91:[  ]+90[   ]+nop[         ]*
-[       ]*92:[  ]+90[   ]+nop[         ]*
-[       ]*93:[  ]+90[   ]+nop[         ]*
-[       ]*94:[  ]+90[   ]+nop[         ]*
-[       ]*95:[  ]+90[   ]+nop[         ]*
-[       ]*96:[  ]+90[   ]+nop[         ]*
-[       ]*97:[  ]+90[   ]+nop[         ]*
-[       ]*98:[  ]+90[   ]+nop[         ]*
-[       ]*99:[  ]+90[   ]+nop[         ]*
-[       ]*9a:[  ]+66 0f 1f 44 00 00[    ]+nopw[        ]+0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    66 0f 1f 44 00 00       nopw   0x0\(%rax,%rax,1\)
  
  0+a0 <nop5>:
-[       ]*a0:[  ]+90[   ]+nop[         ]*
-[       ]*a1:[  ]+90[   ]+nop[         ]*
-[       ]*a2:[  ]+90[   ]+nop[         ]*
-[       ]*a3:[  ]+90[   ]+nop[         ]*
-[       ]*a4:[  ]+90[   ]+nop[         ]*
-[       ]*a5:[  ]+90[   ]+nop[         ]*
-[       ]*a6:[  ]+90[   ]+nop[         ]*
-[       ]*a7:[  ]+90[   ]+nop[         ]*
-[       ]*a8:[  ]+90[   ]+nop[         ]*
-[       ]*a9:[  ]+90[   ]+nop[         ]*
-[       ]*aa:[  ]+90[   ]+nop[         ]*
-[       ]*ab:[  ]+0f 1f 44 00 00[       ]+nopl[        ]+0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    0f 1f 44 00 00          nopl   0x0\(%rax,%rax,1\)
  
  0+b0 <nop4>:
-[       ]*b0:[  ]+90[   ]+nop[         ]*
-[       ]*b1:[  ]+90[   ]+nop[         ]*
-[       ]*b2:[  ]+90[   ]+nop[         ]*
-[       ]*b3:[  ]+90[   ]+nop[         ]*
-[       ]*b4:[  ]+90[   ]+nop[         ]*
-[       ]*b5:[  ]+90[   ]+nop[         ]*
-[       ]*b6:[  ]+90[   ]+nop[         ]*
-[       ]*b7:[  ]+90[   ]+nop[         ]*
-[       ]*b8:[  ]+90[   ]+nop[         ]*
-[       ]*b9:[  ]+90[   ]+nop[         ]*
-[       ]*ba:[  ]+90[   ]+nop[         ]*
-[       ]*bb:[  ]+90[   ]+nop[         ]*
-[       ]*bc:[  ]+0f 1f 40 00[  ]+nopl[        ]+0x0\(%rax\)
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    0f 1f 40 00             nopl   0x0\(%rax\)
  
  0+c0 <nop3>:
-[       ]*c0:[  ]+90[   ]+nop[         ]*
-[       ]*c1:[  ]+90[   ]+nop[         ]*
-[       ]*c2:[  ]+90[   ]+nop[         ]*
-[       ]*c3:[  ]+90[   ]+nop[         ]*
-[       ]*c4:[  ]+90[   ]+nop[         ]*
-[       ]*c5:[  ]+90[   ]+nop[         ]*
-[       ]*c6:[  ]+90[   ]+nop[         ]*
-[       ]*c7:[  ]+90[   ]+nop[         ]*
-[       ]*c8:[  ]+90[   ]+nop[         ]*
-[       ]*c9:[  ]+90[   ]+nop[         ]*
-[       ]*ca:[  ]+90[   ]+nop[         ]*
-[       ]*cb:[  ]+90[   ]+nop[         ]*
-[       ]*cc:[  ]+90[   ]+nop[         ]*
-[       ]*cd:[  ]+0f 1f 00[     ]+nopl[        ]+\(%rax\)
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    0f 1f 00                nopl   \(%rax\)
  
  0+d0 <nop2>:
-[       ]*d0:[  ]+90[   ]+nop[         ]*
-[       ]*d1:[  ]+90[   ]+nop[         ]*
-[       ]*d2:[  ]+90[   ]+nop[         ]*
-[       ]*d3:[  ]+90[   ]+nop[         ]*
-[       ]*d4:[  ]+90[   ]+nop[         ]*
-[       ]*d5:[  ]+90[   ]+nop[         ]*
-[       ]*d6:[  ]+90[   ]+nop[         ]*
-[       ]*d7:[  ]+90[   ]+nop[         ]*
-[       ]*d8:[  ]+90[   ]+nop[         ]*
-[       ]*d9:[  ]+90[   ]+nop[         ]*
-[       ]*da:[  ]+90[   ]+nop[         ]*
-[       ]*db:[  ]+90[   ]+nop[         ]*
-[       ]*dc:[  ]+90[   ]+nop[         ]*
-[       ]*dd:[  ]+90[   ]+nop[         ]*
-[       ]*de:[  ]+66 90[        ]+xchg[        ]+%ax,%ax
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    66 90                   xchg   %ax,%ax
  #pass
diff --git a/gas/testsuite/gas/i386/x86-64-nops-1-nocona.d b/gas/testsuite/gas/i386/x86-64-nops-1-nocona.d

deleted file mode 100644 (file)

index d5cdd4c..0000000
--- a/gas/testsuite/gas/i386/x86-64-nops-1-nocona.d
+++ /dev/null
@@ -1,156 +0,0 @@
-#as: -mtune=nocona
-#source: nops-1.s
-#objdump: -drw
-#name: x86-64 -mtune=nocona nops 1
-
-.*: +file format .*
-
-Disassembly of section .text:
-
-0+ <nop15>:
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00    data16 data16 data16 data16 data16 nopw %cs:0x0\(%rax,%rax,1\)
-
-0+10 <nop14>:
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00       data16 data16 data16 data16 nopw %cs:0x0\(%rax,%rax,1\)
-
-0+20 <nop13>:
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 66 66 66 2e 0f 1f 84 00 00 00 00 00  data16 data16 data16 nopw %cs:0x0\(%rax,%rax,1\)
-
-0+30 <nop12>:
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 66 66 2e 0f 1f 84 00 00 00 00 00     data16 data16 nopw %cs:0x0\(%rax,%rax,1\)
-
-0+40 <nop11>:
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
-
-0+50 <nop10>:
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%rax,%rax,1\)
-
-0+60 <nop9>:
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 0f 1f 84 00 00 00 00 00      nopw   0x0\(%rax,%rax,1\)
-
-0+70 <nop8>:
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    0f 1f 84 00 00 00 00 00         nopl   0x0\(%rax,%rax,1\)
-
-0+80 <nop7>:
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    0f 1f 80 00 00 00 00    nopl   0x0\(%rax\)
-
-0+90 <nop6>:
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 0f 1f 44 00 00       nopw   0x0\(%rax,%rax,1\)
-
-0+a0 <nop5>:
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    0f 1f 44 00 00          nopl   0x0\(%rax,%rax,1\)
-
-0+b0 <nop4>:
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    0f 1f 40 00             nopl   0x0\(%rax\)
-
-0+c0 <nop3>:
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    0f 1f 00                nopl   \(%rax\)
-
-0+d0 <nop2>:
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 90                   xchg   %ax,%ax
-#pass
diff --git a/gas/testsuite/gas/i386/x86-64-nops-1-znver1.d b/gas/testsuite/gas/i386/x86-64-nops-1-znver1.d

deleted file mode 100644 (file)

index 5c7086e..0000000
--- a/gas/testsuite/gas/i386/x86-64-nops-1-znver1.d
+++ /dev/null
@@ -1,162 +0,0 @@
-#as: -mtune=znver1
-#source: nops-1.s
-#objdump: -drw
-#name: x86-64 -mtune=znver1 nops 1
-
-.*: +file format .*
-
-
-Disassembly of section .text:
-
-0+ <nop15>:
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    0f 1f 80 00 00 00 00    nopl   0x0\(%rax\)
-[      ]*[a-f0-9]+:    0f 1f 84 00 00 00 00 00         nopl   0x0\(%rax,%rax,1\)
-
-0+10 <nop14>:
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    0f 1f 80 00 00 00 00    nopl   0x0\(%rax\)
-[      ]*[a-f0-9]+:    0f 1f 80 00 00 00 00    nopl   0x0\(%rax\)
-
-0+20 <nop13>:
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 0f 1f 44 00 00       nopw   0x0\(%rax,%rax,1\)
-[      ]*[a-f0-9]+:    0f 1f 80 00 00 00 00    nopl   0x0\(%rax\)
-
-0+30 <nop12>:
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 0f 1f 44 00 00       nopw   0x0\(%rax,%rax,1\)
-[      ]*[a-f0-9]+:    66 0f 1f 44 00 00       nopw   0x0\(%rax,%rax,1\)
-
-0+40 <nop11>:
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    0f 1f 44 00 00          nopl   0x0\(%rax,%rax,1\)
-[      ]*[a-f0-9]+:    66 0f 1f 44 00 00       nopw   0x0\(%rax,%rax,1\)
-
-0+50 <nop10>:
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%rax,%rax,1\)
-
-0+60 <nop9>:
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 0f 1f 84 00 00 00 00 00      nopw   0x0\(%rax,%rax,1\)
-
-0+70 <nop8>:
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    0f 1f 84 00 00 00 00 00         nopl   0x0\(%rax,%rax,1\)
-
-0+80 <nop7>:
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    0f 1f 80 00 00 00 00    nopl   0x0\(%rax\)
-
-0+90 <nop6>:
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 0f 1f 44 00 00       nopw   0x0\(%rax,%rax,1\)
-
-0+a0 <nop5>:
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    0f 1f 44 00 00          nopl   0x0\(%rax,%rax,1\)
-
-0+b0 <nop4>:
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    0f 1f 40 00             nopl   0x0\(%rax\)
-
-0+c0 <nop3>:
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    0f 1f 00                nopl   \(%rax\)
-
-0+d0 <nop2>:
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 90                   xchg   %ax,%ax
-#pass
diff --git a/gas/testsuite/gas/i386/x86-64-nops-1.d b/gas/testsuite/gas/i386/x86-64-nops-1.d

index 9b53ab24c766a759b5c65a1a5ba6fa842d099325..8bc9639cbeedcbe9be440f40f5a7628a6134fe06 100644 (file)
--- a/gas/testsuite/gas/i386/x86-64-nops-1.d
+++ b/gas/testsuite/gas/i386/x86-64-nops-1.d
@@ -9,25 +9,29 @@ Disassembly of section .text:
  
  0+ <nop15>:
  [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00    data16 data16 data16 data16 data16 nopw %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    0f 1f 44 00 00          nopl   0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%rax,%rax,1\)
  
  0+10 <nop14>:
  [      ]*[a-f0-9]+:    90                      nop
  [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00       data16 data16 data16 data16 nopw %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    0f 1f 40 00             nopl   0x0\(%rax\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%rax,%rax,1\)
  
  0+20 <nop13>:
  [      ]*[a-f0-9]+:    90                      nop
  [      ]*[a-f0-9]+:    90                      nop
  [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 66 66 66 2e 0f 1f 84 00 00 00 00 00  data16 data16 data16 nopw %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    0f 1f 00                nopl   \(%rax\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%rax,%rax,1\)
  
  0+30 <nop12>:
  [      ]*[a-f0-9]+:    90                      nop
  [      ]*[a-f0-9]+:    90                      nop
  [      ]*[a-f0-9]+:    90                      nop
  [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 66 66 2e 0f 1f 84 00 00 00 00 00     data16 data16 nopw %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 90                   xchg   %ax,%ax
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%rax,%rax,1\)
  
  0+40 <nop11>:
  [      ]*[a-f0-9]+:    90                      nop
@@ -35,7 +39,8 @@ Disassembly of section .text:
  [      ]*[a-f0-9]+:    90                      nop
  [      ]*[a-f0-9]+:    90                      nop
  [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%rax,%rax,1\)
  
  0+50 <nop10>:
  [      ]*[a-f0-9]+:    90                      nop
diff --git a/gas/testsuite/gas/i386/x86-64-nops-2.d b/gas/testsuite/gas/i386/x86-64-nops-2.d

index 1fdd4f828178ad7099c62e8d87f91b145a2dab3f..9d7f11a8b48cbbee0347a6d6f83ca8ca25ba1c32 100644 (file)
--- a/gas/testsuite/gas/i386/x86-64-nops-2.d
+++ b/gas/testsuite/gas/i386/x86-64-nops-2.d
@@ -10,29 +10,34 @@ Disassembly of section .text:
  
  0+ <nop>:
  [      ]*[a-f0-9]+:    0f be f0                movsbl %al,%esi
-[      ]*[a-f0-9]+:    66 66 66 66 2e 0f 1f 84 00 00 00 00 00  data16 data16 data16 nopw %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    0f 1f 00                nopl   \(%rax\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%rax,%rax,1\)
  
  0+10 <nop15>:
  [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00    data16 data16 data16 data16 data16 nopw %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    0f 1f 44 00 00          nopl   0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%rax,%rax,1\)
  
  0+20 <nop14>:
  [      ]*[a-f0-9]+:    90                      nop
  [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00       data16 data16 data16 data16 nopw %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    0f 1f 40 00             nopl   0x0\(%rax\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%rax,%rax,1\)
  
  0+30 <nop13>:
  [      ]*[a-f0-9]+:    90                      nop
  [      ]*[a-f0-9]+:    90                      nop
  [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 66 66 66 2e 0f 1f 84 00 00 00 00 00  data16 data16 data16 nopw %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    0f 1f 00                nopl   \(%rax\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%rax,%rax,1\)
  
  0+40 <nop12>:
  [      ]*[a-f0-9]+:    90                      nop
  [      ]*[a-f0-9]+:    90                      nop
  [      ]*[a-f0-9]+:    90                      nop
  [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 66 66 2e 0f 1f 84 00 00 00 00 00     data16 data16 nopw %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 90                   xchg   %ax,%ax
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%rax,%rax,1\)
  
  0+50 <nop11>:
  [      ]*[a-f0-9]+:    90                      nop
@@ -40,7 +45,8 @@ Disassembly of section .text:
  [      ]*[a-f0-9]+:    90                      nop
  [      ]*[a-f0-9]+:    90                      nop
  [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%rax,%rax,1\)
  
  0+60 <nop10>:
  [      ]*[a-f0-9]+:    90                      nop
diff --git a/gas/testsuite/gas/i386/x86-64-nops-3.d b/gas/testsuite/gas/i386/x86-64-nops-3.d

index 08f6d2267ddbd2e4abc59709c8440492bb3bdf19..bbf954501f6b5280a736429b28cc80e7232bf065 100644 (file)
--- a/gas/testsuite/gas/i386/x86-64-nops-3.d
+++ b/gas/testsuite/gas/i386/x86-64-nops-3.d
@@ -11,8 +11,10 @@ Disassembly of section .text:
  0+ <nop>:
  [      ]*[a-f0-9]+:    90                      nop
  [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00    data16 data16 data16 data16 data16 nopw %cs:0x0\(%rax,%rax,1\)
-[      ]*[a-f0-9]+:    66 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00    data16 data16 data16 data16 data16 nopw %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%rax,%rax,1\)
  [      ]*[a-f0-9]+:    89 c3                   mov    %eax,%ebx
-[      ]*[a-f0-9]+:    66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00       data16 data16 data16 data16 nopw %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    0f 1f 40 00             nopl   0x0\(%rax\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%rax,%rax,1\)
  #pass
diff --git a/gas/testsuite/gas/i386/x86-64-nops-4-core2.d b/gas/testsuite/gas/i386/x86-64-nops-4-core2.d

index f9143bfa5c9a7b709a3dba19b53a5bcdef094508..7971488175cde9708f45ddeef9de8f327e0e03a6 100644 (file)
--- a/gas/testsuite/gas/i386/x86-64-nops-4-core2.d
+++ b/gas/testsuite/gas/i386/x86-64-nops-4-core2.d
@@ -11,29 +11,33 @@ Disassembly of section .text:
  0+ <nop31>:
  [      ]*[a-f0-9]+:    90                      nop
  [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00    data16 data16 data16 data16 data16 nopw %cs:0x0\(%rax,%rax,1\)
-[      ]*[a-f0-9]+:    66 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00    data16 data16 data16 data16 data16 nopw %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%rax,%rax,1\)
  
  0+20 <nop30>:
  [      ]*[a-f0-9]+:    90                      nop
  [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00    data16 data16 data16 data16 data16 nopw %cs:0x0\(%rax,%rax,1\)
-[      ]*[a-f0-9]+:    66 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00    data16 data16 data16 data16 data16 nopw %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%rax,%rax,1\)
  
  0+40 <nop29>:
  [      ]*[a-f0-9]+:    90                      nop
  [      ]*[a-f0-9]+:    90                      nop
  [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00       data16 data16 data16 data16 nopw %cs:0x0\(%rax,%rax,1\)
-[      ]*[a-f0-9]+:    66 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00    data16 data16 data16 data16 data16 nopw %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 0f 1f 84 00 00 00 00 00      nopw   0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%rax,%rax,1\)
  
  0+60 <nop28>:
  [      ]*[a-f0-9]+:    90                      nop
  [      ]*[a-f0-9]+:    90                      nop
  [      ]*[a-f0-9]+:    90                      nop
  [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 66 66 66 2e 0f 1f 84 00 00 00 00 00  data16 data16 data16 nopw %cs:0x0\(%rax,%rax,1\)
-[      ]*[a-f0-9]+:    66 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00    data16 data16 data16 data16 data16 nopw %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    0f 1f 84 00 00 00 00 00         nopl   0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%rax,%rax,1\)
  
  0+80 <nop27>:
  [      ]*[a-f0-9]+:    90                      nop
@@ -41,8 +45,9 @@ Disassembly of section .text:
  [      ]*[a-f0-9]+:    90                      nop
  [      ]*[a-f0-9]+:    90                      nop
  [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 66 66 2e 0f 1f 84 00 00 00 00 00     data16 data16 nopw %cs:0x0\(%rax,%rax,1\)
-[      ]*[a-f0-9]+:    66 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00    data16 data16 data16 data16 data16 nopw %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    0f 1f 80 00 00 00 00    nopl   0x0\(%rax\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%rax,%rax,1\)
  
  0+a0 <nop26>:
  [      ]*[a-f0-9]+:    90                      nop
@@ -51,8 +56,9 @@ Disassembly of section .text:
  [      ]*[a-f0-9]+:    90                      nop
  [      ]*[a-f0-9]+:    90                      nop
  [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
-[      ]*[a-f0-9]+:    66 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00    data16 data16 data16 data16 data16 nopw %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 0f 1f 44 00 00       nopw   0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%rax,%rax,1\)
  
  0+c0 <nop25>:
  [      ]*[a-f0-9]+:    90                      nop
@@ -62,8 +68,9 @@ Disassembly of section .text:
  [      ]*[a-f0-9]+:    90                      nop
  [      ]*[a-f0-9]+:    90                      nop
  [      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    0f 1f 44 00 00          nopl   0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%rax,%rax,1\)
  [      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%rax,%rax,1\)
-[      ]*[a-f0-9]+:    66 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00    data16 data16 data16 data16 data16 nopw %cs:0x0\(%rax,%rax,1\)
  
  0+e0 <nop24>:
  [      ]*[a-f0-9]+:    90                      nop
@@ -74,8 +81,9 @@ Disassembly of section .text:
  [      ]*[a-f0-9]+:    90                      nop
  [      ]*[a-f0-9]+:    90                      nop
  [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 0f 1f 84 00 00 00 00 00      nopw   0x0\(%rax,%rax,1\)
-[      ]*[a-f0-9]+:    66 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00    data16 data16 data16 data16 data16 nopw %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    0f 1f 40 00             nopl   0x0\(%rax\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%rax,%rax,1\)
  
  0+100 <nop23>:
  [      ]*[a-f0-9]+:    90                      nop
@@ -87,8 +95,9 @@ Disassembly of section .text:
  [      ]*[a-f0-9]+:    90                      nop
  [      ]*[a-f0-9]+:    90                      nop
  [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    0f 1f 84 00 00 00 00 00         nopl   0x0\(%rax,%rax,1\)
-[      ]*[a-f0-9]+:    66 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00    data16 data16 data16 data16 data16 nopw %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    0f 1f 00                nopl   \(%rax\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%rax,%rax,1\)
  
  0+120 <nop22>:
  [      ]*[a-f0-9]+:    90                      nop
@@ -101,8 +110,9 @@ Disassembly of section .text:
  [      ]*[a-f0-9]+:    90                      nop
  [      ]*[a-f0-9]+:    90                      nop
  [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    0f 1f 80 00 00 00 00    nopl   0x0\(%rax\)
-[      ]*[a-f0-9]+:    66 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00    data16 data16 data16 data16 data16 nopw %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 90                   xchg   %ax,%ax
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%rax,%rax,1\)
  
  0+140 <nop21>:
  [      ]*[a-f0-9]+:    90                      nop
@@ -116,8 +126,9 @@ Disassembly of section .text:
  [      ]*[a-f0-9]+:    90                      nop
  [      ]*[a-f0-9]+:    90                      nop
  [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 0f 1f 44 00 00       nopw   0x0\(%rax,%rax,1\)
-[      ]*[a-f0-9]+:    66 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00    data16 data16 data16 data16 data16 nopw %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%rax,%rax,1\)
  
  0+160 <nop20>:
  [      ]*[a-f0-9]+:    90                      nop
@@ -132,8 +143,8 @@ Disassembly of section .text:
  [      ]*[a-f0-9]+:    90                      nop
  [      ]*[a-f0-9]+:    90                      nop
  [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    0f 1f 44 00 00          nopl   0x0\(%rax,%rax,1\)
-[      ]*[a-f0-9]+:    66 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00    data16 data16 data16 data16 data16 nopw %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%rax,%rax,1\)
  
  0+180 <nop19>:
  [      ]*[a-f0-9]+:    90                      nop
@@ -149,8 +160,8 @@ Disassembly of section .text:
  [      ]*[a-f0-9]+:    90                      nop
  [      ]*[a-f0-9]+:    90                      nop
  [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    0f 1f 40 00             nopl   0x0\(%rax\)
-[      ]*[a-f0-9]+:    66 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00    data16 data16 data16 data16 data16 nopw %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 0f 1f 84 00 00 00 00 00      nopw   0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%rax,%rax,1\)
  
  0+1a0 <nop18>:
  [      ]*[a-f0-9]+:    90                      nop
@@ -167,8 +178,8 @@ Disassembly of section .text:
  [      ]*[a-f0-9]+:    90                      nop
  [      ]*[a-f0-9]+:    90                      nop
  [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    0f 1f 00                nopl   \(%rax\)
-[      ]*[a-f0-9]+:    66 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00    data16 data16 data16 data16 data16 nopw %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    0f 1f 84 00 00 00 00 00         nopl   0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%rax,%rax,1\)
  
  0+1c0 <nop17>:
  [      ]*[a-f0-9]+:    90                      nop
@@ -186,8 +197,8 @@ Disassembly of section .text:
  [      ]*[a-f0-9]+:    90                      nop
  [      ]*[a-f0-9]+:    90                      nop
  [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 90                   xchg   %ax,%ax
-[      ]*[a-f0-9]+:    66 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00    data16 data16 data16 data16 data16 nopw %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    0f 1f 80 00 00 00 00    nopl   0x0\(%rax\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%rax,%rax,1\)
  
  0+1e0 <nop16>:
  [      ]*[a-f0-9]+:    90                      nop
@@ -206,6 +217,6 @@ Disassembly of section .text:
  [      ]*[a-f0-9]+:    90                      nop
  [      ]*[a-f0-9]+:    90                      nop
  [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00    data16 data16 data16 data16 data16 nopw %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 0f 1f 44 00 00       nopw   0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%rax,%rax,1\)
  #pass
diff --git a/gas/testsuite/gas/i386/x86-64-nops-4-k8.d b/gas/testsuite/gas/i386/x86-64-nops-4-k8.d

index b1145fc02a7738981b6b0c99b8dc9164b065225a..7d4b5d3b6acc0f79c8103d02514538e0300433d9 100644 (file)
--- a/gas/testsuite/gas/i386/x86-64-nops-4-k8.d
+++ b/gas/testsuite/gas/i386/x86-64-nops-4-k8.d
@@ -10,37 +10,33 @@ Disassembly of section .text:
  0+ <nop31>:
  [      ]*[a-f0-9]+:    90                      nop
  [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    0f 1f 80 00 00 00 00    nopl   0x0\(%rax\)
-[      ]*[a-f0-9]+:    0f 1f 84 00 00 00 00 00         nopl   0x0\(%rax,%rax,1\)
-[      ]*[a-f0-9]+:    0f 1f 80 00 00 00 00    nopl   0x0\(%rax\)
-[      ]*[a-f0-9]+:    0f 1f 84 00 00 00 00 00         nopl   0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%rax,%rax,1\)
  
  0+20 <nop30>:
  [      ]*[a-f0-9]+:    90                      nop
  [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    0f 1f 80 00 00 00 00    nopl   0x0\(%rax\)
-[      ]*[a-f0-9]+:    0f 1f 84 00 00 00 00 00         nopl   0x0\(%rax,%rax,1\)
-[      ]*[a-f0-9]+:    0f 1f 80 00 00 00 00    nopl   0x0\(%rax\)
-[      ]*[a-f0-9]+:    0f 1f 84 00 00 00 00 00         nopl   0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%rax,%rax,1\)
  
  0+40 <nop29>:
  [      ]*[a-f0-9]+:    90                      nop
  [      ]*[a-f0-9]+:    90                      nop
  [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    0f 1f 80 00 00 00 00    nopl   0x0\(%rax\)
-[      ]*[a-f0-9]+:    0f 1f 80 00 00 00 00    nopl   0x0\(%rax\)
-[      ]*[a-f0-9]+:    0f 1f 80 00 00 00 00    nopl   0x0\(%rax\)
-[      ]*[a-f0-9]+:    0f 1f 84 00 00 00 00 00         nopl   0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 0f 1f 84 00 00 00 00 00      nopw   0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%rax,%rax,1\)
  
  0+60 <nop28>:
  [      ]*[a-f0-9]+:    90                      nop
  [      ]*[a-f0-9]+:    90                      nop
  [      ]*[a-f0-9]+:    90                      nop
  [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 0f 1f 44 00 00       nopw   0x0\(%rax,%rax,1\)
-[      ]*[a-f0-9]+:    0f 1f 80 00 00 00 00    nopl   0x0\(%rax\)
-[      ]*[a-f0-9]+:    0f 1f 80 00 00 00 00    nopl   0x0\(%rax\)
  [      ]*[a-f0-9]+:    0f 1f 84 00 00 00 00 00         nopl   0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%rax,%rax,1\)
  
  0+80 <nop27>:
  [      ]*[a-f0-9]+:    90                      nop
@@ -48,10 +44,9 @@ Disassembly of section .text:
  [      ]*[a-f0-9]+:    90                      nop
  [      ]*[a-f0-9]+:    90                      nop
  [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 0f 1f 44 00 00       nopw   0x0\(%rax,%rax,1\)
-[      ]*[a-f0-9]+:    66 0f 1f 44 00 00       nopw   0x0\(%rax,%rax,1\)
  [      ]*[a-f0-9]+:    0f 1f 80 00 00 00 00    nopl   0x0\(%rax\)
-[      ]*[a-f0-9]+:    0f 1f 84 00 00 00 00 00         nopl   0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%rax,%rax,1\)
  
  0+a0 <nop26>:
  [      ]*[a-f0-9]+:    90                      nop
@@ -60,10 +55,9 @@ Disassembly of section .text:
  [      ]*[a-f0-9]+:    90                      nop
  [      ]*[a-f0-9]+:    90                      nop
  [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    0f 1f 44 00 00          nopl   0x0\(%rax,%rax,1\)
  [      ]*[a-f0-9]+:    66 0f 1f 44 00 00       nopw   0x0\(%rax,%rax,1\)
-[      ]*[a-f0-9]+:    0f 1f 80 00 00 00 00    nopl   0x0\(%rax\)
-[      ]*[a-f0-9]+:    0f 1f 84 00 00 00 00 00         nopl   0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%rax,%rax,1\)
  
  0+c0 <nop25>:
  [      ]*[a-f0-9]+:    90                      nop
@@ -73,9 +67,9 @@ Disassembly of section .text:
  [      ]*[a-f0-9]+:    90                      nop
  [      ]*[a-f0-9]+:    90                      nop
  [      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    0f 1f 44 00 00          nopl   0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%rax,%rax,1\)
  [      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%rax,%rax,1\)
-[      ]*[a-f0-9]+:    0f 1f 80 00 00 00 00    nopl   0x0\(%rax\)
-[      ]*[a-f0-9]+:    0f 1f 84 00 00 00 00 00         nopl   0x0\(%rax,%rax,1\)
  
  0+e0 <nop24>:
  [      ]*[a-f0-9]+:    90                      nop
@@ -86,9 +80,9 @@ Disassembly of section .text:
  [      ]*[a-f0-9]+:    90                      nop
  [      ]*[a-f0-9]+:    90                      nop
  [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 0f 1f 84 00 00 00 00 00      nopw   0x0\(%rax,%rax,1\)
-[      ]*[a-f0-9]+:    0f 1f 80 00 00 00 00    nopl   0x0\(%rax\)
-[      ]*[a-f0-9]+:    0f 1f 84 00 00 00 00 00         nopl   0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    0f 1f 40 00             nopl   0x0\(%rax\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%rax,%rax,1\)
  
  0+100 <nop23>:
  [      ]*[a-f0-9]+:    90                      nop
@@ -100,9 +94,9 @@ Disassembly of section .text:
  [      ]*[a-f0-9]+:    90                      nop
  [      ]*[a-f0-9]+:    90                      nop
  [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    0f 1f 84 00 00 00 00 00         nopl   0x0\(%rax,%rax,1\)
-[      ]*[a-f0-9]+:    0f 1f 80 00 00 00 00    nopl   0x0\(%rax\)
-[      ]*[a-f0-9]+:    0f 1f 84 00 00 00 00 00         nopl   0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    0f 1f 00                nopl   \(%rax\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%rax,%rax,1\)
  
  0+120 <nop22>:
  [      ]*[a-f0-9]+:    90                      nop
@@ -115,9 +109,9 @@ Disassembly of section .text:
  [      ]*[a-f0-9]+:    90                      nop
  [      ]*[a-f0-9]+:    90                      nop
  [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    0f 1f 80 00 00 00 00    nopl   0x0\(%rax\)
-[      ]*[a-f0-9]+:    0f 1f 80 00 00 00 00    nopl   0x0\(%rax\)
-[      ]*[a-f0-9]+:    0f 1f 84 00 00 00 00 00         nopl   0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 90                   xchg   %ax,%ax
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%rax,%rax,1\)
  
  0+140 <nop21>:
  [      ]*[a-f0-9]+:    90                      nop
@@ -131,9 +125,9 @@ Disassembly of section .text:
  [      ]*[a-f0-9]+:    90                      nop
  [      ]*[a-f0-9]+:    90                      nop
  [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 0f 1f 44 00 00       nopw   0x0\(%rax,%rax,1\)
-[      ]*[a-f0-9]+:    0f 1f 80 00 00 00 00    nopl   0x0\(%rax\)
-[      ]*[a-f0-9]+:    0f 1f 84 00 00 00 00 00         nopl   0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%rax,%rax,1\)
  
  0+160 <nop20>:
  [      ]*[a-f0-9]+:    90                      nop
@@ -148,9 +142,8 @@ Disassembly of section .text:
  [      ]*[a-f0-9]+:    90                      nop
  [      ]*[a-f0-9]+:    90                      nop
  [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    0f 1f 44 00 00          nopl   0x0\(%rax,%rax,1\)
-[      ]*[a-f0-9]+:    0f 1f 80 00 00 00 00    nopl   0x0\(%rax\)
-[      ]*[a-f0-9]+:    0f 1f 84 00 00 00 00 00         nopl   0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%rax,%rax,1\)
  
  0+180 <nop19>:
  [      ]*[a-f0-9]+:    90                      nop
@@ -166,9 +159,8 @@ Disassembly of section .text:
  [      ]*[a-f0-9]+:    90                      nop
  [      ]*[a-f0-9]+:    90                      nop
  [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    0f 1f 40 00             nopl   0x0\(%rax\)
-[      ]*[a-f0-9]+:    0f 1f 80 00 00 00 00    nopl   0x0\(%rax\)
-[      ]*[a-f0-9]+:    0f 1f 84 00 00 00 00 00         nopl   0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 0f 1f 84 00 00 00 00 00      nopw   0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%rax,%rax,1\)
  
  0+1a0 <nop18>:
  [      ]*[a-f0-9]+:    90                      nop
@@ -185,9 +177,8 @@ Disassembly of section .text:
  [      ]*[a-f0-9]+:    90                      nop
  [      ]*[a-f0-9]+:    90                      nop
  [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    0f 1f 00                nopl   \(%rax\)
-[      ]*[a-f0-9]+:    0f 1f 80 00 00 00 00    nopl   0x0\(%rax\)
  [      ]*[a-f0-9]+:    0f 1f 84 00 00 00 00 00         nopl   0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%rax,%rax,1\)
  
  0+1c0 <nop17>:
  [      ]*[a-f0-9]+:    90                      nop
@@ -205,9 +196,8 @@ Disassembly of section .text:
  [      ]*[a-f0-9]+:    90                      nop
  [      ]*[a-f0-9]+:    90                      nop
  [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 90                   xchg   %ax,%ax
  [      ]*[a-f0-9]+:    0f 1f 80 00 00 00 00    nopl   0x0\(%rax\)
-[      ]*[a-f0-9]+:    0f 1f 84 00 00 00 00 00         nopl   0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%rax,%rax,1\)
  
  0+1e0 <nop16>:
  [      ]*[a-f0-9]+:    90                      nop
@@ -226,7 +216,6 @@ Disassembly of section .text:
  [      ]*[a-f0-9]+:    90                      nop
  [      ]*[a-f0-9]+:    90                      nop
  [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    0f 1f 80 00 00 00 00    nopl   0x0\(%rax\)
-[      ]*[a-f0-9]+:    0f 1f 84 00 00 00 00 00         nopl   0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 0f 1f 44 00 00       nopw   0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%rax,%rax,1\)
  #pass
diff --git a/gas/testsuite/gas/i386/x86-64-nops-4.d b/gas/testsuite/gas/i386/x86-64-nops-4.d

index 8c20c7fe8c5be870e761ca987f16f246af3f1601..f5fa793ba632d5227798802756a2bfdc25b58cb7 100644 (file)
--- a/gas/testsuite/gas/i386/x86-64-nops-4.d
+++ b/gas/testsuite/gas/i386/x86-64-nops-4.d
@@ -11,29 +11,33 @@ Disassembly of section .text:
  0+ <nop31>:
  [      ]*[a-f0-9]+:    90                      nop
  [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00    data16 data16 data16 data16 data16 nopw %cs:0x0\(%rax,%rax,1\)
-[      ]*[a-f0-9]+:    66 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00    data16 data16 data16 data16 data16 nopw %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%rax,%rax,1\)
  
  0+20 <nop30>:
  [      ]*[a-f0-9]+:    90                      nop
  [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00    data16 data16 data16 data16 data16 nopw %cs:0x0\(%rax,%rax,1\)
-[      ]*[a-f0-9]+:    66 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00    data16 data16 data16 data16 data16 nopw %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%rax,%rax,1\)
  
  0+40 <nop29>:
  [      ]*[a-f0-9]+:    90                      nop
  [      ]*[a-f0-9]+:    90                      nop
  [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00       data16 data16 data16 data16 nopw %cs:0x0\(%rax,%rax,1\)
-[      ]*[a-f0-9]+:    66 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00    data16 data16 data16 data16 data16 nopw %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 0f 1f 84 00 00 00 00 00      nopw   0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%rax,%rax,1\)
  
  0+60 <nop28>:
  [      ]*[a-f0-9]+:    90                      nop
  [      ]*[a-f0-9]+:    90                      nop
  [      ]*[a-f0-9]+:    90                      nop
  [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 66 66 66 2e 0f 1f 84 00 00 00 00 00  data16 data16 data16 nopw %cs:0x0\(%rax,%rax,1\)
-[      ]*[a-f0-9]+:    66 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00    data16 data16 data16 data16 data16 nopw %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    0f 1f 84 00 00 00 00 00         nopl   0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%rax,%rax,1\)
  
  0+80 <nop27>:
  [      ]*[a-f0-9]+:    90                      nop
@@ -41,8 +45,9 @@ Disassembly of section .text:
  [      ]*[a-f0-9]+:    90                      nop
  [      ]*[a-f0-9]+:    90                      nop
  [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 66 66 2e 0f 1f 84 00 00 00 00 00     data16 data16 nopw %cs:0x0\(%rax,%rax,1\)
-[      ]*[a-f0-9]+:    66 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00    data16 data16 data16 data16 data16 nopw %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    0f 1f 80 00 00 00 00    nopl   0x0\(%rax\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%rax,%rax,1\)
  
  0+a0 <nop26>:
  [      ]*[a-f0-9]+:    90                      nop
@@ -51,8 +56,9 @@ Disassembly of section .text:
  [      ]*[a-f0-9]+:    90                      nop
  [      ]*[a-f0-9]+:    90                      nop
  [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 66 2e 0f 1f 84 00 00 00 00 00        data16 nopw %cs:0x0\(%rax,%rax,1\)
-[      ]*[a-f0-9]+:    66 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00    data16 data16 data16 data16 data16 nopw %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 0f 1f 44 00 00       nopw   0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%rax,%rax,1\)
  
  0+c0 <nop25>:
  [      ]*[a-f0-9]+:    90                      nop
@@ -62,8 +68,9 @@ Disassembly of section .text:
  [      ]*[a-f0-9]+:    90                      nop
  [      ]*[a-f0-9]+:    90                      nop
  [      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    0f 1f 44 00 00          nopl   0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%rax,%rax,1\)
  [      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%rax,%rax,1\)
-[      ]*[a-f0-9]+:    66 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00    data16 data16 data16 data16 data16 nopw %cs:0x0\(%rax,%rax,1\)
  
  0+e0 <nop24>:
  [      ]*[a-f0-9]+:    90                      nop
@@ -74,8 +81,9 @@ Disassembly of section .text:
  [      ]*[a-f0-9]+:    90                      nop
  [      ]*[a-f0-9]+:    90                      nop
  [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 0f 1f 84 00 00 00 00 00      nopw   0x0\(%rax,%rax,1\)
-[      ]*[a-f0-9]+:    66 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00    data16 data16 data16 data16 data16 nopw %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    0f 1f 40 00             nopl   0x0\(%rax\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%rax,%rax,1\)
  
  0+100 <nop23>:
  [      ]*[a-f0-9]+:    90                      nop
@@ -87,8 +95,9 @@ Disassembly of section .text:
  [      ]*[a-f0-9]+:    90                      nop
  [      ]*[a-f0-9]+:    90                      nop
  [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    0f 1f 84 00 00 00 00 00         nopl   0x0\(%rax,%rax,1\)
-[      ]*[a-f0-9]+:    66 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00    data16 data16 data16 data16 data16 nopw %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    0f 1f 00                nopl   \(%rax\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%rax,%rax,1\)
  
  0+120 <nop22>:
  [      ]*[a-f0-9]+:    90                      nop
@@ -101,8 +110,9 @@ Disassembly of section .text:
  [      ]*[a-f0-9]+:    90                      nop
  [      ]*[a-f0-9]+:    90                      nop
  [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    0f 1f 80 00 00 00 00    nopl   0x0\(%rax\)
-[      ]*[a-f0-9]+:    66 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00    data16 data16 data16 data16 data16 nopw %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 90                   xchg   %ax,%ax
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%rax,%rax,1\)
  
  0+140 <nop21>:
  [      ]*[a-f0-9]+:    90                      nop
@@ -116,8 +126,9 @@ Disassembly of section .text:
  [      ]*[a-f0-9]+:    90                      nop
  [      ]*[a-f0-9]+:    90                      nop
  [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 0f 1f 44 00 00       nopw   0x0\(%rax,%rax,1\)
-[      ]*[a-f0-9]+:    66 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00    data16 data16 data16 data16 data16 nopw %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    90                      nop
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%rax,%rax,1\)
  
  0+160 <nop20>:
  [      ]*[a-f0-9]+:    90                      nop
@@ -132,8 +143,8 @@ Disassembly of section .text:
  [      ]*[a-f0-9]+:    90                      nop
  [      ]*[a-f0-9]+:    90                      nop
  [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    0f 1f 44 00 00          nopl   0x0\(%rax,%rax,1\)
-[      ]*[a-f0-9]+:    66 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00    data16 data16 data16 data16 data16 nopw %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%rax,%rax,1\)
  
  0+180 <nop19>:
  [      ]*[a-f0-9]+:    90                      nop
@@ -149,8 +160,8 @@ Disassembly of section .text:
  [      ]*[a-f0-9]+:    90                      nop
  [      ]*[a-f0-9]+:    90                      nop
  [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    0f 1f 40 00             nopl   0x0\(%rax\)
-[      ]*[a-f0-9]+:    66 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00    data16 data16 data16 data16 data16 nopw %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 0f 1f 84 00 00 00 00 00      nopw   0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%rax,%rax,1\)
  
  0+1a0 <nop18>:
  [      ]*[a-f0-9]+:    90                      nop
@@ -167,8 +178,8 @@ Disassembly of section .text:
  [      ]*[a-f0-9]+:    90                      nop
  [      ]*[a-f0-9]+:    90                      nop
  [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    0f 1f 00                nopl   \(%rax\)
-[      ]*[a-f0-9]+:    66 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00    data16 data16 data16 data16 data16 nopw %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    0f 1f 84 00 00 00 00 00         nopl   0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%rax,%rax,1\)
  
  0+1c0 <nop17>:
  [      ]*[a-f0-9]+:    90                      nop
@@ -186,8 +197,8 @@ Disassembly of section .text:
  [      ]*[a-f0-9]+:    90                      nop
  [      ]*[a-f0-9]+:    90                      nop
  [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 90                   xchg   %ax,%ax
-[      ]*[a-f0-9]+:    66 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00    data16 data16 data16 data16 data16 nopw %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    0f 1f 80 00 00 00 00    nopl   0x0\(%rax\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%rax,%rax,1\)
  
  0+1e0 <nop16>:
  [      ]*[a-f0-9]+:    90                      nop
@@ -206,6 +217,6 @@ Disassembly of section .text:
  [      ]*[a-f0-9]+:    90                      nop
  [      ]*[a-f0-9]+:    90                      nop
  [      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    90                      nop
-[      ]*[a-f0-9]+:    66 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00    data16 data16 data16 data16 data16 nopw %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 0f 1f 44 00 00       nopw   0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%rax,%rax,1\)
  #pass
diff --git a/gas/testsuite/gas/i386/x86-64-nops-5-k8.d b/gas/testsuite/gas/i386/x86-64-nops-5-k8.d

index add71bf6eb948e05a3e9ba7bf3b1175dfa1f2ceb..c9a883480191666ef979aee78c098263506e97c0 100644 (file)
--- a/gas/testsuite/gas/i386/x86-64-nops-5-k8.d
+++ b/gas/testsuite/gas/i386/x86-64-nops-5-k8.d
@@ -30,19 +30,23 @@ Disassembly of section .text:
  
  0+40 <pentium4>:
  [      ]*[a-f0-9]+:    0f be f0                movsbl %al,%esi
-[      ]*[a-f0-9]+:    66 66 66 66 2e 0f 1f 84 00 00 00 00 00  data16 data16 data16 nopw %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    0f 1f 00                nopl   \(%rax\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%rax,%rax,1\)
  
  0+50 <nocona>:
  [      ]*[a-f0-9]+:    0f be f0                movsbl %al,%esi
-[      ]*[a-f0-9]+:    66 66 66 66 2e 0f 1f 84 00 00 00 00 00  data16 data16 data16 nopw %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    0f 1f 00                nopl   \(%rax\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%rax,%rax,1\)
  
  0+60 <core>:
  [      ]*[a-f0-9]+:    0f be f0                movsbl %al,%esi
-[      ]*[a-f0-9]+:    66 66 66 66 2e 0f 1f 84 00 00 00 00 00  data16 data16 data16 nopw %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    0f 1f 00                nopl   \(%rax\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%rax,%rax,1\)
  
  0+70 <core2>:
  [      ]*[a-f0-9]+:    0f be f0                movsbl %al,%esi
-[      ]*[a-f0-9]+:    66 66 66 66 2e 0f 1f 84 00 00 00 00 00  data16 data16 data16 nopw %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    0f 1f 00                nopl   \(%rax\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%rax,%rax,1\)
  
  0+80 <k6>:
  [      ]*[a-f0-9]+:    0f be f0                movsbl %al,%esi
@@ -51,13 +55,13 @@ Disassembly of section .text:
  
  0+90 <athlon>:
  [      ]*[a-f0-9]+:    0f be f0                movsbl %al,%esi
-[      ]*[a-f0-9]+:    66 0f 1f 44 00 00       nopw   0x0\(%rax,%rax,1\)
-[      ]*[a-f0-9]+:    0f 1f 80 00 00 00 00    nopl   0x0\(%rax\)
+[      ]*[a-f0-9]+:    0f 1f 00                nopl   \(%rax\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%rax,%rax,1\)
  
  0+a0 <k8>:
  [      ]*[a-f0-9]+:    0f be f0                movsbl %al,%esi
-[      ]*[a-f0-9]+:    66 0f 1f 44 00 00       nopw   0x0\(%rax,%rax,1\)
-[      ]*[a-f0-9]+:    0f 1f 80 00 00 00 00    nopl   0x0\(%rax\)
+[      ]*[a-f0-9]+:    0f 1f 00                nopl   \(%rax\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%rax,%rax,1\)
  
  0+b0 <generic32>:
  [      ]*[a-f0-9]+:    0f be f0                movsbl %al,%esi
@@ -66,10 +70,11 @@ Disassembly of section .text:
  
  0+c0 <generic64>:
  [      ]*[a-f0-9]+:    0f be f0                movsbl %al,%esi
-[      ]*[a-f0-9]+:    66 66 66 66 2e 0f 1f 84 00 00 00 00 00  data16 data16 data16 nopw %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    0f 1f 00                nopl   \(%rax\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%rax,%rax,1\)
  
  0+d0 <amdfam10>:
  [      ]*[a-f0-9]+:    0f be f0                movsbl %al,%esi
-[      ]*[a-f0-9]+:    66 0f 1f 44 00 00       nopw   0x0\(%rax,%rax,1\)
-[      ]*[a-f0-9]+:    0f 1f 80 00 00 00 00    nopl   0x0\(%rax\)
+[      ]*[a-f0-9]+:    0f 1f 00                nopl   \(%rax\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%rax,%rax,1\)
  #pass
diff --git a/gas/testsuite/gas/i386/x86-64-nops-5.d b/gas/testsuite/gas/i386/x86-64-nops-5.d

index 664b010316a735eae8f224167b73346627c5fc1a..06892f515045f0102cdb73989bbb67f1b11caa7a 100644 (file)
--- a/gas/testsuite/gas/i386/x86-64-nops-5.d
+++ b/gas/testsuite/gas/i386/x86-64-nops-5.d
@@ -29,19 +29,23 @@ Disassembly of section .text:
  
  0+40 <pentium4>:
  [      ]*[a-f0-9]+:    0f be f0                movsbl %al,%esi
-[      ]*[a-f0-9]+:    66 66 66 66 2e 0f 1f 84 00 00 00 00 00  data16 data16 data16 nopw %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    0f 1f 00                nopl   \(%rax\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%rax,%rax,1\)
  
  0+50 <nocona>:
  [      ]*[a-f0-9]+:    0f be f0                movsbl %al,%esi
-[      ]*[a-f0-9]+:    66 66 66 66 2e 0f 1f 84 00 00 00 00 00  data16 data16 data16 nopw %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    0f 1f 00                nopl   \(%rax\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%rax,%rax,1\)
  
  0+60 <core>:
  [      ]*[a-f0-9]+:    0f be f0                movsbl %al,%esi
-[      ]*[a-f0-9]+:    66 66 66 66 2e 0f 1f 84 00 00 00 00 00  data16 data16 data16 nopw %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    0f 1f 00                nopl   \(%rax\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%rax,%rax,1\)
  
  0+70 <core2>:
  [      ]*[a-f0-9]+:    0f be f0                movsbl %al,%esi
-[      ]*[a-f0-9]+:    66 66 66 66 2e 0f 1f 84 00 00 00 00 00  data16 data16 data16 nopw %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    0f 1f 00                nopl   \(%rax\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%rax,%rax,1\)
  
  0+80 <k6>:
  [      ]*[a-f0-9]+:    0f be f0                movsbl %al,%esi
@@ -50,13 +54,13 @@ Disassembly of section .text:
  
  0+90 <athlon>:
  [      ]*[a-f0-9]+:    0f be f0                movsbl %al,%esi
-[      ]*[a-f0-9]+:    66 0f 1f 44 00 00       nopw   0x0\(%rax,%rax,1\)
-[      ]*[a-f0-9]+:    0f 1f 80 00 00 00 00    nopl   0x0\(%rax\)
+[      ]*[a-f0-9]+:    0f 1f 00                nopl   \(%rax\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%rax,%rax,1\)
  
  0+a0 <k8>:
  [      ]*[a-f0-9]+:    0f be f0                movsbl %al,%esi
-[      ]*[a-f0-9]+:    66 0f 1f 44 00 00       nopw   0x0\(%rax,%rax,1\)
-[      ]*[a-f0-9]+:    0f 1f 80 00 00 00 00    nopl   0x0\(%rax\)
+[      ]*[a-f0-9]+:    0f 1f 00                nopl   \(%rax\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%rax,%rax,1\)
  
  0+b0 <generic32>:
  [      ]*[a-f0-9]+:    0f be f0                movsbl %al,%esi
@@ -65,10 +69,11 @@ Disassembly of section .text:
  
  0+c0 <generic64>:
  [      ]*[a-f0-9]+:    0f be f0                movsbl %al,%esi
-[      ]*[a-f0-9]+:    66 66 66 66 2e 0f 1f 84 00 00 00 00 00  data16 data16 data16 nopw %cs:0x0\(%rax,%rax,1\)
+[      ]*[a-f0-9]+:    0f 1f 00                nopl   \(%rax\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%rax,%rax,1\)
  
  0+d0 <amdfam10>:
  [      ]*[a-f0-9]+:    0f be f0                movsbl %al,%esi
-[      ]*[a-f0-9]+:    66 0f 1f 44 00 00       nopw   0x0\(%rax,%rax,1\)
-[      ]*[a-f0-9]+:    0f 1f 80 00 00 00 00    nopl   0x0\(%rax\)
+[      ]*[a-f0-9]+:    0f 1f 00                nopl   \(%rax\)
+[      ]*[a-f0-9]+:    66 2e 0f 1f 84 00 00 00 00 00   nopw   %cs:0x0\(%rax,%rax,1\)
  #pass
author	H.J. Lu <hjl.tools@gmail.com>
	Fri, 20 Mar 2015 11:39:04 +0000 (04:39 -0700)
committer	H.J. Lu <hjl.tools@gmail.com>
	Fri, 20 Mar 2015 11:49:39 +0000 (04:49 -0700)
gas/ChangeLog		patch \| blob \| history
gas/config/tc-i386.c		patch \| blob \| history
gas/testsuite/ChangeLog		patch \| blob \| history
gas/testsuite/gas/i386/i386.exp		patch \| blob \| history
gas/testsuite/gas/i386/ilp32/x86-64-nops-1-core2.d		patch \| blob \| history
gas/testsuite/gas/i386/ilp32/x86-64-nops-1-k8.d		patch \| blob \| history
gas/testsuite/gas/i386/ilp32/x86-64-nops-1-nocona.d	[deleted file]	patch \| blob \| history
gas/testsuite/gas/i386/ilp32/x86-64-nops-1.d		patch \| blob \| history
gas/testsuite/gas/i386/ilp32/x86-64-nops-2.d		patch \| blob \| history
gas/testsuite/gas/i386/ilp32/x86-64-nops-3.d		patch \| blob \| history
gas/testsuite/gas/i386/ilp32/x86-64-nops-4-core2.d		patch \| blob \| history
gas/testsuite/gas/i386/ilp32/x86-64-nops-4-k8.d		patch \| blob \| history
gas/testsuite/gas/i386/ilp32/x86-64-nops-4.d		patch \| blob \| history
gas/testsuite/gas/i386/ilp32/x86-64-nops-5-k8.d		patch \| blob \| history
gas/testsuite/gas/i386/ilp32/x86-64-nops-5.d		patch \| blob \| history
gas/testsuite/gas/i386/nops-1-bdver1.d	[deleted file]	patch \| blob \| history
gas/testsuite/gas/i386/nops-1-bdver2.d	[deleted file]	patch \| blob \| history
gas/testsuite/gas/i386/nops-1-bdver3.d	[deleted file]	patch \| blob \| history
gas/testsuite/gas/i386/nops-1-bdver4.d	[deleted file]	patch \| blob \| history
gas/testsuite/gas/i386/nops-1-btver1.d	[deleted file]	patch \| blob \| history
gas/testsuite/gas/i386/nops-1-btver2.d	[deleted file]	patch \| blob \| history
gas/testsuite/gas/i386/nops-1-core2.d		patch \| blob \| history
gas/testsuite/gas/i386/nops-1-k8.d		patch \| blob \| history
gas/testsuite/gas/i386/nops-1-znver1.d	[deleted file]	patch \| blob \| history
gas/testsuite/gas/i386/nops-4a-i686.d		patch \| blob \| history
gas/testsuite/gas/i386/nops-5-i686.d		patch \| blob \| history
gas/testsuite/gas/i386/nops-5.d		patch \| blob \| history
gas/testsuite/gas/i386/nops-6.d		patch \| blob \| history
gas/testsuite/gas/i386/x86-64-nops-1-bdver1.d	[deleted file]	patch \| blob \| history
gas/testsuite/gas/i386/x86-64-nops-1-bdver2.d	[deleted file]	patch \| blob \| history
gas/testsuite/gas/i386/x86-64-nops-1-bdver3.d	[deleted file]	patch \| blob \| history
gas/testsuite/gas/i386/x86-64-nops-1-bdver4.d	[deleted file]	patch \| blob \| history
gas/testsuite/gas/i386/x86-64-nops-1-btver1.d	[deleted file]	patch \| blob \| history
gas/testsuite/gas/i386/x86-64-nops-1-btver2.d	[deleted file]	patch \| blob \| history
gas/testsuite/gas/i386/x86-64-nops-1-core2.d		patch \| blob \| history
gas/testsuite/gas/i386/x86-64-nops-1-g64.d		patch \| blob \| history
gas/testsuite/gas/i386/x86-64-nops-1-k8.d		patch \| blob \| history
gas/testsuite/gas/i386/x86-64-nops-1-nocona.d	[deleted file]	patch \| blob \| history
gas/testsuite/gas/i386/x86-64-nops-1-znver1.d	[deleted file]	patch \| blob \| history
gas/testsuite/gas/i386/x86-64-nops-1.d		patch \| blob \| history
gas/testsuite/gas/i386/x86-64-nops-2.d		patch \| blob \| history
gas/testsuite/gas/i386/x86-64-nops-3.d		patch \| blob \| history
gas/testsuite/gas/i386/x86-64-nops-4-core2.d		patch \| blob \| history
gas/testsuite/gas/i386/x86-64-nops-4-k8.d		patch \| blob \| history
gas/testsuite/gas/i386/x86-64-nops-4.d		patch \| blob \| history
gas/testsuite/gas/i386/x86-64-nops-5-k8.d		patch \| blob \| history
gas/testsuite/gas/i386/x86-64-nops-5.d		patch \| blob \| history