From 8368879b1281a8961391c955a9a671b9fe82b352 Mon Sep 17 00:00:00 2001 From: Jan Beulich Date: Fri, 6 May 2005 06:30:33 +0000 Subject: [PATCH] gas/testsuite/ 2005-05-06 Jan Beulich * gas/macros/dot.s: Don't use pseudo-ops in first column. * gas/macros/dot.l: Match broader range of possible outputs. * gas/macros/purge.l: Likewise. * gas/macros/purge.s: Start generated macro names with an underscore. --- gas/testsuite/ChangeLog | 7 +++++++ gas/testsuite/gas/macros/dot.l | 4 ++-- gas/testsuite/gas/macros/dot.s | 26 +++++++++++++------------- gas/testsuite/gas/macros/purge.l | 4 ++++ gas/testsuite/gas/macros/purge.s | 6 +++--- 5 files changed, 29 insertions(+), 18 deletions(-) diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog index c478244..31e651e 100644 --- a/gas/testsuite/ChangeLog +++ b/gas/testsuite/ChangeLog @@ -1,3 +1,10 @@ +2005-05-06 Jan Beulich + + * gas/macros/dot.s: Don't use pseudo-ops in first column. + * gas/macros/dot.l: Match broader range of possible outputs. + * gas/macros/purge.l: Likewise. + * gas/macros/purge.s: Start generated macro names with an underscore. + 2005-05-05 Paul Brook * gas/i386/i386.exp: Don't run divide test on vxworks. diff --git a/gas/testsuite/gas/macros/dot.l b/gas/testsuite/gas/macros/dot.l index e74e4f3..980de4f 100644 --- a/gas/testsuite/gas/macros/dot.l +++ b/gas/testsuite/gas/macros/dot.l @@ -2,7 +2,6 @@ .*:[1-9][0-9]*: Warning: attempt to redefine pseudo-op .\.macro. ignored .*:27: Error: unknown pseudo-op: .\.xyz. .*:28: Error: .* -(.* )?GAS .* #... [ ]*[1-9][0-9]*[ ]+m 4, 2 [ ]*[1-9][0-9]*[ ]+> \.data @@ -19,4 +18,5 @@ [ ]*[1-9][0-9]*[ ]+ [ ]*[1-9][0-9]*[ ]+\.purgem \.xyz, x\.y\.z [ ]*[1-9][0-9]*[ ]+\.xyz 0 -[ ]*[1-9][0-9]*[ ]+x\.y\.z 0 +[ ]*[1-9][0-9]*[ ]+(\?+[0 ]+)?x\.y\.z 0 +#pass diff --git a/gas/testsuite/gas/macros/dot.s b/gas/testsuite/gas/macros/dot.s index 10ed42f..72ce972 100644 --- a/gas/testsuite/gas/macros/dot.s +++ b/gas/testsuite/gas/macros/dot.s @@ -1,17 +1,17 @@ -.altmacro + .altmacro -.macro x.y.z val - .align 4 - .byte val, val -.endm + .macro x.y.z val + .align 4 + .byte val, val + .endm -.macro .xyz val - .align 8 - .byte val, val -.endm + .macro .xyz val + .align 8 + .byte val, val + .endm -.macro .macro -.endm + .macro .macro + .endm label1:label2 : label3 :label4: m: .macro arg.1, arg.2 .data @@ -23,6 +23,6 @@ label9:label8 : label7 :label6: .endm m 4, 2 -.purgem .xyz, x.y.z -.xyz 0 + .purgem .xyz, x.y.z + .xyz 0 x.y.z 0 diff --git a/gas/testsuite/gas/macros/purge.l b/gas/testsuite/gas/macros/purge.l index 2b25b2c..5e516c7 100644 --- a/gas/testsuite/gas/macros/purge.l +++ b/gas/testsuite/gas/macros/purge.l @@ -1,7 +1,11 @@ .*: Assembler messages: .*:11: Error: .* +#... .*:12: Error: .* +#... .*:13: Error: .* +#... .*:14: Error: .* +#... .*:15: Warning: .* .*:16: Warning: .* diff --git a/gas/testsuite/gas/macros/purge.s b/gas/testsuite/gas/macros/purge.s index e46eef8..336cae3 100644 --- a/gas/testsuite/gas/macros/purge.s +++ b/gas/testsuite/gas/macros/purge.s @@ -29,12 +29,12 @@ .irpc b,ABCDEFGHIJKLMNOPQRSTUVWXYZ .irpc c,ABCDEFGHIJKLMNOPQRSTUVWXYZ .irpc d,ABCDEFGHIJKLMNOPQRSTUVWXYZ - .macro \a\b\c\d arg1=0, arg2=0 + .macro _\a\b\c\d arg1=0, arg2=0 .if \arg1 + \arg2 - .purgem \a\b\c\d + .purgem _\a\b\c\d .endif .endm - \a\b\c\d 1, 2 + _\a\b\c\d 1, 2 .endr .endr .endr -- 2.7.4