* iformat.scm (/sfmt-search-key): Use iformat key instead of list

	of ifields.

diff --git a/cgen/ChangeLog b/cgen/ChangeLog
index 3f993cb..cf93c47 100644 (file)
--- a/cgen/ChangeLog
+++ b/cgen/ChangeLog
@@ -1,3 +1,8 @@
+2010-02-12  Doug Evans  <dje@sebabeach.org>
+
+       * iformat.scm (/sfmt-search-key): Use iformat key instead of list
+       of ifields.
+
 2010-02-11  Doug Evans  <dje@sebabeach.org>
 
        * testsuite/location-1.test: Use %pmacros.

diff --git a/cgen/iformat.scm b/cgen/iformat.scm
index d997c60..aea8fe3 100644 (file)
--- a/cgen/iformat.scm
+++ b/cgen/iformat.scm
@@ -284,11 +284,11 @@
                                 ")")))
        )
     (list
+     ;; Use the iformat key so that each sformat maps to only one iformat.
+     (if (= (length sorted-used-iflds) 0)
+        "no-used-ifields"
+        (ifmt-key (insn-ifmt insn)))
      cti?
-     (insn-length insn)
-     (string-map (lambda (ifld)
-                  (string-append " (" (obj:str-name ifld) " " (ifld-ilk ifld) ")"))
-                sorted-used-iflds)
      (string-map op-key
                 sem-in-ops)
      (string-map op-key