From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) by sourceware.org (Postfix) with ESMTP id 42887385B50B for ; Fri, 23 Dec 2022 06:07:26 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 42887385B50B Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=gentoo.org Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gentoo.org Received: by smtp.gentoo.org (Postfix, from userid 559) id DE9B33411D8; Fri, 23 Dec 2022 06:07:25 +0000 (UTC) From: Mike Frysinger To: gdb-patches@sourceware.org Subject: [PATCH 04/20] sim: cr16: move arch-specific settings to internal header Date: Fri, 23 Dec 2022 01:06:57 -0500 Message-Id: <20221223060713.28821-5-vapier@gentoo.org> X-Mailer: git-send-email 2.39.0 In-Reply-To: <20221223060713.28821-1-vapier@gentoo.org> References: <20221223060713.28821-1-vapier@gentoo.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-11.1 required=5.0 tests=BAYES_00,GIT_PATCH_0,JMQ_SPF_NEUTRAL,KAM_DMARC_STATUS,RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,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: There's no need for these settings to be in sim-main.h which is shared with common/ sim code, so drop the cr16_sim.h include and move it to the few files that actually need it. Also rename the file to standardize it a bit better with other ports. --- sim/cr16/{cr16_sim.h => cr16-sim.h} | 1 + sim/cr16/gencode.c | 3 ++- sim/cr16/interp.c | 2 ++ sim/cr16/sim-main.h | 2 -- sim/cr16/simops.c | 2 ++ 5 files changed, 7 insertions(+), 3 deletions(-) rename sim/cr16/{cr16_sim.h => cr16-sim.h} (99%) diff --git a/sim/cr16/cr16_sim.h b/sim/cr16/cr16-sim.h similarity index 99% rename from sim/cr16/cr16_sim.h rename to sim/cr16/cr16-sim.h index 86ee50a24ae2..0481f843308c 100644 --- a/sim/cr16/cr16_sim.h +++ b/sim/cr16/cr16-sim.h @@ -25,6 +25,7 @@ #include "sim/callback.h" #include "opcode/cr16.h" #include "bfd.h" +#include "sim-main.h" #define DEBUG_TRACE 0x00000001 #define DEBUG_VALUES 0x00000002 diff --git a/sim/cr16/gencode.c b/sim/cr16/gencode.c index 210bc2f730b1..9b7b346c0d78 100644 --- a/sim/cr16/gencode.c +++ b/sim/cr16/gencode.c @@ -70,6 +70,7 @@ write_template (void) printf ("#include \"defs.h\"\n"); printf ("#include \"sim-main.h\"\n"); + printf ("#include \"cr16-sim.h\"\n"); printf ("#include \"simops.h\"\n\n"); for ( ; i < NUMOPCODES; i++) @@ -134,7 +135,7 @@ write_opcodes (void) /* write out opcode table. */ printf ("#include \"defs.h\"\n"); - printf ("#include \"sim-main.h\"\n"); + printf ("#include \"cr16-sim.h\"\n"); printf ("#include \"simops.h\"\n\n"); printf ("struct simops Simops[] = {\n"); diff --git a/sim/cr16/interp.c b/sim/cr16/interp.c index 1522ca4fa587..1830e348a060 100644 --- a/sim/cr16/interp.c +++ b/sim/cr16/interp.c @@ -38,6 +38,8 @@ #include "target-newlib-syscall.h" +#include "cr16-sim.h" + struct _state State; int cr16_debug; diff --git a/sim/cr16/sim-main.h b/sim/cr16/sim-main.h index a54a36559814..625d0505ec67 100644 --- a/sim/cr16/sim-main.h +++ b/sim/cr16/sim-main.h @@ -22,6 +22,4 @@ #include "sim-basics.h" #include "sim-base.h" -#include "cr16_sim.h" - #endif diff --git a/sim/cr16/simops.c b/sim/cr16/simops.c index 6eefe1bff60f..39a7214028f2 100644 --- a/sim/cr16/simops.c +++ b/sim/cr16/simops.c @@ -38,6 +38,8 @@ #include "simops.h" #include "target-newlib-syscall.h" +#include "cr16-sim.h" + #ifdef HAVE_UTIME_H #include #endif -- 2.39.0