* gas/v850/basic.exp (do_branch): Check offsets in branch insns.

        (do_jumps): Likewise.
Now that we can resolve known branch targets.

2 files changed, 37 insertions, 32 deletions

diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog
index 9444b1b..4b4c2ea 100644
--- a/gas/testsuite/ChangeLog
+++ b/gas/testsuite/ChangeLog
@@ -1,8 +1,13 @@
 start-sanitize-v850
+Sat Aug 31 01:25:03 1996  Jeffrey A Law  (law@cygnus.com)
+
+	* gas/v850/basic.exp (do_branch): Check offsets in branch insns.
+	(do_jumps): Likewise.
+	
 Fri Aug 30 00:37:55 1996  Jeffrey A Law  (law@cygnus.com)
 
 	* gas/v850/misc.s: Tweak register numbers for better testing.
-	* gas/v850/basic.exp (misc_tests): Corresponding changes.
+	* gas/v850/basic.exp (do_misc): Corresponding changes.
 
 	* gas/v850/hilo.s: New testfile.
 	* gas/v850/basic.exp: Run hilo tests.
@@ -15,38 +20,38 @@ Thu Aug 29 11:32:23 1996  James G. Smith  <jsmith@cygnus.co.uk>
 start-sanitize-v850
 Fri Aug 23 11:02:55 1996  Jeffrey A Law  (law@cygnus.com)
 
-	* gas/v850/basic.exp (move_tests): Test instruction bit patterns.
+	* gas/v850/basic.exp (do_move): Test instruction bit patterns.
 	* gas/v850/move.s: Tweak constants for better testing.
 
-	* gas/v850/basic.exp (mem_tests): Test instruction bit patterns.
+	* gas/v850/basic.exp (do_mem): Test instruction bit patterns.
 	xfail sst and sld tests.
-	(mov_tests): Remove bogus xfail.
+	(do_mov): Remove bogus xfail.
 	* gas/v850/mem.s: sst and sld instructions can only index from
 	"ep" register.
 
-	* gas/v850/basic.exp (logical_tests): Test instruction bit patterns.
+	* gas/v850/basic.exp (do_logical): Test instruction bit patterns.
 	Update addresses.
 	* gas/v850/logical.s: Tweak constants for better testing.
 
-	* gas/v850/basic.exp (jump_tests): Test instruction bit patterns,
+	* gas/v850/basic.exp (do_jump): Test instruction bit patterns,
 	but not displacements (yet).
 
-	* gas/v850/basic.exp (compare_tests): Test instruction bit patterns.
+	* gas/v850/basic.exp (do_compare): Test instruction bit patterns.
 
-	* gas/v850/basic.exp (branch_tests): Test instruction bit patterns,
+	* gas/v850/basic.exp (do_branch): Test instruction bit patterns,
 	but not displacements (yet).
 	
-	* gas/v850/basic.exp (bit_tests): Test instruction bit patterns.
+	* gas/v850/basic.exp (do_bit): Test instruction bit patterns.
 
-	* gas/v850/basic.exp (arith_tests): Test instruction bit patterns.	
+	* gas/v850/basic.exp (do_arith): Test instruction bit patterns.	
 	* gas/v850/arith.s: Tweak constants for better testing.
 
-	* gas/v850/basic.exp (misc_tests): No longer expect failures
+	* gas/v850/basic.exp (do_misc): No longer expect failures
 	assembling "ldsr" and "stsr" opcodes.
 	* gas/v850/misc.s: Re-enable assembling of "ldsr" and "stsr"
 	opcodes.
 
-	* gas/v850/basic.exp (misc_tests): No longer expect failures
+	* gas/v850/basic.exp (do_misc): No longer expect failures
 	assembling "trap" opcodes.
 	* gas/v850/misc.s: Re-enable assembling of "trap" opcodes.
 
diff --git a/gas/testsuite/gas/v850/basic.exp b/gas/testsuite/gas/v850/basic.exp
index 86cf8c3..c43bc16 100755
--- a/gas/testsuite/gas/v850/basic.exp
+++ b/gas/testsuite/gas/v850/basic.exp
@@ -106,25 +106,25 @@ proc do_branch {} {
     while 1 {
 	expect {
 	    -re "^ +\[0-9\]+ 0000 8F05\[^\n\]*\n"	{ set x [expr $x+1] }
-	    -re "^ +\[0-9\]+ 0002 8E05\[^\n\]*\n"	{ set x [expr $x+1] }
-	    -re "^ +\[0-9\]+ 0004 8605\[^\n\]*\n"	{ set x [expr $x+1] }
-	    -re "^ +\[0-9\]+ 0006 8705\[^\n\]*\n"	{ set x [expr $x+1] }
-	    -re "^ +\[0-9\]+ 0008 8B05\[^\n\]*\n"	{ set x [expr $x+1] }
-	    -re "^ +\[0-9\]+ 000a 8905\[^\n\]*\n"	{ set x [expr $x+1] }
-	    -re "^ +\[0-9\]+ 000c 8105\[^\n\]*\n"	{ set x [expr $x+1] }
-	    -re "^ +\[0-9\]+ 000e 8305\[^\n\]*\n"	{ set x [expr $x+1] }
-	    -re "^ +\[0-9\]+ 0010 8205\[^\n\]*\n"	{ set x [expr $x+1] }
-	    -re "^ +\[0-9\]+ 0012 8A05\[^\n\]*\n"	{ set x [expr $x+1] }
-	    -re "^ +\[0-9\]+ 0014 8005\[^\n\]*\n"	{ set x [expr $x+1] }
-	    -re "^ +\[0-9\]+ 0016 8805\[^\n\]*\n"	{ set x [expr $x+1] }
-	    -re "^ +\[0-9\]+ 0018 8405\[^\n\]*\n"	{ set x [expr $x+1] }
-	    -re "^ +\[0-9\]+ 001a 8C05\[^\n\]*\n"	{ set x [expr $x+1] }
-	    -re "^ +\[0-9\]+ 001c 8105\[^\n\]*\n"	{ set x [expr $x+1] }
-	    -re "^ +\[0-9\]+ 001e 8905\[^\n\]*\n"	{ set x [expr $x+1] }
-	    -re "^ +\[0-9\]+ 0020 8205\[^\n\]*\n"	{ set x [expr $x+1] }
-	    -re "^ +\[0-9\]+ 0022 8A05\[^\n\]*\n"	{ set x [expr $x+1] }
-	    -re "^ +\[0-9\]+ 0024 8505\[^\n\]*\n"	{ set x [expr $x+1] }
-	    -re "^ +\[0-9\]+ 0026 8D05\[^\n\]*\n"	{ set x [expr $x+1] }
+	    -re "^ +\[0-9\]+ 0002 FEFD\[^\n\]*\n"	{ set x [expr $x+1] }
+	    -re "^ +\[0-9\]+ 0004 E6FD\[^\n\]*\n"	{ set x [expr $x+1] }
+	    -re "^ +\[0-9\]+ 0006 D7FD\[^\n\]*\n"	{ set x [expr $x+1] }
+	    -re "^ +\[0-9\]+ 0008 CBFD\[^\n\]*\n"	{ set x [expr $x+1] }
+	    -re "^ +\[0-9\]+ 000a B9FD\[^\n\]*\n"	{ set x [expr $x+1] }
+	    -re "^ +\[0-9\]+ 000c A1FD\[^\n\]*\n"	{ set x [expr $x+1] }
+	    -re "^ +\[0-9\]+ 000e 93FD\[^\n\]*\n"	{ set x [expr $x+1] }
+	    -re "^ +\[0-9\]+ 0010 82FD\[^\n\]*\n"	{ set x [expr $x+1] }
+	    -re "^ +\[0-9\]+ 0012 FAF5\[^\n\]*\n"	{ set x [expr $x+1] }
+	    -re "^ +\[0-9\]+ 0014 E0F5\[^\n\]*\n"	{ set x [expr $x+1] }
+	    -re "^ +\[0-9\]+ 0016 D8F5\[^\n\]*\n"	{ set x [expr $x+1] }
+	    -re "^ +\[0-9\]+ 0018 C4F5\[^\n\]*\n"	{ set x [expr $x+1] }
+	    -re "^ +\[0-9\]+ 001a BCF5\[^\n\]*\n"	{ set x [expr $x+1] }
+	    -re "^ +\[0-9\]+ 001c A1F5\[^\n\]*\n"	{ set x [expr $x+1] }
+	    -re "^ +\[0-9\]+ 001e 99F5\[^\n\]*\n"	{ set x [expr $x+1] }
+	    -re "^ +\[0-9\]+ 0020 82F5\[^\n\]*\n"	{ set x [expr $x+1] }
+	    -re "^ +\[0-9\]+ 0022 FAED\[^\n\]*\n"	{ set x [expr $x+1] }
+	    -re "^ +\[0-9\]+ 0024 E5ED\[^\n\]*\n"	{ set x [expr $x+1] }
+	    -re "^ +\[0-9\]+ 0026 DDED\[^\n\]*\n"	{ set x [expr $x+1] }
 	    -re "\[^\n\]*\n"				{ }
 	    timeout				{ perror "timeout\n"; break }
 	    eof					{ break }
@@ -200,7 +200,7 @@ proc do_jumps {} {
 	expect {
 	    -re "^ +\[0-9\]+ 0000 802F0000\[^\n\]*\n"	{ set x [expr $x+1] }
 	    -re "^ +\[0-9\]+ 0004 6500\[^\n\]*\n"	{ set x [expr $x+1] }
-	    -re "^ +\[0-9\]+ 0006 80070000\[^\n\]*\n"	{ set x [expr $x+1] }
+	    -re "^ +\[0-9\]+ 0006 BF07FAFF\[^\n\]*\n"	{ set x [expr $x+1] }
 	    -re "\[^\n\]*\n"				{ }
 	    timeout				{ perror "timeout\n"; break }
 	    eof					{ break }