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

	* README: Update.

	* read.scm (include): Include files from srcdir/cpu.
	(-cgen): Likewise for loading .cpu files.
	* *.cpu: Move all cpu descriptions into cpu subdirectory.
	* *.opc: Likewise.
	* simplify.inc: Likewise.

diff --git a/ChangeLog b/ChangeLog
index 455600a784e80af215888037963fe2b5f1699c31..a403dee46b2f474a4062923513825a7bed597cb0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2001-07-05  Ben Elliston  <bje@redhat.com>
+
+       * README: Update.
+
+       * read.scm (include): Include files from srcdir/cpu.
+       (-cgen): Likewise for loading .cpu files.
+       * *.cpu: Move all cpu descriptions into cpu subdirectory.
+       * *.opc: Likewise.
+       * simplify.inc: Likewise.
+
 2001-07-04  Ben Elliston  <bje@redhat.com>
 
        * read.scm (include): Log "Including file" message at level 1,

diff --git a/README b/README
index d826225b522ba0a3ca24a107e269779fa3aa7118..d370da325b02667c2a63927ac909ae74b8843e92 100644 (file)
--- a/README
+++ b/README
@@ -1,10 +1,10 @@
-This is the README for CGEN 0.7.1
+This is the README for CGEN 1.0.
 
 If you just want to read up on cgen, I suggest going directly to the
 doc directory, and in particular doc/intro.texi.
-\f
+
 What is it?
-===========
+-----------
 
 In a nutshell, CGEN is a project to provide a uniform framework for doing
 binutils and simulator ports without explicitly closing any doors on anything
@@ -23,9 +23,9 @@ because I think it should be.
 CGEN is short for "Cpu tools GENerator".  It's not a very good name.
 I'm not very good at picking names.  An early version of the name was
 "GENCPU"!  So give me a better one.
-\f
+
 Copyright
-=========
+--------
 
 CGEN is Copyright 2000 Red Hat, Inc.
 
@@ -33,9 +33,9 @@ The full text of the copyright for CGEN is contained in the file
 COPYING.CGEN.  The copyright of CGEN uses the Autoconf copyright
 as a guide.  The intent is to have CGEN under a GNU-style copyright but
 place no restrictions on the output of CGEN.
-\f
+
 Installation
-============
+------------
 
 CGEN 0.7.1 can be used with GNU Binutils snapshots as of ??????
 and GNU GDB snapshots as of ??????.
@@ -49,9 +49,9 @@ at this point is M32R and FR30.
 CGEN uses Guile so Guile must be installed.
 Guile 1.2 and 1.3 are supported.
 2) 
-\f
+
 Source Layout
-=============
+-------------
 
 CGEN sources are divided into several categories:
 
@@ -66,19 +66,24 @@ CGEN sources are divided into several categories:
 
 File naming rules:
 
-1) The top level script for each application shall be named cgen-<appl>.scm.
-   No other files shall be named cgen-*.scm.
-2) Files implementing a particular class (or related collection of classes)
-   shall be named <class-name>.scm, or a reasonable abbreviation thereof.
-3) CPU description files shall be named <arch>.cpu.
-   [it should go without saying that no other files shall be named <arch>.cpu]
-4) CPU opcode support files shall be named <arch>.opc.
-   [it should go without saying that no other files shall be named <arch>.opc]
+1. The top level script for each application shall be named
+   cgen-<appl>.scm. No other files shall be named cgen-*.scm.
+
+2. Files implementing a particular class (or related collection of
+   classes) shall be named <class-name>.scm, or a reasonable
+   abbreviation thereof.
+
+3. CPU description files shall be named <arch>.cpu and placed in the
+   `cpu' sub-directory.
+
+4. CPU opcode support files shall be named <arch>.opc and similarly
+   placed in the `cpu' sub-directory.
 
 ??? May wish to change (1) to <appl>-cgen.scm so that each application's
 files will be collected together in `ls' output by the <appl>- prefix.
 
-documentation
+
+Documentation
 -------------
 
 doc/cgen.texi - top level .texi file, includes the others
@@ -178,14 +183,3 @@ cpu specific files
 <arch>.opc - <arch> opcode support
 
 null.cpu - minimal .cpu file for debugging purposes
-
-C version of cgen
------------------
-
-Makefile.am, Makefile.in - automake stuff
-acconfig.h,aclocal.m4,config.in,stamp-h.in - autoconf stuff
-configure.in,configure - autoconf stuff
-gdbinit.in - source for .gdbinit file
-cgen.c - main()
-cgen-gh.[ch] - additional functionality to Guile's gh interface
-cos.[ch] - C implementation of cgen object system

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

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

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

diff --git a/fr30.opc b/cpu/fr30.opc
similarity index 100%
rename from fr30.opc
rename to cpu/fr30.opc

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

diff --git a/i960.opc b/cpu/i960.opc
similarity index 100%
rename from i960.opc
rename to cpu/i960.opc

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

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

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

diff --git a/m32r.opc b/cpu/m32r.opc
similarity index 100%
rename from m32r.opc
rename to cpu/m32r.opc

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

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

diff --git a/openrisc.opc b/cpu/openrisc.opc
similarity index 100%
rename from openrisc.opc
rename to cpu/openrisc.opc

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

diff --git a/simplify.inc b/cpu/simplify.inc
similarity index 100%
rename from simplify.inc
rename to cpu/simplify.inc

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

diff --git a/sparc.opc b/cpu/sparc.opc
similarity index 100%
rename from sparc.opc
rename to cpu/sparc.opc

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

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

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

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

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

diff --git a/read.scm b/read.scm
index 09e228ed62c5debf0563140ab9941559494c8be1..c42b211d4a8ff099e4d04b07035f468eebd20394 100644 (file)
--- a/read.scm
+++ b/read.scm
@@ -795,7 +795,7 @@ Define a preprocessor-style macro.
 
 (define (include file)
   (logit 1 "Including file " file " ...\n")
-  (reader-read-file! (string-append srcdir "/" file))
+  (reader-read-file! (string-append srcdir "/cpu/" file))
   (logit 2 "Resuming previous file ...\n")
 )
 
@@ -1162,7 +1162,7 @@ Define a preprocessor-style macro.
 
        (if repl?
            (debug-repl nil))
-       (cpu-load (string-append srcdir "/" arch ".cpu")
+       (cpu-load (string-append srcdir "/cpu/" arch ".cpu")
                  keep-mach keep-isa flags
                  app-init! app-finish! app-analyze!)
        ; Start another repl loop if -d.