Remove listing lines that are no longer emitted and fix up expected binary

encoding.

diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog
index 3725dde..6e28dab 100644 (file)
--- a/gas/testsuite/ChangeLog
+++ b/gas/testsuite/ChangeLog
@@ -1,3 +1,10 @@
+2005-03-03  Nick Clifton  <nickc@redhat.com>
+
+       * gas/d30v/serial.l: Remove listing lines that are no longer
+       emitted and fix up expected binary encoding.
+       * gas/d30v/serial2.l: Likewise.
+       * gas/d30v/serial2O.l: Likewise.
+
 2005-03-03  Ramana Radhakrishnan  <ramana.radhakrishnan@codito.com>
 
        * gas/arc/extensions.s: Add tests for extcoreregister

diff --git a/gas/testsuite/gas/d30v/serial.l b/gas/testsuite/gas/d30v/serial.l
index f7a5a67..84b475d 100644 (file)
--- a/gas/testsuite/gas/d30v/serial.l
+++ b/gas/testsuite/gas/d30v/serial.l
@@ -11,12 +11,9 @@ GAS LISTING .*
    3                   # In the following examples, the right-subinstructions
    4                   # will never be executed.  GAS should detect this.
    5                           
-   6 \?\?\?\? 000000F0                 trap r21 -> add r2, r0, r0 ; right instruction will never be executed.
+   6 \?\?\?\? ........                 trap r21 -> add r2, r0, r0 ; right instruction will never be executed.
 \*\*\*\*  Error:Unable to mix instructions as specified
-   6      000000F0 
-   6      000000F0 
-   6      00000090 
-   6      001500F0 
+   6      ........ 
    7 \?\?\?\? 08002000                 dbt     -> add r2, r0, r0               ; ditto
 \*\*\*\*  Error:Unable to mix instructions as specified
    7      00F00000 

diff --git a/gas/testsuite/gas/d30v/serial2.l b/gas/testsuite/gas/d30v/serial2.l
index 2de04dc..3dc2652 100644 (file)
--- a/gas/testsuite/gas/d30v/serial2.l
+++ b/gas/testsuite/gas/d30v/serial2.l
@@ -26,12 +26,9 @@ GAS LISTING .*
    2                           
    3                           .text
    4                           
-   5 \?\?\?\? 000000F0                 bra -3 -> add r3,r0,0   ; Invalid
+   5 \?\?\?\? ........                 bra -3 -> add r3,r0,0   ; Invalid
 \*\*\*\*  Error:Unable to mix instructions as specified
-   5      000000F0 
-   5      000000F0 
-   5      0000000B 
-   5      FFFF00F0 
+   5      ........ 
    6 \?\?\?\? 08083000                 bsr -3 -> add r3,r0,0   ; Invalid
 \*\*\*\*  Error:Unable to mix instructions as specified
    6      00F00000 
@@ -79,13 +76,13 @@ GAS LISTING .*
 \*\*\*\*  Error:Unable to mix instructions as specified
   17      00F00000 
   17      000BFFFF 
-\fGAS LISTING .*
-
-
   17      00F00000 
   18 \?\?\?\? 10080001                 bra/tx -3 -> bra 10     ;      Valid
 \*\*\*\*  Error:Unable to mix instructions as specified
   18      00F00000 
+\fGAS LISTING .*
+
+
   18      100BFFFF 
   18      00F00000 
   19 \?\?\?\? 00080001                 bra/tx -3 -> bra/fx 10  ;      Valid

diff --git a/gas/testsuite/gas/d30v/serial2O.l b/gas/testsuite/gas/d30v/serial2O.l
index d9eb05c..dc5b9c7 100644 (file)
--- a/gas/testsuite/gas/d30v/serial2O.l
+++ b/gas/testsuite/gas/d30v/serial2O.l
@@ -16,12 +16,9 @@ GAS LISTING .*
    2                           
    3                           .text
    4                           
-   5 \?\?\?\? 000000F0                 bra -3 -> add r3,r0,0   ; Invalid
+   5 \?\?\?\? ........                 bra -3 -> add r3,r0,0   ; Invalid
 \*\*\*\*  Error:Unable to mix instructions as specified
-   5      000000F0 
-   5      000000F0 
-   5      0000000B 
-   5      FFFF00F0 
+   5      ........ 
    6 \?\?\?\? 08083000                 bsr -3 -> add r3,r0,0   ; Invalid
 \*\*\*\*  Error:Unable to mix instructions as specified
    6      00F00000 
@@ -69,12 +66,12 @@ GAS LISTING .*
 \*\*\*\*  Error:Unable to mix instructions as specified
   21      00F00000 
   22 \?\?\?\? 00080001                 bsr -3 -> bra/tx 10     ;      Invalid
-\fGAS LISTING .*
-
-
 \*\*\*\*  Error:Unable to mix instructions as specified
   22      00F00000 
   22      002BFFFF 
+\fGAS LISTING .*
+
+
   22      00F00000 
   23 \?\?\?\? 10080001                 bsr/tx -3 -> bra 10     ;      Valid
   23      00F00000