sim: cgen: move symcat.h include to where it's used
Commit Message
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.
---
sim/common/cgen-mem.h | 2 ++
sim/common/sim-close.c | 2 ++
sim/common/sim-core.h | 1 +
sim/common/sim-types.h | 2 ++
sim/cris/sim-main.h | 1 -
sim/frv/sim-main.h | 1 -
sim/iq2000/sim-main.h | 1 -
sim/lm32/sim-main.h | 1 -
sim/m32r/m32r-sim.h | 2 ++
sim/m32r/sim-main.h | 1 -
10 files changed, 9 insertions(+), 5 deletions(-)
@@ -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
@@ -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"
@@ -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
@@ -29,6 +29,8 @@
#include <stdint.h>
+#include "symcat.h"
+
/* INTEGER QUANTITIES:
TYPES:
@@ -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"
@@ -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>
@@ -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"
@@ -25,7 +25,6 @@
#define WITH_SCACHE_PBB 1
-#include "symcat.h"
#include "sim-basics.h"
#include "lm32-desc.h"
#include "lm32-opc.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
@@ -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"