aboutsummaryrefslogtreecommitdiff
path: root/sim
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2022-12-23 00:32:29 -0500
committerMike Frysinger <vapier@gentoo.org>2022-12-23 00:52:04 -0500
commit3eaecff5137752dbe01b82efba36aad1d190fe7b (patch)
tree121b8714b7b7b2ca06c0b6c4c9f3a2b9dfe072a1 /sim
parentd9e217e950b01fac7948d2d326e866a9f2d1dcb8 (diff)
downloadgdb-3eaecff5137752dbe01b82efba36aad1d190fe7b.zip
gdb-3eaecff5137752dbe01b82efba36aad1d190fe7b.tar.gz
gdb-3eaecff5137752dbe01b82efba36aad1d190fe7b.tar.bz2
sim: cgen: move symcat.h include to where it's used
Move this out of the global sim-main.h and to the few files that actually use functions from it. Only the cgen ports were pulling this, so this makes cgen & non-cgen behave more the same.
Diffstat (limited to 'sim')
-rw-r--r--sim/common/cgen-mem.h2
-rw-r--r--sim/common/sim-close.c2
-rw-r--r--sim/common/sim-core.h1
-rw-r--r--sim/common/sim-types.h2
-rw-r--r--sim/cris/sim-main.h1
-rw-r--r--sim/frv/sim-main.h1
-rw-r--r--sim/iq2000/sim-main.h1
-rw-r--r--sim/lm32/sim-main.h1
-rw-r--r--sim/m32r/m32r-sim.h2
-rw-r--r--sim/m32r/sim-main.h1
10 files changed, 9 insertions, 5 deletions
diff --git a/sim/common/cgen-mem.h b/sim/common/cgen-mem.h
index 15ba872..b266107 100644
--- a/sim/common/cgen-mem.h
+++ b/sim/common/cgen-mem.h
@@ -20,6 +20,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */
#ifndef CGEN_MEM_H
#define CGEN_MEM_H
+#include "symcat.h"
+
/* TODO: This should get moved into sim-inline.h. */
#ifdef MEMOPS_DEFINE_INLINE
#define MEMOPS_INLINE
diff --git a/sim/common/sim-close.c b/sim/common/sim-close.c
index 4e118a4..e21e617 100644
--- a/sim/common/sim-close.c
+++ b/sim/common/sim-close.c
@@ -21,6 +21,8 @@
/* This must come before any other includes. */
#include "defs.h"
+#include "symcat.h"
+
#include "sim-main.h"
#include "sim-module.h"
#include "sim/sim.h"
diff --git a/sim/common/sim-core.h b/sim/common/sim-core.h
index df4e3e1..256c552 100644
--- a/sim/common/sim-core.h
+++ b/sim/common/sim-core.h
@@ -23,6 +23,7 @@
#ifndef SIM_CORE_H
#define SIM_CORE_H
+#include "symcat.h"
/* core signals (error conditions)
Define SIM_CORE_SIGNAL to catch these signals - see sim-core.c for
diff --git a/sim/common/sim-types.h b/sim/common/sim-types.h
index b4dad0d..22ef343 100644
--- a/sim/common/sim-types.h
+++ b/sim/common/sim-types.h
@@ -29,6 +29,8 @@
#include <stdint.h>
+#include "symcat.h"
+
/* INTEGER QUANTITIES:
TYPES:
diff --git a/sim/cris/sim-main.h b/sim/cris/sim-main.h
index e680c37..63486fc 100644
--- a/sim/cris/sim-main.h
+++ b/sim/cris/sim-main.h
@@ -29,7 +29,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */
one of -scache/-pbb. */
#define WITH_SCACHE_PBB 1
-#include "symcat.h"
#include "sim-basics.h"
#include "cris-desc.h"
#include "cris-opc.h"
diff --git a/sim/frv/sim-main.h b/sim/frv/sim-main.h
index 44ef931..0d092e9 100644
--- a/sim/frv/sim-main.h
+++ b/sim/frv/sim-main.h
@@ -27,7 +27,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */
one of -scache/-pbb. ???? */
#define WITH_SCACHE_PBB 0
-#include "symcat.h"
#include "sim-basics.h"
#include "frv-desc.h"
#include <stdbool.h>
diff --git a/sim/iq2000/sim-main.h b/sim/iq2000/sim-main.h
index d920c34..2398e30 100644
--- a/sim/iq2000/sim-main.h
+++ b/sim/iq2000/sim-main.h
@@ -9,7 +9,6 @@
one of -scache/-pbb. ???? */
#define WITH_SCACHE_PBB 1
-#include "symcat.h"
#include "sim-basics.h"
#include "iq2000-desc.h"
#include "iq2000-opc.h"
diff --git a/sim/lm32/sim-main.h b/sim/lm32/sim-main.h
index 829b39d..0e13aeb 100644
--- a/sim/lm32/sim-main.h
+++ b/sim/lm32/sim-main.h
@@ -25,7 +25,6 @@
#define WITH_SCACHE_PBB 1
-#include "symcat.h"
#include "sim-basics.h"
#include "lm32-desc.h"
#include "lm32-opc.h"
diff --git a/sim/m32r/m32r-sim.h b/sim/m32r/m32r-sim.h
index 0c5103b..fc41c21 100644
--- a/sim/m32r/m32r-sim.h
+++ b/sim/m32r/m32r-sim.h
@@ -20,6 +20,8 @@
#ifndef M32R_SIM_H
#define M32R_SIM_H
+#include "symcat.h"
+
/* GDB register numbers. */
#define PSW_REGNUM 16
#define CBR_REGNUM 17
diff --git a/sim/m32r/sim-main.h b/sim/m32r/sim-main.h
index 81a6c68..a5a745d 100644
--- a/sim/m32r/sim-main.h
+++ b/sim/m32r/sim-main.h
@@ -8,7 +8,6 @@
one of -scache/-pbb. */
#define WITH_SCACHE_PBB 1
-#include "symcat.h"
#include "sim-basics.h"
#include "m32r-desc.h"
#include "m32r-opc.h"