sim: aarch64: 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.

While we're here, drop redundant includes from sim-main.h:
* sim-types.h is included by sim-base.h already
* sim-base.h is included twice
* sim-io.h is included by sim-base.h already

6 files changed, 66 insertions, 35 deletions

diff --git a/sim/aarch64/aarch64-sim.h b/sim/aarch64/aarch64-sim.h
new file mode 100644
index 00000000000..fe3820ffe09
--- /dev/null
+++ b/sim/aarch64/aarch64-sim.h
@@ -0,0 +1,60 @@
+/* aarch64-sim.h -- Internal aarch64 settings.
+
+   Copyright (C) 2015-2022 Free Software Foundation, Inc.
+
+   Contributed by Red Hat.
+
+   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 AARCH64_SIM_H
+#define AARCH64_SIM_H
+
+#include <stdint.h>
+
+#include "cpustate.h"
+
+/* A per-core state structure.  */
+struct aarch64_sim_cpu
+{
+  GRegister    gr[33];	/* Extra register at index 32 is used to hold zero value.  */
+  FRegister    fr[32];
+
+  uint64_t     pc;
+  uint32_t     CPSR;
+  uint32_t     FPSR; /* Floating point Status register.  */
+  uint32_t     FPCR; /* Floating point Control register.  */
+
+  uint64_t     nextpc;
+  uint32_t     instr;
+
+  uint64_t     tpidr;  /* Thread pointer id.  */
+};
+
+#define AARCH64_SIM_CPU(cpu) ((struct aarch64_sim_cpu *) CPU_ARCH_DATA (cpu))
+
+typedef enum
+{
+  AARCH64_MIN_GR     = 0,
+  AARCH64_MAX_GR     = 31,
+  AARCH64_MIN_FR     = 32,
+  AARCH64_MAX_FR     = 63,
+  AARCH64_PC_REGNO   = 64,
+  AARCH64_CPSR_REGNO = 65,
+  AARCH64_FPSR_REGNO = 66,
+  AARCH64_MAX_REGNO  = 67
+} aarch64_regno;
+
+#endif /* AARCH64_SIM_H */
diff --git a/sim/aarch64/cpustate.c b/sim/aarch64/cpustate.c
index 24be34c49d9..05f0d26f90a 100644
--- a/sim/aarch64/cpustate.c
+++ b/sim/aarch64/cpustate.c
@@ -31,6 +31,8 @@
 #include "simulator.h"
 #include "libiberty.h"
 
+#include "aarch64-sim.h"
+
 /* Some operands are allowed to access the stack pointer (reg 31).
    For others a read from r31 always returns 0, and a write to r31 is ignored.  */
 #define reg_num(reg) (((reg) == R31 && !r31_is_sp) ? 32 : (reg))
diff --git a/sim/aarch64/cpustate.h b/sim/aarch64/cpustate.h
index 95c9d561fdb..fe2a5819456 100644
--- a/sim/aarch64/cpustate.h
+++ b/sim/aarch64/cpustate.h
@@ -27,6 +27,7 @@
 #include <inttypes.h>
 
 #include "sim/sim.h"
+#include "sim-main.h"
 
 /* Symbolic names used to identify general registers which also match
    the registers indices in machine code.
diff --git a/sim/aarch64/interp.c b/sim/aarch64/interp.c
index 99e84aa0adc..234d978a768 100644
--- a/sim/aarch64/interp.c
+++ b/sim/aarch64/interp.c
@@ -42,6 +42,8 @@
 #include "simulator.h"
 #include "sim-assert.h"
 
+#include "aarch64-sim.h"
+
 /* Filter out (in place) symbols that are useless for disassembly.
    COUNT is the number of elements in SYMBOLS.
    Return the number of useful symbols. */
diff --git a/sim/aarch64/sim-main.h b/sim/aarch64/sim-main.h
index 211685f8864..6b8da2df1f9 100644
--- a/sim/aarch64/sim-main.h
+++ b/sim/aarch64/sim-main.h
@@ -23,41 +23,6 @@
 #define _SIM_MAIN_H
 
 #include "sim-basics.h"
-#include "sim-types.h"
 #include "sim-base.h"
-#include "sim-base.h"
-#include "sim-io.h"
-#include "cpustate.h"
-
-/* A per-core state structure.  */
-struct aarch64_sim_cpu
-{
-  GRegister    gr[33];	/* Extra register at index 32 is used to hold zero value.  */
-  FRegister    fr[32];
-
-  uint64_t     pc;
-  uint32_t     CPSR;
-  uint32_t     FPSR; /* Floating point Status register.  */
-  uint32_t     FPCR; /* Floating point Control register.  */
-
-  uint64_t     nextpc;
-  uint32_t     instr;
-
-  uint64_t     tpidr;  /* Thread pointer id.  */
-};
-
-#define AARCH64_SIM_CPU(cpu) ((struct aarch64_sim_cpu *) CPU_ARCH_DATA (cpu))
-
-typedef enum
-{
-  AARCH64_MIN_GR     = 0,
-  AARCH64_MAX_GR     = 31,
-  AARCH64_MIN_FR     = 32,
-  AARCH64_MAX_FR     = 63,
-  AARCH64_PC_REGNO   = 64,
-  AARCH64_CPSR_REGNO = 65,
-  AARCH64_FPSR_REGNO = 66,
-  AARCH64_MAX_REGNO  = 67
-} aarch64_regno;
 
 #endif /* _SIM_MAIN_H */
diff --git a/sim/aarch64/simulator.c b/sim/aarch64/simulator.c
index 0a4fde1a9b2..6818e973116 100644
--- a/sim/aarch64/simulator.c
+++ b/sim/aarch64/simulator.c
@@ -30,6 +30,7 @@
 #include <time.h>
 #include <limits.h>
 
+#include "aarch64-sim.h"
 #include "simulator.h"
 #include "cpustate.h"
 #include "memory.h"