From: Andrew Burgess <andrew.burgess@embecosm.com>
To: Mike Frysinger <vapier@gentoo.org>
Cc: gdb-patches@sourceware.org
Subject: Re: [PATCH] opcodes: cris: move desc & opc files from sim/
Date: Wed, 19 May 2021 15:52:37 +0100 [thread overview]
Message-ID: <20210519145237.GA2672@embecosm.com> (raw)
In-Reply-To: <20210519015635.16132-1-vapier@gentoo.org>
* Mike Frysinger via Gdb-patches <gdb-patches@sourceware.org> [2021-05-18 21:56:35 -0400]:
> All other cgen ports keep their desc & opc files under opcodes/, so
> move the cris files over too. The cris-opc.c file is already here.
My understanding is that opcodes/ is managed on the binutils list, so
you should probably send the patch to that list too - not that I
imagine they'll object.
Thanks,
Andrew
> ---
> opcodes/Makefile.am | 14 +++++++++++++-
> opcodes/Makefile.in | 15 ++++++++++++++-
> {sim/cris => opcodes}/cris-desc.c | 0
> {sim/cris => opcodes}/cris-desc.h | 0
> {sim/cris => opcodes}/cris-opc.h | 0
> sim/cris/Makefile.in | 16 ++++------------
> 6 files changed, 31 insertions(+), 14 deletions(-)
> rename {sim/cris => opcodes}/cris-desc.c (100%)
> rename {sim/cris => opcodes}/cris-desc.h (100%)
> rename {sim/cris => opcodes}/cris-opc.h (100%)
>
> diff --git a/opcodes/Makefile.am b/opcodes/Makefile.am
> index 04980f36b113..2d6c6b8c1e93 100644
> --- a/opcodes/Makefile.am
> +++ b/opcodes/Makefile.am
> @@ -60,6 +60,7 @@ BUILD_LIB_DEPS = @BUILD_LIB_DEPS@
> HFILES = \
> aarch64-asm.h aarch64-dis.h aarch64-opc.h aarch64-tbl.h \
> bpf-desc.h bpf-opc.h \
> + cris-desc.h cris-opc.h \
> epiphany-desc.h epiphany-opc.h \
> fr30-desc.h fr30-opc.h \
> frv-desc.h frv-opc.h \
> @@ -108,6 +109,7 @@ TARGET_LIBOPCODES_CFILES = \
> cgen-opc.c \
> cr16-dis.c \
> cr16-opc.c \
> + cris-desc.c \
> cris-dis.c \
> cris-opc.c \
> crx-dis.c \
> @@ -371,10 +373,11 @@ CGENDEPS = \
> $(CGENDIR)/opc-opinst.scm \
> cgen-asm.in cgen-dis.in cgen-ibld.in
>
> -CGEN_CPUS = epiphany fr30 frv ip2k iq2000 lm32 m32c m32r mep mt or1k xc16x xstormy16
> +CGEN_CPUS = cris epiphany fr30 frv ip2k iq2000 lm32 m32c m32r mep mt or1k xc16x xstormy16
>
> if CGEN_MAINT
> BPF_DEPS = stamp-bpf
> +CRIS_DEPS = stamp-cris
> EPIPHANY_DEPS = stamp-epiphany
> FR30_DEPS = stamp-fr30
> FRV_DEPS = stamp-frv
> @@ -390,6 +393,7 @@ XC16X_DEPS = stamp-xc16x
> XSTORMY16_DEPS = stamp-xstormy16
> else
> BPF_DEPS =
> +CRIS_DEPS =
> EPIPHANY_DEPS =
> FR30_DEPS =
> FRV_DEPS =
> @@ -431,6 +435,14 @@ stamp-bpf: $(CGENDEPS) $(CPUDIR)/bpf.cpu $(CPUDIR)/bpf.opc
> $(MAKE) run-cgen arch=bpf prefix=bpf \
> archfile=$(CPUDIR)/bpf.cpu opcfile=$(CPUDIR)/bpf.opc
>
> +$(srcdir)/cris-desc.h $(srcdir)/cris-desc.c $(srcdir)/cris-opc.h \
> + $(srcdir)/cris-opc.c $(srcdir)/cris-dis.c: $(CRIS_DEPS)
> + @true
> +
> +stamp-cris: $(CGENDEPS) $(CPUDIR)/cris.cpu
> + $(MAKE) run-cgen arch=cris prefix=cris \
> + archfile=$(CPUDIR)/cris.cpu
> +
> $(srcdir)/epiphany-desc.h $(srcdir)/epiphany-desc.c $(srcdir)/epiphany-opc.h \
> $(srcdir)/epiphany-opc.c $(srcdir)/epiphany-ibld.c \
> $(srcdir)/epiphany-opinst.c $(srcdir)/epiphany-asm.c \
> diff --git a/opcodes/Makefile.in b/opcodes/Makefile.in
> index b2965ba70cd0..1a51190c1ab5 100644
> --- a/opcodes/Makefile.in
> +++ b/opcodes/Makefile.in
> @@ -450,6 +450,7 @@ BFD_H = ../bfd/bfd.h
> HFILES = \
> aarch64-asm.h aarch64-dis.h aarch64-opc.h aarch64-tbl.h \
> bpf-desc.h bpf-opc.h \
> + cris-desc.h cris-opc.h \
> epiphany-desc.h epiphany-opc.h \
> fr30-desc.h fr30-opc.h \
> frv-desc.h frv-opc.h \
> @@ -499,6 +500,7 @@ TARGET_LIBOPCODES_CFILES = \
> cgen-opc.c \
> cr16-dis.c \
> cr16-opc.c \
> + cris-desc.c \
> cris-dis.c \
> cris-opc.c \
> crx-dis.c \
> @@ -729,9 +731,11 @@ CGENDEPS = \
> $(CGENDIR)/opc-opinst.scm \
> cgen-asm.in cgen-dis.in cgen-ibld.in
>
> -CGEN_CPUS = epiphany fr30 frv ip2k iq2000 lm32 m32c m32r mep mt or1k xc16x xstormy16
> +CGEN_CPUS = cris epiphany fr30 frv ip2k iq2000 lm32 m32c m32r mep mt or1k xc16x xstormy16
> @CGEN_MAINT_FALSE@BPF_DEPS =
> @CGEN_MAINT_TRUE@BPF_DEPS = stamp-bpf
> +@CGEN_MAINT_FALSE@CRIS_DEPS =
> +@CGEN_MAINT_TRUE@CRIS_DEPS = stamp-cris
> @CGEN_MAINT_FALSE@EPIPHANY_DEPS =
> @CGEN_MAINT_TRUE@EPIPHANY_DEPS = stamp-epiphany
> @CGEN_MAINT_FALSE@FR30_DEPS =
> @@ -915,6 +919,7 @@ distclean-compile:
> @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cgen-opc.Plo@am__quote@
> @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cr16-dis.Plo@am__quote@
> @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cr16-opc.Plo@am__quote@
> +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cris-desc.Plo@am__quote@
> @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cris-dis.Plo@am__quote@
> @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cris-opc.Plo@am__quote@
> @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/crx-dis.Plo@am__quote@
> @@ -1417,6 +1422,14 @@ stamp-bpf: $(CGENDEPS) $(CPUDIR)/bpf.cpu $(CPUDIR)/bpf.opc
> $(MAKE) run-cgen arch=bpf prefix=bpf \
> archfile=$(CPUDIR)/bpf.cpu opcfile=$(CPUDIR)/bpf.opc
>
> +$(srcdir)/cris-desc.h $(srcdir)/cris-desc.c $(srcdir)/cris-opc.h \
> + $(srcdir)/cris-opc.c $(srcdir)/cris-dis.c: $(CRIS_DEPS)
> + @true
> +
> +stamp-cris: $(CGENDEPS) $(CPUDIR)/cris.cpu
> + $(MAKE) run-cgen arch=cris prefix=cris \
> + archfile=$(CPUDIR)/cris.cpu
> +
> $(srcdir)/epiphany-desc.h $(srcdir)/epiphany-desc.c $(srcdir)/epiphany-opc.h \
> $(srcdir)/epiphany-opc.c $(srcdir)/epiphany-ibld.c \
> $(srcdir)/epiphany-opinst.c $(srcdir)/epiphany-asm.c \
> diff --git a/sim/cris/cris-desc.c b/opcodes/cris-desc.c
> similarity index 100%
> rename from sim/cris/cris-desc.c
> rename to opcodes/cris-desc.c
> diff --git a/sim/cris/cris-desc.h b/opcodes/cris-desc.h
> similarity index 100%
> rename from sim/cris/cris-desc.h
> rename to opcodes/cris-desc.h
> diff --git a/sim/cris/cris-opc.h b/opcodes/cris-opc.h
> similarity index 100%
> rename from sim/cris/cris-opc.h
> rename to opcodes/cris-opc.h
> diff --git a/sim/cris/Makefile.in b/sim/cris/Makefile.in
> index 3dcdbb2da022..d5e8a88f3a8a 100644
> --- a/sim/cris/Makefile.in
> +++ b/sim/cris/Makefile.in
> @@ -29,14 +29,13 @@ SIM_OBJS = \
> sim-if.o arch.o \
> $(CRISV10F_OBJS) \
> $(CRISV32F_OBJS) \
> - traps.o \
> - cris-desc.o
> + traps.o
>
> # Extra headers included by sim-main.h.
> # FIXME: $(srccom)/cgen-ops.h should be in CGEN_INCLUDE_DEPS.
> SIM_EXTRA_DEPS = \
> $(CGEN_INCLUDE_DEPS) $(srccom)/cgen-ops.h \
> - arch.h cpuall.h cris-sim.h cris-desc.h engv10.h engv32.h
> + arch.h cpuall.h cris-sim.h engv10.h engv32.h
>
> SIM_EXTRA_CLEAN = cris-clean
>
> @@ -97,7 +96,7 @@ cris-clean:
> rm -f mloopv$${v}f.c engv$${v}.h stamp-v$${v}fmloop; \
> rm -f stamp-v$${v}fcpu; \
> done
> - -rm -f stamp-arch stamp-desc
> + -rm -f stamp-arch
> -rm -f tmp-*
>
> # cgen support, enable with --enable-cgen-maint
> @@ -106,7 +105,7 @@ CGEN_MAINT = ; @true
> @CGEN_MAINT@CGEN_MAINT =
>
> # Useful when making CGEN-generated files manually, without --enable-cgen-maint.
> -stamps: stamp-v10fmloop stamp-v32fmloop stamp-arch stamp-v10fcpu stamp-v32fcpu stamp-desc
> +stamps: stamp-v10fmloop stamp-v32fmloop stamp-arch stamp-v10fcpu stamp-v32fcpu
>
> stamp-arch: $(CGEN_READ_SCM) $(CGEN_ARCH_SCM) $(CPU_DIR)/cris.cpu Makefile
> $(MAKE) cgen-arch $(CGEN_FLAGS_TO_PASS) mach=crisv10,crisv32 \
> @@ -135,10 +134,3 @@ stamp-v32fcpu: $(CGEN_READ_SCM) $(CGEN_CPU_SCM) $(CGEN_DECODE_SCM) $(CPU_DIR)/cr
> mv decodev32.c.tmp $(srcdir)/decodev32.c
> touch stamp-v32fcpu
> cpuv32.h cpuv32.c semcrisv32f-switch.c modelv32.c decodev32.c decodev32.h: $(CGEN_MAINT) stamp-v32fcpu
> -
> -stamp-desc: $(CGEN_READ_SCM) $(CGEN_DESC_SCM) $(CPU_DIR)/cris.cpu Makefile
> - $(MAKE) cgen-desc $(CGEN_FLAGS_TO_PASS) \
> - archfile=$(CPU_DIR)/cris.cpu \
> - cpu=cris mach=all
> - touch stamp-desc
> -cris-desc.c cris-desc.h cris-opc.h: $(CGEN_MAINT) stamp-desc
> --
> 2.31.1
>
next prev parent reply other threads:[~2021-05-19 14:52 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-19 1:56 Mike Frysinger
2021-05-19 14:52 ` Andrew Burgess [this message]
2021-05-19 16:21 ` Mike Frysinger
2021-05-19 16:21 ` Mike Frysinger
2021-05-19 21:26 ` Hans-Peter Nilsson
2021-05-19 21:32 ` Hans-Peter Nilsson
2021-05-19 23:38 ` Mike Frysinger
2021-05-19 23:48 ` Hans-Peter Nilsson
2021-05-20 5:18 ` Mike Frysinger
2021-05-20 13:21 ` Hans-Peter Nilsson
2021-05-23 3:55 ` Mike Frysinger
2021-05-23 4:12 ` [PATCH v2] " Mike Frysinger
2021-05-23 20:52 ` Hans-Peter Nilsson
2021-05-23 21:01 ` Hans-Peter Nilsson
2021-05-24 1:23 ` Mike Frysinger
2021-05-24 1:23 ` [PATCH v3] " Mike Frysinger
2021-05-24 1:43 ` Hans-Peter Nilsson
2021-05-24 3:48 ` Mike Frysinger
2021-05-24 3:46 ` [PATCH v4] " Mike Frysinger
2021-05-24 13:24 ` Hans-Peter Nilsson
2021-05-25 10:13 ` Alan Modra
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210519145237.GA2672@embecosm.com \
--to=andrew.burgess@embecosm.com \
--cc=gdb-patches@sourceware.org \
--cc=vapier@gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).