2003-09-09 Dave Brolley <brolley@redhat.com>

        * sim/frv/maddaccs.cgs: move to fr400 subdirectory.
        * sim/frv/msubaccs.cgs: move to fr400 subdirectory.
        * sim/frv/masaccs.cgs: move to fr400 subdirectory.

diff --git a/sim/testsuite/ChangeLog b/sim/testsuite/ChangeLog
index 423cffd6d66e15368741651815a05a193bf643e2..56b16f3af11c2a43ee70de0957a3248fac72eb06 100644 (file)
--- a/sim/testsuite/ChangeLog
+++ b/sim/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2003-09-09  Dave Brolley  <brolley@redhat.com>
+
+       * sim/frv/maddaccs.cgs: move to fr400 subdirectory.
+       * sim/frv/msubaccs.cgs: move to fr400 subdirectory.
+       * sim/frv/masaccs.cgs: move to fr400 subdirectory.
+
 2003-09-03  Michael Snyder  <msnyder@redhat.com>
 
        * sim/frv/fr500/mclracc.cgs: Change mach to 'all', to be

diff --git a/sim/testsuite/lib/sim-defs.exp b/sim/testsuite/lib/sim-defs.exp
index 42374e0977209702b11b0db47ad15da5e5ee7515..017fcefb249141a66c5a656442a3a242e0ffacd2 100644 (file)
--- a/sim/testsuite/lib/sim-defs.exp
+++ b/sim/testsuite/lib/sim-defs.exp
@@ -331,20 +331,20 @@ proc slurp_options { file } {
     # whitespace is ignored anywhere except within the options list;
     # option names are alphabetic only
     set pat "^#${ws}(\[a-zA-Z\]*)\\(?(\[^):\]*)\\)?$ws:${ws}(.*)$ws\$"
-    # Allow comment as first line of file.
-    set firstline 1
+    # Allow arbitrary lines until the first option is seen.
+    set seen_opt 0
     while { [gets $f line] != -1 } {
        set line [string trim $line]
        # Whitespace here is space-tab.
        if [regexp $pat $line xxx opt_name opt_machs opt_val] {
            # match!
            lappend opt_array [list $opt_name $opt_machs $opt_val]
+           set seen_opt 1
        } else {
-           if { ! $firstline } {
+           if { $seen_opt } {
                break
            }
        }
-       set firstline 0
     }
     close $f
     return $opt_array

diff --git a/sim/testsuite/sim/frv/maddaccs.cgs b/sim/testsuite/sim/frv/fr400/maddaccs.cgs
similarity index 99%
rename from sim/testsuite/sim/frv/maddaccs.cgs
rename to sim/testsuite/sim/frv/fr400/maddaccs.cgs
index aa178fedb4f695ba712c109b4751db98548ce065..98659c42c137d0c72cd03834a26eedd7b71813cc 100644 (file)
--- a/sim/testsuite/sim/frv/maddaccs.cgs
+++ b/sim/testsuite/sim/frv/fr400/maddaccs.cgs
@@ -1,7 +1,7 @@
 # frv testcase for maddaccs $ACC40Si,$ACC40Sk
 # mach: fr400
 
-       .include "testutils.inc"
+       .include "../testutils.inc"
 
        start
 

diff --git a/sim/testsuite/sim/frv/masaccs.cgs b/sim/testsuite/sim/frv/fr400/masaccs.cgs
similarity index 99%
rename from sim/testsuite/sim/frv/masaccs.cgs
rename to sim/testsuite/sim/frv/fr400/masaccs.cgs
index 7369a71192fb9c1c1a1a795caa2fff0a5b6c2004..8fbde91f872b4b5ecea3edaa0f6cbe5e83835941 100644 (file)
--- a/sim/testsuite/sim/frv/masaccs.cgs
+++ b/sim/testsuite/sim/frv/fr400/masaccs.cgs
@@ -1,7 +1,7 @@
 # frv testcase for masaccs $ACC40Si,$ACC40Sk
 # mach: fr400
 
-       .include "testutils.inc"
+       .include "../testutils.inc"
 
        start
 

diff --git a/sim/testsuite/sim/frv/msubaccs.cgs b/sim/testsuite/sim/frv/fr400/msubaccs.cgs
similarity index 99%
rename from sim/testsuite/sim/frv/msubaccs.cgs
rename to sim/testsuite/sim/frv/fr400/msubaccs.cgs
index f793e9a5f53e20b31334306d1f2031ea4e3eb056..f0aba1dbfb1c0b9a1c57b9b11a239eb4583fbf40 100644 (file)
--- a/sim/testsuite/sim/frv/msubaccs.cgs
+++ b/sim/testsuite/sim/frv/fr400/msubaccs.cgs
@@ -1,7 +1,7 @@
 # frv testcase for msubaccs $ACC40Si,$ACC40Sk
 # mach: fr400
 
-       .include "testutils.inc"
+       .include "../testutils.inc"
 
        start