* insn.scm (/insn-parse): Canonicalize the ifield-assertion before

	saving.

diff --git a/cgen/ChangeLog b/cgen/ChangeLog
index 95110a6..c633016 100644 (file)
--- a/cgen/ChangeLog
+++ b/cgen/ChangeLog
@@ -1,5 +1,8 @@
 2009-09-09  Doug Evans  <dje@sebabeach.org>
 
+       * insn.scm (/insn-parse): Canonicalize the ifield-assertion before
+       saving.
+
        Add support for controlling warnings/errors.
        Add tests for iformat description errors.
        * dev.scm (cload): New option #:diag.

diff --git a/cgen/insn.scm b/cgen/insn.scm
index a7511d7..efa117b 100644 (file)
--- a/cgen/insn.scm
+++ b/cgen/insn.scm
@@ -399,8 +399,9 @@
 
     (if (keep-atlist? atlist-obj #f)
 
-       (let ((ifield-assertion (if (not (null? ifield-assertion))
-                                   ifield-assertion
+       (let ((ifield-assertion (if (and ifield-assertion
+                                        (not (null? ifield-assertion)))
+                                   (rtx-canonicalize context ifield-assertion)
                                    #f))
              (semantics (if (not (null? semantics))
                             semantics