From 00bc37a5a0fee3628338cea7d009e6e65e29323f Mon Sep 17 00:00:00 2001 From: devans Date: Mon, 8 Sep 2003 18:55:35 +0000 Subject: [PATCH] * CGEN.sh.h: New arg arch-file. * arm7t/Makefile.am (cgen-arm,cgen-arm7f,cgen-arm7f-arm): Update call to CGEN.sh. * arm7t/Makefile.in: Regenerate. * m32r/Makefile.am (cgen-m32r): Update call to CGEN.sh. * m32r/Makefile.in: Regenerate. * xstormy16/Makefile.am (cgen-xstormy16): Update call to CGEN.sh. * xstormy16/Makefile.in: Regenerate. --- sid/component/cgen-cpu/CGEN.sh.in | 6 ++++-- sid/component/cgen-cpu/ChangeLog | 4 ++++ sid/component/cgen-cpu/arm7t/ChangeLog | 6 ++++++ sid/component/cgen-cpu/arm7t/Makefile.am | 7 ++++++- sid/component/cgen-cpu/arm7t/Makefile.in | 7 ++++++- sid/component/cgen-cpu/m32r/ChangeLog | 5 +++++ sid/component/cgen-cpu/m32r/Makefile.am | 1 + sid/component/cgen-cpu/m32r/Makefile.in | 1 + sid/component/cgen-cpu/xstormy16/ChangeLog | 5 +++++ sid/component/cgen-cpu/xstormy16/Makefile.am | 1 + sid/component/cgen-cpu/xstormy16/Makefile.in | 1 + 11 files changed, 40 insertions(+), 4 deletions(-) diff --git a/sid/component/cgen-cpu/CGEN.sh.in b/sid/component/cgen-cpu/CGEN.sh.in index b7553bff37..ca7e9f6b40 100644 --- a/sid/component/cgen-cpu/CGEN.sh.in +++ b/sid/component/cgen-cpu/CGEN.sh.in @@ -3,7 +3,8 @@ # # Usage: /bin/sh cgen.sh cpu-decode srcdir \ # cgen cgendir cgenflags \ -# arch archflags cpu isa mach prefix file-prefix file-specs +# arch archflags cpu isa mach prefix file-prefix \ +# arch-file file-specs # # cpu-decode: specified as is, exists for consistency with other such scripts. # @@ -47,6 +48,7 @@ mach=$9 # bring parms past 9 portably into view shift ; prefix=$9 shift ; fileprefix=$9 +shift ; archfile=$9 shift ; filespecs=$9 rootdir=${srcdir}/../../../.. @@ -100,7 +102,7 @@ ${cgen} -s ${cgendir}/cgen-sid.scm \ -f "${archflags}" \ -m ${mach} \ -i ${isa} \ - -a ${arch} \ + -a ${archfile} \ ${fileopts} diff --git a/sid/component/cgen-cpu/ChangeLog b/sid/component/cgen-cpu/ChangeLog index 5e6259c6c3..f361f02d3c 100644 --- a/sid/component/cgen-cpu/ChangeLog +++ b/sid/component/cgen-cpu/ChangeLog @@ -1,3 +1,7 @@ +2003-09-08 Doug Evans + + * CGEN.sh.h: New arg arch-file. + 2003-08-21 Dave Brolley * compCGEN.cxx (end_trace): Call end_line. diff --git a/sid/component/cgen-cpu/arm7t/ChangeLog b/sid/component/cgen-cpu/arm7t/ChangeLog index 3b4dde8e6c..f933f1d7b5 100644 --- a/sid/component/cgen-cpu/arm7t/ChangeLog +++ b/sid/component/cgen-cpu/arm7t/ChangeLog @@ -1,3 +1,9 @@ +2003-09-08 Doug Evans + + * arm7t/Makefile.am (cgen-arm,cgen-arm7f,cgen-arm7f-arm): Update call + to CGEN.sh. + * arm7t/Makefile.in: Regenerate. + 2003-07-05 Doug Evans * arm-cpu.h: Regenerate. diff --git a/sid/component/cgen-cpu/arm7t/Makefile.am b/sid/component/cgen-cpu/arm7t/Makefile.am index a76263ea1f..fedc64c67e 100644 --- a/sid/component/cgen-cpu/arm7t/Makefile.am +++ b/sid/component/cgen-cpu/arm7t/Makefile.am @@ -32,24 +32,29 @@ cgen-all: $(CGEN_ALL) # General architecture files. cgen-arm: $(SHELL) ../CGEN.sh cpu-decode $(srcdir) $(cgendir) "$(CGENFLAGS)" \ - arm "" arm "arm,thumb" arm7tdmi arm "arm-" "desc.h" + arm "" arm "arm,thumb" arm7tdmi arm "arm-" \ + $(cgendir)/cpu/arm.cpu \ + "desc.h" # ARM7 non-isa-specific files. cgen-arm7f: $(SHELL) ../CGEN.sh cpu-decode $(srcdir) $(cgendir) "$(CGENFLAGS)" \ arm "with-multiple-isa with-scache" arm "arm,thumb" arm7tdmi arm "arm-" \ + $(cgendir)/cpu/arm.cpu \ "cpu.h" # ARM7 files for ARM ISA side. cgen-arm7f-arm: $(SHELL) ../CGEN.sh cpu-decode $(srcdir) $(cgendir) "$(CGENFLAGS)" \ arm "with-multiple-isa with-scache with-pbb with-sem-frags" arm7f arm arm7tdmi arm "arm-" \ + $(cgendir)/cpu/arm.cpu \ "decode.h decode.cxx semantics.cxx sem-switch.cxx" # ARM7 files for Thumb ISA side. cgen-arm7f-thumb: $(SHELL) ../CGEN.sh cpu-decode $(srcdir) $(cgendir) "$(CGENFLAGS)" \ arm "with-multiple-isa with-scache with-pbb" arm7f thumb arm7tdmi thumb "thumb-" \ + $(cgendir)/cpu/arm.cpu \ "decode.h decode.cxx semantics.cxx sem-switch.cxx" html_stylesheet=$(srcdir)/../../component_html.xsl diff --git a/sid/component/cgen-cpu/arm7t/Makefile.in b/sid/component/cgen-cpu/arm7t/Makefile.in index b5d5ab00bf..a71c6feddc 100644 --- a/sid/component/cgen-cpu/arm7t/Makefile.in +++ b/sid/component/cgen-cpu/arm7t/Makefile.in @@ -460,24 +460,29 @@ cgen-all: $(CGEN_ALL) # General architecture files. cgen-arm: $(SHELL) ../CGEN.sh cpu-decode $(srcdir) $(cgendir) "$(CGENFLAGS)" \ - arm "" arm "arm,thumb" arm7tdmi arm "arm-" "desc.h" + arm "" arm "arm,thumb" arm7tdmi arm "arm-" \ + $(cgendir)/cpu/arm.cpu \ + "desc.h" # ARM7 non-isa-specific files. cgen-arm7f: $(SHELL) ../CGEN.sh cpu-decode $(srcdir) $(cgendir) "$(CGENFLAGS)" \ arm "with-multiple-isa with-scache" arm "arm,thumb" arm7tdmi arm "arm-" \ + $(cgendir)/cpu/arm.cpu \ "cpu.h" # ARM7 files for ARM ISA side. cgen-arm7f-arm: $(SHELL) ../CGEN.sh cpu-decode $(srcdir) $(cgendir) "$(CGENFLAGS)" \ arm "with-multiple-isa with-scache with-pbb with-sem-frags" arm7f arm arm7tdmi arm "arm-" \ + $(cgendir)/cpu/arm.cpu \ "decode.h decode.cxx semantics.cxx sem-switch.cxx" # ARM7 files for Thumb ISA side. cgen-arm7f-thumb: $(SHELL) ../CGEN.sh cpu-decode $(srcdir) $(cgendir) "$(CGENFLAGS)" \ arm "with-multiple-isa with-scache with-pbb" arm7f thumb arm7tdmi thumb "thumb-" \ + $(cgendir)/cpu/arm.cpu \ "decode.h decode.cxx semantics.cxx sem-switch.cxx" @MAINTAINER_MODE_TRUE@@HAVE_XSLTPROC_TRUE@.xml.html: diff --git a/sid/component/cgen-cpu/m32r/ChangeLog b/sid/component/cgen-cpu/m32r/ChangeLog index bf1f4fdd3e..be6c415974 100644 --- a/sid/component/cgen-cpu/m32r/ChangeLog +++ b/sid/component/cgen-cpu/m32r/ChangeLog @@ -1,3 +1,8 @@ +2003-09-08 Doug Evans + + * m32r/Makefile.am (cgen-m32r): Update call to CGEN.sh. + * m32r/Makefile.in: Regenerate. + 2003-07-05 Doug Evans * m32r-cpu.h: Regenerate. diff --git a/sid/component/cgen-cpu/m32r/Makefile.am b/sid/component/cgen-cpu/m32r/Makefile.am index 67145ff339..00ad2a1904 100644 --- a/sid/component/cgen-cpu/m32r/Makefile.am +++ b/sid/component/cgen-cpu/m32r/Makefile.am @@ -55,6 +55,7 @@ cgen-all: $(CGEN_ALL) cgen-m32r: $(SHELL) ../CGEN.sh cpu-decode $(srcdir) $(cgendir) "$(CGENFLAGS)" \ m32r "with-scache" m32rbf m32r m32r m32rbf "m32r-" \ + $(cgendir)/cpu/m32r.cpu \ "desc.h cpu.h decode.h decode.cxx semantics.cxx write.cxx defs.h" html_stylesheet=$(srcdir)/../../component_html.xsl diff --git a/sid/component/cgen-cpu/m32r/Makefile.in b/sid/component/cgen-cpu/m32r/Makefile.in index 46d99e3a34..8bbb99788e 100644 --- a/sid/component/cgen-cpu/m32r/Makefile.in +++ b/sid/component/cgen-cpu/m32r/Makefile.in @@ -484,6 +484,7 @@ cgen-all: $(CGEN_ALL) cgen-m32r: $(SHELL) ../CGEN.sh cpu-decode $(srcdir) $(cgendir) "$(CGENFLAGS)" \ m32r "with-scache" m32rbf m32r m32r m32rbf "m32r-" \ + $(cgendir)/cpu/m32r.cpu \ "desc.h cpu.h decode.h decode.cxx semantics.cxx write.cxx defs.h" @MAINTAINER_MODE_TRUE@@HAVE_XSLTPROC_TRUE@.xml.html: diff --git a/sid/component/cgen-cpu/xstormy16/ChangeLog b/sid/component/cgen-cpu/xstormy16/ChangeLog index d1431286d6..5553fb0a54 100644 --- a/sid/component/cgen-cpu/xstormy16/ChangeLog +++ b/sid/component/cgen-cpu/xstormy16/ChangeLog @@ -1,3 +1,8 @@ +2003-09-08 Doug Evans + + * xstormy16/Makefile.am (cgen-xstormy16): Update call to CGEN.sh. + * xstormy16/Makefile.in: Regenerate. + 2003-07-05 Doug Evans * xstormy16-cpu.h: Regenerate. diff --git a/sid/component/cgen-cpu/xstormy16/Makefile.am b/sid/component/cgen-cpu/xstormy16/Makefile.am index d9ad193ba6..571438cd7d 100644 --- a/sid/component/cgen-cpu/xstormy16/Makefile.am +++ b/sid/component/cgen-cpu/xstormy16/Makefile.am @@ -52,4 +52,5 @@ cgen-all: $(CGEN_ALL) cgen-xstormy16: $(SHELL) ../CGEN.sh cpu-decode $(srcdir) $(cgendir) "$(CGENFLAGS)" \ xstormy16 "with-scache" xstormy16 xstormy16 xstormy16 xstormy16 "xstormy16-" \ + $(cgendir)/cpu/xstormy16.cpu \ "desc.h cpu.h defs.h decode.h decode.cxx write.cxx semantics.cxx" diff --git a/sid/component/cgen-cpu/xstormy16/Makefile.in b/sid/component/cgen-cpu/xstormy16/Makefile.in index 6c19212f4d..bbf6958003 100644 --- a/sid/component/cgen-cpu/xstormy16/Makefile.in +++ b/sid/component/cgen-cpu/xstormy16/Makefile.in @@ -463,6 +463,7 @@ cgen-all: $(CGEN_ALL) cgen-xstormy16: $(SHELL) ../CGEN.sh cpu-decode $(srcdir) $(cgendir) "$(CGENFLAGS)" \ xstormy16 "with-scache" xstormy16 xstormy16 xstormy16 xstormy16 "xstormy16-" \ + $(cgendir)/cpu/xstormy16.cpu \ "desc.h cpu.h defs.h decode.h decode.cxx write.cxx semantics.cxx" # Tell versions [3.59,3.63) of GNU make to not export all variables. -- 2.11.0