From patchwork Sat Nov 5 13:32:34 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mike Frysinger X-Patchwork-Id: 59998 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 52D883858025 for ; Sat, 5 Nov 2022 13:33:34 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 52D883858025 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1667655214; bh=qT8cn1Ju8C/XkIhorEoOClqjNWxtwTCVIGi5RQfzqeA=; 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=BtvAiQyXvZBV7m4YQApqoyiRolx+wTZLgkFvNNEB3yOrsfc43NkZmIDMF41JGW5b5 uI38RC2nrOGYKg3kuBtFadkE6eWPp4UHpmVKW2HKoy9Ndz+XCHgFEP/BW3KSdqOYXM La/T4b1WEMnvl7/BQgJCbLO7E4Hd52nNNeE7Jr2k= X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) by sourceware.org (Postfix) with ESMTP id ACBB23858427 for ; Sat, 5 Nov 2022 13:33:08 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org ACBB23858427 Received: by smtp.gentoo.org (Postfix, from userid 559) id 49EFA3412D2; Sat, 5 Nov 2022 13:33:08 +0000 (UTC) To: gdb-patches@sourceware.org Subject: [PATCH 02/26] sim: bfin: invert sim_cpu storage Date: Sat, 5 Nov 2022 20:32:34 +0700 Message-Id: <20221105133258.23409-3-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=-1.1 required=5.0 tests=BAYES_00, GIT_PATCH_0, JMQ_SPF_NEUTRAL, KAM_DMARC_STATUS, 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 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/bfin/interp.c | 5 ++--- sim/bfin/sim-main.h | 10 +++------- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/sim/bfin/interp.c b/sim/bfin/interp.c index f63690cfac41..f4071ce47398 100644 --- a/sim/bfin/interp.c +++ b/sim/bfin/interp.c @@ -643,8 +643,6 @@ free_state (SIM_DESC sd) static void bfin_initialize_cpu (SIM_DESC sd, SIM_CPU *cpu) { - memset (&cpu->state, 0, sizeof (cpu->state)); - PROFILE_TOTAL_INSN_COUNT (CPU_PROFILE_DATA (cpu)) = 0; bfin_model_cpu_init (sd, cpu); @@ -674,7 +672,8 @@ sim_open (SIM_OPEN_KIND kind, host_callback *callback, current_target_byte_order = BFD_ENDIAN_LITTLE; /* 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 bfin_cpu_state)) + != SIM_RC_OK) { free_state (sd); return 0; diff --git a/sim/bfin/sim-main.h b/sim/bfin/sim-main.h index 42dfd5408ee9..48e54c8c8e13 100644 --- a/sim/bfin/sim-main.h +++ b/sim/bfin/sim-main.h @@ -21,6 +21,8 @@ #ifndef _BFIN_MAIN_SIM_H_ #define _BFIN_MAIN_SIM_H_ +#define SIM_HAVE_COMMON_SIM_CPU + #include "sim-basics.h" #include "arch.h" #include "sim-base.h" @@ -29,13 +31,7 @@ #include "machs.h" -struct _sim_cpu { - /* ... simulator specific members ... */ - struct bfin_cpu_state state; - sim_cpu_base base; -}; -#define BFIN_CPU_STATE ((cpu)->state) - +#define BFIN_CPU_STATE (*(struct bfin_cpu_state *) CPU_ARCH_DATA (cpu)) #define STATE_BOARD_DATA(sd) ((struct bfin_board_data *) STATE_ARCH_DATA (sd)) #include "sim-config.h"