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 A68273858D1E for ; Sat, 24 Dec 2022 01:55:42 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org A68273858D1E 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 5762433BF41; Sat, 24 Dec 2022 01:55:42 +0000 (UTC) From: Mike Frysinger To: gdb-patches@sourceware.org Subject: [PATCH] sim: or1k: move arch-specific settings to internal header Date: Fri, 23 Dec 2022 20:55:39 -0500 Message-Id: <20221224015539.8804-1-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: There's no need for these settings to be in sim-main.h which is shared with common/ sim code, so move it all out to the existing or1k-sim.h. Unfortunately, we can't yet drop the or1k-sim.h include from sim-main.h as many of the generated CGEN files refer only to sim-main.h. We'll have to improve the CGEN interface before we can make more progress, but this is at least a minor improvement. --- sim/or1k/or1k-sim.h | 27 +++++++++++++++++++++++++++ sim/or1k/sim-main.h | 32 ++------------------------------ sim/or1k/traps.c | 1 + 3 files changed, 30 insertions(+), 30 deletions(-) diff --git a/sim/or1k/or1k-sim.h b/sim/or1k/or1k-sim.h index 417272033cd1..61d542fcf7c8 100644 --- a/sim/or1k/or1k-sim.h +++ b/sim/or1k/or1k-sim.h @@ -89,4 +89,31 @@ USI or1k32bf_make_load_store_addr (sim_cpu *current_cpu, USI base, SI offset, USI or1k32bf_ff1 (sim_cpu *current_cpu, USI val); USI or1k32bf_fl1 (sim_cpu *current_cpu, USI val); +#define OR1K_DEFAULT_MEM_SIZE 0x800000 /* 8M */ + +struct or1k_sim_cpu +{ + OR1K_MISC_PROFILE or1k_misc_profile; +#define CPU_OR1K_MISC_PROFILE(cpu) (& OR1K_SIM_CPU (cpu)->or1k_misc_profile) + + /* CPU specific parts go here. + Note that in files that don't need to access these pieces WANT_CPU_FOO + won't be defined and thus these parts won't appear. This is ok in the + sense that things work. It is a source of bugs though. + One has to of course be careful to not take the size of this + struct and no structure members accessed in non-cpu specific files can + go after here. Oh for a better language. */ + UWI spr[NUM_SPR]; + + /* Next instruction will be in delay slot. */ + BI next_delay_slot; + /* Currently in delay slot. */ + BI delay_slot; + +#ifdef WANT_CPU_OR1K32BF + OR1K32BF_CPU_DATA cpu_data; +#endif +}; +#define OR1K_SIM_CPU(cpu) ((struct or1k_sim_cpu *) CPU_ARCH_DATA (cpu)) + #endif /* OR1K_SIM_H */ diff --git a/sim/or1k/sim-main.h b/sim/or1k/sim-main.h index 24c8ddb0e31a..7dd3e9a66550 100644 --- a/sim/or1k/sim-main.h +++ b/sim/or1k/sim-main.h @@ -21,42 +21,14 @@ #define WITH_SCACHE_PBB 1 -#include "ansidecl.h" #include "or1k-desc.h" #include "or1k-opc.h" #include "sim-basics.h" #include "arch.h" #include "sim-base.h" -#include "sim-fpu.h" - #include "cgen-sim.h" -#include "or1k-sim.h" -#define OR1K_DEFAULT_MEM_SIZE 0x800000 /* 8M */ - -struct or1k_sim_cpu -{ - OR1K_MISC_PROFILE or1k_misc_profile; -#define CPU_OR1K_MISC_PROFILE(cpu) (& OR1K_SIM_CPU (cpu)->or1k_misc_profile) - - /* CPU specific parts go here. - Note that in files that don't need to access these pieces WANT_CPU_FOO - won't be defined and thus these parts won't appear. This is ok in the - sense that things work. It is a source of bugs though. - One has to of course be careful to not take the size of this - struct and no structure members accessed in non-cpu specific files can - go after here. Oh for a better language. */ - UWI spr[NUM_SPR]; - - /* Next instruction will be in delay slot. */ - BI next_delay_slot; - /* Currently in delay slot. */ - BI delay_slot; - -#ifdef WANT_CPU_OR1K32BF - OR1K32BF_CPU_DATA cpu_data; -#endif -}; -#define OR1K_SIM_CPU(cpu) ((struct or1k_sim_cpu *) CPU_ARCH_DATA (cpu)) +/* TODO: Move this to the CGEN generated files instead. */ +#include "or1k-sim.h" #endif /* SIM_MAIN_H */ diff --git a/sim/or1k/traps.c b/sim/or1k/traps.c index 97e81f41e7da..6fe94d88abd6 100644 --- a/sim/or1k/traps.c +++ b/sim/or1k/traps.c @@ -23,6 +23,7 @@ #define WANT_CPU #include "sim-main.h" +#include "sim-fpu.h" #include "sim-signal.h" #include "cgen-ops.h" -- 2.39.0