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 DD6FA385B51C for ; Fri, 23 Dec 2022 06:07:19 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org DD6FA385B51C 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 641D43411D8; Fri, 23 Dec 2022 06:07:19 +0000 (UTC) From: Mike Frysinger To: gdb-patches@sourceware.org Subject: [PATCH 01/20] sim: avr: move arch-specific settings to internal header Date: Fri, 23 Dec 2022 01:06:54 -0500 Message-Id: <20221223060713.28821-2-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 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,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 List-Id: 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. --- sim/avr/avr-sim.h | 41 +++++++++++++++++++++++++++++++++++++++++ sim/avr/interp.c | 1 + sim/avr/sim-main.h | 18 ------------------ 3 files changed, 42 insertions(+), 18 deletions(-) create mode 100644 sim/avr/avr-sim.h diff --git a/sim/avr/avr-sim.h b/sim/avr/avr-sim.h new file mode 100644 index 000000000000..479ef04fb42f --- /dev/null +++ b/sim/avr/avr-sim.h @@ -0,0 +1,41 @@ +/* AVR Simulator definition. + 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 AVR_SIM_H +#define AVR_SIM_H + +#include + +struct avr_sim_cpu { + /* The only real register. */ + uint32_t pc; + + /* We update a cycle counter. */ + uint32_t cycles; +}; + +#define AVR_SIM_CPU(cpu) ((struct avr_sim_cpu *) CPU_ARCH_DATA (cpu)) + +struct avr_sim_state { + /* If true, the pc needs more than 2 bytes. */ + int avr_pc22; +}; + +#define AVR_SIM_STATE(sd) ((struct avr_sim_state *) STATE_ARCH_DATA (sd)) + +#endif diff --git a/sim/avr/interp.c b/sim/avr/interp.c index b72da5363080..ddd9e1ff1eae 100644 --- a/sim/avr/interp.c +++ b/sim/avr/interp.c @@ -30,6 +30,7 @@ #include "sim-base.h" #include "sim-options.h" #include "sim-signal.h" +#include "avr-sim.h" /* As AVR is a 8/16 bits processor, define handy types. */ typedef unsigned short int word; diff --git a/sim/avr/sim-main.h b/sim/avr/sim-main.h index 97129ec91836..0c005370c091 100644 --- a/sim/avr/sim-main.h +++ b/sim/avr/sim-main.h @@ -20,24 +20,6 @@ along with this program. If not, see . */ #define SIM_MAIN_H #include "sim-basics.h" - #include "sim-base.h" -struct avr_sim_cpu { - /* The only real register. */ - uint32_t pc; - - /* We update a cycle counter. */ - uint32_t cycles; -}; - -#define AVR_SIM_CPU(cpu) ((struct avr_sim_cpu *) CPU_ARCH_DATA (cpu)) - -struct avr_sim_state { - /* If true, the pc needs more than 2 bytes. */ - int avr_pc22; -}; - -#define AVR_SIM_STATE(sd) ((struct avr_sim_state *) STATE_ARCH_DATA (sd)) - #endif -- 2.39.0