* cpu/play.cpu (add): Use (ifield enum) for one format element.

	* cpu/play.opc: New file.

	Allow arbitrary enums in instruction formats, e.g. (f-op1 OP1_4).
	* insn.scm (-parse-insn-format-ifield-spec): Recognize (ifield enum).
	* doc/rtl.texi (Instructions): Update.

diff --git a/ChangeLog b/ChangeLog
index bbc3e5f58ff16f0353b81fe1fb300e16d09e7d73..00ed9302f95a73ed42d80255e78e755b28fc1b21 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2009-07-07  Doug Evans  <dje@sebabeach.org>
 
+       * cpu/play.cpu (add): Use (ifield enum) for one format element.
+       * cpu/play.opc: New file.
+
+       Allow arbitrary enums in instruction formats, e.g. (f-op1 OP1_4).
+       * insn.scm (-parse-insn-format-ifield-spec): Recognize (ifield enum).
+       * doc/rtl.texi (Instructions): Update.
+
        * 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.

diff --git a/cpu/play.cpu b/cpu/play.cpu
index 7b25b7e02c8cd184021795b0d47b30ca00f59210..3f905033196a121ecf241d422a11b0a1a66e941c 100644 (file)
--- a/cpu/play.cpu
+++ b/cpu/play.cpu
@@ -175,7 +175,8 @@
 (dni add "add"
      ()
      "add $dr,$sr"
-     (+ OP1_4 OP2_0 dr sr)
+     ; Use (f-op1 OP1_4) to exercise it.
+     (+ (f-op1 OP1_4) OP2_0 dr sr)
      (sequence ()
               (set vbit (add-oflag dr sr (const 0)))
               (set cbit (add-cflag dr sr (const 0)))

diff --git a/cpu/play.opc b/cpu/play.opc
new file mode 100644 (file)
index 0000000..e9fb6b1
--- /dev/null
+++ b/cpu/play.opc
@@ -0,0 +1,18 @@
+/* Play opcode support.  -*- C -*-
+   Copyright (C) 2009 Red Hat, Inc.
+   This file is part of CGEN.  */
+
+/* This file is an addendum to play.cpu.  Heavy use of C code isn't
+   appropriate in .cpu files, so it resides here.  This especially applies
+   to assembly/disassembly where parsing/printing can be quite involved.
+   Such things aren't really part of the specification of the cpu, per se,
+   so .cpu files provide the general framework and .opc files handle the
+   nitty-gritty details as necessary.
+
+   Each section is delimited with start and end markers.
+
+   <arch>-opc.h additions use: "-- opc.h"
+   <arch>-opc.c additions use: "-- opc.c"
+   <arch>-asm.c additions use: "-- asm.c"
+   <arch>-dis.c additions use: "-- dis.c"
+   <arch>-ibd.h additions use: "-- ibd.h"  */

diff --git a/doc/rtl.texi b/doc/rtl.texi
index 0d1d5de4eca0cd9a63ec4d01c9211c73ceef715c..208e67aef98bda745b593181e49257442c00f156 100644 (file)
--- a/doc/rtl.texi
+++ b/doc/rtl.texi
@@ -1867,9 +1867,10 @@ The ordering of the fields is not important.
 Format elements can be any of:
 
 @itemize @bullet
-@item instruction field specifiers with a value (e.g. @code{(f-r1 14)})
-@item an instruction field enum, as in @code{OP1_4}
-@item an operand
+@item an instruction field name with an integer, e.g. @code{(f-op1 4)}
+@item an instruction field name with an enum, e.g. @code{(f-op1 OP1_4)}
+@item an instruction field enum, e.g. @code{OP1_4}
+@item an operand name, e.g. @code{dr}
 @end itemize
 
 @subsection semantics

diff --git a/insn.scm b/insn.scm
index e9caa8f6a55d076c0817ea66b7837d63af1fd9b7..0bb96f933890e9fdbc61e99644655d57a1aba69e 100644 (file)
--- a/insn.scm
+++ b/insn.scm
@@ -546,9 +546,15 @@
     ; ??? This use to allow (ifield-name operand-name).  That's how
     ; `operand-name' elements are handled, but there's no current need
     ; to handle (ifield-name operand-name).
-    (if (not (integer? value))
-       (parse-error errtxt "ifield value not an integer" ifld-spec))
-    (ifld-new-value ifld value))
+    (cond ((integer? value)
+          (ifld-new-value ifld value))
+         ((symbol? value)
+          (let ((e (enum-lookup-val value)))
+            (if (not e)
+                (parse-error errtxt "symbolic ifield value not an enum" ifld-spec))
+            (ifld-new-value ifld (car e))))
+         (else
+          (parse-error errtxt "ifield value not an integer" ifld-spec))))
 )
 
 ; Subroutine of -parse-insn-format to parse an