OpenE2K
/
binutils-gdb
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Default LISTING_LHS_WIDTH to depend on LISTING_WORD_SIZE so that bytes per 

line is 4.  Fix tests for LISTING_WORD_SIZE==1.
This commit is contained in:
Alan Modra 2000-03-27 23:47:09 +00:00
parent ba23e138c9
commit 224de7a50d
6 changed files with 31 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
gas/ChangeLog
View File

@ -1,9 +1,15 @@
2000-03-28 Alan Modra <alan@linuxcare.com.au>
* listing.c (LISTING_LHS_WIDTH): Default depends on
LISTING_WORD_SIZE.
(LISTING_LHS_WIDTH_SECOND): Default to LISTING_LHS_WIDTH.
2000-03-27 Ian Lance Taylor <ian@zembu.com> 2000-03-27 Ian Lance Taylor <ian@zembu.com>
* config/tc-sh.c (md_show_usage): Use backslash before newline in * config/tc-sh.c (md_show_usage): Use backslash before newline in
string literal. string literal.
2000-03-27 Alan Modra <alan@linuxcare.com> 2000-03-27 Alan Modra <alan@linuxcare.com.au>
* config/tc-avr.h (TC_HANDLES_FX_DONE): Define. * config/tc-avr.h (TC_HANDLES_FX_DONE): Define.
@ -46,7 +52,7 @@
* internals.texi: Document new macro hooks. * internals.texi: Document new macro hooks.
* as.h: New prototypes added. * as.h: New prototypes added.
2000-03-26 Alan Modra <alan@linuxcare.com> 2000-03-26 Alan Modra <alan@linuxcare.com.au>
* config/tc-i386.c: Don't start any as_bad or as_warn message with * config/tc-i386.c: Don't start any as_bad or as_warn message with
an initial capital letter. an initial capital letter.

4
gas/listing.c
View File

@ -109,10 +109,10 @@ Software Foundation, 59 Temple Place - Suite 330, Boston, MA
#define LISTING_WORD_SIZE 4 #define LISTING_WORD_SIZE 4
#endif #endif
#ifndef LISTING_LHS_WIDTH #ifndef LISTING_LHS_WIDTH
#define LISTING_LHS_WIDTH 1 #define LISTING_LHS_WIDTH ((LISTING_WORD_SIZE) > 4 ? 1 : 4 / (LISTING_WORD_SIZE))
#endif #endif
#ifndef LISTING_LHS_WIDTH_SECOND #ifndef LISTING_LHS_WIDTH_SECOND
#define LISTING_LHS_WIDTH_SECOND 1 #define LISTING_LHS_WIDTH_SECOND LISTING_LHS_WIDTH
#endif #endif
#ifndef LISTING_RHS_WIDTH #ifndef LISTING_RHS_WIDTH
#define LISTING_RHS_WIDTH 100 #define LISTING_RHS_WIDTH 100

7
gas/testsuite/ChangeLog
View File

@ -1,3 +1,10 @@
2000-03-27 Alan Modra <alan@linuxcare.com.au>
* gas/ieee-fp/x930509a.exp (dotest): Fix test for
LISTING_WORD_SIZE==1.
* gas/all/gas.exp (do_930509a): Same here.
* gas/all/cond.d: And here.
2000-03-10 Geoffrey Keating <geoffk@cygnus.com> 2000-03-10 Geoffrey Keating <geoffk@cygnus.com>
* gas/mips/empic.d: New file. * gas/mips/empic.d: New file.

14
gas/testsuite/gas/all/cond.d
View File

@ -7,14 +7,14 @@
8[ ]+.else 8[ ]+.else
9[ ]+.if 1 9[ ]+.if 1
10[ ]+.endc 10[ ]+.endc
11 0000 0[02]00 ?000[02][ ]+.long[ ]+2 11 0000 0[02] ?00 ?00 ?0[02][ ]+.long[ ]+2
12[ ]+.if 0 12[ ]+.if 0
14[ ]+.else 14[ ]+.else
15 0004 0[04]00 ?000[04][ ]+.long[ ]+4 15 0004 0[04] ?00 ?00 ?0[04][ ]+.long[ ]+4
16[ ]+.endc 16[ ]+.endc
17[ ]+.endc 17[ ]+.endc
18 0008 0000 ?0000[ ]+.p2align 5,0 18 0008 00 ?00 ?00 ?00[ ]+.p2align 5,0
18[ ]+0000 ?0000 18[ ]+00 ?00 ?00 ?00
18[ ]+0000 ?0000 18[ ]+00 ?00 ?00 ?00
18[ ]+0000 ?0000 18[ ]+00 ?00 ?00 ?00
18[ ]+0000 ?0000 18[ ]+00 ?00 ?00 ?00

8
gas/testsuite/gas/all/gas.exp
View File

@ -65,9 +65,9 @@ proc do_930509a {} {
# If ".long" means an 8-byte value on some target someday, this test will have # If ".long" means an 8-byte value on some target someday, this test will have
# to be fixed. # to be fixed.
expect { expect {
-re "^ +1 .... 0000 *0000" { fail $testname; set x 1 } -re "^ +1 .... 00 ?00 ?00 ?00" { fail $testname; set x 1 }
-re "^ +1 .... 0400 *0000" { pass $testname; set x 1 } -re "^ +1 .... 04 ?00 ?00 ?00" { pass $testname; set x 1 }
-re "^ +1 .... 0000 *0004" { pass $testname; set x 1 } -re "^ +1 .... 00 ?00 ?00 ?04" { pass $testname; set x 1 }
-re "\[^\n\]*\n" { } -re "\[^\n\]*\n" { }
timeout { perror "timeout\n"; break } timeout { perror "timeout\n"; break }
eof { break } eof { break }
@ -124,7 +124,7 @@ proc test_cond {} {
global subdir global subdir
set testname "conditional listings" set testname "conditional listings"
gas_run cond.s -alc ">dump.out" gas_run cond.s "-alc" ">dump.out"
if ![string match "" $comp_output] { if ![string match "" $comp_output] {
send_log "$comp_output\n" send_log "$comp_output\n"
fail $testname fail $testname

7
gas/testsuite/gas/ieee-fp/x930509a.exp
View File

@ -7,10 +7,9 @@ proc dotest {} {
gas_start "x930509a.s" "-al" gas_start "x930509a.s" "-al"
while 1 { while 1 {
expect { expect {
-re " 00008000\[ \]+.single" { pass $testname; set x 1 } -re " 00 ?00 ?80 ?00\[ \]+.single" { pass $testname; set x 1 }
-re " 00800000\[ \]+.single" { pass $testname; set x 1 } -re " 00 ?80 ?00 ?00\[ \]+.single" { pass $testname; set x 1 }
-re " 0080 0000\[ \]+.single" { pass $testname; set x 1 } -re ".single" { fail $testname; set x 1 }
-re " ........ +.single" { fail $testname; set x 1 }
-re "\[^\n\]*\n" { } -re "\[^\n\]*\n" { }
timeout { perror "timeout\n"; break } timeout { perror "timeout\n"; break }
eof { break } eof { break }