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 7A6D538582B7 for ; Tue, 1 Nov 2022 16:26:37 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 7A6D538582B7 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 29C52340DAF; Tue, 1 Nov 2022 16:26:37 +0000 (UTC) From: Mike Frysinger To: gdb-patches@sourceware.org Subject: [PATCH 07/27] sim: microblaze: invert sim_cpu storage Date: Tue, 1 Nov 2022 20:56:38 +0545 Message-Id: <20221101151158.24916-8-vapier@gentoo.org> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20221101151158.24916-1-vapier@gentoo.org> References: <20221101151158.24916-1-vapier@gentoo.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-1.0 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,UNWANTED_LANGUAGE_BODY 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/microblaze/interp.c | 7 ++++--- sim/microblaze/microblaze.h | 2 +- sim/microblaze/sim-main.h | 7 +++---- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/sim/microblaze/interp.c b/sim/microblaze/interp.c index 1435eccf6e26..5f31bd7c2306 100644 --- a/sim/microblaze/interp.c +++ b/sim/microblaze/interp.c @@ -382,13 +382,13 @@ sim_info (SIM_DESC sd, int verbose) static sim_cia microblaze_pc_get (sim_cpu *cpu) { - return cpu->microblaze_cpu.spregs[0]; + return MICROBLAZE_SIM_CPU (cpu)->spregs[0]; } static void microblaze_pc_set (sim_cpu *cpu, sim_cia pc) { - cpu->microblaze_cpu.spregs[0] = pc; + MICROBLAZE_SIM_CPU (cpu)->spregs[0] = pc; } static void @@ -409,7 +409,8 @@ sim_open (SIM_OPEN_KIND kind, host_callback *cb, SIM_ASSERT (STATE_MAGIC (sd) == SIM_MAGIC_NUMBER); /* 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 microblaze_regset)) + != SIM_RC_OK) { free_state (sd); return 0; diff --git a/sim/microblaze/microblaze.h b/sim/microblaze/microblaze.h index e871b91af097..6b1d25bede95 100644 --- a/sim/microblaze/microblaze.h +++ b/sim/microblaze/microblaze.h @@ -24,7 +24,7 @@ #define GET_RA ((inst & RA_MASK) >> RA_LOW) #define GET_RB ((inst & RB_MASK) >> RB_LOW) -#define CPU cpu->microblaze_cpu +#define CPU (*MICROBLAZE_SIM_CPU (cpu)) #define RD CPU.regs[rd] #define RA CPU.regs[ra] diff --git a/sim/microblaze/sim-main.h b/sim/microblaze/sim-main.h index 650ba20e85bb..df85a6f1e232 100644 --- a/sim/microblaze/sim-main.h +++ b/sim/microblaze/sim-main.h @@ -18,6 +18,8 @@ #ifndef MICROBLAZE_SIM_MAIN #define MICROBLAZE_SIM_MAIN +#define SIM_HAVE_COMMON_SIM_CPU + #include "microblaze.h" #include "sim-basics.h" #include "sim-base.h" @@ -43,9 +45,6 @@ signed_2 imm_high; }; -struct _sim_cpu { - struct microblaze_regset microblaze_cpu; - sim_cpu_base base; -}; +#define MICROBLAZE_SIM_CPU(cpu) ((struct microblaze_regset *) CPU_ARCH_DATA (cpu)) #endif /* MICROBLAZE_SIM_MAIN */ -- 2.37.3