sim mn10300: Fix igen generation.

Only pass the top-level instruction decode table (mn10300.igen) to
igen via -i.  The additional files passed previously caused igen to
exit its getopt loop in main and exit silently without generating any
output.  In addition, when am33-2.igen was added, it was not included
from mn10300.igen, so was never used.

sim/mn10300/ChangeLog:

	* Makefile.in: (tmp-igen) Only pass mn10300.igen to igen.
	* mn10300.igen: Include am33-2.igen.

diff --git a/sim/mn10300/ChangeLog b/sim/mn10300/ChangeLog
index 5638b8621ef2014094edb0f0d72cfaaf3fd412b0..4e377785b4d3ba4092b9570b0f0d7dc22e550e27 100644 (file)
--- a/sim/mn10300/ChangeLog
+++ b/sim/mn10300/ChangeLog
@@ -1,3 +1,8 @@
+2021-04-15  John Baldwin  <jhb@FreeBSD.org>
+
+       * Makefile.in: (tmp-igen) Only pass mn10300.igen to igen.
+       * mn10300.igen: Include am33-2.igen.
+
 2021-04-12  Mike Frysinger  <vapier@gentoo.org>
 
        * interp.c (sim_open): Delete 3rd arg to sim_cpu_alloc_all.

diff --git a/sim/mn10300/Makefile.in b/sim/mn10300/Makefile.in
index 773b7f9a0c593907293af7beeba9bebe6e2cec23..120958fce6d19529ffa291a7f33f81f7d475c9a2 100644 (file)
--- a/sim/mn10300/Makefile.in
+++ b/sim/mn10300/Makefile.in
@@ -66,9 +66,10 @@ clean-igen:
        rm -f tmp-igen tmp-insns
 
 IGEN_TRACE= # -G omit-line-numbers # -G trace-rule-selection -G trace-rule-rejection -G trace-entries
-IGEN_INSN=$(srcdir)/mn10300.igen $(srcdir)/am33.igen $(srcdir)/am33-2.igen
+IGEN_INSN=$(srcdir)/mn10300.igen
+IGEN_INSN_INC=$(srcdir)/am33.igen $(srcdir)/am33-2.igen
 IGEN_DC=$(srcdir)/mn10300.dc
-tmp-igen: $(IGEN_INSN) $(IGEN_DC) ../igen/igen
+tmp-igen: $(IGEN_INSN) $(IGEN_INSN_INC) $(IGEN_DC) ../igen/igen
        $(IGEN) \
                $(IGEN_TRACE) \
                -G gen-direct-access \

diff --git a/sim/mn10300/mn10300.igen b/sim/mn10300/mn10300.igen
index c7b83ed141fc520ce8095404e37844c7a162b5cc..80a394309c905c3fcbaaf49ba6d25fea6d50ddab 100644 (file)
--- a/sim/mn10300/mn10300.igen
+++ b/sim/mn10300/mn10300.igen
@@ -4590,4 +4590,5 @@
 
 
 :include::am33:am33.igen
+:include::am33-2:am33-2.igen