From patchwork Fri Dec 23 06:06:56 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mike Frysinger X-Patchwork-Id: 62329 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 8007D3845867 for ; Fri, 23 Dec 2022 06:08:21 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 8007D3845867 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1671775701; bh=YVHJWNkKNWsP6R93PDBFL7q8duRSnyXc7jXLUqftZBE=; 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=H3gfwBKI7iFjP3UMONhwZn7H7NsrYl2ggH/7U2NvYeNE6xmtnNHC00k4zu2D3xitS w/MDtWUd2ZLzVWNtuhrIF7vItblP+MflmCskqkMHP3RrSP3v2TaKYPX6tr78VbX593 wBJXA4OlBtFTe9SvfI/tk2OlyUHDR8zvTmFiE1dw= 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 273463854178 for ; Fri, 23 Dec 2022 06:07:24 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 273463854178 Received: by smtp.gentoo.org (Postfix, from userid 559) id B19083411D4; Fri, 23 Dec 2022 06:07:23 +0000 (UTC) To: gdb-patches@sourceware.org Subject: [PATCH 03/20] sim: arm: move arch-specific settings to internal header Date: Fri, 23 Dec 2022 01:06:56 -0500 Message-Id: <20221223060713.28821-4-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 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" 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 a new header which only this port will include. The BIT override would be better in the place where it's redefined, so move it to armdefs.h instead. --- sim/arm/arm-sim.h | 26 ++++++++++++++++++++++++++ sim/arm/armdefs.h | 6 ++++++ sim/arm/armemu.h | 2 ++ sim/arm/sim-main.h | 5 ----- sim/arm/wrapper.c | 1 + 5 files changed, 35 insertions(+), 5 deletions(-) create mode 100644 sim/arm/arm-sim.h diff --git a/sim/arm/arm-sim.h b/sim/arm/arm-sim.h new file mode 100644 index 000000000000..65a1c676e8e9 --- /dev/null +++ b/sim/arm/arm-sim.h @@ -0,0 +1,26 @@ +/* Simulation code for the ARM processor. + Copyright (C) 2009-2022 Free Software Foundation, Inc. + + This file is part of the GNU simulators. + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . */ + +#ifndef ARM_SIM_H +#define ARM_SIM_H + +#include "armdefs.h" + +extern struct ARMul_State *state; + +#endif diff --git a/sim/arm/armdefs.h b/sim/arm/armdefs.h index 7df5d022942b..d87220bf29b6 100644 --- a/sim/arm/armdefs.h +++ b/sim/arm/armdefs.h @@ -14,6 +14,9 @@ You should have received a copy of the GNU General Public License along with this program; if not, see . */ +#ifndef ARMDEFS_H +#define ARMDEFS_H + #include #include #include @@ -183,6 +186,7 @@ struct ARMul_State * Macros to extract instruction fields * \***************************************************************************/ +#undef BIT /* common/sim-bits.h conflict :( */ #define BIT(n) ( (ARMword)(instr>>(n))&1) /* bit n of instruction */ #define BITS(m,n) ( (ARMword)(instr<<(31-(n))) >> ((31-(n))+(m)) ) /* bits m to n of instr */ #define TOPBITS(n) (instr >> (n)) /* bits 31 to n of instr */ @@ -418,3 +422,5 @@ extern void ARMul_FixSPSR (ARMul_State *, ARMword, ARMword); extern void ARMul_ConsolePrint (ARMul_State *, const char *, ...) ATTRIBUTE_PRINTF (2, 3); extern void ARMul_SelectProcessor (ARMul_State *, unsigned); + +#endif diff --git a/sim/arm/armemu.h b/sim/arm/armemu.h index 7f25b94d51cb..318f1b76d203 100644 --- a/sim/arm/armemu.h +++ b/sim/arm/armemu.h @@ -14,6 +14,8 @@ You should have received a copy of the GNU General Public License along with this program; if not, see . */ +#include "armdefs.h" + extern ARMword isize; extern int trace; extern int disas; diff --git a/sim/arm/sim-main.h b/sim/arm/sim-main.h index 5ca01eb91c5f..a08729b74608 100644 --- a/sim/arm/sim-main.h +++ b/sim/arm/sim-main.h @@ -22,9 +22,4 @@ #include "sim-basics.h" #include "sim-base.h" -#undef BIT -#include "armdefs.h" - -extern struct ARMul_State *state; - #endif diff --git a/sim/arm/wrapper.c b/sim/arm/wrapper.c index 7b1153298f1d..5eb61df14378 100644 --- a/sim/arm/wrapper.c +++ b/sim/arm/wrapper.c @@ -41,6 +41,7 @@ #include "libiberty.h" #include "iwmmxt.h" #include "maverick.h" +#include "arm-sim.h" /* TODO: This should get pulled from the SIM_DESC. */ host_callback *sim_callback;