From 4fc797ff5cb66a7ee878820eea2c14f39341cd10 Mon Sep 17 00:00:00 2001
From: Jeff Law <law@redhat.com>
Date: Fri, 23 Aug 1996 17:10:41 +0000
Subject: [PATCH]         * gas/v850/basic.exp (misc_tests): No longer expect
 failures         assembling "trap" opcodes.         * gas/v850/misc.s:
 Re-enable assembling of "trap" opcodes.

---
 gas/testsuite/ChangeLog          | 4 ++++
 gas/testsuite/gas/v850/basic.exp | 7 +++----
 gas/testsuite/gas/v850/misc.s    | 4 ++--
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog
index 87207820d8..0be78a5411 100644
--- 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 21e25ea86d..f428c89ca3 100755
--- 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 c436e2bd90..a1db6bfeb6 100644
--- 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