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.
This commit is contained in:
Mike Frysinger
2022-12-22 22:12:20 -05:00
parent 8af23b30ed
commit 42b68db170
3 changed files with 42 additions and 18 deletions

41
sim/avr/avr-sim.h Normal file
View File

@ -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 <http://www.gnu.org/licenses/>. */
#ifndef AVR_SIM_H
#define AVR_SIM_H
#include <stdint.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

View File

@ -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;

View File

@ -20,24 +20,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */
#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