From a420f3b166d3de66c6452b9fe04ce76c54c346c8 Mon Sep 17 00:00:00 2001 From: Jeff Law Date: Wed, 5 Sep 2001 02:05:07 +0000 Subject: [PATCH] Tue Sep 4 20:06:09 2001 Jeffrey A Law (law@cygnus.com) * gas/all/gas.exp (930509a): Expect failure on the H8/300 ELF port. * gas/h8300/ffxx1-elf.d: Update due to recent changes to H8/300 ELF toolchain. * gas/h8300/h8300-elf.exp: Likewise. * gas/macros/macros.exp: Expect failure on all H8/300 ports. * gas/vtable/vtable.exp: Do not run tests on H8/300 ELF ports. --- gas/testsuite/ChangeLog | 12 ++ gas/testsuite/gas/all/gas.exp | 1 + gas/testsuite/gas/h8300/ffxx1-elf.d | 9 +- gas/testsuite/gas/h8300/h8300-elf.exp | 218 +++++++++++++++++----------------- gas/testsuite/gas/macros/macros.exp | 1 + gas/testsuite/gas/vtable/vtable.exp | 1 + 6 files changed, 129 insertions(+), 113 deletions(-) diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog index 42871d2e82..11f0a0a9bb 100644 --- a/gas/testsuite/ChangeLog +++ b/gas/testsuite/ChangeLog @@ -1,3 +1,15 @@ +Tue Sep 4 20:06:09 2001 Jeffrey A Law (law@cygnus.com) + + * gas/all/gas.exp (930509a): Expect failure on the H8/300 ELF port. + + * gas/h8300/ffxx1-elf.d: Update due to recent changes to H8/300 + ELF toolchain. + * gas/h8300/h8300-elf.exp: Likewise. + + * gas/macros/macros.exp: Expect failure on all H8/300 ports. + + * gas/vtable/vtable.exp: Do not run tests on H8/300 ELF ports. + Thu Aug 30 21:58:48 2001 J"orn Rennecke * gas/h8300/h8300.exp (do_h8300_cbranch): Remove invocation. diff --git a/gas/testsuite/gas/all/gas.exp b/gas/testsuite/gas/all/gas.exp index 796f105cbc..af0b1b0cc6 100644 --- a/gas/testsuite/gas/all/gas.exp +++ b/gas/testsuite/gas/all/gas.exp @@ -95,6 +95,7 @@ if { ![istarget hppa*-*-*] && ![istarget *c54x*-*-*] } then { setup_xfail "vax*-*-vms*" setup_xfail "mn10300*-*-*" setup_xfail "mn10200*-*-*" + setup_xfail "h8300*-*-elf*" do_930509a } diff --git a/gas/testsuite/gas/h8300/ffxx1-elf.d b/gas/testsuite/gas/h8300/ffxx1-elf.d index 5640f22f22..efbf308e3d 100644 --- a/gas/testsuite/gas/h8300/ffxx1-elf.d +++ b/gas/testsuite/gas/h8300/ffxx1-elf.d @@ -6,9 +6,8 @@ .*: file format .*h8300.* Disassembly of section .text: -0+0000 04 00 orc #0x0,ccr - 0: R_H8_DIR16 .text[+]0x400 ... + 0: R_H8_DIR16 main 0+0400
f8 7f mov.b #0x7f,r0l 0+0402 28 bb mov.b @0xbb:8,r0l 0+0404 6a 88 ff b9 mov.b r0l,@0xffb9:16 @@ -16,7 +15,9 @@ Disassembly of section .text: 0+040a 6a 88 ff bb mov.b r0l,@0xffbb:16 0+040e 79 01 00 00 mov.w #0x0,r1 0+0412 0b 01 adds #0x1,er1 -0+0414 46 fc bne .-4 \(412\) +0+0414 46 00 bne .0 \(416\) + 415: R_H8_PCREL8 deloop 0+0416 12 88 rotl r0l -0+0418 40 f0 bra .-16 \(40a\) +0+0418 40 00 bra .0 \(41a\) + 419: R_H8_PCREL8 loop ... diff --git a/gas/testsuite/gas/h8300/h8300-elf.exp b/gas/testsuite/gas/h8300/h8300-elf.exp index 260e8d9ebc..66e2dfe882 100644 --- a/gas/testsuite/gas/h8300/h8300-elf.exp +++ b/gas/testsuite/gas/h8300/h8300-elf.exp @@ -11,26 +11,26 @@ proc do_h8300_cbranch {} { # assembled correctly. while 1 { expect { - -re " +\[0-9\]+ 0000 40FE\[^\n\]*\n" { set x [expr $x+1] } - -re " +\[0-9\]+ 0002 40FC\[^\n\]*\n" { set x [expr $x+1] } - -re " +\[0-9\]+ 0004 41FA\[^\n\]*\n" { set x [expr $x+1] } - -re " +\[0-9\]+ 0006 41F8\[^\n\]*\n" { set x [expr $x+1] } - -re " +\[0-9\]+ 0008 42F6\[^\n\]*\n" { set x [expr $x+1] } - -re " +\[0-9\]+ 000a 43F4\[^\n\]*\n" { set x [expr $x+1] } - -re " +\[0-9\]+ 000c 44F2\[^\n\]*\n" { set x [expr $x+1] } - -re " +\[0-9\]+ 000e 44F0\[^\n\]*\n" { set x [expr $x+1] } - -re " +\[0-9\]+ 0010 45EE\[^\n\]*\n" { set x [expr $x+1] } - -re " +\[0-9\]+ 0012 45EC\[^\n\]*\n" { set x [expr $x+1] } - -re " +\[0-9\]+ 0014 46EA\[^\n\]*\n" { set x [expr $x+1] } - -re " +\[0-9\]+ 0016 47E8\[^\n\]*\n" { set x [expr $x+1] } - -re " +\[0-9\]+ 0018 48E6\[^\n\]*\n" { set x [expr $x+1] } - -re " +\[0-9\]+ 001a 49E4\[^\n\]*\n" { set x [expr $x+1] } - -re " +\[0-9\]+ 001c 4AE2\[^\n\]*\n" { set x [expr $x+1] } - -re " +\[0-9\]+ 001e 4BE0\[^\n\]*\n" { set x [expr $x+1] } - -re " +\[0-9\]+ 0020 4CDE\[^\n\]*\n" { set x [expr $x+1] } - -re " +\[0-9\]+ 0022 4DDC\[^\n\]*\n" { set x [expr $x+1] } - -re " +\[0-9\]+ 0024 4EDA\[^\n\]*\n" { set x [expr $x+1] } - -re " +\[0-9\]+ 0026 4FD8\[^\n\]*\n" { set x [expr $x+1] } + -re " +\[0-9\]+ 0000 4000\[^\n\]*\n" { set x [expr $x+1] } + -re " +\[0-9\]+ 0002 4000\[^\n\]*\n" { set x [expr $x+1] } + -re " +\[0-9\]+ 0004 4100\[^\n\]*\n" { set x [expr $x+1] } + -re " +\[0-9\]+ 0006 4100\[^\n\]*\n" { set x [expr $x+1] } + -re " +\[0-9\]+ 0008 4200\[^\n\]*\n" { set x [expr $x+1] } + -re " +\[0-9\]+ 000a 4300\[^\n\]*\n" { set x [expr $x+1] } + -re " +\[0-9\]+ 000c 4400\[^\n\]*\n" { set x [expr $x+1] } + -re " +\[0-9\]+ 000e 4400\[^\n\]*\n" { set x [expr $x+1] } + -re " +\[0-9\]+ 0010 4500\[^\n\]*\n" { set x [expr $x+1] } + -re " +\[0-9\]+ 0012 4500\[^\n\]*\n" { set x [expr $x+1] } + -re " +\[0-9\]+ 0014 4600\[^\n\]*\n" { set x [expr $x+1] } + -re " +\[0-9\]+ 0016 4700\[^\n\]*\n" { set x [expr $x+1] } + -re " +\[0-9\]+ 0018 4800\[^\n\]*\n" { set x [expr $x+1] } + -re " +\[0-9\]+ 001a 4900\[^\n\]*\n" { set x [expr $x+1] } + -re " +\[0-9\]+ 001c 4A00\[^\n\]*\n" { set x [expr $x+1] } + -re " +\[0-9\]+ 001e 4B00\[^\n\]*\n" { set x [expr $x+1] } + -re " +\[0-9\]+ 0020 4C00\[^\n\]*\n" { set x [expr $x+1] } + -re " +\[0-9\]+ 0022 4D00\[^\n\]*\n" { set x [expr $x+1] } + -re " +\[0-9\]+ 0024 4E00\[^\n\]*\n" { set x [expr $x+1] } + -re " +\[0-9\]+ 0026 4F00\[^\n\]*\n" { set x [expr $x+1] } timeout { perror "timeout\n; break } eof { break } } @@ -54,7 +54,7 @@ proc do_h8300_branch {} { # assembled correctly. while 1 { expect { - -re " +\[0-9\]+ 0000 55FE\[^\n\]*\n" { set x [expr $x+1] } + -re " +\[0-9\]+ 0000 5500\[^\n\]*\n" { set x [expr $x+1] } -re " +\[0-9\]+ 0002 5A000000\[^\n\]*\n" { set x [expr $x+1] } -re " +\[0-9\]+ 0006 5900\[^\n\]*\n" { set x [expr $x+1] } -re " +\[0-9\]+ 0008 5B00\[^\n\]*\n" { set x [expr $x+1] } @@ -84,46 +84,46 @@ proc do_h8300h_cbranch {} { # assembled correctly. while 1 { expect { - -re " +\[0-9\]+ 0000 40FE\[^\n\]*\n" { set x [expr $x+1] } - -re " +\[0-9\]+ 0002 40FC\[^\n\]*\n" { set x [expr $x+1] } - -re " +\[0-9\]+ 0004 41FA\[^\n\]*\n" { set x [expr $x+1] } - -re " +\[0-9\]+ 0006 41F8\[^\n\]*\n" { set x [expr $x+1] } - -re " +\[0-9\]+ 0008 42F6\[^\n\]*\n" { set x [expr $x+1] } - -re " +\[0-9\]+ 000a 43F4\[^\n\]*\n" { set x [expr $x+1] } - -re " +\[0-9\]+ 000c 44F2\[^\n\]*\n" { set x [expr $x+1] } - -re " +\[0-9\]+ 000e 44F0\[^\n\]*\n" { set x [expr $x+1] } - -re " +\[0-9\]+ 0010 45EE\[^\n\]*\n" { set x [expr $x+1] } - -re " +\[0-9\]+ 0012 45EC\[^\n\]*\n" { set x [expr $x+1] } - -re " +\[0-9\]+ 0014 46EA\[^\n\]*\n" { set x [expr $x+1] } - -re " +\[0-9\]+ 0016 47E8\[^\n\]*\n" { set x [expr $x+1] } - -re " +\[0-9\]+ 0018 48E6\[^\n\]*\n" { set x [expr $x+1] } - -re " +\[0-9\]+ 001a 49E4\[^\n\]*\n" { set x [expr $x+1] } - -re " +\[0-9\]+ 001c 4AE2\[^\n\]*\n" { set x [expr $x+1] } - -re " +\[0-9\]+ 001e 4BE0\[^\n\]*\n" { set x [expr $x+1] } - -re " +\[0-9\]+ 0020 4CDE\[^\n\]*\n" { set x [expr $x+1] } - -re " +\[0-9\]+ 0022 4DDC\[^\n\]*\n" { set x [expr $x+1] } - -re " +\[0-9\]+ 0024 4EDA\[^\n\]*\n" { set x [expr $x+1] } - -re " +\[0-9\]+ 0026 4FD8\[^\n\]*\n" { set x [expr $x+1] } - -re " +\[0-9\]+ 0028 5800FFD4\[^\n\]*\n" { set x [expr $x+1] } - -re " +\[0-9\]+ 002c 5800FFD0\[^\n\]*\n" { set x [expr $x+1] } - -re " +\[0-9\]+ 0030 5810FFCC\[^\n\]*\n" { set x [expr $x+1] } - -re " +\[0-9\]+ 0034 5810FFC8\[^\n\]*\n" { set x [expr $x+1] } - -re " +\[0-9\]+ 0038 5820FFC4\[^\n\]*\n" { set x [expr $x+1] } - -re " +\[0-9\]+ 003c 5830FFC0\[^\n\]*\n" { set x [expr $x+1] } - -re " +\[0-9\]+ 0040 5840FFBC\[^\n\]*\n" { set x [expr $x+1] } - -re " +\[0-9\]+ 0044 5840FFB8\[^\n\]*\n" { set x [expr $x+1] } - -re " +\[0-9\]+ 0048 5850FFB4\[^\n\]*\n" { set x [expr $x+1] } - -re " +\[0-9\]+ 004c 5850FFB0\[^\n\]*\n" { set x [expr $x+1] } - -re " +\[0-9\]+ 0050 5860FFAC\[^\n\]*\n" { set x [expr $x+1] } - -re " +\[0-9\]+ 0054 5870FFA8\[^\n\]*\n" { set x [expr $x+1] } - -re " +\[0-9\]+ 0058 5880FFA4\[^\n\]*\n" { set x [expr $x+1] } - -re " +\[0-9\]+ 005c 5890FFA0\[^\n\]*\n" { set x [expr $x+1] } - -re " +\[0-9\]+ 0060 58A0FF9C\[^\n\]*\n" { set x [expr $x+1] } - -re " +\[0-9\]+ 0064 58B0FF98\[^\n\]*\n" { set x [expr $x+1] } - -re " +\[0-9\]+ 0068 58C0FF94\[^\n\]*\n" { set x [expr $x+1] } - -re " +\[0-9\]+ 006c 58D0FF90\[^\n\]*\n" { set x [expr $x+1] } - -re " +\[0-9\]+ 0070 58E0FF8C\[^\n\]*\n" { set x [expr $x+1] } - -re " +\[0-9\]+ 0074 58F0FF88\[^\n\]*\n" { set x [expr $x+1] } + -re " +\[0-9\]+ 0000 4000\[^\n\]*\n" { set x [expr $x+1] } + -re " +\[0-9\]+ 0002 4000\[^\n\]*\n" { set x [expr $x+1] } + -re " +\[0-9\]+ 0004 4100\[^\n\]*\n" { set x [expr $x+1] } + -re " +\[0-9\]+ 0006 4100\[^\n\]*\n" { set x [expr $x+1] } + -re " +\[0-9\]+ 0008 4200\[^\n\]*\n" { set x [expr $x+1] } + -re " +\[0-9\]+ 000a 4300\[^\n\]*\n" { set x [expr $x+1] } + -re " +\[0-9\]+ 000c 4400\[^\n\]*\n" { set x [expr $x+1] } + -re " +\[0-9\]+ 000e 4400\[^\n\]*\n" { set x [expr $x+1] } + -re " +\[0-9\]+ 0010 4500\[^\n\]*\n" { set x [expr $x+1] } + -re " +\[0-9\]+ 0012 4500\[^\n\]*\n" { set x [expr $x+1] } + -re " +\[0-9\]+ 0014 4600\[^\n\]*\n" { set x [expr $x+1] } + -re " +\[0-9\]+ 0016 4700\[^\n\]*\n" { set x [expr $x+1] } + -re " +\[0-9\]+ 0018 4800\[^\n\]*\n" { set x [expr $x+1] } + -re " +\[0-9\]+ 001a 4900\[^\n\]*\n" { set x [expr $x+1] } + -re " +\[0-9\]+ 001c 4A00\[^\n\]*\n" { set x [expr $x+1] } + -re " +\[0-9\]+ 001e 4B00\[^\n\]*\n" { set x [expr $x+1] } + -re " +\[0-9\]+ 0020 4C00\[^\n\]*\n" { set x [expr $x+1] } + -re " +\[0-9\]+ 0022 4D00\[^\n\]*\n" { set x [expr $x+1] } + -re " +\[0-9\]+ 0024 4E00\[^\n\]*\n" { set x [expr $x+1] } + -re " +\[0-9\]+ 0026 4F00\[^\n\]*\n" { set x [expr $x+1] } + -re " +\[0-9\]+ 0028 58000000\[^\n\]*\n" { set x [expr $x+1] } + -re " +\[0-9\]+ 002c 58000000\[^\n\]*\n" { set x [expr $x+1] } + -re " +\[0-9\]+ 0030 58100000\[^\n\]*\n" { set x [expr $x+1] } + -re " +\[0-9\]+ 0034 58100000\[^\n\]*\n" { set x [expr $x+1] } + -re " +\[0-9\]+ 0038 58200000\[^\n\]*\n" { set x [expr $x+1] } + -re " +\[0-9\]+ 003c 58300000\[^\n\]*\n" { set x [expr $x+1] } + -re " +\[0-9\]+ 0040 58400000\[^\n\]*\n" { set x [expr $x+1] } + -re " +\[0-9\]+ 0044 58400000\[^\n\]*\n" { set x [expr $x+1] } + -re " +\[0-9\]+ 0048 58500000\[^\n\]*\n" { set x [expr $x+1] } + -re " +\[0-9\]+ 004c 58500000\[^\n\]*\n" { set x [expr $x+1] } + -re " +\[0-9\]+ 0050 58600000\[^\n\]*\n" { set x [expr $x+1] } + -re " +\[0-9\]+ 0054 58700000\[^\n\]*\n" { set x [expr $x+1] } + -re " +\[0-9\]+ 0058 58800000\[^\n\]*\n" { set x [expr $x+1] } + -re " +\[0-9\]+ 005c 58900000\[^\n\]*\n" { set x [expr $x+1] } + -re " +\[0-9\]+ 0060 58A00000\[^\n\]*\n" { set x [expr $x+1] } + -re " +\[0-9\]+ 0064 58B00000\[^\n\]*\n" { set x [expr $x+1] } + -re " +\[0-9\]+ 0068 58C00000\[^\n\]*\n" { set x [expr $x+1] } + -re " +\[0-9\]+ 006c 58D00000\[^\n\]*\n" { set x [expr $x+1] } + -re " +\[0-9\]+ 0070 58E00000\[^\n\]*\n" { set x [expr $x+1] } + -re " +\[0-9\]+ 0074 58F00000\[^\n\]*\n" { set x [expr $x+1] } timeout { perror "timeout\n; break } eof { break } } @@ -147,14 +147,14 @@ proc do_h8300h_branch {} { # assembled correctly. while 1 { expect { - -re " +\[0-9\]+ 0000 55FE\[^\n\]*\n" { set x [expr $x+1] } - -re " +\[0-9\]+ 0002 5C00FFFA\[^\n\]*\n" { set x [expr $x+1] } + -re " +\[0-9\]+ 0000 5500\[^\n\]*\n" { set x [expr $x+1] } + -re " +\[0-9\]+ 0002 5C000000\[^\n\]*\n" { set x [expr $x+1] } -re " +\[0-9\]+ 0006 5A000000\[^\n\]*\n" { set x [expr $x+1] } -re " +\[0-9\]+ 000a 5900\[^\n\]*\n" { set x [expr $x+1] } - -re " +\[0-9\]+ 000c 5B10\[^\n\]*\n" { set x [expr $x+1] } + -re " +\[0-9\]+ 000c 5B00\[^\n\]*\n" { set x [expr $x+1] } -re " +\[0-9\]+ 000e 5E000000\[^\n\]*\n" { set x [expr $x+1] } -re " +\[0-9\]+ 0012 5D00\[^\n\]*\n" { set x [expr $x+1] } - -re " +\[0-9\]+ 0014 5F10\[^\n\]*\n" { set x [expr $x+1] } + -re " +\[0-9\]+ 0014 5F00\[^\n\]*\n" { set x [expr $x+1] } timeout { perror "timeout\n; break } eof { break } } @@ -178,46 +178,46 @@ proc do_h8300s_cbranch {} { # assembled correctly. while 1 { expect { - -re " +\[0-9\]+ 0000 40FE\[^\n\]*\n" { set x [expr $x+1] } - -re " +\[0-9\]+ 0002 40FC\[^\n\]*\n" { set x [expr $x+1] } - -re " +\[0-9\]+ 0004 41FA\[^\n\]*\n" { set x [expr $x+1] } - -re " +\[0-9\]+ 0006 41F8\[^\n\]*\n" { set x [expr $x+1] } - -re " +\[0-9\]+ 0008 42F6\[^\n\]*\n" { set x [expr $x+1] } - -re " +\[0-9\]+ 000a 43F4\[^\n\]*\n" { set x [expr $x+1] } - -re " +\[0-9\]+ 000c 44F2\[^\n\]*\n" { set x [expr $x+1] } - -re " +\[0-9\]+ 000e 44F0\[^\n\]*\n" { set x [expr $x+1] } - -re " +\[0-9\]+ 0010 45EE\[^\n\]*\n" { set x [expr $x+1] } - -re " +\[0-9\]+ 0012 45EC\[^\n\]*\n" { set x [expr $x+1] } - -re " +\[0-9\]+ 0014 46EA\[^\n\]*\n" { set x [expr $x+1] } - -re " +\[0-9\]+ 0016 47E8\[^\n\]*\n" { set x [expr $x+1] } - -re " +\[0-9\]+ 0018 48E6\[^\n\]*\n" { set x [expr $x+1] } - -re " +\[0-9\]+ 001a 49E4\[^\n\]*\n" { set x [expr $x+1] } - -re " +\[0-9\]+ 001c 4AE2\[^\n\]*\n" { set x [expr $x+1] } - -re " +\[0-9\]+ 001e 4BE0\[^\n\]*\n" { set x [expr $x+1] } - -re " +\[0-9\]+ 0020 4CDE\[^\n\]*\n" { set x [expr $x+1] } - -re " +\[0-9\]+ 0022 4DDC\[^\n\]*\n" { set x [expr $x+1] } - -re " +\[0-9\]+ 0024 4EDA\[^\n\]*\n" { set x [expr $x+1] } - -re " +\[0-9\]+ 0026 4FD8\[^\n\]*\n" { set x [expr $x+1] } - -re " +\[0-9\]+ 0028 5800FFD4\[^\n\]*\n" { set x [expr $x+1] } - -re " +\[0-9\]+ 002c 5800FFD0\[^\n\]*\n" { set x [expr $x+1] } - -re " +\[0-9\]+ 0030 5810FFCC\[^\n\]*\n" { set x [expr $x+1] } - -re " +\[0-9\]+ 0034 5810FFC8\[^\n\]*\n" { set x [expr $x+1] } - -re " +\[0-9\]+ 0038 5820FFC4\[^\n\]*\n" { set x [expr $x+1] } - -re " +\[0-9\]+ 003c 5830FFC0\[^\n\]*\n" { set x [expr $x+1] } - -re " +\[0-9\]+ 0040 5840FFBC\[^\n\]*\n" { set x [expr $x+1] } - -re " +\[0-9\]+ 0044 5840FFB8\[^\n\]*\n" { set x [expr $x+1] } - -re " +\[0-9\]+ 0048 5850FFB4\[^\n\]*\n" { set x [expr $x+1] } - -re " +\[0-9\]+ 004c 5850FFB0\[^\n\]*\n" { set x [expr $x+1] } - -re " +\[0-9\]+ 0050 5860FFAC\[^\n\]*\n" { set x [expr $x+1] } - -re " +\[0-9\]+ 0054 5870FFA8\[^\n\]*\n" { set x [expr $x+1] } - -re " +\[0-9\]+ 0058 5880FFA4\[^\n\]*\n" { set x [expr $x+1] } - -re " +\[0-9\]+ 005c 5890FFA0\[^\n\]*\n" { set x [expr $x+1] } - -re " +\[0-9\]+ 0060 58A0FF9C\[^\n\]*\n" { set x [expr $x+1] } - -re " +\[0-9\]+ 0064 58B0FF98\[^\n\]*\n" { set x [expr $x+1] } - -re " +\[0-9\]+ 0068 58C0FF94\[^\n\]*\n" { set x [expr $x+1] } - -re " +\[0-9\]+ 006c 58D0FF90\[^\n\]*\n" { set x [expr $x+1] } - -re " +\[0-9\]+ 0070 58E0FF8C\[^\n\]*\n" { set x [expr $x+1] } - -re " +\[0-9\]+ 0074 58F0FF88\[^\n\]*\n" { set x [expr $x+1] } + -re " +\[0-9\]+ 0000 4000\[^\n\]*\n" { set x [expr $x+1] } + -re " +\[0-9\]+ 0002 4000\[^\n\]*\n" { set x [expr $x+1] } + -re " +\[0-9\]+ 0004 4100\[^\n\]*\n" { set x [expr $x+1] } + -re " +\[0-9\]+ 0006 4100\[^\n\]*\n" { set x [expr $x+1] } + -re " +\[0-9\]+ 0008 4200\[^\n\]*\n" { set x [expr $x+1] } + -re " +\[0-9\]+ 000a 4300\[^\n\]*\n" { set x [expr $x+1] } + -re " +\[0-9\]+ 000c 4400\[^\n\]*\n" { set x [expr $x+1] } + -re " +\[0-9\]+ 000e 4400\[^\n\]*\n" { set x [expr $x+1] } + -re " +\[0-9\]+ 0010 4500\[^\n\]*\n" { set x [expr $x+1] } + -re " +\[0-9\]+ 0012 4500\[^\n\]*\n" { set x [expr $x+1] } + -re " +\[0-9\]+ 0014 4600\[^\n\]*\n" { set x [expr $x+1] } + -re " +\[0-9\]+ 0016 4700\[^\n\]*\n" { set x [expr $x+1] } + -re " +\[0-9\]+ 0018 4800\[^\n\]*\n" { set x [expr $x+1] } + -re " +\[0-9\]+ 001a 4900\[^\n\]*\n" { set x [expr $x+1] } + -re " +\[0-9\]+ 001c 4A00\[^\n\]*\n" { set x [expr $x+1] } + -re " +\[0-9\]+ 001e 4B00\[^\n\]*\n" { set x [expr $x+1] } + -re " +\[0-9\]+ 0020 4C00\[^\n\]*\n" { set x [expr $x+1] } + -re " +\[0-9\]+ 0022 4D00\[^\n\]*\n" { set x [expr $x+1] } + -re " +\[0-9\]+ 0024 4E00\[^\n\]*\n" { set x [expr $x+1] } + -re " +\[0-9\]+ 0026 4F00\[^\n\]*\n" { set x [expr $x+1] } + -re " +\[0-9\]+ 0028 58000000\[^\n\]*\n" { set x [expr $x+1] } + -re " +\[0-9\]+ 002c 58000000\[^\n\]*\n" { set x [expr $x+1] } + -re " +\[0-9\]+ 0030 58100000\[^\n\]*\n" { set x [expr $x+1] } + -re " +\[0-9\]+ 0034 58100000\[^\n\]*\n" { set x [expr $x+1] } + -re " +\[0-9\]+ 0038 58200000\[^\n\]*\n" { set x [expr $x+1] } + -re " +\[0-9\]+ 003c 58300000\[^\n\]*\n" { set x [expr $x+1] } + -re " +\[0-9\]+ 0040 58400000\[^\n\]*\n" { set x [expr $x+1] } + -re " +\[0-9\]+ 0044 58400000\[^\n\]*\n" { set x [expr $x+1] } + -re " +\[0-9\]+ 0048 58500000\[^\n\]*\n" { set x [expr $x+1] } + -re " +\[0-9\]+ 004c 58500000\[^\n\]*\n" { set x [expr $x+1] } + -re " +\[0-9\]+ 0050 58600000\[^\n\]*\n" { set x [expr $x+1] } + -re " +\[0-9\]+ 0054 58700000\[^\n\]*\n" { set x [expr $x+1] } + -re " +\[0-9\]+ 0058 58800000\[^\n\]*\n" { set x [expr $x+1] } + -re " +\[0-9\]+ 005c 58900000\[^\n\]*\n" { set x [expr $x+1] } + -re " +\[0-9\]+ 0060 58A00000\[^\n\]*\n" { set x [expr $x+1] } + -re " +\[0-9\]+ 0064 58B00000\[^\n\]*\n" { set x [expr $x+1] } + -re " +\[0-9\]+ 0068 58C00000\[^\n\]*\n" { set x [expr $x+1] } + -re " +\[0-9\]+ 006c 58D00000\[^\n\]*\n" { set x [expr $x+1] } + -re " +\[0-9\]+ 0070 58E00000\[^\n\]*\n" { set x [expr $x+1] } + -re " +\[0-9\]+ 0074 58F00000\[^\n\]*\n" { set x [expr $x+1] } timeout { perror "timeout\n; break } eof { break } } @@ -241,14 +241,14 @@ proc do_h8300s_branch {} { # assembled correctly. while 1 { expect { - -re " +\[0-9\]+ 0000 55FE\[^\n\]*\n" { set x [expr $x+1] } - -re " +\[0-9\]+ 0002 5C00FFFA\[^\n\]*\n" { set x [expr $x+1] } + -re " +\[0-9\]+ 0000 5500\[^\n\]*\n" { set x [expr $x+1] } + -re " +\[0-9\]+ 0002 5C000000\[^\n\]*\n" { set x [expr $x+1] } -re " +\[0-9\]+ 0006 5A000000\[^\n\]*\n" { set x [expr $x+1] } -re " +\[0-9\]+ 000a 5900\[^\n\]*\n" { set x [expr $x+1] } - -re " +\[0-9\]+ 000c 5B10\[^\n\]*\n" { set x [expr $x+1] } + -re " +\[0-9\]+ 000c 5B00\[^\n\]*\n" { set x [expr $x+1] } -re " +\[0-9\]+ 000e 5E000000\[^\n\]*\n" { set x [expr $x+1] } -re " +\[0-9\]+ 0012 5D00\[^\n\]*\n" { set x [expr $x+1] } - -re " +\[0-9\]+ 0014 5F10\[^\n\]*\n" { set x [expr $x+1] } + -re " +\[0-9\]+ 0014 5F00\[^\n\]*\n" { set x [expr $x+1] } timeout { perror "timeout\n; break } eof { break } } diff --git a/gas/testsuite/gas/macros/macros.exp b/gas/testsuite/gas/macros/macros.exp index fd481df8f0..b3b4d57682 100644 --- a/gas/testsuite/gas/macros/macros.exp +++ b/gas/testsuite/gas/macros/macros.exp @@ -32,5 +32,6 @@ if { ![istarget hppa*-*-*] || [istarget *-*-linux*]} { setup_xfail powerpc-*-aix* setup_xfail sh*-*-* setup_xfail z8k*-*-* + setup_xfail h8300*-*-* run_dump_test strings } diff --git a/gas/testsuite/gas/vtable/vtable.exp b/gas/testsuite/gas/vtable/vtable.exp index 682bc4b3a4..62d0affff8 100644 --- a/gas/testsuite/gas/vtable/vtable.exp +++ b/gas/testsuite/gas/vtable/vtable.exp @@ -26,6 +26,7 @@ if { ( [istarget "*-*-elf*"] || [istarget "*-*-linux*"]) || [istarget "arc*-*-*"] || [istarget "alpha*-*-*"] || [istarget "sparc64*-*-*"] + || [istarget "h8300*-*-*"] || [istarget "d30v-*-*"] } then { return } -- 2.11.0