public inbox for gdb-cvs@sourceware.org help / color / mirror / Atom feed
From: Mark Wielaard <mark@sourceware.org> To: gdb-cvs@sourceware.org Subject: [binutils-gdb] sim: mn10300: minimize mn10300-sim.h include in sim-main.h Date: Thu, 19 Jan 2023 00:06:53 +0000 (GMT) [thread overview] Message-ID: <20230119000653.D173A3858D35@sourceware.org> (raw) https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=c064fab247691180b7bc317d44a9bcbf53a11ee7 commit c064fab247691180b7bc317d44a9bcbf53a11ee7 Author: Mark Wielaard <mark@klomp.org> Date: Sun Jan 15 20:24:06 2023 +0100 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. Diff: --- sim/mn10300/dv-mn103cpu.c | 4 ++++ sim/mn10300/interp.c | 3 +++ sim/mn10300/op_utils.c | 2 ++ sim/mn10300/sim-main.h | 8 ++++++++ 4 files changed, 17 insertions(+) diff --git a/sim/mn10300/dv-mn103cpu.c b/sim/mn10300/dv-mn103cpu.c index ad8669d3efa..55bbe253a63 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 07c3b8c900f..91b742c7276 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 7e035f43259..5425537dc1d 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 2187e794adb..d08b13dc531 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;
reply other threads:[~2023-01-19 0:06 UTC|newest] Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20230119000653.D173A3858D35@sourceware.org \ --to=mark@sourceware.org \ --cc=gdb-cvs@sourceware.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).