From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id gasCFz0mpWA5PAAAWB0awg (envelope-from ) for ; Wed, 19 May 2021 10:52:45 -0400 Received: by simark.ca (Postfix, from userid 112) id 4AB6E1F11C; Wed, 19 May 2021 10:52:45 -0400 (EDT) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on simark.ca X-Spam-Level: X-Spam-Status: No, score=-1.1 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,MAILING_LIST_MULTI,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.2 Received: from sourceware.org (server2.sourceware.org [8.43.85.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by simark.ca (Postfix) with ESMTPS id 979E91E01F for ; Wed, 19 May 2021 10:52:43 -0400 (EDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id BDD183896C0E; Wed, 19 May 2021 14:52:42 +0000 (GMT) Received: from mail-wm1-x336.google.com (mail-wm1-x336.google.com [IPv6:2a00:1450:4864:20::336]) by sourceware.org (Postfix) with ESMTPS id 77F9F3896C0E for ; Wed, 19 May 2021 14:52:39 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 77F9F3896C0E Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=embecosm.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=andrew.burgess@embecosm.com Received: by mail-wm1-x336.google.com with SMTP id u4-20020a05600c00c4b02901774b80945cso3611858wmm.3 for ; Wed, 19 May 2021 07:52:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=embecosm.com; s=google; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to; bh=MeXnx97IzKdLq7xrCiXRnw2l801GMRbhb/9hdDRWcyU=; b=Iu+Mv/+m/FJftHiy3rKaMxKe5FTnlHG87nbWESwLe988QblufDwS4PAM9CLtRCS/KE KUYhZM7VlRec3F8V6mNVYcSFvGDp3yGMPh+BoJWwdQOTFyrne68ICtwSlzK+DZnK+o05 9C28vJ8DnCjTk1w+MGTLowD/1OIpWEXSOLpJaDEuCNXOQ8SfLFvCdVUMbeBFVPL0///Q otv0bbUTmK+An98Fy5GGcGdU+TlAulVriE7mjQdp8PUtx8hvR6q9NXytItmo1ozCRibw gc89N0EoR6fn9r4jp10OMj7GDQ6slZzIOyxSB/DgBdOe/g2Snt647Tg+eXjDyutpI8JK RMNA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=MeXnx97IzKdLq7xrCiXRnw2l801GMRbhb/9hdDRWcyU=; b=Awh+JCxNDZteM962Ipnjgv/uUZ38doZTrznphCvfkYGc8Nn2wR/ZLgBf4HdPhYRD+g T/t8BE54fZmzPGxFj8Eq0P1c+tHcYYPQbIHzUFQ/93I+SmQb5pWKRhvume/2RqwvY+Pu E2Q9/mgPueXCGd3d7Z/A+4cEw0uNjHattb3F4TEJtunS3QKYqmZp6pgIPG0o2RN6BhSL r4i9qCHQHvCr+m5I6Nrg0uB1kXaoaZegNdAKO78euJK0op4VXzamV9790f2lPN2L1/HG LI6r8lyO5ECO1GUoUlrr0pWNOTMJi9GLLNBbdeoNXeq80Cg5HUw8/TP45f/ubWoqjMKJ qjiQ== X-Gm-Message-State: AOAM531poBGeoi/dVZeVWH14mFsPOUSoPI8f4SBM7k/Mxej7wvf5LaOr RaQaS7qpM3vizMtCanXwD09D5MaKx+1lyA== X-Google-Smtp-Source: ABdhPJyhW/3lZF87FIJZfTQIuNxX2JaYjns6E8qPYFMHhllBA1YQqsPR35zSd1q09XWrrwvxHME3jQ== X-Received: by 2002:a1c:e912:: with SMTP id q18mr11662301wmc.59.1621435958572; Wed, 19 May 2021 07:52:38 -0700 (PDT) Received: from localhost (host109-151-46-70.range109-151.btcentralplus.com. [109.151.46.70]) by smtp.gmail.com with ESMTPSA id p6sm9721961wma.4.2021.05.19.07.52.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 19 May 2021 07:52:38 -0700 (PDT) Date: Wed, 19 May 2021 15:52:37 +0100 From: Andrew Burgess To: Mike Frysinger Subject: Re: [PATCH] opcodes: cris: move desc & opc files from sim/ Message-ID: <20210519145237.GA2672@embecosm.com> References: <20210519015635.16132-1-vapier@gentoo.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20210519015635.16132-1-vapier@gentoo.org> X-Operating-System: Linux/5.8.18-100.fc31.x86_64 (x86_64) X-Uptime: 15:51:26 up 4:35, 1 X-Editor: GNU Emacs [ http://www.gnu.org/software/emacs ] X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: gdb-patches@sourceware.org Errors-To: gdb-patches-bounces@sourceware.org Sender: "Gdb-patches" * Mike Frysinger via Gdb-patches [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 >