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.

diff --git a/sim/common/cgen-mem.h b/sim/common/cgen-mem.h
index 15ba8724b3b0bad46c4f3f6e9551038e6723a698..b266107b4c7a5bc53522bd1b14481304fa9ee50b 100644 (file)
--- 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 4e118a4d325e4fdda9eef2882f2db88c2c1f87cb..e21e6178006dd21ba7922b20a9b527dc10f1fa05 100644 (file)
--- 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 df4e3e17a7bcff05070d97759d58f3e119727037..256c552842c427214b89a9032ef4c5b69e3af6a5 100644 (file)
--- 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 b4dad0d957a5de4cd0f268a3e4eb8f072dcd81eb..22ef343bce66be6f0b96c4e7ca780ca4a5b281e8 100644 (file)
--- 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 e680c37230d863297fe4783f4e1874ec8e0f8b5c..63486fc87d73b953bb83913ae1c0e03003faaee1 100644 (file)
--- 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 44ef931270dad2818ae0ed40f5186742b540f4e1..0d092e95579f0b86915d6313347405e0e9d35f7b 100644 (file)
--- 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 d920c34f98c7521e9da2e52e183bf35dad6075fc..2398e30b9a104ff21879de77e3a133b58e9a1054 100644 (file)
--- 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 829b39dd36f3f1d04e7b0c023cecedeed438b47c..0e13aeb6758b58bde88e1bdc1361c0020a197b0e 100644 (file)
--- 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 0c5103b0784d43e329518558b7dcd6f02bdba131..fc41c2146f75180f7be1a13064ce62a2f949e54f 100644 (file)
--- 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 81a6c68c01f71ddce17fd0af5578ca47266e9b23..a5a745d15bcfec3d66c626996ede3630c0363238 100644 (file)
--- 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"