2001-07-05 Ben Elliston <bje@redhat.com>

	* sid.scm (sim-finish!): Read .sim files from srcdir/cpu.

diff --git a/ChangeLog b/ChangeLog
index a403dee46b2f474a4062923513825a7bed597cb0..f22974bdd6803d0f4dd01d91cdcd55af70c0d732 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,7 @@
 
        * read.scm (include): Include files from srcdir/cpu.
        (-cgen): Likewise for loading .cpu files.
+       * sid.scm (sim-finish!): Read .sim files from srcdir/cpu.
        * *.cpu: Move all cpu descriptions into cpu subdirectory.
        * *.opc: Likewise.
        * simplify.inc: Likewise.

diff --git a/arm.sim b/cpu/arm.sim
similarity index 100%
rename from arm.sim
rename to cpu/arm.sim

diff --git a/sid.scm b/sid.scm
index 867c12d825b12b6c10a624ce4c8756f537a07491..1be32d38d3daf261529a31cb9e9f4a4ab4fc7a24 100644 (file)
--- a/sid.scm
+++ b/sid.scm
@@ -1966,7 +1966,7 @@
     '(comment "write hardware elements via cover functions/methods"))
 
   ; If there is a .sim file, load it.
-  (let ((sim-file (string-append srcdir "/" (current-arch-name) ".sim")))
+  (let ((sim-file (string-append srcdir "/cpu/" (current-arch-name) ".sim")))
     (if (file-exists? sim-file)
        (begin
          (display (string-append "Loading sim file " sim-file " ...\n"))