From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) by sourceware.org (Postfix) with ESMTP id 98CDC385841A for ; Mon, 2 Jan 2023 04:32:18 +0000 (GMT) Received: by smtp.gentoo.org (Postfix, from userid 559) id 3A81C340CA7; Mon, 2 Jan 2023 04:32:18 +0000 (UTC) From: Mike Frysinger To: gdb-patches@sourceware.org Subject: [PATCH 3/9] sim: cris: hoist cgen rules to top-level Date: Sun, 1 Jan 2023 23:32:03 -0500 Message-Id: <20230102043209.21542-3-vapier@gentoo.org> X-Mailer: git-send-email 2.39.0 In-Reply-To: <20230102043209.21542-1-vapier@gentoo.org> References: <20230102043209.21542-1-vapier@gentoo.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-11.2 required=5.0 tests=BAYES_00,GIT_PATCH_0,JMQ_SPF_NEUTRAL,KAM_DMARC_STATUS,SPF_HELO_PASS,SPF_PASS,TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: --- sim/Makefile.in | 14 ++++++++++++++ sim/cris/Makefile.in | 33 --------------------------------- sim/cris/local.mk | 14 ++++++++++++++ 3 files changed, 28 insertions(+), 33 deletions(-) diff --git a/sim/cris/Makefile.in b/sim/cris/Makefile.in index e9eaefb11bf6..0a045ca06778 100644 --- a/sim/cris/Makefile.in +++ b/sim/cris/Makefile.in @@ -33,37 +33,4 @@ SIM_OBJS = \ $(CRISV32F_OBJS) \ traps.o -SIM_EXTRA_CLEAN = cris-clean - ## COMMON_POST_CONFIG_FRAG - -cris-clean: - -rm -f stamp-arch - -rm -f tmp-* - -# Useful when making CGEN-generated files manually, without --enable-cgen-maint. -stamps: 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 \ - archfile=$(CPU_DIR)/cris.cpu \ - FLAGS="with-scache with-profile=fn" - $(SILENCE) touch $@ -arch.h arch.c cpuall.h: $(CGEN_MAINT) stamp-arch - -# The sed-hack is supposed to be temporary, until we get CGEN to emit it. -stamp-v10fcpu: $(CGEN_READ_SCM) $(CGEN_CPU_SCM) $(CGEN_DECODE_SCM) $(CPU_DIR)/cris.cpu Makefile - $(MAKE) cgen-cpu-decode $(CGEN_FLAGS_TO_PASS) \ - archfile=$(CPU_DIR)/cris.cpu \ - cpu=crisv10f mach=crisv10 SUFFIX=v10 FLAGS="with-scache with-profile=fn" EXTRAFILES="$(CGEN_CPU_SEMSW)" - $(SILENCE) $(SHELL) $(srcroot)/move-if-change $(srcdir)/semv10-switch.c $(srcdir)/semcrisv10f-switch.c - $(SILENCE) touch $@ -cpuv10.h cpuv10.c semcrisv10f-switch.c modelv10.c decodev10.c decodev10.h: $(CGEN_MAINT) stamp-v10fcpu - -stamp-v32fcpu: $(CGEN_READ_SCM) $(CGEN_CPU_SCM) $(CGEN_DECODE_SCM) $(CPU_DIR)/cris.cpu Makefile - $(MAKE) cgen-cpu-decode $(CGEN_FLAGS_TO_PASS) \ - archfile=$(CPU_DIR)/cris.cpu \ - cpu=crisv32f mach=crisv32 SUFFIX=v32 FLAGS="with-scache with-profile=fn" EXTRAFILES="$(CGEN_CPU_SEMSW)" - $(SILENCE) $(SHELL) $(srcroot)/move-if-change $(srcdir)/semv32-switch.c $(srcdir)/semcrisv32f-switch.c - $(SILENCE) touch $@ -cpuv32.h cpuv32.c semcrisv32f-switch.c modelv32.c decodev32.c decodev32.h: $(CGEN_MAINT) stamp-v32fcpu diff --git a/sim/cris/local.mk b/sim/cris/local.mk index 135d5ebaabba..b2f45855317e 100644 --- a/sim/cris/local.mk +++ b/sim/cris/local.mk @@ -70,3 +70,17 @@ SIM_ALL_RECURSIVE_DEPS += $(%C%_BUILD_OUTPUTS) $(AM_V_at)touch $@ MOSTLYCLEANFILES += $(%C%_BUILD_OUTPUTS) + +%D%/cgen-arch: + $(AM_V_GEN)mach=crisv10,crisv32 FLAGS="with-scache with-profile=fn"; $(CGEN_GEN_ARCH) +%D%/arch.h %D%/arch.c %D%/cpuall.h: @CGEN_MAINT@ %D%/cgen-arch + +%D%/cgen-cpu-decode-v10f: + $(AM_V_GEN)cpu=crisv10f mach=crisv10 SUFFIX=v10 FLAGS="with-scache with-profile=fn" EXTRAFILES="$(CGEN_CPU_SEMSW)"; $(CGEN_GEN_CPU_DECODE) + $(AM_V_at)$(SHELL) $(srcroot)/move-if-change $(srcdir)/%D%/semv10-switch.c $(srcdir)/%D%/semcrisv10f-switch.c +%D%/cpuv10.h %D%/cpuv10.c %D%/semcrisv10f-switch.c %D%/modelv10.c %D%/decodev10.c %D%/decodev10.h: @CGEN_MAINT@ %D%/cgen-cpu-decode-v10f + +%D%/cgen-cpu-decode-v32f: + $(AM_V_GEN)cpu=crisv32f mach=crisv32 SUFFIX=v32 FLAGS="with-scache with-profile=fn" EXTRAFILES="$(CGEN_CPU_SEMSW)"; $(CGEN_GEN_CPU_DECODE) + $(AM_V_at)$(SHELL) $(srcroot)/move-if-change $(srcdir)/%D%/semv32-switch.c $(srcdir)/%D%/semcrisv32f-switch.c +%D%/cpuv32.h %D%/cpuv32.c %D%/semcrisv32f-switch.c %D%/modelv32.c %D%/decodev32.c %D%/decodev32.h: @CGEN_MAINT@ %D%/cgen-cpu-decode-v32f -- 2.39.0