From patchwork Sat Nov 5 13:32:37 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mike Frysinger X-Patchwork-Id: 59999 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 7C979385829C for ; Sat, 5 Nov 2022 13:33:55 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 7C979385829C DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1667655235; bh=3RvdP8cYHe9GmNft8N9m8Qfl8LmGbUKdSn3s48LZrzg=; h=To:Subject:Date:In-Reply-To:References:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To: From; b=m1t7FXe6bFQ2B67y7/KT+99YZzrPyeCKq3yxf5pDKaqtNE34ynz6/ab5Y2BP3Hd95 1h35ZXTCBJsRfTubbrHZLwYU/mrXcT0tQvSU6duXQz5ttytMgRaIuBCRFmzcKTX+1L qwwpGJmZ6iiqJL6ydPlRsMwt72hz/pMjDHbO/q2c= X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) by sourceware.org (Postfix) with ESMTP id 55F653858CDB for ; Sat, 5 Nov 2022 13:33:15 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 55F653858CDB Received: by smtp.gentoo.org (Postfix, from userid 559) id E4F073412CC; Sat, 5 Nov 2022 13:33:14 +0000 (UTC) To: gdb-patches@sourceware.org Subject: [PATCH 05/26] sim: moxie: invert sim_cpu storage Date: Sat, 5 Nov 2022 20:32:37 +0700 Message-Id: <20221105133258.23409-6-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 X-Spam-Status: No, score=-11.1 required=5.0 tests=BAYES_00, GIT_PATCH_0, JMQ_SPF_NEUTRAL, KAM_DMARC_STATUS, KAM_SHORT, 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 X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Mike Frysinger via Gdb-patches From: Mike Frysinger Reply-To: Mike Frysinger Errors-To: gdb-patches-bounces+patchwork=sourceware.org@sourceware.org Sender: "Gdb-patches" --- sim/moxie/interp.c | 9 +++++---- sim/moxie/sim-main.h | 18 ++++++++---------- 2 files changed, 13 insertions(+), 14 deletions(-) diff --git a/sim/moxie/interp.c b/sim/moxie/interp.c index fec79aa28621..ea0a559a0572 100644 --- a/sim/moxie/interp.c +++ b/sim/moxie/interp.c @@ -127,7 +127,7 @@ struct moxie_regset #define CC_GTU 1<<3 #define CC_LTU 1<<4 -/* TODO: This should be moved to sim-main.h:_sim_cpu. */ +/* TODO: This should be moved to sim-main.h:moxie_sim_cpu. */ union { struct moxie_regset asregs; @@ -1173,13 +1173,13 @@ moxie_reg_fetch (SIM_CPU *scpu, int rn, void *memory, int length) static sim_cia moxie_pc_get (sim_cpu *cpu) { - return cpu->registers[PCIDX]; + return MOXIE_SIM_CPU (cpu)->registers[PCIDX]; } static void moxie_pc_set (sim_cpu *cpu, sim_cia pc) { - cpu->registers[PCIDX] = pc; + MOXIE_SIM_CPU (cpu)->registers[PCIDX] = pc; } static void @@ -1203,7 +1203,8 @@ sim_open (SIM_OPEN_KIND kind, host_callback *cb, 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 moxie_sim_cpu)) + != SIM_RC_OK) { free_state (sd); return 0; diff --git a/sim/moxie/sim-main.h b/sim/moxie/sim-main.h index 9e4b1d4f8bcd..7db12e01498b 100644 --- a/sim/moxie/sim-main.h +++ b/sim/moxie/sim-main.h @@ -20,23 +20,21 @@ along with this program. If not, see . */ #ifndef SIM_MAIN_H #define SIM_MAIN_H +#define SIM_HAVE_COMMON_SIM_CPU + #include "sim-basics.h" #include "sim-base.h" #include "bfd.h" #define PCIDX 17 -struct _sim_cpu { - - /* The following are internal simulator state variables: */ - -/* To keep this default simulator simple, and fast, we use a direct - vector of registers. The internal simulator engine then uses - manifests to access the correct slot. */ - +struct moxie_sim_cpu { + /* To keep this default simulator simple, and fast, we use a direct + vector of registers. The internal simulator engine then uses + manifests to access the correct slot. */ unsigned_word registers[19]; - - sim_cpu_base base; }; +#define MOXIE_SIM_CPU(cpu) ((struct moxie_sim_cpu *) CPU_ARCH_DATA (cpu)) + #endif