From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) by sourceware.org (Postfix) with ESMTP id 8E58F3858298 for ; Fri, 23 Dec 2022 06:07:46 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 8E58F3858298 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 3129A3411FD; Fri, 23 Dec 2022 06:07:46 +0000 (UTC) From: Mike Frysinger To: gdb-patches@sourceware.org Subject: [PATCH 13/20] sim: mn10300: standardize the arch-specific settings a little Date: Fri, 23 Dec 2022 01:07:06 -0500 Message-Id: <20221223060713.28821-14-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,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: Rename mn10300_sim.h to mn10300-sim.h to match other ports, and move most of the arch-specific content out of sim-main.h to it. This isn't a big win though as we still have to include the header in sim-main.h due to the igen interface: it hardcodes including sim-main.h in its files. So until we can fix that, we have to keep bleeding these settings into the common codes. Also take the opportunity to purge a lot of unused headers from these. The local modules should already include the right headers, so there's no need to force everyone to pull them in. A lot of this is a hold over from the pre-igen days of this port. --- sim/mn10300/interp.c | 2 -- sim/mn10300/{mn10300_sim.h => mn10300-sim.h} | 24 ++++++++------ sim/mn10300/op_utils.c | 10 +++--- sim/mn10300/sim-main.h | 34 ++++---------------- 4 files changed, 27 insertions(+), 43 deletions(-) rename sim/mn10300/{mn10300_sim.h => mn10300-sim.h} (94%) diff --git a/sim/mn10300/interp.c b/sim/mn10300/interp.c index 3ea8079b1fa7..8467070addb6 100644 --- a/sim/mn10300/interp.c +++ b/sim/mn10300/interp.c @@ -14,8 +14,6 @@ #include #include -#include "bfd.h" - struct _state State; diff --git a/sim/mn10300/mn10300_sim.h b/sim/mn10300/mn10300-sim.h similarity index 94% rename from sim/mn10300/mn10300_sim.h rename to sim/mn10300/mn10300-sim.h index f1ab23ffe4fb..f6e4d854a144 100644 --- a/sim/mn10300/mn10300_sim.h +++ b/sim/mn10300/mn10300-sim.h @@ -1,14 +1,8 @@ -#include -#include -#include "ansidecl.h" -#include "sim/callback.h" -#include "opcode/mn10300.h" -#include -#include "sim/sim.h" -#include "bfd.h" -#include "sim-fpu.h" -#include "sim-signal.h" +#ifndef MN10300_SIM_H +#define MN10300_SIM_H +/* For compatibility, until all functions converted to passing + SIM_DESC as an argument */ extern SIM_DESC simulator; typedef struct @@ -185,6 +179,14 @@ dw2u64 (dword data) return data.low | (((uint64_t)data.high) << 32); } +/* Bring data in from the cold */ + +#define IMEM8(EA) \ +(sim_core_read_aligned_1(STATE_CPU(sd, 0), EA, exec_map, (EA))) + +#define IMEM8_IMMED(EA, N) \ +(sim_core_read_aligned_1(STATE_CPU(sd, 0), EA, exec_map, (EA) + (N))) + /* Function declarations. */ INLINE_SIM_MAIN (void) genericAdd (uint32_t source, uint32_t destReg); @@ -225,3 +227,5 @@ void fpu_fmadd (SIM_DESC, sim_cpu *, address_word, const void *, const void *, void fpu_fmsub (SIM_DESC, sim_cpu *, address_word, const void *, const void *, const void *, void *, const struct fp_prec_t *); void fpu_fnmadd (SIM_DESC, sim_cpu *, address_word, const void *, const void *, const void *, void *, const struct fp_prec_t *); void fpu_fnmsub (SIM_DESC, sim_cpu *, address_word, const void *, const void *, const void *, void *, const struct fp_prec_t *); + +#endif diff --git a/sim/mn10300/op_utils.c b/sim/mn10300/op_utils.c index 2fccf2da207f..b29b803d8e7f 100644 --- a/sim/mn10300/op_utils.c +++ b/sim/mn10300/op_utils.c @@ -1,10 +1,7 @@ /* This must come before any other includes. */ #include "defs.h" -#include "sim-main.h" -#include "sim-signal.h" -#include "sim-syscall.h" - +#include #include #ifdef HAVE_UNISTD_H #include @@ -13,6 +10,11 @@ #include #include +#include "sim/callback.h" + +#include "sim-main.h" +#include "sim-signal.h" +#include "sim-syscall.h" #define REG0(X) ((X) & 0x3) diff --git a/sim/mn10300/sim-main.h b/sim/mn10300/sim-main.h index 77a7ba8ea0d4..09887b592379 100644 --- a/sim/mn10300/sim-main.h +++ b/sim/mn10300/sim-main.h @@ -26,40 +26,20 @@ #include "sim-basics.h" -#include /* For kill() in insns:do_trap */ - -#include -#ifdef HAVE_UNISTD_H -#include -#endif - -/* These are generated files. */ -#include "itable.h" -#include "idecode.h" - #define SIM_CORE_SIGNAL(SD,CPU,CIA,MAP,NR_BYTES,ADDR,TRANSFER,ERROR) \ mn10300_core_signal ((SD), (CPU), (CIA), (MAP), (NR_BYTES), (ADDR), (TRANSFER), (ERROR)) - #include "sim-base.h" -#include "mn10300_sim.h" - -/* Bring data in from the cold */ - -#define IMEM8(EA) \ -(sim_core_read_aligned_1(STATE_CPU(sd, 0), EA, exec_map, (EA))) - -#define IMEM8_IMMED(EA, N) \ -(sim_core_read_aligned_1(STATE_CPU(sd, 0), EA, exec_map, (EA) + (N))) - -/* For compatibility, until all functions converted to passing - SIM_DESC as an argument */ -extern SIM_DESC simulator; +/** + * TODO: Move these includes to the igen files that need them. + * This requires extending the igen syntax to support header includes. + */ +#include "sim-fpu.h" +#include "sim-signal.h" -/* (re) initialize the simulator */ +#include "mn10300-sim.h" -extern void engine_init(SIM_DESC sd); extern SIM_CORE_SIGNAL_FN mn10300_core_signal; #endif -- 2.39.0