* gas/v850/basic.exp (misc_tests): No longer expect failures

        assembling "trap" opcodes.
        * gas/v850/misc.s: Re-enable assembling of "trap" opcodes.

diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog
index 87207820d882a642b3ec114e28eabc4e61af988d..0be78a541118548d0c07ad57eb8156698a1f9eb5 100644 (file)
--- a/gas/testsuite/ChangeLog
+++ b/gas/testsuite/ChangeLog
@@ -1,6 +1,10 @@
 start-sanitize-v850
 Fri Aug 23 11:02:55 1996  Jeffrey A Law  (law@cygnus.com)
 
+       * gas/v850/basic.exp (misc_tests): No longer expect failures
+       assembling "trap" opcodes.
+       * gas/v850/misc.s: Re-enable assembling of "trap" opcodes.
+
        * gas/v850: New directory with v850 tests.
 
 end-sanitize-v850

diff --git a/gas/testsuite/gas/v850/basic.exp b/gas/testsuite/gas/v850/basic.exp
index 21e25ea86d1c84faece05d2abde58d75e688e607..f428c89ca3c40cff804f7b0a16ad89433d24f761 100755 (executable)
--- a/gas/testsuite/gas/v850/basic.exp
+++ b/gas/testsuite/gas/v850/basic.exp
@@ -300,6 +300,8 @@ proc do_misc {} {
            -re "^ +\[0-9\]+ 0008\[^\n\]*\n"    { set x [expr $x+1] }
            -re "^ +\[0-9\]+ 000c\[^\n\]*\n"    { set x [expr $x+1] }
            -re "^ +\[0-9\]+ 000e\[^\n\]*\n"    { set x [expr $x+1] }
+           -re "^ +\[0-9\]+ 0012\[^\n\]*\n"    { set x [expr $x+1] }
+           -re "^ +\[0-9\]+ 0016\[^\n\]*\n"    { set x [expr $x+1] }
            -re "\[^\n\]*\n"                            { }
            timeout                             { perror "timeout\n"; break }
            eof                                 { break }
@@ -311,10 +313,7 @@ proc do_misc {} {
     gas_finish
 
     # Did we find what we were looking for?  If not, flunk it.
-    if [expr $x==5] then { pass $testname } else { fail $testname }
-
-    setup_xfail "*-*-*"
-    fail "misc.s: trap tests"
+    if [expr $x==7] then { pass $testname } else { fail $testname }
 
     setup_xfail "*-*-*"
     fail "misc.s: ldsr and stsr tests"

diff --git a/gas/testsuite/gas/v850/misc.s b/gas/testsuite/gas/v850/misc.s
index c436e2bd90047e60ec2ff226be8e82f745dbb6f1..a1db6bfeb60fca406b31f97c9cdff0951c6873ef 100644 (file)
--- a/gas/testsuite/gas/v850/misc.s
+++ b/gas/testsuite/gas/v850/misc.s
@@ -7,7 +7,7 @@ misc:
        halt
        nop
        reti
-#      trap 0
-#      trap 31
+       trap 0
+       trap 31
 #      ldsr r5,r6
 #      stsr r6,r5