Fix s12z test regexps

Fixes
ERROR: tcl error sourcing .../gas/testsuite/gas/s12z/s12z.exp.
ERROR: couldn't compile regular expression pattern: quantifier operand invalid

run_dump_test expected output lines are regexps.

	* testsuite/gas/s12z/bit-manip-invalid.d: Correct regexps.

diff --git a/gas/ChangeLog b/gas/ChangeLog
index 1ad770d..031fb42 100644 (file)
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,4 +1,8 @@
-2018-07-28  John Darrington  <john@darrington.wattle.id.au>
+2018-08-21  Alan Modra  <amodra@gmail.com>
+
+       * testsuite/gas/s12z/bit-manip-invalid.d: Correct regexps.
+
+2018-08-18  John Darrington  <john@darrington.wattle.id.au>
 
        * testsuite/gas/s12z/bit-manip-invalid.d: New file.
        * testsuite/gas/s12z/bit-manip-invalid.s: New file.

diff --git a/gas/testsuite/gas/s12z/bit-manip-invalid.d b/gas/testsuite/gas/s12z/bit-manip-invalid.d
index 0cfcfe4..571f435 100644 (file)
--- a/gas/testsuite/gas/s12z/bit-manip-invalid.d
+++ b/gas/testsuite/gas/s12z/bit-manip-invalid.d
@@ -3,17 +3,17 @@
 #source:  bit-manip-invalid.s
 
 
-dump.o:     file format elf32-s12z
+.*:     file format elf32-s12z
 
 
-Disassembly of section .text:
+Disassembly of section \.text:
 
-00000000 <.text>:
+00000000 <\.text>:
    0:  01              nop
-   1:  03 a5 10 04     brset.w 4100, d4, *+6
+   1:  03 a5 10 04     brset\.w 4100, d4, \*\+6
    5:  06 
    6:  01              nop
    7:  01              nop
-   8:  03 65 12        brset d1, #4, *+18
+   8:  03 65 12        brset d1, #4, \*\+18
    b:  01              nop
    c:  01              nop

diff --git a/include/ChangeLog b/include/ChangeLog
index ab3ff1f..37edc38 100644 (file)
--- a/include/ChangeLog
+++ b/include/ChangeLog
@@ -1,4 +1,4 @@
-2018-07-27  John Darrington  <john@darrington.wattle.id.au>
+2018-08-18  John Darrington  <john@darrington.wattle.id.au>
 
        * opcode/s12z.h: New file.
 

diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog
index 137e34c..268e5b7 100644 (file)
--- a/opcodes/ChangeLog
+++ b/opcodes/ChangeLog
@@ -2,14 +2,13 @@
 
        * sh-opc.h (MASK): Simplify.
 
-2018-07-28  John Darrington  <john@darrington.wattle.id.au>
+2018-08-18  John Darrington  <john@darrington.wattle.id.au>
 
        * s12z-dis.c (bm_decode): Deal with cases where the mode is
        BM_RESERVED0 or BM_RESERVED1
-       * s12z-dis.c (bm_rel_decode): ditto
-       * s12z-dis.c (bm_n_bytes): ditto
+       (bm_rel_decode, bm_n_bytes): Ditto.
 
-2018-07-28  John Darrington  <john@darrington.wattle.id.au>
+2018-08-18  John Darrington  <john@darrington.wattle.id.au>
 
        * s12z.h: Delete.