New order.

diff --git a/gas/testsuite/gasp/.Sanitize b/gas/testsuite/gasp/.Sanitize
index c96679c..c736c9f 100644 (file)
--- a/gas/testsuite/gasp/.Sanitize
+++ b/gas/testsuite/gasp/.Sanitize
@@ -28,69 +28,105 @@ Things-to-keep:
 INC1.H
 INC2.H
 assign.asm
-assign.was
+assign.err
+assign.out
 condass.asm
-condass.was
+condass.err
+condass.out
 crash.asm
-crash.was
+crash.err
+crash.out
 crash1.asm
-crash1.was
+crash1.err
+crash1.out
 crash2.asm
-crash2.was
+crash2.err
+crash2.out
 data.asm
-data.was
+data.err
+data.out
 exp.asm
-exp.was
+exp.err
+exp.out
+gasp.exp
 include.asm
-include.was
+include.err
+include.out
 listing.asm
-listing.was
+listing.err
+listing.out
 macro.asm
-macro.was
+macro.err
+macro.out
 mdouble.asm
-mdouble.was
+mdouble.err
+mdouble.out
 pl1.asm
-pl1.was
+pl1.err
+pl1.out
 pl2.asm
-pl2.was
+pl2.err
+pl2.out
 pl3.asm
-pl3.was
+pl3.err
+pl3.out
 pl4.asm
-pl4.was
+pl4.err
+pl4.out
 pl5.asm
-pl5.was
+pl5.err
+pl5.out
 pl6.asm
-pl6.was
+pl6.err
+pl6.out
 pl7.asm
-pl7.was
+pl7.err
+pl7.out
 pl8.asm
-pl8.was
+pl8.err
+pl8.out
+pr7583.asm
+pr7583.err
+pr7583.out
 reg.asm
-reg.was
+reg.err
+reg.out
 rep.asm
-rep.was
+rep.err
+rep.out
 repeat.asm
-repeat.was
+repeat.err
+repeat.out
 reperr.asm
-reperr.was
+reperr.err
+reperr.out
 reperr1.asm
-reperr1.was
+reperr1.err
+reperr1.out
 reperr2.asm
-reperr2.was
+reperr2.err
+reperr2.out
 reperr3.asm
-reperr3.was
+reperr3.err
+reperr3.out
 sdata.asm
-sdata.was
+sdata.err
+sdata.out
 sfunc.asm
-sfunc.was
+sfunc.err
+sfunc.out
 t1.asm
-t1.was
+t1.err
+t1.out
 t2.asm
-t2.was
+t2.err
+t2.out
 t3.asm
-t3.was
+t3.err
+t3.out
 while.asm
-while.was
+while.err
+while.out
 
 Things-to-lose:
 

diff --git a/gas/testsuite/gasp/assign.err b/gas/testsuite/gasp/assign.err
new file mode 100644 (file)
index 0000000..fe3733f
--- /dev/null
+++ b/gas/testsuite/gasp/assign.err
@@ -0,0 +1 @@
+assign.asm:8 Can't find preprocessor variable bar.

diff --git a/gas/testsuite/gasp/assign.was b/gas/testsuite/gasp/assign.out
similarity index 73%
rename from gas/testsuite/gasp/assign.was
rename to gas/testsuite/gasp/assign.out
index 7fd80e3..85509ae 100644 (file)
--- a/gas/testsuite/gasp/assign.was
+++ b/gas/testsuite/gasp/assign.out
@@ -1,4 +1,3 @@
-******** assign.amp
 !
 
 !foo:  .ASSIGNC        "hello"
@@ -21,4 +20,3 @@
 
 !      
 !      .END
-assign.asm:8 Can't find preprocessor variable bar.

diff --git a/gas/testsuite/gasp/condass.err b/gas/testsuite/gasp/condass.err
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/gas/testsuite/gasp/condass.was b/gas/testsuite/gasp/condass.out
similarity index 98%
rename from gas/testsuite/gasp/condass.was
rename to gas/testsuite/gasp/condass.out
index a1093a7..115cef5 100644 (file)
--- a/gas/testsuite/gasp/condass.was
+++ b/gas/testsuite/gasp/condass.out
@@ -1,4 +1,3 @@
-******** condass.amp
 !      .AIF    1 EQ 1
 !      OK
        OK
@@ -75,6 +74,7 @@
 !      .AENDI
 !      .AIF    "FOO" NE "BAR"
 !      OK
+       OK
 !      .AENDI
 !      .AIF    "FOO" EQ "FOO"
 !      OK

diff --git a/gas/testsuite/gasp/crash.err b/gas/testsuite/gasp/crash.err
new file mode 100644 (file)
index 0000000..1008802
--- /dev/null
+++ b/gas/testsuite/gasp/crash.err
@@ -0,0 +1 @@
+crash.asm:18 Unreasonable expansion (-u turns off check).

diff --git a/gas/testsuite/gasp/crash.was b/gas/testsuite/gasp/crash.out
similarity index 99%
rename from gas/testsuite/gasp/crash.was
rename to gas/testsuite/gasp/crash.out
index 6fec5ed..6b948a3 100644 (file)
--- a/gas/testsuite/gasp/crash.was
+++ b/gas/testsuite/gasp/crash.out
@@ -1,4 +1,3 @@
-******** crash.amp
 !
 
 !      Stuff to try and crash it
@@ -3058,4 +3057,3 @@
 !      THERE
        THERE
 !      bar
-crash.asm:18 Unreasonable expansion (-u turns off check).

diff --git a/gas/testsuite/gasp/crash1.err b/gas/testsuite/gasp/crash1.err
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/gas/testsuite/gasp/crash1.out b/gas/testsuite/gasp/crash1.out
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/gas/testsuite/gasp/crash1.was b/gas/testsuite/gasp/crash1.was
deleted file mode 100644 (file)
index a93c724..0000000
--- a/gas/testsuite/gasp/crash1.was
+++ /dev/null
@@ -1,26 +0,0 @@
-******** crash1.amp
-!
-
-!
-
-!      .MACRO  foo a b c=a
-!      \a \b \c \d
-!      .ENDM
-!
-
-!      foo 1 2
-!      1 2 a \d
-       1 2 a \d
-!      foo 1 2 3 4
-!      foo 1
-!      1  a \d
-       1  a \d
-!      foo 
-!        a \d
-       a \d
-!
-
-!
-
-!      .END
-crash1.asm:8 Too many positional arguments.

diff --git a/gas/testsuite/gasp/crash2.err b/gas/testsuite/gasp/crash2.err
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/gas/testsuite/gasp/crash2.was b/gas/testsuite/gasp/crash2.out
similarity index 96%
rename from gas/testsuite/gasp/crash2.was
rename to gas/testsuite/gasp/crash2.out
index 1e9c7ce..0d1a2f7 100644 (file)
--- a/gas/testsuite/gasp/crash2.was
+++ b/gas/testsuite/gasp/crash2.out
@@ -1,4 +1,3 @@
-******** crash2.amp
 !
 
 !foo:  .ASSIGNA        1

diff --git a/gas/testsuite/gasp/data.err b/gas/testsuite/gasp/data.err
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/gas/testsuite/gasp/data.was b/gas/testsuite/gasp/data.out
similarity index 96%
rename from gas/testsuite/gasp/data.was
rename to gas/testsuite/gasp/data.out
index 0fe6974..e96e1e5 100644 (file)
--- a/gas/testsuite/gasp/data.was
+++ b/gas/testsuite/gasp/data.out
@@ -1,4 +1,3 @@
-******** data.amp
 !
 
 !foo   .DATA   1,2,3

diff --git a/gas/testsuite/gasp/exp.err b/gas/testsuite/gasp/exp.err
new file mode 100644 (file)
index 0000000..f41fd52
--- /dev/null
+++ b/gas/testsuite/gasp/exp.err
@@ -0,0 +1,7 @@
+exp.asm:56 can't add two relocatable expressions
+exp.asm:57 the * operator cannot take non-absolute arguments.
+exp.asm:58 the / operator cannot take non-absolute arguments.
+exp.asm:59 the | operator cannot take non-absolute arguments.
+exp.asm:60 the & operator cannot take non-absolute arguments.
+exp.asm:61 the ~ operator cannot take non-absolute arguments.
+exp.asm:62 the * operator cannot take non-absolute arguments.

diff --git a/gas/testsuite/gasp/exp.was b/gas/testsuite/gasp/exp.out
similarity index 74%
rename from gas/testsuite/gasp/exp.was
rename to gas/testsuite/gasp/exp.out
index b5419d4..cecb9a8 100644 (file)
--- a/gas/testsuite/gasp/exp.was
+++ b/gas/testsuite/gasp/exp.out
@@ -1,4 +1,3 @@
-******** exp.amp
 !
 
 !; test all ops
@@ -123,10 +122,3 @@ space2:
 !
 
 !      .END
-exp.asm:56 can't add two relocatable expressions
-exp.asm:57 the * operator cannot take non-absolute arguments.
-exp.asm:58 the / operator cannot take non-absolute arguments.
-exp.asm:59 the | operator cannot take non-absolute arguments.
-exp.asm:60 the & operator cannot take non-absolute arguments.
-exp.asm:61 the ~ operator cannot take non-absolute arguments.
-exp.asm:62 the * operator cannot take non-absolute arguments.

diff --git a/gas/testsuite/gasp/include.err b/gas/testsuite/gasp/include.err
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/gas/testsuite/gasp/include.was b/gas/testsuite/gasp/include.out
similarity index 91%
rename from gas/testsuite/gasp/include.was
rename to gas/testsuite/gasp/include.out
index 3d35d85..d77a0df 100644 (file)
--- a/gas/testsuite/gasp/include.was
+++ b/gas/testsuite/gasp/include.out
@@ -1,4 +1,3 @@
-******** include.amp
 !      HI
        HI
 !      .INCLUDE        "INC1.H"

diff --git a/gas/testsuite/gasp/listing.err b/gas/testsuite/gasp/listing.err
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/gas/testsuite/gasp/listing.was b/gas/testsuite/gasp/listing.out
similarity index 82%
rename from gas/testsuite/gasp/listing.was
rename to gas/testsuite/gasp/listing.out
index 657e902..585bda2 100644 (file)
--- a/gas/testsuite/gasp/listing.was
+++ b/gas/testsuite/gasp/listing.out
@@ -1,4 +1,3 @@
-******** listing.amp
 !
 
 !
@@ -27,4 +26,3 @@
        .psize 123,23
 !      
 !      .END
-End of file not at start of line.

diff --git a/gas/testsuite/gasp/macro.err b/gas/testsuite/gasp/macro.err
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/gas/testsuite/gasp/macro.was b/gas/testsuite/gasp/macro.out
similarity index 57%
rename from gas/testsuite/gasp/macro.was
rename to gas/testsuite/gasp/macro.out
index bbbb318..b56f191 100644 (file)
--- a/gas/testsuite/gasp/macro.was
+++ b/gas/testsuite/gasp/macro.out
@@ -1,4 +1,3 @@
-******** macro.amp
 !      .MACRO  SUM FROM=0, TO=9
 !      ; \FROM \TO
 !      MOV     R\FROM,R10
@@ -150,8 +149,8 @@
 !      COMM
 !      bar     ; this comment will get copied out
        bar     ; this comment will get copied out
-!      foo     
-       foo     
+!      foo     \; this one will get dropped
+       foo     \; this one will get dropped
 !      BACK_SLASH_SET
 !      MOV     #"\",R0 
        MOV     #"\",R0 
@@ -173,201 +172,4 @@
 !      PLUS1   R,R1
 !      ADD     #1,R1
        ADD     #1,R1
-!      .SDATA  "R1"
-       .byte   82,49
-!
-
-!      .MACRO  SUM P1
-!      MOV     R0,R10
-!      ADD     R1,R10
-!      ADD     R2,R10
-!      \P1     
-!      ADD     R3,R10
-!      .ENDM
-!
-
-!      SUM     .EXITM
-!      MOV     R0,R10
-       MOV     R0,R10
-!      ADD     R1,R10
-       ADD     R1,R10
-!      ADD     R2,R10
-       ADD     R2,R10
-!      .EXITM  
-!
-
-!      .MACRO foo bar=a default=b
-!      \bar
-!      \default
-!      bar
-!      default
-!      .ENDM
-!      foo default=dog bar=cat
-!      cat
-       cat
-!      dog
-       dog
-!      bar
-       bar
-!      default
-       default
-!      foo X Y
-!      X
-       X
-!      Y
-       Y
-!      bar
-       bar
-!      default
-       default
-!      foo
-!      a
-       a
-!      b
-       b
-!      bar
-       bar
-!      default
-       default
-!      foo bar=cat default=dog
-!      cat
-       cat
-!      dog
-       dog
-!      bar
-       bar
-!      default
-       default
-!
-
-!
-
-!      .MACRO  foo bar
-!      HI
-!      HI \bar
-!      HI
-!      .ENDM
-!
-
-!      foo 1
-!      HI
-       HI
-!      HI 1
-       HI 1
-!      HI
-       HI
-!      foo 123
-!      HI
-       HI
-!      HI 123
-       HI 123
-!      HI
-       HI
-!      foo 1 2 3 4
-!      foo
-!      HI
-       HI
-!      HI 
-       HI 
-!      HI
-       HI
-!
-
-!      
-!      .MACRO  PUSH Rn
-!      MOV.L   \Rn,@-r15
-!      .ENDM
-!      PUSH    R0
-!      MOV.L   R0,@-r15
-       MOV.L   R0,@-r15
-!      PUSH    R1
-!      MOV.L   R1,@-r15
-       MOV.L   R1,@-r15
-!
-
-!
-
-!      .MACRO  RES_STR STR, Rn
-!      MOV.L   #str\@,\Rn
-!      BRA     end_str\@
-!      NOP
-!str\@ .SDATA "\STR"
-!      .ALIGN  2
-!end_str\@
-!      .ENDM
-!      
-!      RES_STR "ONE",R0        
-!      MOV.L   #str00018,R0
-       MOV.L   #str00018,R0
-!      BRA     end_str00018
-       BRA     end_str00018
-!      NOP
-       NOP
-!str00018      .SDATA "ONE"
-str00018:      .byte   79,78,69
-!      .ALIGN  2
-       .align  2
-!end_str00018
-end_str00018:
-!      RES_STR "TWO",R1
-!      MOV.L   #str00019,R1
-       MOV.L   #str00019,R1
-!      BRA     end_str00019
-       BRA     end_str00019
-!      NOP
-       NOP
-!str00019      .SDATA "TWO"
-str00019:      .byte   84,87,79
-!      .ALIGN  2
-       .align  2
-!end_str00019
-end_str00019:
-!      RES_STR "THREE",R2
-!      MOV.L   #str00020,R2
-       MOV.L   #str00020,R2
-!      BRA     end_str00020
-       BRA     end_str00020
-!      NOP
-       NOP
-!str00020      .SDATA "THREE"
-str00020:      .byte   84,72,82,69,69
-!      .ALIGN  2
-       .align  2
-!end_str00020
-end_str00020:
-!
-
-!
-
-!
-
-!      RES_STR STR=donkey Rn=R1
-!      MOV.L   #str00021,R1
-       MOV.L   #str00021,R1
-!      BRA     end_str00021
-       BRA     end_str00021
-!      NOP
-       NOP
-!str00021      .SDATA "donkey"
-str00021:      .byte   100,111,110,107,101,121
-!      .ALIGN  2
-       .align  2
-!end_str00021
-end_str00021:
-!      RES_STR donkey,R1
-!      MOV.L   #str00022,R1
-       MOV.L   #str00022,R1
-!      BRA     end_str00022
-       BRA     end_str00022
-!      NOP
-       NOP
-!str00022      .SDATA "donkey"
-str00022:      .byte   100,111,110,107,101,121
-!      .ALIGN  2
-       .align  2
-!end_str00022
-end_str00022:
-!      RES_STR donkey Rn=R1
-!      .END
-macro.asm:70 Too many positional arguments.
-macro.asm:98 Can't mix positional and keyword arguments.
+!      .SDATA  "R1
\ No newline at end of file

diff --git a/gas/testsuite/gasp/mdouble.err b/gas/testsuite/gasp/mdouble.err
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/gas/testsuite/gasp/mdouble.was b/gas/testsuite/gasp/mdouble.out
similarity index 69%
rename from gas/testsuite/gasp/mdouble.was
rename to gas/testsuite/gasp/mdouble.out
index 6b413ce..9d9ad62 100644 (file)
--- a/gas/testsuite/gasp/mdouble.was
+++ b/gas/testsuite/gasp/mdouble.out
@@ -1,4 +1,27 @@
-******** mdouble.amp
+!
+
+!      .MACRO  HI
+!      A
+!      \! this is hidden
+!      B
+!      ! this is not
+!      C
+!      .ENDM
+!      Hello 
+       Hello 
+!      HI
+!      A
+       A
+!      
+!      B
+       B
+!      ! this is not
+       ! this is not
+!      C
+       C
+!      Emily
+       Emily
+!      
 !
 
 !      H'0f
@@ -34,8 +57,8 @@
        ADD #1,@B
 !ENTRY JMP     @MAIN
 ENTRY: JMP     @MAIN
-!L00000        ADD     #1,@HL
-L00000:        ADD     #1,@HL
+!L00001        ADD     #1,@HL
+L00001:        ADD     #1,@HL
 !      MOV     #0,@C   
        MOV     #0,@C   
 !      ADD     #2,@C

diff --git a/gas/testsuite/gasp/pl1.err b/gas/testsuite/gasp/pl1.err
new file mode 100644 (file)
index 0000000..a1e3318
--- /dev/null
+++ b/gas/testsuite/gasp/pl1.err
@@ -0,0 +1 @@
+END missing from end of file.

diff --git a/gas/testsuite/gasp/pl1.was b/gas/testsuite/gasp/pl1.out
similarity index 89%
rename from gas/testsuite/gasp/pl1.was
rename to gas/testsuite/gasp/pl1.out
index 03bd7a7..8b80f12 100644 (file)
--- a/gas/testsuite/gasp/pl1.was
+++ b/gas/testsuite/gasp/pl1.out
@@ -1,4 +1,3 @@
-******** pl1.amp
 !      
 !      .ALTERNATE
 !
@@ -47,4 +46,4 @@
 
 !
 
-!END missing from end of file.
+!
\ No newline at end of file

diff --git a/gas/testsuite/gasp/pl2.err b/gas/testsuite/gasp/pl2.err
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/gas/testsuite/gasp/pl2.was b/gas/testsuite/gasp/pl2.out
similarity index 96%
rename from gas/testsuite/gasp/pl2.was
rename to gas/testsuite/gasp/pl2.out
index bbaf959..cca6fa3 100644 (file)
--- a/gas/testsuite/gasp/pl2.was
+++ b/gas/testsuite/gasp/pl2.out
@@ -1,4 +1,3 @@
-******** pl2.amp
 !
 
 !

diff --git a/gas/testsuite/gasp/pl3.err b/gas/testsuite/gasp/pl3.err
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/gas/testsuite/gasp/pl3.was b/gas/testsuite/gasp/pl3.out
similarity index 90%
rename from gas/testsuite/gasp/pl3.was
rename to gas/testsuite/gasp/pl3.out
index 338a00d..2db7a32 100644 (file)
--- a/gas/testsuite/gasp/pl3.was
+++ b/gas/testsuite/gasp/pl3.out
@@ -1,4 +1,3 @@
-******** pl3.amp
 !      .ALTERNATE
 !
 
@@ -14,13 +13,13 @@
 !lab1: DATA.L  lab2
 LL0001:        .long   LL0002
 !lab2: SDATA   "An example"
-LL0002:        .byte   34,65,110,32,101,120,97,109,112,108,101,34
+LL0002:        .byte   65,110,32,101,120,97,109,112,108,101
 !      foo     "using LOCAL"
 !      LOCAL   lab1, lab2
 !lab1: DATA.L  lab2
 LL0003:        .long   LL0004
 !lab2: SDATA   "using LOCAL"
-LL0004:        .byte   34,117,115,105,110,103,32,76,79,67,65,76,34
+LL0004:        .byte   117,115,105,110,103,32,76,79,67,65,76
 !
 
 !! test of LOCAL directive

diff --git a/gas/testsuite/gasp/pl4.err b/gas/testsuite/gasp/pl4.err
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/gas/testsuite/gasp/pl4.was b/gas/testsuite/gasp/pl4.out
similarity index 90%
rename from gas/testsuite/gasp/pl4.was
rename to gas/testsuite/gasp/pl4.out
index fcda842..35d1391 100644 (file)
--- a/gas/testsuite/gasp/pl4.was
+++ b/gas/testsuite/gasp/pl4.out
@@ -1,4 +1,3 @@
-******** pl4.amp
 !      .ALTERNATE
 !! test of macro substitution around &s
        ! test of macro substitution around &s

diff --git a/gas/testsuite/gasp/pl5.err b/gas/testsuite/gasp/pl5.err
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/gas/testsuite/gasp/pl5.was b/gas/testsuite/gasp/pl5.out
similarity index 50%
rename from gas/testsuite/gasp/pl5.was
rename to gas/testsuite/gasp/pl5.out
index 6d92179..0aa488b 100644 (file)
--- a/gas/testsuite/gasp/pl5.was
+++ b/gas/testsuite/gasp/pl5.out
@@ -1,4 +1,3 @@
-******** pl5.amp
 !! test of literal text operator
        ! test of literal text operator
 !      .ALTERNATE
@@ -13,19 +12,19 @@
 !      
 !      foop    this< is a <string> with angle brackets>
 !      SDATA   "this"
-       .byte   34,116,104,105,115,34
+       .byte   116,104,105,115
 !      SDATA   " is a <string> with angle brackets"
-       .byte   34,32,105,115,32,97,32,60,115,116,114,105,110,103,62,32,119,105,116,104,32,97,110,103,108,101,32,98,114,97,99,107,101,116,115,34
+       .byte   32,105,115,32,97,32,60,115,116,114,105,110,103,62,32,119,105,116,104,32,97,110,103,108,101,32,98,114,97,99,107,101,116,115
 !      foop    this< is a string with spaces>
 !      SDATA   "this"
-       .byte   34,116,104,105,115,34
+       .byte   116,104,105,115
 !      SDATA   " is a string with spaces"
-       .byte   34,32,105,115,32,97,32,115,116,114,105,110,103,32,119,105,116,104,32,115,112,97,99,101,115,34
+       .byte   32,105,115,32,97,32,115,116,114,105,110,103,32,119,105,116,104,32,115,112,97,99,101,115
 !      foop    this < is a string with a !>>
 !      SDATA   "this"
-       .byte   34,116,104,105,115,34
+       .byte   116,104,105,115
 !      SDATA   " is a string with a >"
-       .byte   34,32,105,115,32,97,32,115,116,114,105,110,103,32,119,105,116,104,32,97,32,62,34
+       .byte   32,105,115,32,97,32,115,116,114,105,110,103,32,119,105,116,104,32,97,32,62
 !
 
 !

diff --git a/gas/testsuite/gasp/pl6.err b/gas/testsuite/gasp/pl6.err
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/gas/testsuite/gasp/pl6.was b/gas/testsuite/gasp/pl6.out
similarity index 55%
rename from gas/testsuite/gasp/pl6.was
rename to gas/testsuite/gasp/pl6.out
index e071d7b..dcd16cf 100644 (file)
--- a/gas/testsuite/gasp/pl6.was
+++ b/gas/testsuite/gasp/pl6.out
@@ -1,4 +1,3 @@
-******** pl6.amp
 !      .ALTERNATE
 !! test of expression operator
        ! test of expression operator
@@ -8,44 +7,44 @@
 !      ENDM
 !      define "1","99%of100"   ! notice % within string
 !      SDATA   "1"
-       .byte   34,49,34
+       .byte   49
 !      SDATA   "99%of100"
-       .byte   34,57,57,37,111,102,49,48,48,34
+       .byte   57,57,37,111,102,49,48,48
 !      define  %1 + 2, "=3"
-!      SDATA   "3"
-       .byte   34,51,34
+!      SDATA   3
+       .byte   51
 !      SDATA   "=3"
-       .byte   34,61,51,34
+       .byte   61,51
 !
 
 !
 
 !      define  % 1 + 2 %3+4
-!      SDATA   "3"
-       .byte   34,51,34
-!      SDATA   "7"
-       .byte   34,55,34
+!      SDATA   3
+       .byte   51
+!      SDATA   7
+       .byte   55
 !
 
 !      define  %3*4-2  <=10>
-!      SDATA   "10"
-       .byte   34,49,48,34
+!      SDATA   10
+       .byte   49,48
 !      SDATA   "=10"
-       .byte   34,61,49,48,34
+       .byte   61,49,48
 !
 
 !      define  %3*4-2  5
-!      SDATA   "10"
-       .byte   34,49,48,34
+!      SDATA   10
+       .byte   49,48
 !      SDATA   5
        .byte   53
 !
 
 !      define  %1 + 2,<is equal to %1 + 2, right?>
-!      SDATA   "3"
-       .byte   34,51,34
+!      SDATA   3
+       .byte   51
 !      SDATA   "is equal to %1 + 2, right?"
-       .byte   34,105,115,32,101,113,117,97,108,32,116,111,32,37,49,32,43,32,50,44,32,114,105,103,104,116,63,34
+       .byte   105,115,32,101,113,117,97,108,32,116,111,32,37,49,32,43,32,50,44,32,114,105,103,104,116,63
 !
 
 !      ! has no effect

diff --git a/gas/testsuite/gasp/pl7.err b/gas/testsuite/gasp/pl7.err
new file mode 100644 (file)
index 0000000..a1e3318
--- /dev/null
+++ b/gas/testsuite/gasp/pl7.err
@@ -0,0 +1 @@
+END missing from end of file.

diff --git a/gas/testsuite/gasp/pl7.was b/gas/testsuite/gasp/pl7.out
similarity index 68%
rename from gas/testsuite/gasp/pl7.was
rename to gas/testsuite/gasp/pl7.out
index 60581fd..1519b34 100644 (file)
--- a/gas/testsuite/gasp/pl7.was
+++ b/gas/testsuite/gasp/pl7.out
@@ -1,4 +1,3 @@
-******** pl7.amp
 !      .ALTERNATE
 !! test of string operators
        ! test of string operators
@@ -10,12 +9,12 @@
 !      SDATA   one" way to get "spaces
        .byte   111,110,101,34,32,119,97,121,32,116,111,32,103,101,116,32,34,115,112,97,99,101,115
 !      SDATA   "0"
-       .byte   34,48,34
+       .byte   48
 !      define  "lot's! of <special>,chars%", 0
 !      SDATA   "lot's of <special>,chars%"
-       .byte   34,108,111,116,39,115,32,111,102,32,60,115,112,101,99,105,97,108,62,44,99,104,97,114,115,37,34
+       .byte   108,111,116,39,115,32,111,102,32,60,115,112,101,99,105,97,108,62,44,99,104,97,114,115,37
 !      SDATA   "0"
-       .byte   34,48,34
+       .byte   48
 !
 
 !
@@ -24,4 +23,4 @@
 
 !
 
-!END missing from end of file.
+!
\ No newline at end of file

diff --git a/gas/testsuite/gasp/pl8.err b/gas/testsuite/gasp/pl8.err
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/gas/testsuite/gasp/pl8.out b/gas/testsuite/gasp/pl8.out
new file mode 100644 (file)
index 0000000..3710412
--- /dev/null
+++ b/gas/testsuite/gasp/pl8.out
@@ -0,0 +1,33 @@
+!
+
+!      .ALTERNATE
+!      SDATA   %1+2+3 
+       .byte   37,49,43,50,43,51,32
+!      SDATA   "5"
+       .byte   53
+!
+
+!
+
+!
+
+!      MACRO   foo
+!      SDATA   "HI"    !! this will go
+!      SDATA   "THERE  ! this will stay
+!      ENDM
+!
+
+!      foo
+!      SDATA   "HI"    
+       .byte   72,73
+!      SDATA   "THERE  ! this will stay
+       .byte   84,72,69,82,69,9,32,116,104,105,115,32,119,105,108,108,32,115,116,97,121
+!
+
+!
+
+!      SDATA   <!<this is <a wacky> example!>!!>
+       .byte   60,116,104,105,115,32,105,115,32,60,97,32,119,97,99,107,121,62,32,101,120,97,109,112,108,101,62,33
+!      SDATA   "<this is <a wacky> example>!"
+       .byte   60,116,104,105,115,32,105,115,32,60,97,32,119,97,99,107,121,62,32,101,120,97,109,112,108,101,62,34
+!      END

diff --git a/gas/testsuite/gasp/pl8.was b/gas/testsuite/gasp/pl8.was
deleted file mode 100644 (file)
index 9ba0f1f..0000000
--- a/gas/testsuite/gasp/pl8.was
+++ /dev/null
@@ -1,34 +0,0 @@
-******** pl8.amp
-!
-
-!      .ALTERNATE
-!      SDATA   %1+2+3 
-       .byte   34,54,34
-!      SDATA   "5"
-       .byte   34,53,34
-!
-
-!
-
-!
-
-!      MACRO   foo
-!      SDATA   "HI"    !! this will go
-!      SDATA   "THERE  ! this will stay
-!      ENDM
-!
-
-!      foo
-!      SDATA   "HI"    
-       .byte   34,72,73,34
-!      SDATA   "THERE  ! this will stay
-       .byte   34,84,72,69,82,69,9,32,116,104,105,115,32,119,105,108,108,32,115,116,97,121,34
-!
-
-!
-
-!      SDATA   <!<this is <a wacky> example!>!!>
-       .byte   34,60,116,104,105,115,32,105,115,32,60,97,32,119,97,99,107,121,62,32,101,120,97,109,112,108,101,62,33,34
-!      SDATA   "<this is <a wacky> example>!"
-       .byte   34,60,116,104,105,115,32,105,115,32,60,97,32,119,97,99,107,121,62,32,101,120,97,109,112,108,101,62,34,34
-!      END

diff --git a/gas/testsuite/gasp/pr7583.asm b/gas/testsuite/gasp/pr7583.asm
new file mode 100644 (file)
index 0000000..c97caf5
--- /dev/null
+++ b/gas/testsuite/gasp/pr7583.asm
@@ -0,0 +1,3 @@
+
+     .sdata "v1.0000"
+     .end

diff --git a/gas/testsuite/gasp/pr7583.err b/gas/testsuite/gasp/pr7583.err
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/gas/testsuite/gasp/pr7583.out b/gas/testsuite/gasp/pr7583.out
new file mode 100644 (file)
index 0000000..a5df1d7
--- /dev/null
+++ b/gas/testsuite/gasp/pr7583.out
@@ -0,0 +1,5 @@
+!
+
+!     .sdata "v1.0000"
+       .byte   118,49,46,48,48,48,48
+!     .end

diff --git a/gas/testsuite/gasp/reg.err b/gas/testsuite/gasp/reg.err
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/gas/testsuite/gasp/reg.was b/gas/testsuite/gasp/reg.out
similarity index 85%
rename from gas/testsuite/gasp/reg.was
rename to gas/testsuite/gasp/reg.out
index 27f3d2b..79268a3 100644 (file)
--- a/gas/testsuite/gasp/reg.was
+++ b/gas/testsuite/gasp/reg.out
@@ -1,4 +1,3 @@
-******** reg.amp
 !
 
 !

diff --git a/gas/testsuite/gasp/rep.err b/gas/testsuite/gasp/rep.err
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/gas/testsuite/gasp/rep.was b/gas/testsuite/gasp/rep.out
similarity index 99%
rename from gas/testsuite/gasp/rep.was
rename to gas/testsuite/gasp/rep.out
index 5271b3e..510d0e1 100644 (file)
--- a/gas/testsuite/gasp/rep.was
+++ b/gas/testsuite/gasp/rep.out
@@ -1,4 +1,3 @@
-******** rep.amp
 !      .AREPEAT        5
 !      FIVE
 !      .AREPEAT        2

diff --git a/gas/testsuite/gasp/repeat.err b/gas/testsuite/gasp/repeat.err
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/gas/testsuite/gasp/repeat.was b/gas/testsuite/gasp/repeat.out
similarity index 98%
rename from gas/testsuite/gasp/repeat.was
rename to gas/testsuite/gasp/repeat.out
index eb6c967..705d8d8 100644 (file)
--- a/gas/testsuite/gasp/repeat.was
+++ b/gas/testsuite/gasp/repeat.out
@@ -1,4 +1,3 @@
-******** repeat.amp
 !
 
 !      .AREPEAT        10

diff --git a/gas/testsuite/gasp/reperr.err b/gas/testsuite/gasp/reperr.err
new file mode 100644 (file)
index 0000000..a1e3318
--- /dev/null
+++ b/gas/testsuite/gasp/reperr.err
@@ -0,0 +1 @@
+END missing from end of file.

diff --git a/gas/testsuite/gasp/reperr.out b/gas/testsuite/gasp/reperr.out
new file mode 100644 (file)
index 0000000..2c9f8c6
--- /dev/null
+++ b/gas/testsuite/gasp/reperr.out
@@ -0,0 +1,5 @@
+!
+
+!      .REPEAT 10
+       .REPEAT 10
+!
\ No newline at end of file

diff --git a/gas/testsuite/gasp/reperr.was b/gas/testsuite/gasp/reperr.was
deleted file mode 100644 (file)
index 3cb7bad..0000000
--- a/gas/testsuite/gasp/reperr.was
+++ /dev/null
@@ -1,6 +0,0 @@
-******** reperr.amp
-!
-
-!      .REPEAT 10
-       .REPEAT 10
-!.END missing from end of file.

diff --git a/gas/testsuite/gasp/reperr1.err b/gas/testsuite/gasp/reperr1.err
new file mode 100644 (file)
index 0000000..536545b
--- /dev/null
+++ b/gas/testsuite/gasp/reperr1.err
@@ -0,0 +1 @@
+End of file whilst inside AREPEAT, started on line 3.

diff --git a/gas/testsuite/gasp/reperr1.out b/gas/testsuite/gasp/reperr1.out
new file mode 100644 (file)
index 0000000..dd82880
--- /dev/null
+++ b/gas/testsuite/gasp/reperr1.out
@@ -0,0 +1,5 @@
+!
+
+!      .AREPEAT        10
+!      .END
+!
\ No newline at end of file

diff --git a/gas/testsuite/gasp/reperr1.was b/gas/testsuite/gasp/reperr1.was
deleted file mode 100644 (file)
index 72ae1bb..0000000
--- a/gas/testsuite/gasp/reperr1.was
+++ /dev/null
@@ -1,6 +0,0 @@
-******** reperr1.amp
-!
-
-!      .AREPEAT        10
-!      .END
-!End of file whilst inside .AREPEAT, started on line 3.

diff --git a/gas/testsuite/gasp/reperr2.err b/gas/testsuite/gasp/reperr2.err
new file mode 100644 (file)
index 0000000..840ccc5
--- /dev/null
+++ b/gas/testsuite/gasp/reperr2.err
@@ -0,0 +1 @@
+reperr2.asm:4 AENDR without a AREPEAT.

diff --git a/gas/testsuite/gasp/reperr2.was b/gas/testsuite/gasp/reperr2.out
similarity index 68%
rename from gas/testsuite/gasp/reperr2.was
rename to gas/testsuite/gasp/reperr2.out
index d29f57e..df7a84d 100644 (file)
--- a/gas/testsuite/gasp/reperr2.was
+++ b/gas/testsuite/gasp/reperr2.out
@@ -1,4 +1,3 @@
-******** reperr2.amp
 !
 
 !      .AREPEAT        5
@@ -13,4 +12,3 @@
 !      .AENDR
 !      .AENDR
 !      .END
-reperr2.asm:4 AENDR without a AREPEAT.

diff --git a/gas/testsuite/gasp/reperr3.err b/gas/testsuite/gasp/reperr3.err
new file mode 100644 (file)
index 0000000..1be0dce
--- /dev/null
+++ b/gas/testsuite/gasp/reperr3.err
@@ -0,0 +1,6 @@
+reperr3.asm:14 AENDR without a AREPEAT.
+reperr3.asm:16 AENDR without a AREPEAT.
+reperr3.asm:17 AENDR without a AREPEAT.
+reperr3.asm:18 AENDR without a AREPEAT.
+reperr3.asm:19 AENDR without a AREPEAT.
+reperr3.asm:20 AENDR without a AREPEAT.

diff --git a/gas/testsuite/gasp/reperr3.was b/gas/testsuite/gasp/reperr3.out
similarity index 98%
rename from gas/testsuite/gasp/reperr3.was
rename to gas/testsuite/gasp/reperr3.out
index 775fbf5..9a3513b 100644 (file)
--- a/gas/testsuite/gasp/reperr3.was
+++ b/gas/testsuite/gasp/reperr3.out
@@ -1,4 +1,3 @@
-******** reperr3.amp
 !      .AREPEAT        4
 !      .AREPEAT        4
 !      .AREPEAT        4
@@ -2034,9 +2033,3 @@
 !      .AENDR  
 !      .AENDR  
 !      .END
-reperr3.asm:14 AENDR without a AREPEAT.
-reperr3.asm:16 AENDR without a AREPEAT.
-reperr3.asm:17 AENDR without a AREPEAT.
-reperr3.asm:18 AENDR without a AREPEAT.
-reperr3.asm:19 AENDR without a AREPEAT.
-reperr3.asm:20 AENDR without a AREPEAT.

diff --git a/gas/testsuite/gasp/sdata.err b/gas/testsuite/gasp/sdata.err
new file mode 100644 (file)
index 0000000..7544ccc
--- /dev/null
+++ b/gas/testsuite/gasp/sdata.err
@@ -0,0 +1,3 @@
+sdata.asm:19 Character code in string must be absolute expression.
+sdata.asm:19 Missing > for character code.
+END missing from end of file.

diff --git a/gas/testsuite/gasp/sdata.was b/gas/testsuite/gasp/sdata.out
similarity index 85%
rename from gas/testsuite/gasp/sdata.was
rename to gas/testsuite/gasp/sdata.out
index 2a6b889..e689d35 100644 (file)
--- a/gas/testsuite/gasp/sdata.was
+++ b/gas/testsuite/gasp/sdata.out
@@ -1,4 +1,3 @@
-******** sdata.amp
 !
 
 !
@@ -20,7 +19,7 @@
 !      .SDATA  "SHOULD NOT FAIL" "HERE" 
        .byte   83,72,79,85,76,68,32,78,79,84,32,70,65,73,76,72,69,82,69
 !      .SDATA  "SHOULD FAIL"  foo "HERE" 
-       .byte   83,72,79,85,76,68,32,70,65,73,76,102,111,111,72,69,82,69
+       .byte   83,72,79,85,76,68,32,70,65,73,76,102,111,111,32,34,72,69,82,69,34,32
 !
 
 !      .SDATAB 8,"BOINK"
@@ -45,8 +44,8 @@
        .byte   34,66,66,66,34
        .byte   34,66,66,66,34
 !      .SDATAB 2,"AABB"<H'07>
-       .byte   65,65,66,66,7
-       .byte   65,65,66,66,7
+       .byte   65,65,66,66,0
+       .byte   65,65,66,66,0
 !
 
 !
@@ -57,4 +56,4 @@ a1:   .byte   72,73,0
 a2:    .byte   2,72,73
 !a3:   .SDATA  "HI"
 a3:    .byte   72,73
-!END missing from end of file.
+!
\ No newline at end of file

diff --git a/gas/testsuite/gasp/sfunc.err b/gas/testsuite/gasp/sfunc.err
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/gas/testsuite/gasp/sfunc.out b/gas/testsuite/gasp/sfunc.out
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/gas/testsuite/gasp/sfunc.was b/gas/testsuite/gasp/sfunc.was
deleted file mode 100644 (file)
index 98e80d5..0000000
--- a/gas/testsuite/gasp/sfunc.was
+++ /dev/null
@@ -1,50 +0,0 @@
-******** sfunc.amp
-!
-
-!      .MACRO  RESERVE_STR P1=0 P2
-!      .SDATA  .SUBSTR("ABCDEFG",\P1,\P2)
-!      .ENDM
-!
-
-!      RESERVE_STR     2,2
-!      .SDATA  .SUBSTR("ABCDEFG",2,2)
-       .byte   67,68
-!      RESERVE_STR     ,3
-!      .SDATA  .SUBSTR("ABCDEFG",0,3)
-       .byte   65,66,67
-!
-
-!
-
-!      .MACRO FIND_STR P1
-!      .DATA.W .INSTR("ABCDEFG","\P1", 0)
-!      .ENDM
-!
-
-!      FIND_STR        CDE
-!      .DATA.W .INSTR("ABCDEFG","CDE", 0)
-       .short  2
-!      FIND_STR        H
-!      .DATA.W .INSTR("ABCDEFG","H", 0)
-       .short  -1
-!
-
-!      .MACRO  RESERVE_LENGTH P1
-!      .ALIGN  4
-!      .SRES   .LEN("\P1")
-!      .ENDM
-!
-
-!      RESERVE_LENGTH  ABCDEF
-!      .ALIGN  4
-       .align  4
-!      .SRES   .LEN("ABCDEF")
-       .space  24
-!      RESERVE_LENGTH  ABC
-!      .ALIGN  4
-       .align  4
-!      .SRES   .LEN("ABC")
-       .space  12
-!
-
-!      .END

diff --git a/gas/testsuite/gasp/t1.err b/gas/testsuite/gasp/t1.err
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/gas/testsuite/gasp/t1.was b/gas/testsuite/gasp/t1.out
similarity index 82%
rename from gas/testsuite/gasp/t1.was
rename to gas/testsuite/gasp/t1.out
index 63ba4af..39230e1 100644 (file)
--- a/gas/testsuite/gasp/t1.was
+++ b/gas/testsuite/gasp/t1.out
@@ -1,4 +1,3 @@
-******** t1.amp
 !
 
 !      test for eof in middle of line

diff --git a/gas/testsuite/gasp/t2.err b/gas/testsuite/gasp/t2.err
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/gas/testsuite/gasp/t2.was b/gas/testsuite/gasp/t2.out
similarity index 80%
rename from gas/testsuite/gasp/t2.was
rename to gas/testsuite/gasp/t2.out
index 3df17e0..0c44e8b 100644 (file)
--- a/gas/testsuite/gasp/t2.was
+++ b/gas/testsuite/gasp/t2.out
@@ -1,4 +1,3 @@
-******** t2.amp
 !
 
 !

diff --git a/gas/testsuite/gasp/t3.err b/gas/testsuite/gasp/t3.err
new file mode 100644 (file)
index 0000000..a1e3318
--- /dev/null
+++ b/gas/testsuite/gasp/t3.err
@@ -0,0 +1 @@
+END missing from end of file.

diff --git a/gas/testsuite/gasp/t3.was b/gas/testsuite/gasp/t3.out
similarity index 82%
rename from gas/testsuite/gasp/t3.was
rename to gas/testsuite/gasp/t3.out
index a16b5e8..8ad150b 100644 (file)
--- a/gas/testsuite/gasp/t3.was
+++ b/gas/testsuite/gasp/t3.out
@@ -1,4 +1,3 @@
-******** t3.amp
 !
 
 !      test base convertions
@@ -23,4 +22,4 @@
        FOOD'136BAR
 !      FOOH'88BAR
        FOOH'88BAR
-!.END missing from end of file.
+!
\ No newline at end of file

diff --git a/gas/testsuite/gasp/while.err b/gas/testsuite/gasp/while.err
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/gas/testsuite/gasp/while.was b/gas/testsuite/gasp/while.out
similarity index 99%
rename from gas/testsuite/gasp/while.was
rename to gas/testsuite/gasp/while.out
index d33fbc4..128aeb1 100644 (file)
--- a/gas/testsuite/gasp/while.was
+++ b/gas/testsuite/gasp/while.out
@@ -1,4 +1,3 @@
-******** while.amp
 !      donkey
        donkey
 !bar   .ASSIGNA        0