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 CA23F3857BA8 for ; Sat, 5 Nov 2022 13:33:53 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org CA23F3857BA8 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 7CDE93412CC; Sat, 5 Nov 2022 13:33:53 +0000 (UTC) From: Mike Frysinger To: gdb-patches@sourceware.org Subject: [PATCH 22/26] sim: lm32: invert sim_cpu storage Date: Sat, 5 Nov 2022 20:32:54 +0700 Message-Id: <20221105133258.23409-23-vapier@gentoo.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221105133258.23409-1-vapier@gentoo.org> References: <20221101151158.24916-1-vapier@gentoo.org> <20221105133258.23409-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: The cpu.h change is in generated cgen code, but that has been sent upstream too, so the next regen should include it automatically. --- sim/lm32/cpu.h | 2 +- sim/lm32/sim-if.c | 3 ++- sim/lm32/sim-main.h | 14 ++++---------- 3 files changed, 7 insertions(+), 12 deletions(-) diff --git a/sim/lm32/cpu.h b/sim/lm32/cpu.h index d025065f2ba9..f179cfce30e9 100644 --- a/sim/lm32/cpu.h +++ b/sim/lm32/cpu.h @@ -54,7 +54,7 @@ typedef struct { #define GET_H_CSR(a1) CPU (h_csr)[a1] #define SET_H_CSR(a1, x) (CPU (h_csr)[a1] = (x)) } hardware; -#define CPU_CGEN_HW(cpu) (& (cpu)->cpu_data.hardware) +#define CPU_CGEN_HW(cpu) (& LM32_SIM_CPU (cpu)->cpu_data.hardware) } LM32BF_CPU_DATA; /* Cover fns for register access. */ diff --git a/sim/lm32/sim-if.c b/sim/lm32/sim-if.c index f6ff7129e2c5..a2a33620bdbc 100644 --- a/sim/lm32/sim-if.c +++ b/sim/lm32/sim-if.c @@ -101,7 +101,8 @@ sim_open (SIM_OPEN_KIND kind, host_callback *callback, struct bfd *abfd, current_target_byte_order = BFD_ENDIAN_BIG; /* The cpu data is kept in a separately allocated chunk of memory. */ - if (sim_cpu_alloc_all (sd, 1) != SIM_RC_OK) + if (sim_cpu_alloc_all_extra (sd, 1, sizeof (struct lm32_sim_cpu)) + != SIM_RC_OK) { free_state (sd); return 0; diff --git a/sim/lm32/sim-main.h b/sim/lm32/sim-main.h index 14da34c55199..17c817cb1f69 100644 --- a/sim/lm32/sim-main.h +++ b/sim/lm32/sim-main.h @@ -23,6 +23,8 @@ #ifndef SIM_MAIN_H #define SIM_MAIN_H +#define SIM_HAVE_COMMON_SIM_CPU + #define WITH_SCACHE_PBB 1 #include "symcat.h" @@ -36,16 +38,8 @@ #include "lm32-sim.h" #include "opcode/cgen.h" -/* The _sim_cpu struct. */ - -struct _sim_cpu +struct lm32_sim_cpu { - /* sim/common cpu base. */ - sim_cpu_base base; - - /* Static parts of cgen. */ - CGEN_CPU cgen_cpu; - /* 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 @@ -56,8 +50,8 @@ struct _sim_cpu #if defined (WANT_CPU_LM32BF) LM32BF_CPU_DATA cpu_data; #endif - }; +#define LM32_SIM_CPU(cpu) ((struct lm32_sim_cpu *) CPU_ARCH_DATA (cpu)) /* Misc. */ -- 2.38.1