gas/

2006-08-01  H.J. Lu  <hongjiu.lu@intel.com>

	* config/tc-i386.c (md_assemble): Don't update
	cpu_arch_isa_flags.

gas/testsuite/

2006-08-01  H.J. Lu  <hongjiu.lu@intel.com>

	* gas/i386/nops-2-i386.d: Updated.
	* gas/i386/nops-2-merom.d: Likewise.
	* gas/i386/nops-2.d: Likewise.

diff --git a/gas/ChangeLog b/gas/ChangeLog
index c6ae3ed3ad56499f9bfec8f033c8419575245f1a..368c9264486a44c07dbdb6f133ba9228acbe37aa 100644 (file)
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,8 @@
+2006-08-01  H.J. Lu  <hongjiu.lu@intel.com>
+
+       * config/tc-i386.c (md_assemble): Don't update
+       cpu_arch_isa_flags.
+
 2006-08-01  Thiemo Seufer  <ths@mips.com>
 
        * config/tc-mips.c (md_section_align): Check ELF-ness at runtime.

diff --git a/gas/config/tc-i386.c b/gas/config/tc-i386.c
index a90173505794de8728d17c8d531755078de5d58a..10605109c77119e402f9aed9d98e71f4d5c395e8 100644 (file)
--- a/gas/config/tc-i386.c
+++ b/gas/config/tc-i386.c
@@ -1945,9 +1945,6 @@ md_assemble (line)
   if (i.rex != 0)
     add_prefix (REX_OPCODE | i.rex);
 
-  /* Record what ISA we have generated so far.  */
-  cpu_arch_isa_flags |= i.tm.cpu_flags;
-
   /* We are ready to output the insn.  */
   output_insn ();
 }

diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog
index 8a9ce01b2f1d6178edbb1edfe11f2e6ccbd3a815..466ca6d39fb3f266dfb89d04e78b0f8a38c03e21 100644 (file)
--- a/gas/testsuite/ChangeLog
+++ b/gas/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2006-08-01  H.J. Lu  <hongjiu.lu@intel.com>
+
+       * gas/i386/nops-2-i386.d: Updated.
+       * gas/i386/nops-2-merom.d: Likewise.
+       * gas/i386/nops-2.d: Likewise.
+
 2006-07-29  Richard Sandiford  <richard@codesourcery.com>
 
        * gas/m68k/mcf-fpu.s: Add tests for all addressing modes.

diff --git a/gas/testsuite/gas/i386/nops-2-i386.d b/gas/testsuite/gas/i386/nops-2-i386.d
index 2b245071cd1f92ca17a5fdbef4c23abc249b04ef..c7dffabe70be324e71d72d0a77073e608ab3c6ef 100644 (file)
--- a/gas/testsuite/gas/i386/nops-2-i386.d
+++ b/gas/testsuite/gas/i386/nops-2-i386.d
@@ -9,34 +9,46 @@ Disassembly of section .text:
 
 0+ <nop>:
 [       ]*0:[   ]+0f 44 c0[     ]+cmove[       ]+%eax,%eax
-[       ]*3:[   ]+66 0f 1f 44 00 00[    ]+nopw[        ]+0x0\(%eax,%eax,1\)
-[       ]*9:[   ]+0f 1f 80 00 00 00 00[         ]+nopl[        ]+0x0\(%eax\)
+[       ]*3:[   ]+8d b6 00 00 00 00[    ]+lea[         ]+0x0\(%esi\),%esi
+[       ]*9:[   ]+8d bc 27 00 00 00 00[         ]+lea[         ]+0x0\(%edi\),%edi
 
 0+10 <nop15>:
 [       ]*10:[  ]+90[   ]+nop[         ]*
-[       ]*11:[  ]+0f 1f 80 00 00 00 00[         ]+nopl[        ]+0x0\(%eax\)
-[       ]*18:[  ]+0f 1f 84 00 00 00 00 00[      ]+nopl[        ]+0x0\(%eax,%eax,1\)
+[       ]*11:[  ]+eb 0d[        ]+jmp[         ]+20[   ]+<nop14>
+[       ]*13:[  ]+90[   ]+nop[         ]*
+[       ]*14:[  ]+90[   ]+nop[         ]*
+[       ]*15:[  ]+90[   ]+nop[         ]*
+[       ]*16:[  ]+90[   ]+nop[         ]*
+[       ]*17:[  ]+90[   ]+nop[         ]*
+[       ]*18:[  ]+90[   ]+nop[         ]*
+[       ]*19:[  ]+90[   ]+nop[         ]*
+[       ]*1a:[  ]+90[   ]+nop[         ]*
+[       ]*1b:[  ]+90[   ]+nop[         ]*
+[       ]*1c:[  ]+90[   ]+nop[         ]*
+[       ]*1d:[  ]+90[   ]+nop[         ]*
+[       ]*1e:[  ]+90[   ]+nop[         ]*
+[       ]*1f:[  ]+90[   ]+nop[         ]*
 
 0+20 <nop14>:
 [       ]*20:[  ]+90[   ]+nop[         ]*
 [       ]*21:[  ]+90[   ]+nop[         ]*
-[       ]*22:[  ]+0f 1f 80 00 00 00 00[         ]+nopl[        ]+0x0\(%eax\)
-[       ]*29:[  ]+0f 1f 80 00 00 00 00[         ]+nopl[        ]+0x0\(%eax\)
+[       ]*22:[  ]+8d b4 26 00 00 00 00[         ]+lea[         ]+0x0\(%esi\),%esi
+[       ]*29:[  ]+8d bc 27 00 00 00 00[         ]+lea[         ]+0x0\(%edi\),%edi
 
 0+30 <nop13>:
 [       ]*30:[  ]+90[   ]+nop[         ]*
 [       ]*31:[  ]+90[   ]+nop[         ]*
 [       ]*32:[  ]+90[   ]+nop[         ]*
-[       ]*33:[  ]+66 0f 1f 44 00 00[    ]+nopw[        ]+0x0\(%eax,%eax,1\)
-[       ]*39:[  ]+0f 1f 80 00 00 00 00[         ]+nopl[        ]+0x0\(%eax\)
+[       ]*33:[  ]+8d b6 00 00 00 00[    ]+lea[         ]+0x0\(%esi\),%esi
+[       ]*39:[  ]+8d bc 27 00 00 00 00[         ]+lea[         ]+0x0\(%edi\),%edi
 
 0+40 <nop12>:
 [       ]*40:[  ]+90[   ]+nop[         ]*
 [       ]*41:[  ]+90[   ]+nop[         ]*
 [       ]*42:[  ]+90[   ]+nop[         ]*
 [       ]*43:[  ]+90[   ]+nop[         ]*
-[       ]*44:[  ]+66 0f 1f 44 00 00[    ]+nopw[        ]+0x0\(%eax,%eax,1\)
-[       ]*4a:[  ]+66 0f 1f 44 00 00[    ]+nopw[        ]+0x0\(%eax,%eax,1\)
+[       ]*44:[  ]+8d b6 00 00 00 00[    ]+lea[         ]+0x0\(%esi\),%esi
+[       ]*4a:[  ]+8d bf 00 00 00 00[    ]+lea[         ]+0x0\(%edi\),%edi
 
 0+50 <nop11>:
 [       ]*50:[  ]+90[   ]+nop[         ]*
@@ -44,8 +56,8 @@ Disassembly of section .text:
 [       ]*52:[  ]+90[   ]+nop[         ]*
 [       ]*53:[  ]+90[   ]+nop[         ]*
 [       ]*54:[  ]+90[   ]+nop[         ]*
-[       ]*55:[  ]+0f 1f 44 00 00[       ]+nopl[        ]+0x0\(%eax,%eax,1\)
-[       ]*5a:[  ]+66 0f 1f 44 00 00[    ]+nopw[        ]+0x0\(%eax,%eax,1\)
+[       ]*55:[  ]+8d 74 26 00[  ]+lea[         ]+0x0\(%esi\),%esi
+[       ]*59:[  ]+8d bc 27 00 00 00 00[         ]+lea[         ]+0x0\(%edi\),%edi
 
 0+60 <nop10>:
 [       ]*60:[  ]+90[   ]+nop[         ]*
@@ -54,7 +66,8 @@ Disassembly of section .text:
 [       ]*63:[  ]+90[   ]+nop[         ]*
 [       ]*64:[  ]+90[   ]+nop[         ]*
 [       ]*65:[  ]+90[   ]+nop[         ]*
-[       ]*66:[  ]+66 2e 0f 1f 84 00 00 00 00 00[        ]+nopw[        ]+%cs:0x0\(%eax,%eax,1\)
+[       ]*66:[  ]+8d 76 00[     ]+lea[         ]+0x0\(%esi\),%esi
+[       ]*69:[  ]+8d bc 27 00 00 00 00[         ]+lea[         ]+0x0\(%edi\),%edi
 
 0+70 <nop9>:
 [       ]*70:[  ]+90[   ]+nop[         ]*
@@ -64,7 +77,8 @@ Disassembly of section .text:
 [       ]*74:[  ]+90[   ]+nop[         ]*
 [       ]*75:[  ]+90[   ]+nop[         ]*
 [       ]*76:[  ]+90[   ]+nop[         ]*
-[       ]*77:[  ]+66 0f 1f 84 00 00 00 00 00[   ]+nopw[        ]+0x0\(%eax,%eax,1\)
+[       ]*77:[  ]+89 f6[        ]+mov[         ]+%esi,%esi
+[       ]*79:[  ]+8d bc 27 00 00 00 00[         ]+lea[         ]+0x0\(%edi\),%edi
 
 0+80 <nop8>:
 [       ]*80:[  ]+90[   ]+nop[         ]*
@@ -75,7 +89,8 @@ Disassembly of section .text:
 [       ]*85:[  ]+90[   ]+nop[         ]*
 [       ]*86:[  ]+90[   ]+nop[         ]*
 [       ]*87:[  ]+90[   ]+nop[         ]*
-[       ]*88:[  ]+0f 1f 84 00 00 00 00 00[      ]+nopl[        ]+0x0\(%eax,%eax,1\)
+[       ]*88:[  ]+90[   ]+nop[         ]*
+[       ]*89:[  ]+8d b4 26 00 00 00 00[         ]+lea[         ]+0x0\(%esi\),%esi
 
 0+90 <nop7>:
 [       ]*90:[  ]+90[   ]+nop[         ]*
@@ -87,7 +102,7 @@ Disassembly of section .text:
 [       ]*96:[  ]+90[   ]+nop[         ]*
 [       ]*97:[  ]+90[   ]+nop[         ]*
 [       ]*98:[  ]+90[   ]+nop[         ]*
-[       ]*99:[  ]+0f 1f 80 00 00 00 00[         ]+nopl[        ]+0x0\(%eax\)
+[       ]*99:[  ]+8d b4 26 00 00 00 00[         ]+lea[         ]+0x0\(%esi\),%esi
 
 0+a0 <nop6>:
 [       ]*a0:[  ]+90[   ]+nop[         ]*
@@ -100,7 +115,7 @@ Disassembly of section .text:
 [       ]*a7:[  ]+90[   ]+nop[         ]*
 [       ]*a8:[  ]+90[   ]+nop[         ]*
 [       ]*a9:[  ]+90[   ]+nop[         ]*
-[       ]*aa:[  ]+66 0f 1f 44 00 00[    ]+nopw[        ]+0x0\(%eax,%eax,1\)
+[       ]*aa:[  ]+8d b6 00 00 00 00[    ]+lea[         ]+0x0\(%esi\),%esi
 
 0+b0 <nop5>:
 [       ]*b0:[  ]+90[   ]+nop[         ]*
@@ -114,7 +129,8 @@ Disassembly of section .text:
 [       ]*b8:[  ]+90[   ]+nop[         ]*
 [       ]*b9:[  ]+90[   ]+nop[         ]*
 [       ]*ba:[  ]+90[   ]+nop[         ]*
-[       ]*bb:[  ]+0f 1f 44 00 00[       ]+nopl[        ]+0x0\(%eax,%eax,1\)
+[       ]*bb:[  ]+90[   ]+nop[         ]*
+[       ]*bc:[  ]+8d 74 26 00[  ]+lea[         ]+0x0\(%esi\),%esi
 
 0+c0 <nop4>:
 [       ]*c0:[  ]+90[   ]+nop[         ]*
@@ -129,7 +145,7 @@ Disassembly of section .text:
 [       ]*c9:[  ]+90[   ]+nop[         ]*
 [       ]*ca:[  ]+90[   ]+nop[         ]*
 [       ]*cb:[  ]+90[   ]+nop[         ]*
-[       ]*cc:[  ]+0f 1f 40 00[  ]+nopl[        ]+0x0\(%eax\)
+[       ]*cc:[  ]+8d 74 26 00[  ]+lea[         ]+0x0\(%esi\),%esi
 
 0+d0 <nop3>:
 [       ]*d0:[  ]+90[   ]+nop[         ]*
@@ -145,7 +161,7 @@ Disassembly of section .text:
 [       ]*da:[  ]+90[   ]+nop[         ]*
 [       ]*db:[  ]+90[   ]+nop[         ]*
 [       ]*dc:[  ]+90[   ]+nop[         ]*
-[       ]*dd:[  ]+0f 1f 00[     ]+nopl[        ]+\(%eax\)
+[       ]*dd:[  ]+8d 76 00[     ]+lea[         ]+0x0\(%esi\),%esi
 
 0+e0 <nop2>:
 [       ]*e0:[  ]+90[   ]+nop[         ]*
@@ -162,5 +178,5 @@ Disassembly of section .text:
 [       ]*eb:[  ]+90[   ]+nop[         ]*
 [       ]*ec:[  ]+90[   ]+nop[         ]*
 [       ]*ed:[  ]+90[   ]+nop[         ]*
-[       ]*ee:[  ]+66 90[        ]+xchg[        ]+%ax,%ax
+[       ]*ee:[  ]+66 90[       ]+xchg[         ]+%ax,%ax
 #pass

diff --git a/gas/testsuite/gas/i386/nops-2-merom.d b/gas/testsuite/gas/i386/nops-2-merom.d
index b84aeff451a2d5d3c4041194c574d4ccf996dea1..c6ea559761e0ea93e31443050c648d9f8e66abd0 100644 (file)
--- a/gas/testsuite/gas/i386/nops-2-merom.d
+++ b/gas/testsuite/gas/i386/nops-2-merom.d
@@ -9,29 +9,46 @@ Disassembly of section .text:
 
 0+ <nop>:
 [       ]*0:[   ]+0f 44 c0[     ]+cmove[       ]+%eax,%eax
-[       ]*3:[   ]+66 66 66 66 2e 0f 1f 84 00 00 00 00 00[       ]+nopw[        ]+%cs:0x0\(%eax,%eax,1\)
+[       ]*3:[   ]+8d b6 00 00 00 00[    ]+lea[         ]+0x0\(%esi\),%esi
+[       ]*9:[   ]+8d bc 27 00 00 00 00[         ]+lea[         ]+0x0\(%edi\),%edi
 
 0+10 <nop15>:
 [       ]*10:[  ]+90[   ]+nop[         ]*
-[       ]*11:[  ]+66 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00[         ]+nopw[        ]+%cs:0x0\(%eax,%eax,1\)
+[       ]*11:[  ]+eb 0d[        ]+jmp[         ]+20[   ]+<nop14>
+[       ]*13:[  ]+90[   ]+nop[         ]*
+[       ]*14:[  ]+90[   ]+nop[         ]*
+[       ]*15:[  ]+90[   ]+nop[         ]*
+[       ]*16:[  ]+90[   ]+nop[         ]*
+[       ]*17:[  ]+90[   ]+nop[         ]*
+[       ]*18:[  ]+90[   ]+nop[         ]*
+[       ]*19:[  ]+90[   ]+nop[         ]*
+[       ]*1a:[  ]+90[   ]+nop[         ]*
+[       ]*1b:[  ]+90[   ]+nop[         ]*
+[       ]*1c:[  ]+90[   ]+nop[         ]*
+[       ]*1d:[  ]+90[   ]+nop[         ]*
+[       ]*1e:[  ]+90[   ]+nop[         ]*
+[       ]*1f:[  ]+90[   ]+nop[         ]*
 
 0+20 <nop14>:
 [       ]*20:[  ]+90[   ]+nop[         ]*
 [       ]*21:[  ]+90[   ]+nop[         ]*
-[       ]*22:[  ]+66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00[    ]+nopw[        ]+%cs:0x0\(%eax,%eax,1\)
+[       ]*22:[  ]+8d b4 26 00 00 00 00[         ]+lea[         ]+0x0\(%esi\),%esi
+[       ]*29:[  ]+8d bc 27 00 00 00 00[         ]+lea[         ]+0x0\(%edi\),%edi
 
 0+30 <nop13>:
 [       ]*30:[  ]+90[   ]+nop[         ]*
 [       ]*31:[  ]+90[   ]+nop[         ]*
 [       ]*32:[  ]+90[   ]+nop[         ]*
-[       ]*33:[  ]+66 66 66 66 2e 0f 1f 84 00 00 00 00 00[       ]+nopw[        ]+%cs:0x0\(%eax,%eax,1\)
+[       ]*33:[  ]+8d b6 00 00 00 00[    ]+lea[         ]+0x0\(%esi\),%esi
+[       ]*39:[  ]+8d bc 27 00 00 00 00[         ]+lea[         ]+0x0\(%edi\),%edi
 
 0+40 <nop12>:
 [       ]*40:[  ]+90[   ]+nop[         ]*
 [       ]*41:[  ]+90[   ]+nop[         ]*
 [       ]*42:[  ]+90[   ]+nop[         ]*
 [       ]*43:[  ]+90[   ]+nop[         ]*
-[       ]*44:[  ]+66 66 66 2e 0f 1f 84 00 00 00 00 00[  ]+nopw[        ]+%cs:0x0\(%eax,%eax,1\)
+[       ]*44:[  ]+8d b6 00 00 00 00[    ]+lea[         ]+0x0\(%esi\),%esi
+[       ]*4a:[  ]+8d bf 00 00 00 00[    ]+lea[         ]+0x0\(%edi\),%edi
 
 0+50 <nop11>:
 [       ]*50:[  ]+90[   ]+nop[         ]*
@@ -39,7 +56,8 @@ Disassembly of section .text:
 [       ]*52:[  ]+90[   ]+nop[         ]*
 [       ]*53:[  ]+90[   ]+nop[         ]*
 [       ]*54:[  ]+90[   ]+nop[         ]*
-[       ]*55:[  ]+66 66 2e 0f 1f 84 00 00 00 00 00[     ]+nopw[        ]+%cs:0x0\(%eax,%eax,1\)
+[       ]*55:[  ]+8d 74 26 00[  ]+lea[         ]+0x0\(%esi\),%esi
+[       ]*59:[  ]+8d bc 27 00 00 00 00[         ]+lea[         ]+0x0\(%edi\),%edi
 
 0+60 <nop10>:
 [       ]*60:[  ]+90[   ]+nop[         ]*
@@ -48,7 +66,8 @@ Disassembly of section .text:
 [       ]*63:[  ]+90[   ]+nop[         ]*
 [       ]*64:[  ]+90[   ]+nop[         ]*
 [       ]*65:[  ]+90[   ]+nop[         ]*
-[       ]*66:[  ]+66 2e 0f 1f 84 00 00 00 00 00[        ]+nopw[        ]+%cs:0x0\(%eax,%eax,1\)
+[       ]*66:[  ]+8d 76 00[     ]+lea[         ]+0x0\(%esi\),%esi
+[       ]*69:[  ]+8d bc 27 00 00 00 00[         ]+lea[         ]+0x0\(%edi\),%edi
 
 0+70 <nop9>:
 [       ]*70:[  ]+90[   ]+nop[         ]*
@@ -58,7 +77,8 @@ Disassembly of section .text:
 [       ]*74:[  ]+90[   ]+nop[         ]*
 [       ]*75:[  ]+90[   ]+nop[         ]*
 [       ]*76:[  ]+90[   ]+nop[         ]*
-[       ]*77:[  ]+66 0f 1f 84 00 00 00 00 00[   ]+nopw[        ]+0x0\(%eax,%eax,1\)
+[       ]*77:[  ]+89 f6[        ]+mov[         ]+%esi,%esi
+[       ]*79:[  ]+8d bc 27 00 00 00 00[         ]+lea[         ]+0x0\(%edi\),%edi
 
 0+80 <nop8>:
 [       ]*80:[  ]+90[   ]+nop[         ]*
@@ -69,7 +89,8 @@ Disassembly of section .text:
 [       ]*85:[  ]+90[   ]+nop[         ]*
 [       ]*86:[  ]+90[   ]+nop[         ]*
 [       ]*87:[  ]+90[   ]+nop[         ]*
-[       ]*88:[  ]+0f 1f 84 00 00 00 00 00[      ]+nopl[        ]+0x0\(%eax,%eax,1\)
+[       ]*88:[  ]+90[   ]+nop[         ]*
+[       ]*89:[  ]+8d b4 26 00 00 00 00[         ]+lea[         ]+0x0\(%esi\),%esi
 
 0+90 <nop7>:
 [       ]*90:[  ]+90[   ]+nop[         ]*
@@ -81,7 +102,7 @@ Disassembly of section .text:
 [       ]*96:[  ]+90[   ]+nop[         ]*
 [       ]*97:[  ]+90[   ]+nop[         ]*
 [       ]*98:[  ]+90[   ]+nop[         ]*
-[       ]*99:[  ]+0f 1f 80 00 00 00 00[         ]+nopl[        ]+0x0\(%eax\)
+[       ]*99:[  ]+8d b4 26 00 00 00 00[         ]+lea[         ]+0x0\(%esi\),%esi
 
 0+a0 <nop6>:
 [       ]*a0:[  ]+90[   ]+nop[         ]*
@@ -94,7 +115,7 @@ Disassembly of section .text:
 [       ]*a7:[  ]+90[   ]+nop[         ]*
 [       ]*a8:[  ]+90[   ]+nop[         ]*
 [       ]*a9:[  ]+90[   ]+nop[         ]*
-[       ]*aa:[  ]+66 0f 1f 44 00 00[    ]+nopw[        ]+0x0\(%eax,%eax,1\)
+[       ]*aa:[  ]+8d b6 00 00 00 00[    ]+lea[         ]+0x0\(%esi\),%esi
 
 0+b0 <nop5>:
 [       ]*b0:[  ]+90[   ]+nop[         ]*
@@ -108,7 +129,8 @@ Disassembly of section .text:
 [       ]*b8:[  ]+90[   ]+nop[         ]*
 [       ]*b9:[  ]+90[   ]+nop[         ]*
 [       ]*ba:[  ]+90[   ]+nop[         ]*
-[       ]*bb:[  ]+0f 1f 44 00 00[       ]+nopl[        ]+0x0\(%eax,%eax,1\)
+[       ]*bb:[  ]+90[   ]+nop[         ]*
+[       ]*bc:[  ]+8d 74 26 00[  ]+lea[         ]+0x0\(%esi\),%esi
 
 0+c0 <nop4>:
 [       ]*c0:[  ]+90[   ]+nop[         ]*
@@ -123,7 +145,7 @@ Disassembly of section .text:
 [       ]*c9:[  ]+90[   ]+nop[         ]*
 [       ]*ca:[  ]+90[   ]+nop[         ]*
 [       ]*cb:[  ]+90[   ]+nop[         ]*
-[       ]*cc:[  ]+0f 1f 40 00[  ]+nopl[        ]+0x0\(%eax\)
+[       ]*cc:[  ]+8d 74 26 00[  ]+lea[         ]+0x0\(%esi\),%esi
 
 0+d0 <nop3>:
 [       ]*d0:[  ]+90[   ]+nop[         ]*
@@ -139,7 +161,7 @@ Disassembly of section .text:
 [       ]*da:[  ]+90[   ]+nop[         ]*
 [       ]*db:[  ]+90[   ]+nop[         ]*
 [       ]*dc:[  ]+90[   ]+nop[         ]*
-[       ]*dd:[  ]+0f 1f 00[     ]+nopl[        ]+\(%eax\)
+[       ]*dd:[  ]+8d 76 00[     ]+lea[         ]+0x0\(%esi\),%esi
 
 0+e0 <nop2>:
 [       ]*e0:[  ]+90[   ]+nop[         ]*
@@ -156,5 +178,5 @@ Disassembly of section .text:
 [       ]*eb:[  ]+90[   ]+nop[         ]*
 [       ]*ec:[  ]+90[   ]+nop[         ]*
 [       ]*ed:[  ]+90[   ]+nop[         ]*
-[       ]*ee:[  ]+66 90[        ]+xchg[        ]+%ax,%ax
+[       ]*ee:[  ]+66 90[       ]+xchg[         ]+%ax,%ax
 #pass

diff --git a/gas/testsuite/gas/i386/nops-2.d b/gas/testsuite/gas/i386/nops-2.d
index cface9cc9cc9d08dfba4fd36482df309da98120e..6382f7e3772a2b1d004c64bb85c580aecd1bc4e2 100644 (file)
--- a/gas/testsuite/gas/i386/nops-2.d
+++ b/gas/testsuite/gas/i386/nops-2.d
@@ -8,34 +8,46 @@ Disassembly of section .text:
 
 0+ <nop>:
 [       ]*0:[   ]+0f 44 c0[     ]+cmove[       ]+%eax,%eax
-[       ]*3:[   ]+66 0f 1f 44 00 00[    ]+nopw[        ]+0x0\(%eax,%eax,1\)
-[       ]*9:[   ]+0f 1f 80 00 00 00 00[         ]+nopl[        ]+0x0\(%eax\)
+[       ]*3:[   ]+8d b6 00 00 00 00[    ]+lea[         ]+0x0\(%esi\),%esi
+[       ]*9:[   ]+8d bc 27 00 00 00 00[         ]+lea[         ]+0x0\(%edi\),%edi
 
 0+10 <nop15>:
 [       ]*10:[  ]+90[   ]+nop[         ]*
-[       ]*11:[  ]+0f 1f 80 00 00 00 00[         ]+nopl[        ]+0x0\(%eax\)
-[       ]*18:[  ]+0f 1f 84 00 00 00 00 00[      ]+nopl[        ]+0x0\(%eax,%eax,1\)
+[       ]*11:[  ]+eb 0d[        ]+jmp[         ]+20[   ]+<nop14>
+[       ]*13:[  ]+90[   ]+nop[         ]*
+[       ]*14:[  ]+90[   ]+nop[         ]*
+[       ]*15:[  ]+90[   ]+nop[         ]*
+[       ]*16:[  ]+90[   ]+nop[         ]*
+[       ]*17:[  ]+90[   ]+nop[         ]*
+[       ]*18:[  ]+90[   ]+nop[         ]*
+[       ]*19:[  ]+90[   ]+nop[         ]*
+[       ]*1a:[  ]+90[   ]+nop[         ]*
+[       ]*1b:[  ]+90[   ]+nop[         ]*
+[       ]*1c:[  ]+90[   ]+nop[         ]*
+[       ]*1d:[  ]+90[   ]+nop[         ]*
+[       ]*1e:[  ]+90[   ]+nop[         ]*
+[       ]*1f:[  ]+90[   ]+nop[         ]*
 
 0+20 <nop14>:
 [       ]*20:[  ]+90[   ]+nop[         ]*
 [       ]*21:[  ]+90[   ]+nop[         ]*
-[       ]*22:[  ]+0f 1f 80 00 00 00 00[         ]+nopl[        ]+0x0\(%eax\)
-[       ]*29:[  ]+0f 1f 80 00 00 00 00[         ]+nopl[        ]+0x0\(%eax\)
+[       ]*22:[  ]+8d b4 26 00 00 00 00[         ]+lea[         ]+0x0\(%esi\),%esi
+[       ]*29:[  ]+8d bc 27 00 00 00 00[         ]+lea[         ]+0x0\(%edi\),%edi
 
 0+30 <nop13>:
 [       ]*30:[  ]+90[   ]+nop[         ]*
 [       ]*31:[  ]+90[   ]+nop[         ]*
 [       ]*32:[  ]+90[   ]+nop[         ]*
-[       ]*33:[  ]+66 0f 1f 44 00 00[    ]+nopw[        ]+0x0\(%eax,%eax,1\)
-[       ]*39:[  ]+0f 1f 80 00 00 00 00[         ]+nopl[        ]+0x0\(%eax\)
+[       ]*33:[  ]+8d b6 00 00 00 00[    ]+lea[         ]+0x0\(%esi\),%esi
+[       ]*39:[  ]+8d bc 27 00 00 00 00[         ]+lea[         ]+0x0\(%edi\),%edi
 
 0+40 <nop12>:
 [       ]*40:[  ]+90[   ]+nop[         ]*
 [       ]*41:[  ]+90[   ]+nop[         ]*
 [       ]*42:[  ]+90[   ]+nop[         ]*
 [       ]*43:[  ]+90[   ]+nop[         ]*
-[       ]*44:[  ]+66 0f 1f 44 00 00[    ]+nopw[        ]+0x0\(%eax,%eax,1\)
-[       ]*4a:[  ]+66 0f 1f 44 00 00[    ]+nopw[        ]+0x0\(%eax,%eax,1\)
+[       ]*44:[  ]+8d b6 00 00 00 00[    ]+lea[         ]+0x0\(%esi\),%esi
+[       ]*4a:[  ]+8d bf 00 00 00 00[    ]+lea[         ]+0x0\(%edi\),%edi
 
 0+50 <nop11>:
 [       ]*50:[  ]+90[   ]+nop[         ]*
@@ -43,8 +55,8 @@ Disassembly of section .text:
 [       ]*52:[  ]+90[   ]+nop[         ]*
 [       ]*53:[  ]+90[   ]+nop[         ]*
 [       ]*54:[  ]+90[   ]+nop[         ]*
-[       ]*55:[  ]+0f 1f 44 00 00[       ]+nopl[        ]+0x0\(%eax,%eax,1\)
-[       ]*5a:[  ]+66 0f 1f 44 00 00[    ]+nopw[        ]+0x0\(%eax,%eax,1\)
+[       ]*55:[  ]+8d 74 26 00[  ]+lea[         ]+0x0\(%esi\),%esi
+[       ]*59:[  ]+8d bc 27 00 00 00 00[         ]+lea[         ]+0x0\(%edi\),%edi
 
 0+60 <nop10>:
 [       ]*60:[  ]+90[   ]+nop[         ]*
@@ -53,7 +65,8 @@ Disassembly of section .text:
 [       ]*63:[  ]+90[   ]+nop[         ]*
 [       ]*64:[  ]+90[   ]+nop[         ]*
 [       ]*65:[  ]+90[   ]+nop[         ]*
-[       ]*66:[  ]+66 2e 0f 1f 84 00 00 00 00 00[        ]+nopw[        ]+%cs:0x0\(%eax,%eax,1\)
+[       ]*66:[  ]+8d 76 00[     ]+lea[         ]+0x0\(%esi\),%esi
+[       ]*69:[  ]+8d bc 27 00 00 00 00[         ]+lea[         ]+0x0\(%edi\),%edi
 
 0+70 <nop9>:
 [       ]*70:[  ]+90[   ]+nop[         ]*
@@ -63,7 +76,8 @@ Disassembly of section .text:
 [       ]*74:[  ]+90[   ]+nop[         ]*
 [       ]*75:[  ]+90[   ]+nop[         ]*
 [       ]*76:[  ]+90[   ]+nop[         ]*
-[       ]*77:[  ]+66 0f 1f 84 00 00 00 00 00[   ]+nopw[        ]+0x0\(%eax,%eax,1\)
+[       ]*77:[  ]+89 f6[        ]+mov[         ]+%esi,%esi
+[       ]*79:[  ]+8d bc 27 00 00 00 00[         ]+lea[         ]+0x0\(%edi\),%edi
 
 0+80 <nop8>:
 [       ]*80:[  ]+90[   ]+nop[         ]*
@@ -74,7 +88,8 @@ Disassembly of section .text:
 [       ]*85:[  ]+90[   ]+nop[         ]*
 [       ]*86:[  ]+90[   ]+nop[         ]*
 [       ]*87:[  ]+90[   ]+nop[         ]*
-[       ]*88:[  ]+0f 1f 84 00 00 00 00 00[      ]+nopl[        ]+0x0\(%eax,%eax,1\)
+[       ]*88:[  ]+90[   ]+nop[         ]*
+[       ]*89:[  ]+8d b4 26 00 00 00 00[         ]+lea[         ]+0x0\(%esi\),%esi
 
 0+90 <nop7>:
 [       ]*90:[  ]+90[   ]+nop[         ]*
@@ -86,7 +101,7 @@ Disassembly of section .text:
 [       ]*96:[  ]+90[   ]+nop[         ]*
 [       ]*97:[  ]+90[   ]+nop[         ]*
 [       ]*98:[  ]+90[   ]+nop[         ]*
-[       ]*99:[  ]+0f 1f 80 00 00 00 00[         ]+nopl[        ]+0x0\(%eax\)
+[       ]*99:[  ]+8d b4 26 00 00 00 00[         ]+lea[         ]+0x0\(%esi\),%esi
 
 0+a0 <nop6>:
 [       ]*a0:[  ]+90[   ]+nop[         ]*
@@ -99,7 +114,7 @@ Disassembly of section .text:
 [       ]*a7:[  ]+90[   ]+nop[         ]*
 [       ]*a8:[  ]+90[   ]+nop[         ]*
 [       ]*a9:[  ]+90[   ]+nop[         ]*
-[       ]*aa:[  ]+66 0f 1f 44 00 00[    ]+nopw[        ]+0x0\(%eax,%eax,1\)
+[       ]*aa:[  ]+8d b6 00 00 00 00[    ]+lea[         ]+0x0\(%esi\),%esi
 
 0+b0 <nop5>:
 [       ]*b0:[  ]+90[   ]+nop[         ]*
@@ -113,7 +128,8 @@ Disassembly of section .text:
 [       ]*b8:[  ]+90[   ]+nop[         ]*
 [       ]*b9:[  ]+90[   ]+nop[         ]*
 [       ]*ba:[  ]+90[   ]+nop[         ]*
-[       ]*bb:[  ]+0f 1f 44 00 00[       ]+nopl[        ]+0x0\(%eax,%eax,1\)
+[       ]*bb:[  ]+90[   ]+nop[         ]*
+[       ]*bc:[  ]+8d 74 26 00[  ]+lea[         ]+0x0\(%esi\),%esi
 
 0+c0 <nop4>:
 [       ]*c0:[  ]+90[   ]+nop[         ]*
@@ -128,7 +144,7 @@ Disassembly of section .text:
 [       ]*c9:[  ]+90[   ]+nop[         ]*
 [       ]*ca:[  ]+90[   ]+nop[         ]*
 [       ]*cb:[  ]+90[   ]+nop[         ]*
-[       ]*cc:[  ]+0f 1f 40 00[  ]+nopl[        ]+0x0\(%eax\)
+[       ]*cc:[  ]+8d 74 26 00[  ]+lea[         ]+0x0\(%esi\),%esi
 
 0+d0 <nop3>:
 [       ]*d0:[  ]+90[   ]+nop[         ]*
@@ -144,7 +160,7 @@ Disassembly of section .text:
 [       ]*da:[  ]+90[   ]+nop[         ]*
 [       ]*db:[  ]+90[   ]+nop[         ]*
 [       ]*dc:[  ]+90[   ]+nop[         ]*
-[       ]*dd:[  ]+0f 1f 00[     ]+nopl[        ]+\(%eax\)
+[       ]*dd:[  ]+8d 76 00[     ]+lea[         ]+0x0\(%esi\),%esi
 
 0+e0 <nop2>:
 [       ]*e0:[  ]+90[   ]+nop[         ]*
@@ -161,5 +177,5 @@ Disassembly of section .text:
 [       ]*eb:[  ]+90[   ]+nop[         ]*
 [       ]*ec:[  ]+90[   ]+nop[         ]*
 [       ]*ed:[  ]+90[   ]+nop[         ]*
-[       ]*ee:[  ]+66 90[        ]+xchg[        ]+%ax,%ax
+[       ]*ee:[  ]+66 90[       ]+xchg[         ]+%ax,%ax
 #pass