This is the mail archive of the
sid@sources.redhat.com
mailing list for the SID project.
[PATCH] Update to cgen invocation.
- From: Doug Evans <dje at transmeta dot com>
- To: fche at redhat dot com, brolley at redhat dot com
- Cc: sid at sources dot redhat dot com
- Date: Mon, 8 Sep 2003 10:31:12 -0700
- Subject: [PATCH] Update to cgen invocation.
fyi,
Now that my patch to cgen that removes hardcoding of .cpu file location
has been checked in, I'll be applying this to sid.
2003-09-08 Doug Evans <dje@casey.transmeta.com>
* 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.
Index: component/cgen-cpu/CGEN.sh.in
===================================================================
RCS file: /cvs/src/src/sid/component/cgen-cpu/CGEN.sh.in,v
retrieving revision 1.3
diff -u -p -r1.3 CGEN.sh.in
--- component/cgen-cpu/CGEN.sh.in 16 Apr 2003 18:13:51 -0000 1.3
+++ component/cgen-cpu/CGEN.sh.in 8 Sep 2003 17:24:38 -0000
@@ -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}
Index: component/cgen-cpu/arm7t/Makefile.am
===================================================================
RCS file: /cvs/src/src/sid/component/cgen-cpu/arm7t/Makefile.am,v
retrieving revision 1.5
diff -u -p -r1.5 Makefile.am
--- component/cgen-cpu/arm7t/Makefile.am 8 Jan 2003 03:17:27 -0000 1.5
+++ component/cgen-cpu/arm7t/Makefile.am 8 Sep 2003 17:24:38 -0000
@@ -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
Index: component/cgen-cpu/arm7t/Makefile.in
===================================================================
RCS file: /cvs/src/src/sid/component/cgen-cpu/arm7t/Makefile.in,v
retrieving revision 1.6
diff -u -p -r1.6 Makefile.in
--- component/cgen-cpu/arm7t/Makefile.in 8 Jan 2003 03:17:27 -0000 1.6
+++ component/cgen-cpu/arm7t/Makefile.in 8 Sep 2003 17:24:38 -0000
@@ -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:
Index: component/cgen-cpu/m32r/Makefile.am
===================================================================
RCS file: /cvs/src/src/sid/component/cgen-cpu/m32r/Makefile.am,v
retrieving revision 1.5
diff -u -p -r1.5 Makefile.am
--- component/cgen-cpu/m32r/Makefile.am 27 Nov 2001 22:59:04 -0000 1.5
+++ component/cgen-cpu/m32r/Makefile.am 8 Sep 2003 17:24:38 -0000
@@ -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
Index: component/cgen-cpu/m32r/Makefile.in
===================================================================
RCS file: /cvs/src/src/sid/component/cgen-cpu/m32r/Makefile.in,v
retrieving revision 1.6
diff -u -p -r1.6 Makefile.in
--- component/cgen-cpu/m32r/Makefile.in 27 Nov 2001 22:59:04 -0000 1.6
+++ component/cgen-cpu/m32r/Makefile.in 8 Sep 2003 17:24:38 -0000
@@ -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:
Index: component/cgen-cpu/xstormy16/Makefile.am
===================================================================
RCS file: /cvs/src/src/sid/component/cgen-cpu/xstormy16/Makefile.am,v
retrieving revision 1.1
diff -u -p -r1.1 Makefile.am
--- component/cgen-cpu/xstormy16/Makefile.am 17 Dec 2001 09:31:20 -0000 1.1
+++ component/cgen-cpu/xstormy16/Makefile.am 8 Sep 2003 17:24:38 -0000
@@ -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"
Index: component/cgen-cpu/xstormy16/Makefile.in
===================================================================
RCS file: /cvs/src/src/sid/component/cgen-cpu/xstormy16/Makefile.in,v
retrieving revision 1.1
diff -u -p -r1.1 Makefile.in
--- component/cgen-cpu/xstormy16/Makefile.in 17 Dec 2001 09:31:20 -0000 1.1
+++ component/cgen-cpu/xstormy16/Makefile.in 8 Sep 2003 17:24:38 -0000
@@ -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.