* basic.exp: Fix spelling in comment. Use canonical form of target

	patterns. Run DSP test only for DSP-capable ISAs. Check also mips32r2
	and mips64r2 if supported by the target.

2 files changed, 21 insertions, 11 deletions

diff --git a/sim/testsuite/sim/mips/ChangeLog b/sim/testsuite/sim/mips/ChangeLog
index 07a765a5f0..b6ff359741 100644
--- a/sim/testsuite/sim/mips/ChangeLog
+++ b/sim/testsuite/sim/mips/ChangeLog
@@ -1,3 +1,9 @@
+2006-11-08  Thiemo Seufer  <ths@mips.com>
+
+	* basic.exp: Fix spelling in comment. Use canonical form of target
+	patterns. Run DSP test only for DSP-capable ISAs. Check also mips32r2
+	and mips64r2 if supported by the target.
+
 2006-08-08  Chris Dearman  <chris@mips.com>
 
 	* testutils.inc (setup): __start is also a valid start symbol.
diff --git a/sim/testsuite/sim/mips/basic.exp b/sim/testsuite/sim/mips/basic.exp
index 98795abac2..00f77c2af8 100644
--- a/sim/testsuite/sim/mips/basic.exp
+++ b/sim/testsuite/sim/mips/basic.exp
@@ -1,6 +1,6 @@
 # MIPS simulator instruction tests
 
-# As gross as it is, we unset the linker script specifid by the target
+# As gross as it is, we unset the linker script specified by the target
 # board.  The MIPS libgloss linker scripts include libgcc (and possibly
 # other libraries), which the linker (used to link these tests rather
 # than the compiler) can't necessarily find.
@@ -32,23 +32,27 @@ proc run_hilo_test {testfile models nops} {
 }
 
 
-# Only test mips*-elf (e.g., no mips-linux), and only test if the target
+# Only test mips*-*-elf (e.g., no mips*-*-linux), and only test if the target
 # board really is a simulator (sim tests don't work on real HW).
-if {[istarget mips*-elf] && [board_info target exists is_simulator]} {
+if {[istarget mips*-*-elf] && [board_info target exists is_simulator]} {
 
-    if {[istarget mipsisa64sb1*-elf]} {
+    set dspmodels ""
+
+    if {[istarget mipsisa64sb1*-*-elf]} {
 	set models "sb1"
 	set submodels "mips1 mips2 mips3 mips4 mips32 mips64"
-    } elseif {[istarget mipsisa64*-elf]} {
-	set models "mips32 mips64"
+    } elseif {[istarget mipsisa64*-*-elf]} {
+	set models "mips32 mips64 mips32r2 mips64r2"
 	set submodels "mips1 mips2 mips3 mips4"
-    } elseif {[istarget mipsisa32*-elf]} {
-	set models "mips32"
+	append dspmodels " mips32r2 mips64r2"
+    } elseif {[istarget mipsisa32*-*-elf]} {
+	set models "mips32 mips32r2"
 	set submodels "mips1 mips2"
-    } elseif {[istarget mips64vr-*-elf] || [istarget mips64vrel-*-elf]} {
+	append dspmodels " mips32r2"
+    } elseif {[istarget mips64vr*-*-elf]} {
 	set models "vr4100 vr4111 vr4120 vr5000 vr5400 vr5500"
 	set submodels "mips1 mips2 mips3 mips4"
-    } elseif {[istarget mips64*-elf]} {
+    } elseif {[istarget mips64*-*-elf]} {
 	set models "mips3"
 	set submodels "mips1 mips2"
     } else {
@@ -72,5 +76,5 @@ if {[istarget mips*-elf] && [board_info target exists is_simulator]} {
     run_sim_test mdmx-ob.s $submodels
     run_sim_test mdmx-ob-sb1.s $submodels
 
-    run_sim_test mips32-dsp.s $models
+    run_sim_test mips32-dsp.s $dspmodels
 }