From 42b68db17036c197f249bbbe13a0335e3c6af20f Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Thu, 22 Dec 2022 22:12:20 -0500 Subject: [PATCH] sim: avr: move arch-specific settings to internal header 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 00000000000..479ef04fb42 --- /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 b72da536308..ddd9e1ff1ea 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 97129ec9183..0c005370c09 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.30.2