sim: cgen: move cgen-types.h include to cgen-defs.h

The cgen-types.h header sets up types that are needed by cgen-defs.h,
so move the include out of sim-main.h and to that header.  It might
be needed in other specific modules, but for now let's kick it out of
sim-main.h to make some progress.  Things still build with just this.

8 files changed, 2 insertions, 7 deletions

diff --git a/sim/bpf/sim-main.h b/sim/bpf/sim-main.h
index 0de4d41..6529b6e 100644
--- a/sim/bpf/sim-main.h
+++ b/sim/bpf/sim-main.h
@@ -20,7 +20,6 @@
 #define SIM_MAIN_H
 
 #include "sim-basics.h"
-#include "cgen-types.h"
 #include "bpf-desc.h"
 #include "bpf-opc.h"
 #include "arch.h"
diff --git a/sim/common/cgen-defs.h b/sim/common/cgen-defs.h
index b9e0c06..7bf1334 100644
--- a/sim/common/cgen-defs.h
+++ b/sim/common/cgen-defs.h
@@ -20,6 +20,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 #ifndef CGEN_DEFS_H
 #define CGEN_DEFS_H
 
+#include "cgen-types.h"
+
 /* Compute number of longs required to hold N bits.  */
 #define HOST_LONGS_FOR_BITS(n) \
   (((n) + sizeof (long) * 8 - 1) / sizeof (long) * 8)
diff --git a/sim/cris/sim-main.h b/sim/cris/sim-main.h
index e946489..e680c37 100644
--- a/sim/cris/sim-main.h
+++ b/sim/cris/sim-main.h
@@ -31,7 +31,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "symcat.h"
 #include "sim-basics.h"
-#include "cgen-types.h"
 #include "cris-desc.h"
 #include "cris-opc.h"
 #include "arch.h"
diff --git a/sim/frv/sim-main.h b/sim/frv/sim-main.h
index 2ad7571..44ef931 100644
--- a/sim/frv/sim-main.h
+++ b/sim/frv/sim-main.h
@@ -29,7 +29,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "symcat.h"
 #include "sim-basics.h"
-#include "cgen-types.h"
 #include "frv-desc.h"
 #include <stdbool.h>
 #include "frv-opc.h"
diff --git a/sim/iq2000/sim-main.h b/sim/iq2000/sim-main.h
index ccc3fc8..d920c34 100644
--- a/sim/iq2000/sim-main.h
+++ b/sim/iq2000/sim-main.h
@@ -11,7 +11,6 @@
 
 #include "symcat.h"
 #include "sim-basics.h"
-#include "cgen-types.h"
 #include "iq2000-desc.h"
 #include "iq2000-opc.h"
 #include "arch.h"
diff --git a/sim/lm32/sim-main.h b/sim/lm32/sim-main.h
index 6ae757f08..829b39d 100644
--- a/sim/lm32/sim-main.h
+++ b/sim/lm32/sim-main.h
@@ -27,7 +27,6 @@
 
 #include "symcat.h"
 #include "sim-basics.h"
-#include "cgen-types.h"
 #include "lm32-desc.h"
 #include "lm32-opc.h"
 #include "arch.h"
diff --git a/sim/m32r/sim-main.h b/sim/m32r/sim-main.h
index 6d69ecf..81a6c68 100644
--- a/sim/m32r/sim-main.h
+++ b/sim/m32r/sim-main.h
@@ -10,7 +10,6 @@
 
 #include "symcat.h"
 #include "sim-basics.h"
-#include "cgen-types.h"
 #include "m32r-desc.h"
 #include "m32r-opc.h"
 #include "arch.h"
diff --git a/sim/or1k/sim-main.h b/sim/or1k/sim-main.h
index 1b6939d..24c8ddb 100644
--- a/sim/or1k/sim-main.h
+++ b/sim/or1k/sim-main.h
@@ -25,7 +25,6 @@
 #include "or1k-desc.h"
 #include "or1k-opc.h"
 #include "sim-basics.h"
-#include "cgen-types.h"
 #include "arch.h"
 #include "sim-base.h"
 #include "sim-fpu.h"