2001-01-06 Ben Elliston <bje@redhat.com>

	* cgen.sh: Allow extrafiles to include the semantics files when
	generating an ISA-specific decoder.

diff --git a/sim/common/ChangeLog b/sim/common/ChangeLog
index dd8893085e5ca49c9ca550297deb5eabaf8860f9..1caff734b32a566c4af4282c8130efb5ab110bbd 100644 (file)
--- a/sim/common/ChangeLog
+++ b/sim/common/ChangeLog
@@ -1,3 +1,8 @@
+2001-01-06  Ben Elliston  <bje@redhat.com>
+
+       * cgen.sh: Allow extrafiles to include the semantics files when
+       generating an ISA-specific decoder.
+
 2000-12-27  Alexandre Oliva  <aoliva@redhat.com>
 
        * Make-common.in (sim-io.o): Depend on targ-vals.h.

diff --git a/sim/common/cgen.sh b/sim/common/cgen.sh
index 14fa247773e0038bd4d41553f1082db46dd7ad56..bf467e13baa939ca1ecf1f02602e5759a9dd51ba 100644 (file)
--- a/sim/common/cgen.sh
+++ b/sim/common/cgen.sh
@@ -97,6 +97,12 @@ cpu | decode | cpu-decode)
                fileopts="$fileopts \
                        -T tmp-dec.h1 \
                        -D tmp-dec.c1"
+               case "$extrafiles" in
+                 ignored) # Do nothing.
+                          ;;
+                 *)       fileopts="$fileopts $extrafiles"
+                          ;;
+               esac
                ;;
        esac
 
@@ -151,6 +157,15 @@ cpu | decode | cpu-decode)
                sed $sedscript < tmp-dec.c1 > tmp-dec.c
                ${rootdir}/move-if-change tmp-dec.c ${srcdir}/decode${suffix}.c
 
+               if test -f tmp-sem.c1 ; then \
+                       sed $sedscript < tmp-sem.c1 > tmp-sem.c ; \
+                       ${rootdir}/move-if-change tmp-sem.c ${srcdir}/sem${suffix}.c ; \
+               fi
+               if test -f tmp-semsw.c1 ; then \
+                       sed $sedscript < tmp-semsw.c1 > tmp-semsw.c ; \
+                       ${rootdir}/move-if-change tmp-semsw.c ${srcdir}/sem${suffix}-switch.c ; \
+               fi
+
                rm -f tmp-dec.h1 tmp-dec.c1
                ;;
        esac