2000-12-01 Ben Elliston <bje@redhat.com>

	* sim-cpu.scm (cgen-cpu.h): Only emit argbuf, scache and extract
	definitions if run without with-multipla-isa?.
	(cgen-defs.h): New function. Emit an ISA-specific defs file.
	* cgen-sim.scm (sim-arguments): Accept -G option to generate defs.

diff --git a/cgen/ChangeLog b/cgen/ChangeLog
index 3e6b4fc..068b840 100644 (file)
--- a/cgen/ChangeLog
+++ b/cgen/ChangeLog
@@ -1,3 +1,10 @@
+2000-12-01  Ben Elliston  <bje@redhat.com>
+
+       * sim-cpu.scm (cgen-cpu.h): Only emit argbuf, scache and extract
+       definitions if run without with-multipla-isa?.
+       (cgen-defs.h): New function. Emit an ISA-specific defs file.
+       * cgen-sim.scm (sim-arguments): Accept -G option to generate defs.
+
 2000-11-24  Ben Elliston  <bje@redhat.com>
 
        * sim-cpu.scm (-gen-hardware-struct): New function.

diff --git a/cgen/cgen-sim.scm b/cgen/cgen-sim.scm
index 766153a..b774f70 100644 (file)
--- a/cgen/cgen-sim.scm
+++ b/cgen/cgen-sim.scm
@@ -1,6 +1,6 @@
 ; Simulator generator entry point.
 ; This is invoked to build: arch.h, cpu-<cpu>.h, memops.h, semops.h, decode.h,
-; decode.c, extract.c, semantics.c, ops.c, model.c, mainloop.in.
+; decode.c, defs.h, extract.c, semantics.c, ops.c, model.c, mainloop.in.
 ;
 ; memops.h, semops.h, ops.c, mainloop.in are either deprecated or wip.
 ;
@@ -39,6 +39,8 @@
         (lambda (arg) (file-write arg cgen-cpuall.h)))
    (list '-F "file" "generate memops.h in <file>"
         (lambda (arg) (file-write arg cgen-mem-ops.h)))
+   (list '-G "file" "generate defs.h in <file>"
+        (lambda (arg) (file-write arg cgen-defs.h)))
    (list '-P "file" "generate semops.h in <file>"
         (lambda (arg) (file-write arg cgen-sem-ops.h)))
    (list '-T "file" "generate decode.h in <file>"

diff --git a/cgen/sim-cpu.scm b/cgen/sim-cpu.scm
index b3b744f..d63c9e0 100644 (file)
--- a/cgen/sim-cpu.scm
+++ b/cgen/sim-cpu.scm
@@ -823,9 +823,14 @@ SEM_FN_NAME (@cpu@,init_idesc_table) (SIM_CPU *current_cpu)
    -gen-hardware-types
    -gen-cpu-reg-access-decls
    -gen-model-decls
-   (lambda () (gen-argbuf-type #t))
-   (lambda () (gen-scache-type #t))
-   -gen-extract-macros
+
+   (if (not (with-multiple-isa?))
+     (string-list
+       (lambda () (gen-argbuf-type #t))
+       (lambda () (gen-scache-type #t))
+       -gen-extract-macros)
+     "")
+
    (if (and (with-parallel?) (not (with-generic-write?)))
        -gen-parallel-exec-type
        "")
@@ -834,6 +839,37 @@ SEM_FN_NAME (@cpu@,init_idesc_table) (SIM_CPU *current_cpu)
    )
 )
 
+; Generate defs-<isa>.h.
+
+(define (cgen-defs.h)
+  (logit 1 "Generating " (obj:name (current-isa)) " defs.h ...\n")
+
+  (sim-analyze-insns!)
+
+  ; Tell the rtl->c translator we're not the simulator.
+  ; ??? Minimizes changes in generated code until this is changed.
+  ; RTL->C happens for field decoding.
+  (rtl-c-config! #:rtl-cover-fns? #f)
+
+  (string-write
+   (gen-copyright (string-append
+                  "ISA definitions header for "
+                  (obj:name (current-isa))
+                  ".")
+                 CURRENT-COPYRIGHT CURRENT-PACKAGE)
+   "\
+#ifndef DEFS_@PREFIX@_H
+#define DEFS_@PREFIX@_H
+
+"
+   (lambda () (gen-argbuf-type #t))
+   (lambda () (gen-scache-type #t))
+   -gen-extract-macros
+
+   "#endif /* DEFS_@PREFIX@_H */\n"
+   )
+)
+
 ; Generate cpu-<cpu>.c
 
 (define (cgen-cpu.c)