* Converted conditional-trap MIPS opcodes to extra-operand variety also.

* Bonus test cases to confirm behavior.

[ChangeLog]
Thu May  7 12:50:33 1998  Frank Ch. Eigler  <fche@cygnus.com>

	* config/tc-mips.c (validate_mips_insn): Removed hack
	for previously inaccessible bitfields in some INSN_TRAP
	instructions.

[testsuite/ChangeLog]

Thu May  7 13:05:25 1998  Frank Ch. Eigler  <fche@cygnus.com>

	* gas/mips/break20.[sd]: New tests for 20-bit operand break and
 	sddbp instructions.
	* gas/mips/trap20.[sd]: New tests for 20-bit operand trap
 	instructions.
	* gas/mips/mips.exp: Run them.

5 files changed, 66 insertions, 1 deletions

diff --git a/gas/ChangeLog b/gas/ChangeLog
index 5b41588..5c746ff 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -3,6 +3,12 @@ Thu May  7 13:20:56 1998  Anders Blomdell  <anders.blomdell@control.lth.se>
 	* gasp.c (grab_label): Permit a label to be a preprocessor
 	variable by permitting a label to start with a backslash.
 
+Thu May  7 12:50:33 1998  Frank Ch. Eigler  <fche@cygnus.com>
+
+	* config/tc-mips.c (validate_mips_insn): Removed hack
+	for previously inaccessible bitfields in some INSN_TRAP
+	instructions.
+
 start-sanitize-d30v
 Thu May  7 11:13:00 1998  Frank Ch. Eigler  <fche@cygnus.com>
 
diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog
index 53a8eb59..13ff06d 100644
--- a/gas/testsuite/ChangeLog
+++ b/gas/testsuite/ChangeLog
@@ -1,3 +1,11 @@
+Thu May  7 13:05:25 1998  Frank Ch. Eigler  <fche@cygnus.com>
+
+	* gas/mips/break20.[sd]: New tests for 20-bit operand break and
+ 	sddbp instructions. 
+	* gas/mips/trap20.[sd]: New tests for 20-bit operand trap
+ 	instructions. 
+	* gas/mips/mips.exp: Run them.
+
 start-sanitize-d30v
 Thu Apr 30 11:55:01 1998  Frank Ch. Eigler  <fche@cygnus.com>
 
diff --git a/gas/testsuite/gas/mips/break20.s b/gas/testsuite/gas/mips/break20.s
new file mode 100644
index 0000000..ee35b0e
--- /dev/null
+++ b/gas/testsuite/gas/mips/break20.s
@@ -0,0 +1,17 @@
+# Source file used to test the 20-bit break instructions
+foo:	
+	break
+	break	0
+	break	20
+	break	20,40
+	break	1023,1023
+	
+	sdbbp
+	sdbbp	0
+	sdbbp	20
+	sdbbp	20,40
+	sdbbp	1023,1023
+	
+# force some padding, to make objdump consistently report that there's some
+# here...
+	.space	8
diff --git a/gas/testsuite/gas/mips/mips.exp b/gas/testsuite/gas/mips/mips.exp
index 4edbab6..95cc01a 100644
--- a/gas/testsuite/gas/mips/mips.exp
+++ b/gas/testsuite/gas/mips/mips.exp
@@ -14,6 +14,10 @@ if [istarget mips*-*-*] then {
     set gpr_ilocks [expr $gpr_ilocks || [istarget mipstx19*-*-*]]
 # end-sanitize-tx19
 
+# start-sanitize-vr4320
+    set ilocks [expr $ilocks || [istarget mips64vr4320*-*-*]]
+
+# end-sanitize-vr4320
 #start-sanitize-tx49
     set ilocks [expr $ilocks || [istarget mips64tx49*-*-*]]
     set no_mips16 [expr $no_mips16 || [istarget mips64tx49*-*-*]]
@@ -27,6 +31,8 @@ if [istarget mips*-*-*] then {
     run_dump_test "abs"
     run_dump_test "add"
     run_dump_test "and"
+    run_dump_test "break20"
+    run_dump_test "trap20"
     run_dump_test "beq"
     run_dump_test "bge"
     run_dump_test "bgeu"
@@ -44,7 +50,12 @@ if [istarget mips*-*-*] then {
     if $empic { run_dump_test "la-empic" }
     if !$aout { run_dump_test "lb" }
     if $svr4pic { run_dump_test "lb-svr4pic" }
-    if $svr4pic { run_dump_test "lb-xgot" }
+    if $svr4pic {
+	# Both versions specify the cpu, so we can run both regardless of
+	# the interlocking in the configured default cpu.
+	run_dump_test "lb-xgot"
+	run_dump_test "lb-xgot-ilocks"
+    }
     if $empic { run_dump_test "lb-empic" }
     if !$aout { if !$gpr_ilocks { run_dump_test "ld" } else { run_dump_test "ld-ilocks" } } 
     if $svr4pic { run_dump_test "ld-svr4pic" }
@@ -81,5 +92,10 @@ if [istarget mips*-*-*] then {
 # end-sanitize-vr5400
 # start-sanitize-r5900
     run_dump_test "r5900"
+    run_dump_test "vu0"
 # end-sanitize-r5900
+    run_dump_test "mips4010"
+    run_dump_test "mips4650"
+    run_dump_test "mips4100"
+    run_dump_test "lineno"
 }
diff --git a/gas/testsuite/gas/mips/trap20.s b/gas/testsuite/gas/mips/trap20.s
new file mode 100644
index 0000000..a56d659
--- /dev/null
+++ b/gas/testsuite/gas/mips/trap20.s
@@ -0,0 +1,18 @@
+# Source file used to test the 20-bit trap instructions
+foo:	
+	teq	$0,$3
+	teq	$0,$3,1
+	tge	$0,$3
+	tge	$0,$3,3
+	tgeu	$0,$3
+	tgeu	$0,$3,7
+	tlt	$0,$3
+	tlt	$0,$3,31
+	tltu	$0,$3
+	tltu	$0,$3,255
+	tne	$0,$3
+	tne	$0,$3,1023
+	
+# force some padding, to make objdump consistently report that there's some
+# here...
+	.space	8