diff options
| -rw-r--r-- | gas/testsuite/ChangeLog | 7 | ||||
| -rwxr-xr-x | gas/testsuite/gas/mn10300/basic.exp | 197 | ||||
| -rwxr-xr-x | gas/testsuite/gas/mn10300/other.s | 6 |
3 files changed, 127 insertions, 83 deletions
diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog index bf32b50..cf5410e 100644 --- a/gas/testsuite/ChangeLog +++ b/gas/testsuite/ChangeLog @@ -1,3 +1,10 @@ +Wed Nov 6 13:50:07 1996 Jeffrey A Law (law@cygnus.com) + + * gas/mn10300/*.s: Tweak constants in 32bit insns for + better testing coverage. + * gas/mn10300/basic.exp: Test insertion of most 32bit + operands. + Tue Nov 5 13:33:12 1996 Jeffrey A Law (law@cygnus.com) * gas/mn10300/basic.exp: Check bit patterns for indexed mov, diff --git a/gas/testsuite/gas/mn10300/basic.exp b/gas/testsuite/gas/mn10300/basic.exp index 1c6d77d..2ba5877 100755 --- a/gas/testsuite/gas/mn10300/basic.exp +++ b/gas/testsuite/gas/mn10300/basic.exp @@ -36,13 +36,16 @@ proc do_add {} { -re "^ +\[0-9\]+ 0005 F159\[^\n\]*\n" { set x [expr $x+1] } -re "^ +\[0-9\]+ 0007 2910\[^\n\]*\n" { set x [expr $x+1] } -re "^ +\[0-9\]+ 0009 FAC20100\[^\n\]*\n" { set x [expr $x+1] } - -re "^ +\[0-9\]+ 000d\[^\n\]*\n" { set x [expr $x+1] } + -re "^ +\[0-9\]+ 000d FCC30001\[^\n\]*\n" { set x [expr $x+1] } + -re "^ +8 +FFFF\[^\n\]*\n" { set x [expr $x+1] } -re "^ +\[0-9\]+ 0013 2110\[^\n\]*\n" { set x [expr $x+1] } -re "^ +\[0-9\]+ 0015 FAD20100\[^\n\]*\n" { set x [expr $x+1] } - -re "^ +\[0-9\]+ 0019\[^\n\]*\n" { set x [expr $x+1] } + -re "^ +\[0-9\]+ 0019 FCD30001\[^\n\]*\n" { set x [expr $x+1] } + -re "^ +11 +FFFF\[^\n\]*\n" { set x [expr $x+1] } -re "^ +\[0-9\]+ 001f F8FE10\[^\n\]*\n" { set x [expr $x+1] } -re "^ +\[0-9\]+ 0022 FAFE0100\[^\n\]*\n" { set x [expr $x+1] } - -re "^ +\[0-9\]+ 0026\[^\n\]*\n" { set x [expr $x+1] } + -re "^ +\[0-9\]+ 0026 FCFE0001\[^\n\]*\n" { set x [expr $x+1] } + -re "^ +14 +FFFF\[^\n\]*\n" { set x [expr $x+1] } -re "^ +\[0-9\]+ 002c F146\[^\n\]*\n" { set x [expr $x+1] } -re "\[^\n\]*\n" { } timeout { perror "timeout\n"; break } @@ -55,7 +58,7 @@ proc do_add {} { gas_finish # Did we find what we were looking for? If not, flunk it. - if [expr $x==14] then { pass $testname } else { fail $testname } + if [expr $x==17] then { pass $testname } else { fail $testname } } proc do_bcc {} { @@ -111,7 +114,8 @@ proc do_bit {} { expect { -re "^ +\[0-9\]+ 0000 F8ED40\[^\n\]*\n" { set x [expr $x+1] } -re "^ +\[0-9\]+ 0003 FAEE2000\[^\n\]*\n" { set x [expr $x+1] } - -re "^ +\[0-9\]+ 0007\[^\n\]*\n" { set x [expr $x+1] } + -re "^ +\[0-9\]+ 0007 FCEF0001\[^\n\]*\n" { set x [expr $x+1] } + -re "^ +4 +FFFF\[^\n\]*\n" { set x [expr $x+1] } -re "^ +\[0-9\]+ 000d FAF90840\[^\n\]*\n" { set x [expr $x+1] } -re "^ +\[0-9\]+ 0011\[^\n\]*\n" { set x [expr $x+1] } -re "^ +\[0-9\]+ 0018 F086\[^\n\]*\n" { set x [expr $x+1] } @@ -131,7 +135,7 @@ proc do_bit {} { gas_finish # Did we find what we were looking for? If not, flunk it. - if [expr $x==11] then { pass $testname } else { fail $testname } + if [expr $x==12] then { pass $testname } else { fail $testname } } proc do_cmp {} { @@ -145,16 +149,18 @@ proc do_cmp {} { # of instructions (as these tests to). while 1 { expect { - -re "^ +\[0-9\]+ 0000 A6\[^\n\]*\n" { set x [expr $x+1] } + -re "^ +\[0-9\]+ 0000 A6\[^\n\]*\n" { set x [expr $x+1] } -re "^ +\[0-9\]+ 0001 F1AB\[^\n\]*\n" { set x [expr $x+1] } -re "^ +\[0-9\]+ 0003 F19F\[^\n\]*\n" { set x [expr $x+1] } - -re "^ +\[0-9\]+ 0005 BE\[^\n\]*\n" { set x [expr $x+1] } + -re "^ +\[0-9\]+ 0005 BE\[^\n\]*\n" { set x [expr $x+1] } -re "^ +\[0-9\]+ 0006 AF10\[^\n\]*\n" { set x [expr $x+1] } -re "^ +\[0-9\]+ 0008 FACA0100\[^\n\]*\n" { set x [expr $x+1] } - -re "^ +\[0-9\]+ 000c\[^\n\]*\n" { set x [expr $x+1] } + -re "^ +\[0-9\]+ 000c FCC90001\[^\n\]*\n" { set x [expr $x+1] } + -re "^ +8 +FFFF\[^\n\]*\n" { set x [expr $x+1] } -re "^ +\[0-9\]+ 0012 BF10\[^\n\]*\n" { set x [expr $x+1] } -re "^ +\[0-9\]+ 0014 FADA0100\[^\n\]*\n" { set x [expr $x+1] } - -re "^ +\[0-9\]+ 0018\[^\n\]*\n" { set x [expr $x+1] } + -re "^ +\[0-9\]+ 0018 FCD90001\[^\n\]*\n" { set x [expr $x+1] } + -re "^ +11 +FFFF\[^\n\]*\n" { set x [expr $x+1] } -re "\[^\n\]*\n" { } timeout { perror "timeout\n"; break } eof { break } @@ -166,7 +172,7 @@ proc do_cmp {} { gas_finish # Did we find what we were looking for? If not, flunk it. - if [expr $x==10] then { pass $testname } else { fail $testname } + if [expr $x==12] then { pass $testname } else { fail $testname } } proc do_ext {} { @@ -181,10 +187,10 @@ proc do_ext {} { while 1 { expect { -re "^ +\[0-9\]+ 0000 F2D1\[^\n\]*\n" { set x [expr $x+1] } - -re "^ +\[0-9\]+ 0002 12\[^\n\]*\n" { set x [expr $x+1] } - -re "^ +\[0-9\]+ 0003 17\[^\n\]*\n" { set x [expr $x+1] } - -re "^ +\[0-9\]+ 0004 1A\[^\n\]*\n" { set x [expr $x+1] } - -re "^ +\[0-9\]+ 0005 1D\[^\n\]*\n" { set x [expr $x+1] } + -re "^ +\[0-9\]+ 0002 12\[^\n\]*\n" { set x [expr $x+1] } + -re "^ +\[0-9\]+ 0003 17\[^\n\]*\n" { set x [expr $x+1] } + -re "^ +\[0-9\]+ 0004 1A\[^\n\]*\n" { set x [expr $x+1] } + -re "^ +\[0-9\]+ 0005 1D\[^\n\]*\n" { set x [expr $x+1] } -re "\[^\n\]*\n" { } timeout { perror "timeout\n"; break } eof { break } @@ -251,18 +257,21 @@ proc do_logical {} { -re "^ +\[0-9\]+ 0000 F206\[^\n\]*\n" { set x [expr $x+1] } -re "^ +\[0-9\]+ 0002 F8E27F\[^\n\]*\n" { set x [expr $x+1] } -re "^ +\[0-9\]+ 0005 FAE37FFF\[^\n\]*\n" { set x [expr $x+1] } - -re "^ +\[0-9\]+ 0009\[^\n\]*\n" { set x [expr $x+1] } + -re "^ +\[0-9\]+ 0009 FCE30001\[^\n\]*\n" { set x [expr $x+1] } + -re "^ +5 +FFFF\[^\n\]*\n" { set x [expr $x+1] } -re "^ +\[0-9\]+ 000f FAFC7FFF\[^\n\]*\n" { set x [expr $x+1] } -re "^ +\[0-9\]+ 0013 F216\[^\n\]*\n" { set x [expr $x+1] } -re "^ +\[0-9\]+ 0015 F8E67F\[^\n\]*\n" { set x [expr $x+1] } -re "^ +\[0-9\]+ 0018 FAE77FFF\[^\n\]*\n" { set x [expr $x+1] } - -re "^ +\[0-9\]+ 001c\[^\n\]*\n" { set x [expr $x+1] } + -re "^ +\[0-9\]+ 001c FCE70001\[^\n\]*\n" { set x [expr $x+1] } + -re "^ +10 +FFFF\[^\n\]*\n" { set x [expr $x+1] } -re "^ +\[0-9\]+ 0022 FAFD7FFF\[^\n\]*\n" { set x [expr $x+1] } -re "^ +\[0-9\]+ 0026 F226\[^\n\]*\n" { set x [expr $x+1] } -re "^ +\[0-9\]+ 0028 FAEB7FFF\[^\n\]*\n" { set x [expr $x+1] } - -re "^ +\[0-9\]+ 002c\[^\n\]*\n" { set x [expr $x+1] } + -re "^ +\[0-9\]+ 002c FCEB0001\[^\n\]*\n" { set x [expr $x+1] } + -re "^ +14 +FFFF\[^\n\]*\n" { set x [expr $x+1] } -re "^ +\[0-9\]+ 0032 F233\[^\n\]*\n" { set x [expr $x+1] } - -re "\[^\n\]*\n" { } + -re "^\[^\n\]*\n" { } timeout { perror "timeout\n"; break } eof { break } } @@ -273,7 +282,7 @@ proc do_logical {} { gas_finish # Did we find what we were looking for? If not, flunk it. - if [expr $x==14] then { pass $testname } else { fail $testname } + if [expr $x==17] then { pass $testname } else { fail $testname } } proc do_loop {} { @@ -287,18 +296,18 @@ proc do_loop {} { # of instructions (as these tests to). while 1 { expect { - -re "^ +\[0-9\]+ 0000 D8\[^\n\]*\n" { set x [expr $x+1] } - -re "^ +\[0-9\]+ 0001 D9\[^\n\]*\n" { set x [expr $x+1] } - -re "^ +\[0-9\]+ 0002 D1\[^\n\]*\n" { set x [expr $x+1] } - -re "^ +\[0-9\]+ 0003 D2\[^\n\]*\n" { set x [expr $x+1] } - -re "^ +\[0-9\]+ 0004 D3\[^\n\]*\n" { set x [expr $x+1] } - -re "^ +\[0-9\]+ 0005 D0\[^\n\]*\n" { set x [expr $x+1] } - -re "^ +\[0-9\]+ 0006 D5\[^\n\]*\n" { set x [expr $x+1] } - -re "^ +\[0-9\]+ 0007 D6\[^\n\]*\n" { set x [expr $x+1] } - -re "^ +\[0-9\]+ 0008 D7\[^\n\]*\n" { set x [expr $x+1] } - -re "^ +\[0-9\]+ 0009 D4\[^\n\]*\n" { set x [expr $x+1] } - -re "^ +\[0-9\]+ 000a DA\[^\n\]*\n" { set x [expr $x+1] } - -re "^ +\[0-9\]+ 000b DB\[^\n\]*\n" { set x [expr $x+1] } + -re "^ +\[0-9\]+ 0000 D8\[^\n\]*\n" { set x [expr $x+1] } + -re "^ +\[0-9\]+ 0001 D9\[^\n\]*\n" { set x [expr $x+1] } + -re "^ +\[0-9\]+ 0002 D1\[^\n\]*\n" { set x [expr $x+1] } + -re "^ +\[0-9\]+ 0003 D2\[^\n\]*\n" { set x [expr $x+1] } + -re "^ +\[0-9\]+ 0004 D3\[^\n\]*\n" { set x [expr $x+1] } + -re "^ +\[0-9\]+ 0005 D0\[^\n\]*\n" { set x [expr $x+1] } + -re "^ +\[0-9\]+ 0006 D5\[^\n\]*\n" { set x [expr $x+1] } + -re "^ +\[0-9\]+ 0007 D6\[^\n\]*\n" { set x [expr $x+1] } + -re "^ +\[0-9\]+ 0008 D7\[^\n\]*\n" { set x [expr $x+1] } + -re "^ +\[0-9\]+ 0009 D4\[^\n\]*\n" { set x [expr $x+1] } + -re "^ +\[0-9\]+ 000a DA\[^\n\]*\n" { set x [expr $x+1] } + -re "^ +\[0-9\]+ 000b DB\[^\n\]*\n" { set x [expr $x+1] } -re "\[^\n\]*\n" { } timeout { perror "timeout\n"; break } eof { break } @@ -324,19 +333,20 @@ proc do_mov1 {} { # of instructions (as these tests to). while 1 { expect { - -re "^ +\[0-9\]+ 0000 86\[^\n\]*\n" { set x [expr $x+1] } + -re "^ +\[0-9\]+ 0000 86\[^\n\]*\n" { set x [expr $x+1] } -re "^ +\[0-9\]+ 0001 F1E6\[^\n\]*\n" { set x [expr $x+1] } -re "^ +\[0-9\]+ 0003 F1D9\[^\n\]*\n" { set x [expr $x+1] } - -re "^ +\[0-9\]+ 0005 99\[^\n\]*\n" { set x [expr $x+1] } - -re "^ +\[0-9\]+ 0006 3E\[^\n\]*\n" { set x [expr $x+1] } + -re "^ +\[0-9\]+ 0005 99\[^\n\]*\n" { set x [expr $x+1] } + -re "^ +\[0-9\]+ 0006 3E\[^\n\]*\n" { set x [expr $x+1] } -re "^ +\[0-9\]+ 0007 F2F4\[^\n\]*\n" { set x [expr $x+1] } -re "^ +\[0-9\]+ 0009 F2FB\[^\n\]*\n" { set x [expr $x+1] } -re "^ +\[0-9\]+ 000b F2E1\[^\n\]*\n" { set x [expr $x+1] } -re "^ +\[0-9\]+ 000d F2FA\[^\n\]*\n" { set x [expr $x+1] } - -re "^ +\[0-9\]+ 000f 76\[^\n\]*\n" { set x [expr $x+1] } + -re "^ +\[0-9\]+ 000f 76\[^\n\]*\n" { set x [expr $x+1] } -re "^ +\[0-9\]+ 0010 F80608\[^\n\]*\n" { set x [expr $x+1] } -re "^ +\[0-9\]+ 0013 FA060100\[^\n\]*\n" { set x [expr $x+1] } - -re "^ +\[0-9\]+ 0017\[^\n\]*\n" { set x [expr $x+1] } + -re "^ +\[0-9\]+ 0017 FC060001\[^\n\]*\n" { set x [expr $x+1] } + -re "^ +14 +FFFF\[^\n\]*\n" { set x [expr $x+1] } -re "^ +\[0-9\]+ 001d 5908\[^\n\]*\n" { set x [expr $x+1] } -re "^ +\[0-9\]+ 001f FAB50100\[^\n\]*\n" { set x [expr $x+1] } -re "^ +\[0-9\]+ 0023 F2E7\[^\n\]*\n" { set x [expr $x+1] } @@ -351,7 +361,7 @@ proc do_mov1 {} { gas_finish # Did we find what we were looking for? If not, flunk it. - if [expr $x==16] then { pass $testname } else { fail $testname } + if [expr $x==17] then { pass $testname } else { fail $testname } } proc do_mov2 {} { @@ -365,20 +375,25 @@ proc do_mov2 {} { # of instructions (as these tests to). while 1 { expect { - -re "^ +\[0-9\]+ 0000\[^\n\]*\n" { set x [expr $x+1] } + -re "^ +\[0-9\]+ 0000 FCB50001\[^\n\]*\n" { set x [expr $x+1] } + -re "^ +2 +FFFF\[^\n\]*\n" { set x [expr $x+1] } -re "^ +\[0-9\]+ 0006 F325\[^\n\]*\n" { set x [expr $x+1] } -re "^ +\[0-9\]+ 0008 318000\[^\n\]*\n" { set x [expr $x+1] } - -re "^ +\[0-9\]+ 000b\[^\n\]*\n" { set x [expr $x+1] } + -re "^ +\[0-9\]+ 000b FCA50001\[^\n\]*\n" { set x [expr $x+1] } + -re "^ +5 +FFFF\[^\n\]*\n" { set x [expr $x+1] } -re "^ +\[0-9\]+ 0011 F006\[^\n\]*\n" { set x [expr $x+1] } -re "^ +\[0-9\]+ 0013 F82608\[^\n\]*\n" { set x [expr $x+1] } -re "^ +\[0-9\]+ 0016 FA260100 \[^\n\]*\n" { set x [expr $x+1] } - -re "^ +\[0-9\]+ 001a\[^\n\]*\n" { set x [expr $x+1] } + -re "^ +\[0-9\]+ 001a FC260001\[^\n\]*\n" { set x [expr $x+1] } + -re "^ +9 +FFFF\[^\n\]*\n" { set x [expr $x+1] } -re "^ +\[0-9\]+ 0020 5D08\[^\n\]*\n" { set x [expr $x+1] } -re "^ +\[0-9\]+ 0022 FAB10100\[^\n\]*\n" { set x [expr $x+1] } - -re "^ +\[0-9\]+ 0026\[^\n\]*\n" { set x [expr $x+1] } + -re "^ +\[0-9\]+ 0026 FCB10001\[^\n\]*\n" { set x [expr $x+1] } + -re "^ +12 +FFFF\[^\n\]*\n" { set x [expr $x+1] } -re "^ +\[0-9\]+ 002c F3A5\[^\n\]*\n" { set x [expr $x+1] } -re "^ +\[0-9\]+ 002e FAA18000\[^\n\]*\n" { set x [expr $x+1] } - -re "^ +\[0-9\]+ 0032\[^\n\]*\n" { set x [expr $x+1] } + -re "^ +\[0-9\]+ 0032 FCA10001\[^\n\]*\n" { set x [expr $x+1] } + -re "^ +15 +FFFF\[^\n\]*\n" { set x [expr $x+1] } -re "^ +\[0-9\]+ 0038 F8F120\[^\n\]*\n" { set x [expr $x+1] } -re "\[^\n\]*\n" { } timeout { perror "timeout\n"; break } @@ -391,7 +406,7 @@ proc do_mov2 {} { gas_finish # Did we find what we were looking for? If not, flunk it. - if [expr $x==15] then { pass $testname } else { fail $testname } + if [expr $x==20] then { pass $testname } else { fail $testname } } proc do_mov3 {} { @@ -408,17 +423,21 @@ proc do_mov3 {} { -re "^ +\[0-9\]+ 0000 66\[^\n\]*\n" { set x [expr $x+1] } -re "^ +\[0-9\]+ 0001 F81620\[^\n\]*\n" { set x [expr $x+1] } -re "^ +\[0-9\]+ 0004 FA160100\[^\n\]*\n" { set x [expr $x+1] } - -re "^ +\[0-9\]+ 0008\[^\n\]*\n" { set x [expr $x+1] } + -re "^ +\[0-9\]+ 0008 FC160001\[^\n\]*\n" { set x [expr $x+1] } + -re "^ +5 +FFFF\[^\n\]*\n" { set x [expr $x+1] } -re "^ +\[0-9\]+ 000e 4620\[^\n\]*\n" { set x [expr $x+1] } -re "^ +\[0-9\]+ 0010 FA958000\[^\n\]*\n" { set x [expr $x+1] } - -re "^ +\[0-9\]+ 0014\[^\n\]*\n" { set x [expr $x+1] } + -re "^ +\[0-9\]+ 0014 FC950001\[^\n\]*\n" { set x [expr $x+1] } + -re "^ +8 +FFFF\[^\n\]*\n" { set x [expr $x+1] } -re "^ +\[0-9\]+ 001a F35A\[^\n\]*\n" { set x [expr $x+1] } -re "^ +\[0-9\]+ 001c 050080\[^\n\]*\n" { set x [expr $x+1] } - -re "^ +\[0-9\]+ 001f\[^\n\]*\n" { set x [expr $x+1] } + -re "^ +\[0-9\]+ 001f FC850001\[^\n\]*\n" { set x [expr $x+1] } + -re "^ +11 +FFFF\[^\n\]*\n" { set x [expr $x+1] } -re "^ +\[0-9\]+ 0025 F016\[^\n\]*\n" { set x [expr $x+1] } -re "^ +\[0-9\]+ 0027 F83620\[^\n\]*\n" { set x [expr $x+1] } -re "^ +\[0-9\]+ 002a FA360100\[^\n\]*\n" { set x [expr $x+1] } - -re "^ +\[0-9\]+ 002e\[^\n\]*\n" { set x [expr $x+1] } + -re "^ +\[0-9\]+ 002e FC360001\[^\n\]*\n" { set x [expr $x+1] } + -re "^ +15 +FFFF\[^\n\]*\n" { set x [expr $x+1] } -re "^ +\[0-9\]+ 0034 4720\[^\n\]*\n" { set x [expr $x+1] } -re "\[^\n\]*\n" { } timeout { perror "timeout\n"; break } @@ -431,7 +450,7 @@ proc do_mov3 {} { gas_finish # Did we find what we were looking for? If not, flunk it. - if [expr $x==15] then { pass $testname } else { fail $testname } + if [expr $x==19] then { pass $testname } else { fail $testname } } proc do_mov4 {} { @@ -446,17 +465,21 @@ proc do_mov4 {} { while 1 { expect { -re "^ +\[0-9\]+ 0000 FA948000\[^\n\]*\n" { set x [expr $x+1] } - -re "^ +\[0-9\]+ 0004\[^\n\]*\n" { set x [expr $x+1] } + -re "^ +\[0-9\]+ 0004 FC940001\[^\n\]*\n" { set x [expr $x+1] } + -re "^ +3 +FFFF\[^\n\]*\n" { set x [expr $x+1] } -re "^ +\[0-9\]+ 000a F3DA\[^\n\]*\n" { set x [expr $x+1] } -re "^ +\[0-9\]+ 000c FA840080\[^\n\]*\n" { set x [expr $x+1] } - -re "^ +\[0-9\]+ 0010\[^\n\]*\n" { set x [expr $x+1] } + -re "^ +\[0-9\]+ 0010 FC840001\[^\n\]*\n" { set x [expr $x+1] } + -re "^ +6 +FFFF\[^\n\]*\n" { set x [expr $x+1] } -re "^ +\[0-9\]+ 0016 F8F520\[^\n\]*\n" { set x [expr $x+1] } -re "^ +\[0-9\]+ 0019 8508\[^\n\]*\n" { set x [expr $x+1] } -re "^ +\[0-9\]+ 001b 2D0100\[^\n\]*\n" { set x [expr $x+1] } - -re "^ +\[0-9\]+ 001e\[^\n\]*\n" { set x [expr $x+1] } + -re "^ +\[0-9\]+ 001e FCCD0001\[^\n\]*\n" { set x [expr $x+1] } + -re "^ +10 +FFFF\[^\n\]*\n" { set x [expr $x+1] } -re "^ +\[0-9\]+ 0024 9508\[^\n\]*\n" { set x [expr $x+1] } -re "^ +\[0-9\]+ 0026 250100\[^\n\]*\n" { set x [expr $x+1] } - -re "^ +\[0-9\]+ 0029\[^\n\]*\n" { set x [expr $x+1] } + -re "^ +\[0-9\]+ 0029 FCDD0001\[^\n\]*\n" { set x [expr $x+1] } + -re "^ +13 +FFFF\[^\n\]*\n" { set x [expr $x+1] } -re "\[^\n\]*\n" { } timeout { perror "timeout\n"; break } eof { break } @@ -468,7 +491,7 @@ proc do_mov4 {} { gas_finish # Did we find what we were looking for? If not, flunk it. - if [expr $x==12] then { pass $testname } else { fail $testname } + if [expr $x==16] then { pass $testname } else { fail $testname } } proc do_movbu {} { @@ -485,23 +508,29 @@ proc do_movbu {} { -re "^ +\[0-9\]+ 0000 F046\[^\n\]*\n" { set x [expr $x+1] } -re "^ +\[0-9\]+ 0002 F84608\[^\n\]*\n" { set x [expr $x+1] } -re "^ +\[0-9\]+ 0005 FA460100\[^\n\]*\n" { set x [expr $x+1] } - -re "^ +\[0-9\]+ 0009\[^\n\]*\n" { set x [expr $x+1] } + -re "^ +\[0-9\]+ 0009 FC460001\[^\n\]*\n" { set x [expr $x+1] } + -re "^ +5 +FFFF\[^\n\]*\n" { set x [expr $x+1] } -re "^ +\[0-9\]+ 000f F8B908\[^\n\]*\n" { set x [expr $x+1] } -re "^ +\[0-9\]+ 0012 FAB90100\[^\n\]*\n" { set x [expr $x+1] } - -re "^ +\[0-9\]+ 0016\[^\n\]*\n" { set x [expr $x+1] } + -re "^ +\[0-9\]+ 0016 FCB90001\[^\n\]*\n" { set x [expr $x+1] } + -re "^ +8 +FFFF\[^\n\]*\n" { set x [expr $x+1] } -re "^ +\[0-9\]+ 001c F425\[^\n\]*\n" { set x [expr $x+1] } -re "^ +\[0-9\]+ 001e 358000\[^\n\]*\n" { set x [expr $x+1] } - -re "^ +\[0-9\]+ 0021\[^\n\]*\n" { set x [expr $x+1] } + -re "^ +\[0-9\]+ 0021 FCA90001\[^\n\]*\n" { set x [expr $x+1] } + -re "^ +11 +FFFF\[^\n\]*\n" { set x [expr $x+1] } -re "^ +\[0-9\]+ 0027 F056\[^\n\]*\n" { set x [expr $x+1] } -re "^ +\[0-9\]+ 0029 F85620\[^\n\]*\n" { set x [expr $x+1] } -re "^ +\[0-9\]+ 002c FA560100\[^\n\]*\n" { set x [expr $x+1] } - -re "^ +\[0-9\]+ 0030\[^\n\]*\n" { set x [expr $x+1] } + -re "^ +\[0-9\]+ 0030 FC560001\[^\n\]*\n" { set x [expr $x+1] } + -re "^ +15 +FFFF\[^\n\]*\n" { set x [expr $x+1] } -re "^ +\[0-9\]+ 0036 F89620\[^\n\]*\n" { set x [expr $x+1] } -re "^ +\[0-9\]+ 0039 FA968000\[^\n\]*\n" { set x [expr $x+1] } - -re "^ +\[0-9\]+ 003d\[^\n\]*\n" { set x [expr $x+1] } + -re "^ +\[0-9\]+ 003d FC960001\[^\n\]*\n" { set x [expr $x+1] } + -re "^ +18 +FFFF\[^\n\]*\n" { set x [expr $x+1] } -re "^ +\[0-9\]+ 0043 F45A\[^\n\]*\n" { set x [expr $x+1] } -re "^ +\[0-9\]+ 0045 060080\[^\n\]*\n" { set x [expr $x+1] } - -re "^ +\[0-9\]+ 0048\[^\n\]*\n" { set x [expr $x+1] } + -re "^ +\[0-9\]+ 0048 FC860001\[^\n\]*\n" { set x [expr $x+1] } + -re "^ +21 +FFFF\[^\n\]*\n" { set x [expr $x+1] } -re "\[^\n\]*\n" { } timeout { perror "timeout\n"; break } eof { break } @@ -513,7 +542,7 @@ proc do_movbu {} { gas_finish # Did we find what we were looking for? If not, flunk it. - if [expr $x==20] then { pass $testname } else { fail $testname } + if [expr $x==26] then { pass $testname } else { fail $testname } } proc do_movhu {} { @@ -530,23 +559,29 @@ proc do_movhu {} { -re "^ +\[0-9\]+ 0000 F066\[^\n\]*\n" { set x [expr $x+1] } -re "^ +\[0-9\]+ 0002 F86608\[^\n\]*\n" { set x [expr $x+1] } -re "^ +\[0-9\]+ 0005 FA660100\[^\n\]*\n" { set x [expr $x+1] } - -re "^ +\[0-9\]+ 0009\[^\n\]*\n" { set x [expr $x+1] } + -re "^ +\[0-9\]+ 0009 FC660001\[^\n\]*\n" { set x [expr $x+1] } + -re "^ +5 +FFFF\[^\n\]*\n" { set x [expr $x+1] } -re "^ +\[0-9\]+ 000f F8BD08\[^\n\]*\n" { set x [expr $x+1] } -re "^ +\[0-9\]+ 0012 FABD0100\[^\n\]*\n" { set x [expr $x+1] } - -re "^ +\[0-9\]+ 0016\[^\n\]*\n" { set x [expr $x+1] } + -re "^ +\[0-9\]+ 0016 FCBD0001\[^\n\]*\n" { set x [expr $x+1] } + -re "^ +8 +FFFF\[^\n\]*\n" { set x [expr $x+1] } -re "^ +\[0-9\]+ 001c F4A5\[^\n\]*\n" { set x [expr $x+1] } -re "^ +\[0-9\]+ 001e 398000\[^\n\]*\n" { set x [expr $x+1] } - -re "^ +\[0-9\]+ 0021\[^\n\]*\n" { set x [expr $x+1] } + -re "^ +\[0-9\]+ 0021 FCAD0001\[^\n\]*\n" { set x [expr $x+1] } + -re "^ +11 +FFFF\[^\n\]*\n" { set x [expr $x+1] } -re "^ +\[0-9\]+ 0027 F076\[^\n\]*\n" { set x [expr $x+1] } -re "^ +\[0-9\]+ 0029 F87620\[^\n\]*\n" { set x [expr $x+1] } -re "^ +\[0-9\]+ 002c FA760100\[^\n\]*\n" { set x [expr $x+1] } - -re "^ +\[0-9\]+ 0030\[^\n\]*\n" { set x [expr $x+1] } + -re "^ +\[0-9\]+ 0030 FC760001\[^\n\]*\n" { set x [expr $x+1] } + -re "^ +15 +FFFF\[^\n\]*\n" { set x [expr $x+1] } -re "^ +\[0-9\]+ 0036 F89720\[^\n\]*\n" { set x [expr $x+1] } -re "^ +\[0-9\]+ 0039 FA978000\[^\n\]*\n" { set x [expr $x+1] } - -re "^ +\[0-9\]+ 003d\[^\n\]*\n" { set x [expr $x+1] } + -re "^ +\[0-9\]+ 003d FC970001\[^\n\]*\n" { set x [expr $x+1] } + -re "^ +18 +FFFF\[^\n\]*\n" { set x [expr $x+1] } -re "^ +\[0-9\]+ 0043 F4DA\[^\n\]*\n" { set x [expr $x+1] } -re "^ +\[0-9\]+ 0045 070080\[^\n\]*\n" { set x [expr $x+1] } - -re "^ +\[0-9\]+ 0048\[^\n\]*\n" { set x [expr $x+1] } + -re "^ +\[0-9\]+ 0048 FC870001\[^\n\]*\n" { set x [expr $x+1] } + -re "^ +21 +FFFF\[^\n\]*\n" { set x [expr $x+1] } -re "\[^\n\]*\n" { } timeout { perror "timeout\n"; break } eof { break } @@ -558,7 +593,7 @@ proc do_movhu {} { gas_finish # Did we find what we were looking for? If not, flunk it. - if [expr $x==20] then { pass $testname } else { fail $testname } + if [expr $x==26] then { pass $testname } else { fail $testname } } proc do_movm {} { @@ -630,15 +665,15 @@ proc do_other {} { # of instructions (as these tests to). while 1 { expect { - -re "^ +\[0-9\]+ 0000 08\[^\n\]*\n" { set x [expr $x+1] } - -re "^ +\[0-9\]+ 0001 44\[^\n\]*\n" { set x [expr $x+1] } - -re "^ +\[0-9\]+ 0002 49\[^\n\]*\n" { set x [expr $x+1] } - -re "^ +\[0-9\]+ 0003 53\[^\n\]*\n" { set x [expr $x+1] } + -re "^ +\[0-9\]+ 0000 08\[^\n\]*\n" { set x [expr $x+1] } + -re "^ +\[0-9\]+ 0001 44\[^\n\]*\n" { set x [expr $x+1] } + -re "^ +\[0-9\]+ 0002 49\[^\n\]*\n" { set x [expr $x+1] } + -re "^ +\[0-9\]+ 0003 53\[^\n\]*\n" { set x [expr $x+1] } -re "^ +\[0-9\]+ 0004 F0F6\[^\n\]*\n" { set x [expr $x+1] } -re "^ +\[0-9\]+ 0006 CC0100\[^\n\]*\n" { set x [expr $x+1] } -re "^ +\[0-9\]+ 0009\[^\n\]*\n" { set x [expr $x+1] } - -re "^ +\[0-9\]+ 000e CD010005\[^\n\]*\n +\[0-9\]+ +09\[^\n\]*\n" - { set x [expr $x+1] } + -re "^ +\[0-9\]+ 000e CD010005\[^\n\]*\n" { set x [expr $x+1] } + -re "^ +9 +09\[^\n\]*\n" { set x [expr $x+1] } -re "^ +\[0-9\]+ 0013\[^\n\]*\n" { set x [expr $x+1] } -re "^ +\[0-9\]+ 001a F0F2\[^\n\]*\n" { set x [expr $x+1] } -re "^ +\[0-9\]+ 001c FAFF0100\[^\n\]*\n" { set x [expr $x+1] } @@ -648,7 +683,7 @@ proc do_other {} { -re "^ +\[0-9\]+ 002c F0FC\[^\n\]*\n" { set x [expr $x+1] } -re "^ +\[0-9\]+ 002e F0FD\[^\n\]*\n" { set x [expr $x+1] } -re "^ +\[0-9\]+ 0030 F0FE\[^\n\]*\n" { set x [expr $x+1] } - -re "^ +\[0-9\]+ 0032 CB\[^\n\]*\n" { set x [expr $x+1] } + -re "^ +\[0-9\]+ 0032 CB\[^\n\]*\n" { set x [expr $x+1] } -re "^ +\[0-9\]+ 0033 F0FF\[^\n\]*\n" { set x [expr $x+1] } -re "\[^\n\]*\n" { } timeout { perror "timeout\n"; break } @@ -661,7 +696,7 @@ proc do_other {} { gas_finish # Did we find what we were looking for? If not, flunk it. - if [expr $x==19] then { pass $testname } else { fail $testname } + if [expr $x==20] then { pass $testname } else { fail $testname } } proc do_shift {} { @@ -681,7 +716,7 @@ proc do_shift {} { -re "^ +\[0-9\]+ 0007 F8C704\[^\n\]*\n" { set x [expr $x+1] } -re "^ +\[0-9\]+ 000a F29E\[^\n\]*\n" { set x [expr $x+1] } -re "^ +\[0-9\]+ 000c F8C204\[^\n\]*\n" { set x [expr $x+1] } - -re "^ +\[0-9\]+ 000f 56\[^\n\]*\n" { set x [expr $x+1] } + -re "^ +\[0-9\]+ 000f 56\[^\n\]*\n" { set x [expr $x+1] } -re "^ +\[0-9\]+ 0010 F285\[^\n\]*\n" { set x [expr $x+1] } -re "^ +\[0-9\]+ 0012 F282\[^\n\]*\n" { set x [expr $x+1] } -re "\[^\n\]*\n" { } @@ -713,8 +748,10 @@ proc do_sub {} { -re "^ +\[0-9\]+ 0002 F12B\[^\n\]*\n" { set x [expr $x+1] } -re "^ +\[0-9\]+ 0004 F11F\[^\n\]*\n" { set x [expr $x+1] } -re "^ +\[0-9\]+ 0006 F13E\[^\n\]*\n" { set x [expr $x+1] } - -re "^ +\[0-9\]+ 0008\[^\n\]*\n" { set x [expr $x+1] } - -re "^ +\[0-9\]+ 000e\[^\n\]*\n" { set x [expr $x+1] } + -re "^ +\[0-9\]+ 0008 FCC60001 \[^\n\]*\n" { set x [expr $x+1] } + -re "^ +6 +FFFF\[^\n\]*\n" { set x [expr $x+1] } + -re "^ +\[0-9\]+ 000e FCD50001\[^\n\]*\n" { set x [expr $x+1] } + -re "^ +7 +FFFF\[^\n\]*\n" { set x [expr $x+1] } -re "^ +\[0-9\]+ 0014 F186\[^\n\]*\n" { set x [expr $x+1] } -re "\[^\n\]*\n" { } timeout { perror "timeout\n"; break } @@ -727,7 +764,7 @@ proc do_sub {} { gas_finish # Did we find what we were looking for? If not, flunk it. - if [expr $x==7] then { pass $testname } else { fail $testname } + if [expr $x==9] then { pass $testname } else { fail $testname } } if [istarget mn10300*-*-*] then { diff --git a/gas/testsuite/gas/mn10300/other.s b/gas/testsuite/gas/mn10300/other.s index 42d1e27..996d7b2 100755 --- a/gas/testsuite/gas/mn10300/other.s +++ b/gas/testsuite/gas/mn10300/other.s @@ -5,12 +5,12 @@ inc4 a3 jmp a2 jmp 256 - jmp 65536 + jmp 131071 call 256,5,9 - call 65536,0,0 + call 131071,0,0 calls a2 calls 256 - calls 65536 + calls 131071 ret 15,7 retf 9,5 rets |