Reflect new rules.

diff --git a/gas/testsuite/gasp/mdouble.is b/gas/testsuite/gasp/mdouble.is
index 6b413ce2a1d553fd03699eda00061ea8308a130e..c9c3aa5204510442bf2171f32125d9a5b67daf24 100644 (file)
--- a/gas/testsuite/gasp/mdouble.is
+++ b/gas/testsuite/gasp/mdouble.is
@@ -1,6 +1,30 @@
 ******** 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
        15
 !      200+H'0F
@@ -34,8 +58,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.is b/gas/testsuite/gasp/pl1.is
index 03bd7a74a51ec2dca7833b91904db9b275b04653..53184dda4605a77fb4cc44185162066e4542d733 100644 (file)
--- a/gas/testsuite/gasp/pl1.is
+++ b/gas/testsuite/gasp/pl1.is
@@ -10,10 +10,10 @@
 !
 
 !      alloc   "that's" 'show biz'
-!      DB      "that's"
-       .byte   116,104,97,116,39,115
-!      DB      "show biz"
-       .byte   115,104,111,119,32,98,105,122
+!      DB      that's
+       .byte   that0s
+!      DB      show biz
+       .byte   showbiz
 !      alloc   0,1
 !      DB      0
        .byte   0
@@ -47,4 +47,5 @@
 
 !
 
-!END missing from end of file.
+!pl1.asm:10 alloc:1 can't find primary in expression.
+END missing from end of file.

diff --git a/gas/testsuite/gasp/pl3.is b/gas/testsuite/gasp/pl3.is
index 338a00d5e0cbfc94d4d43f18afa67120c09f579d..78dd645cc88be61760c9dabdbc0507cfd72d9d08 100644 (file)
--- a/gas/testsuite/gasp/pl3.is
+++ b/gas/testsuite/gasp/pl3.is
@@ -13,14 +13,14 @@
 !      LOCAL   lab1, lab2
 !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
+!lab2: SDATA   An example
+LL0002:        .byte   65,110,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
+!lab2: SDATA   using LOCAL
+LL0004:        .byte   117,115,105,110,103,76,79,67,65,76
 !
 
 !! test of LOCAL directive

diff --git a/gas/testsuite/gasp/pl5.is b/gas/testsuite/gasp/pl5.is
index 6d92179e341044294699ee85a6a9c0310b5449ec..6581d089035dd1eb6bee9876868c54039e25e8d9 100644 (file)
--- a/gas/testsuite/gasp/pl5.is
+++ b/gas/testsuite/gasp/pl5.is
@@ -13,19 +13,19 @@
 !      
 !      foop    this< is a <string> with angle brackets>
 !      SDATA   "this"
-       .byte   34,116,104,105,115,34
-!      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   116,104,105,115
+!      SDATA    is a <string> with angle brackets
+       .byte   105,115,97,115,116,114,105,110,103,119,105,116,104,97,110,103,108,101,98,114,97,99,107,101,116,115
 !      foop    this< is a string with spaces>
 !      SDATA   "this"
-       .byte   34,116,104,105,115,34
-!      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   116,104,105,115
+!      SDATA    is a string with spaces
+       .byte   105,115,97,115,116,114,105,110,103,119,105,116,104,115,112,97,99,101,115
 !      foop    this < is a string with a !>>
 !      SDATA   "this"
-       .byte   34,116,104,105,115,34
-!      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   116,104,105,115
+!      SDATA    is a string with a >
+       .byte   105,115,97,115,116,114,105,110,103,119,105,116,104,97
 !
 
 !

diff --git a/gas/testsuite/gasp/pl6.is b/gas/testsuite/gasp/pl6.is
index e071d7ba2dd8218f8cac30d01bd8dae9b844f4ff..25446390fa92189c0ebf0018bd9ff03603ef6ac7 100644 (file)
--- a/gas/testsuite/gasp/pl6.is
+++ b/gas/testsuite/gasp/pl6.is
@@ -7,45 +7,33 @@
 !      SDATA   string
 !      ENDM
 !      define "1","99%of100"   ! notice % within string
-!      SDATA   "1"
-       .byte   34,49,34
-!      SDATA   "99%of100"
-       .byte   34,57,57,37,111,102,49,48,48,34
+!      SDATA   1
+       .byte   49
+!      SDATA   99%of100
+       .byte   57,57,37,111,102,49,48,48
 !      define  %1 + 2, "=3"
-!      SDATA   "3"
-       .byte   34,51,34
-!      SDATA   "=3"
-       .byte   34,61,51,34
 !
 
 !
 
 !      define  % 1 + 2 %3+4
-!      SDATA   "3"
-       .byte   34,51,34
-!      SDATA   "7"
-       .byte   34,55,34
 !
 
 !      define  %3*4-2  <=10>
-!      SDATA   "10"
+!      SDATA   %3*4-2
        .byte   34,49,48,34
-!      SDATA   "=10"
-       .byte   34,61,49,48,34
+!      SDATA   =10
+       .byte   61,49,48
 !
 
 !      define  %3*4-2  5
-!      SDATA   "10"
+!      SDATA   %3*4-2
        .byte   34,49,48,34
 !      SDATA   5
        .byte   53
 !
 
 !      define  %1 + 2,<is equal to %1 + 2, right?>
-!      SDATA   "3"
-       .byte   34,51,34
-!      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
 !
 
 !      ! has no effect
@@ -53,3 +41,6 @@
 !
 
 !      end
+pl6.asm:8 Too many positional arguments.
+pl6.asm:11 Too many positional arguments.
+pl6.asm:17 Too many positional arguments.

diff --git a/gas/testsuite/gasp/pl7.is b/gas/testsuite/gasp/pl7.is
index 60581fd398a24137accfd68cc6730d9e4f1c7dfd..10d736f6046da1d4837984842eadf964580c9b40 100644 (file)
--- a/gas/testsuite/gasp/pl7.is
+++ b/gas/testsuite/gasp/pl7.is
@@ -10,12 +10,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
+!      SDATA   lot's of <special>,chars%
+       .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,99
 !      SDATA   "0"
-       .byte   34,48,34
+       .byte   48
 !
 
 !

diff --git a/gas/testsuite/gasp/pl8.is b/gas/testsuite/gasp/pl8.is
index 9ba0f1fbe410d04554c24740771b20ff97364edc..761f8f0fdf26bb2b28371239a6ff5fb232b0e9a3 100644 (file)
--- a/gas/testsuite/gasp/pl8.is
+++ b/gas/testsuite/gasp/pl8.is
@@ -5,7 +5,7 @@
 !      SDATA   %1+2+3 
        .byte   34,54,34
 !      SDATA   "5"
-       .byte   34,53,34
+       .byte   53
 !
 
 !
@@ -20,15 +20,15 @@
 
 !      foo
 !      SDATA   "HI"    
-       .byte   34,72,73,34
+       .byte   72,73
 !      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
+       .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   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
+       .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   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
+       .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