* cgen-opc.scm (-opc-file-path,opc-file-path): Move to opcodes.scm

	(opc-arguments, -OPC): Call set-opc-file-path!.
	* opcodes.scm (-opc-file-path,opc-file-path): Moved here.
	(set-opc-file-path!): New function.
	* dev.scm: Mention set-opc-file-path!.  Mention doc options.

diff --git a/cgen/ChangeLog b/cgen/ChangeLog
index 8c0982a..bbc3e5f 100644 (file)
--- a/cgen/ChangeLog
+++ b/cgen/ChangeLog
@@ -1,5 +1,11 @@
 2009-07-07  Doug Evans  <dje@sebabeach.org>
 
+       * cgen-opc.scm (-opc-file-path,opc-file-path): Move to opcodes.scm
+       (opc-arguments, -OPC): Call set-opc-file-path!.
+       * opcodes.scm (-opc-file-path,opc-file-path): Moved here.
+       (set-opc-file-path!): New function.
+       * dev.scm: Mention set-opc-file-path!.  Mention doc options.
+
        * opc-ibld.scm (gen-insn-builder): Convert symbols to strings
        before passing to gen-c-args.
 

diff --git a/cgen/cgen-opc.scm b/cgen/cgen-opc.scm
index 81cfd0f..276fdb8 100644 (file)
--- a/cgen/cgen-opc.scm
+++ b/cgen/cgen-opc.scm
@@ -20,18 +20,10 @@
   (load (string-append srcdir "/opc-opinst.scm"))
 )
 
-; Records the -OPC arg which specifies the path to the .opc file.
-(define -opc-file-path #f)
-(define (opc-file-path)
-  (if -opc-file-path
-      -opc-file-path
-      (error ".opc file unspecified, missing -OPC argument"))
-)
-
 (define opc-arguments
   (list
    (list "-OPC" "file" "specify path to .opc file"
-        (lambda (arg) (set! -opc-file-path arg))
+        (lambda (arg) (set-opc-file-path! arg))
         #f)
    (list "-H" "file" "generate $arch-desc.h in <file>"
         #f

diff --git a/cgen/dev.scm b/cgen/dev.scm
index b73d9da..4d77681 100644 (file)
--- a/cgen/dev.scm
+++ b/cgen/dev.scm
@@ -189,8 +189,12 @@ comma separated list of machs to keep or `all'
 keep-isa:
 comma separated list of isas to keep or `all'
 
+doc options:
+[none yet]
+
 opcode options:
 [none yet]
+Remember to call (set-opc-file-path! \"/path/to/cpu.opc\").
 
 gas test options:
 [none yet]

diff --git a/cgen/opcodes.scm b/cgen/opcodes.scm
index 3410c55..cb2c28b 100644 (file)
--- a/cgen/opcodes.scm
+++ b/cgen/opcodes.scm
@@ -7,6 +7,17 @@
 ; Specify which application.
 (set! APPLICATION 'OPCODES)
 
+; Records the -OPC arg which specifies the path to the .opc file.
+(define -opc-file-path #f)
+(define (opc-file-path)
+  (if -opc-file-path
+      -opc-file-path
+      (error ".opc file unspecified, missing -OPC argument"))
+)
+(define (set-opc-file-path! path)
+  (set! -opc-file-path path)
+)
+
 ; Boolean indicating if we're to build the operand instance table.
 ; The default is no, since only the m32r uses it at present.
 ; ??? Simulator tracing support could use it.