aboutsummaryrefslogtreecommitdiff
path: root/sim
diff options
context:
space:
mode:
authorMark Wielaard <mark@klomp.org>2023-01-15 20:24:06 +0100
committerMark Wielaard <mark@klomp.org>2023-01-19 01:05:00 +0100
commitc064fab247691180b7bc317d44a9bcbf53a11ee7 (patch)
tree5ea95bd01b55bb124443a4ee3cfe0e12758e5bdb /sim
parenta184bce8040a9b71e36193905b830ed259a4d478 (diff)
downloadgdb-c064fab247691180b7bc317d44a9bcbf53a11ee7.zip
gdb-c064fab247691180b7bc317d44a9bcbf53a11ee7.tar.gz
gdb-c064fab247691180b7bc317d44a9bcbf53a11ee7.tar.bz2
sim: mn10300: minimize mn10300-sim.h include in sim-main.h
sim-main.h is special since it is one of the files automatically included in igen generated files. But this means anything including sim-main.h might get everything included just for the igen files. To prevent clashing symbols/defines only include sim-fpu.h, sim-signal.h, mn10300-sim.h from sim-main.h if it is included from one of the generated igen C files. Add explicit includes of mn10300-sim.h, sim-fpu.h and/or sim-signal.h to dv-mn103cpu.c, interp.c and op_utils.c.
Diffstat (limited to 'sim')
-rw-r--r--sim/mn10300/dv-mn103cpu.c4
-rw-r--r--sim/mn10300/interp.c3
-rw-r--r--sim/mn10300/op_utils.c2
-rw-r--r--sim/mn10300/sim-main.h8
4 files changed, 17 insertions, 0 deletions
diff --git a/sim/mn10300/dv-mn103cpu.c b/sim/mn10300/dv-mn103cpu.c
index ad8669d..55bbe25 100644
--- a/sim/mn10300/dv-mn103cpu.c
+++ b/sim/mn10300/dv-mn103cpu.c
@@ -22,8 +22,12 @@
#include "defs.h"
#include "sim-main.h"
+#include "sim-fpu.h"
+#include "sim-signal.h"
#include "hw-main.h"
+#include "mn10300-sim.h"
+
/* DEVICE
diff --git a/sim/mn10300/interp.c b/sim/mn10300/interp.c
index 07c3b8c..91b742c 100644
--- a/sim/mn10300/interp.c
+++ b/sim/mn10300/interp.c
@@ -7,8 +7,11 @@
#include "bfd.h"
#include "sim-assert.h"
+#include "sim-fpu.h"
#include "sim-signal.h"
+#include "mn10300-sim.h"
+
#include <stdlib.h>
#include <string.h>
diff --git a/sim/mn10300/op_utils.c b/sim/mn10300/op_utils.c
index 7e035f4..5425537 100644
--- a/sim/mn10300/op_utils.c
+++ b/sim/mn10300/op_utils.c
@@ -11,9 +11,11 @@
#include "sim/callback.h"
#include "sim-main.h"
+#include "sim-fpu.h"
#include "sim-signal.h"
#include "sim-syscall.h"
+#include "mn10300-sim.h"
#define REG0(X) ((X) & 0x3)
#define REG1(X) (((X) & 0xc) >> 2)
diff --git a/sim/mn10300/sim-main.h b/sim/mn10300/sim-main.h
index 2187e79..d08b13d 100644
--- a/sim/mn10300/sim-main.h
+++ b/sim/mn10300/sim-main.h
@@ -34,11 +34,19 @@ mn10300_core_signal ((SD), (CPU), (CIA), (MAP), (NR_BYTES), (ADDR), (TRANSFER),
/**
* TODO: Move these includes to the igen files that need them.
* This requires extending the igen syntax to support header includes.
+ *
+ * For now only include them in the igen generated support.c,
+ * semantics.c, idecode.c and engine.c files.
*/
+#if defined(SUPPORT_C) \
+ || defined(SEMANTICS_C) \
+ || defined(IDECODE_C) \
+ || defined(ENGINE_C)
#include "sim-fpu.h"
#include "sim-signal.h"
#include "mn10300-sim.h"
+#endif
extern SIM_CORE_SIGNAL_FN mn10300_core_signal;