2000-10-26 Ben Elliston <bje@redhat.com>

        * cgen.sh: Handle an isa argument between cpu and mach. Default to
        `all'. Pass `-i' options to cgen applications.
        * Make-common.in (cgen-arch, cgen-cpu, cgen-decode, cgen-cpu-decode,
        cgen-desc): Pass $(isa) to cgen.sh.

diff --git a/sim/common/ChangeLog b/sim/common/ChangeLog
index 523b9f9175b8732f00486992a7977678414a1685..32b9762494c113c5c4e12827ba1b6c7ed6373384 100644 (file)
--- a/sim/common/ChangeLog
+++ b/sim/common/ChangeLog
@@ -1,3 +1,10 @@
+2000-10-26  Ben Elliston  <bje@redhat.com>
+
+        * cgen.sh: Handle an isa argument between cpu and mach. Default to
+        `all'. Pass `-i' options to cgen applications.
+        * Make-common.in (cgen-arch, cgen-cpu, cgen-decode, cgen-cpu-decode,
+        cgen-desc): Pass $(isa) to cgen.sh.
+
 2000-10-08  Ben Elliston  <bje@redhat.com>
 
        * cgen-utils.c (cgen_rtx_error): New function.

diff --git a/sim/common/Make-common.in b/sim/common/Make-common.in
index 4ee4acb73f07cc563e52cbafb8eb3606858c4006..98e663b768629dd4aabacb0031c0e7f0c8ee4dff 100644 (file)
--- a/sim/common/Make-common.in
+++ b/sim/common/Make-common.in
@@ -684,26 +684,26 @@ CGEN_FLAGS_TO_PASS = \
 cgen-arch: force
        $(SHELL) $(srccom)/cgen.sh arch $(srcdir) \
                $(CGEN) $(CGENDIR) "$(CGENFLAGS)" \
-               $(arch) "$(FLAGS)" ignored $(mach) ignored ignored
-
+               $(arch) "$(FLAGS)" ignored "$(isa)" $(mach) ignored ignored
+       
 cgen-cpu: force
        $(SHELL) $(srccom)/cgen.sh cpu $(srcdir) \
                $(CGEN) $(CGENDIR) "$(CGENFLAGS)" \
-               $(arch) "$(FLAGS)" $(cpu) $(mach) "$(SUFFIX)" "$(EXTRAFILES)"
+               $(arch) "$(FLAGS)" $(cpu) "$(isa)" $(mach) "$(SUFFIX)" "$(EXTRAFILES)"
 
 cgen-decode: force
        $(SHELL) $(srccom)/cgen.sh decode $(srcdir) \
                $(CGEN) $(CGENDIR) "$(CGENFLAGS)" \
-               $(arch) "$(FLAGS)" $(cpu) $(mach) "$(SUFFIX)" ignored
+               $(arch) "$(FLAGS)" $(cpu) "$(isa)" $(mach) "$(SUFFIX)" ignored
 
 cgen-cpu-decode: force
        $(SHELL) $(srccom)/cgen.sh cpu-decode $(srcdir) \
                $(CGEN) $(CGENDIR) "$(CGENFLAGS)" \
-               $(arch) "$(FLAGS)" $(cpu) $(mach) "$(SUFFIX)" "$(EXTRAFILES)"
+               $(arch) "$(FLAGS)" $(cpu) "$(isa)" $(mach) "$(SUFFIX)" "$(EXTRAFILES)"
 
 cgen-desc: force
        $(SHELL) $(srccom)/cgen.sh desc $(srcdir) \
                $(CGEN) $(CGENDIR) "$(CGENFLAGS)" \
-               $(arch) "$(FLAGS)" $(cpu) $(mach) "$(SUFFIX)" ignored
+               $(arch) "$(FLAGS)" $(cpu) "$(isa)" $(mach) "$(SUFFIX)" ignored
 
 ## End COMMON_POST_CONFIG_FRAG

diff --git a/sim/common/cgen.sh b/sim/common/cgen.sh
index 5ee7db83f6d117d0c7d8919a0c4affe861b03f8c..58449af7f3bda72a283062cc0c530a25707b72fa 100644 (file)
--- a/sim/common/cgen.sh
+++ b/sim/common/cgen.sh
@@ -20,8 +20,9 @@ cgenflags=$5
 arch=$6
 archflags=$7
 cpu=$8
-mach=$9
+isa=$9
 # bring parms past 9 portably into view
+shift ; mach=$9
 shift ; suffix=$9
 shift ; extrafiles=$9
 
@@ -32,6 +33,10 @@ uppercase='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
 ARCH=`echo ${arch} | tr "${lowercase}" "${uppercase}"`
 CPU=`echo ${cpu} | tr "${lowercase}" "${uppercase}"`
 
+if test -z "$isa" ; then
+  isa=all
+fi
+
 case $action in
 arch)
        rm -f tmp-arch.h1 tmp-arch.h
@@ -44,6 +49,7 @@ arch)
                -f "${archflags}" \
                -m ${mach} \
                -a ${arch} \
+               -i ${isa} \
                -A tmp-arch.h1 \
                -B tmp-arch.c1 \
                -N tmp-all.h1
@@ -91,6 +97,7 @@ cpu | decode | cpu-decode)
                -f "${archflags}" \
                -m ${mach} \
                -a ${arch} \
+               -i ${isa} \
                ${fileopts}
 
        case $action in
@@ -152,6 +159,7 @@ desc)
                -f "${archflags}" \
                -m ${mach} \
                -a ${arch} \
+               -i ${isa} \
                -H tmp-desc.h1 \
                -C tmp-desc.c1 \
                -O tmp-opc.h1