Update x86-64-mpx-inval-2 test for COFF

Assembler displays upper case hex numbers and we need to force a good
alignment to avoid matching NOPs at the end.

	* testsuite/gas/i386/x86-64-mpx-inval-2.s: Force a good alignment.
	* testsuite/gas/i386/x86-64-mpx-inval-2.l: Expect [0-9A-F]+.

diff --git a/gas/ChangeLog b/gas/ChangeLog
index 9b1849dc4ed442d783a4b316a8ffe8735291aa7e..654b3cb8bddedff316ba897230be4f6b3c692e7f 100644 (file)
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,8 @@
+2017-03-06  H.J. Lu  <hongjiu.lu@intel.com>
+
+       * testsuite/gas/i386/x86-64-mpx-inval-2.s: Force a good alignment.
+       * testsuite/gas/i386/x86-64-mpx-inval-2.l: Expect [0-9A-F]+.
+
 2017-03-06  Alan Modra  <amodra@gmail.com>
 
        * dw2gencfi.c (encoding_size): Return unsigned int.

diff --git a/gas/testsuite/gas/i386/x86-64-mpx-inval-2.l b/gas/testsuite/gas/i386/x86-64-mpx-inval-2.l
index ed69fe5b03559d9e09d3ce5bacfcf276e0295483..e4feae90f3aac37d93fa605032ae0028bd7a6bfd 100644 (file)
--- a/gas/testsuite/gas/i386/x86-64-mpx-inval-2.l
+++ b/gas/testsuite/gas/i386/x86-64-mpx-inval-2.l
@@ -143,7 +143,7 @@ GAS LISTING .*
 [      ]*[1-9][0-9]*[  ]+bndstx %bnd3, base\(%rip\)
 [      ]*[1-9][0-9]*[  ]+\?\?\?\? 670F1B0D             bndstx %bnd1, base\(%eip\)
 .*  Error: 32-bit address isn't allowed in 64-bit MPX instructions\.
-[      ]*[1-9][0-9]*[  ]+[0-9a-f][0-9a-f][0-9a-f]00000 
+[      ]*[1-9][0-9]*[  ]+[0-9A-F]+ 
 [      ]*[1-9][0-9]*[  ]+
 [      ]*[1-9][0-9]*[  ]+\#\#\# bndldx
 [      ]*[1-9][0-9]*[  ]+\?\?\?\? 670F1A44             bndldx 0x3\(%eax,%ebx,1\), %bnd0
@@ -158,7 +158,7 @@ GAS LISTING .*
 [      ]*[1-9][0-9]*[  ]*bndldx base\(%rip\), %bnd1
 [      ]*[1-9][0-9]*[  ]*\?\?\?\? 670F1A1D             bndldx base\(%eip\), %bnd3
 .*  Error: 32-bit address isn't allowed in 64-bit MPX instructions\.
-[      ]*[1-9][0-9]*[  ]+[0-9a-f][0-9a-f][0-9a-f]00000 
+[      ]*[1-9][0-9]*[  ]+[0-9A-F]+ 
 [      ]*[1-9][0-9]*[  ]+
 [      ]*[1-9][0-9]*[  ]+\.intel_syntax noprefix
 [      ]*[1-9][0-9]*[  ]+\?\?\?\? 67F30F1B             bndmk bnd1, \[eax\]
@@ -236,7 +236,7 @@ GAS LISTING .*
 [      ]*[1-9][0-9]*[  ]+bndstx \[rip\+base\], bnd1
 [      ]*[1-9][0-9]*[  ]+\?\?\?\? 670F1B1D             bndstx \[eip\+base\], bnd3
 .*  Error: 32-bit address isn't allowed in 64-bit MPX instructions\.
-[      ]*[1-9][0-9]*[  ]+[0-9a-f][0-9a-f][0-9a-f]00000 
+[      ]*[1-9][0-9]*[  ]+[0-9A-F]+ 
 [      ]*[1-9][0-9]*[  ]+bndstx \[rax\+rsp\], bnd3
 [      ]*[1-9][0-9]*[  ]+
 [      ]*[1-9][0-9]*[  ]+\#\#\# bndldx
@@ -256,6 +256,6 @@ GAS LISTING .*
 [      ]*[1-9][0-9]*[  ]+bndldx bnd1, \[rip\+base\]
 [      ]*[1-9][0-9]*[  ]+\?\?\?\? 670F1A1D             bndldx bnd3, \[eip\+base\]
 .*  Error: 32-bit address isn't allowed in 64-bit MPX instructions\.
-[      ]*[1-9][0-9]*[  ]+[0-9a-f][0-9a-f][0-9a-f]00000 
+[      ]*[1-9][0-9]*[  ]+[0-9A-F]+ 
 [      ]*[1-9][0-9]*[  ]+bndldx bnd3, \[rax\+rsp\]
 #pass

diff --git a/gas/testsuite/gas/i386/x86-64-mpx-inval-2.s b/gas/testsuite/gas/i386/x86-64-mpx-inval-2.s
index 0ff0e782497da0fed2f1f0439acc1752d1b12061..dc555eb3bac5b7253fd35bd3c09e7fc06988b660 100644 (file)
--- a/gas/testsuite/gas/i386/x86-64-mpx-inval-2.s
+++ b/gas/testsuite/gas/i386/x86-64-mpx-inval-2.s
@@ -94,3 +94,6 @@
        bndldx bnd1, [rip+base]
        bndldx bnd3, [eip+base]
        bndldx bnd3, [rax+rsp]
+
+       # Force a good alignment.
+       .p2align        4,0