From 1fef66b0dcc09c9114100e782ea54594550e8fb7 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Sun, 13 Jun 2021 23:16:32 -0400 Subject: [PATCH] sim: split sim-signal.h include out The sim-basics.h is too big and includes too many things. This leads to some arch's sim-main.h having circular loop issues with defs, and makes it hard to separate out common objects from arch-specific defs. By splitting up sim-basics.h and killing off sim-main.h, it'll make it easier to separate out the two. --- sim/aarch64/ChangeLog | 5 +++++ sim/aarch64/cpustate.c | 1 + sim/aarch64/memory.c | 1 + sim/aarch64/simulator.c | 2 ++ sim/avr/ChangeLog | 4 ++++ sim/avr/interp.c | 1 + sim/bfin/ChangeLog | 5 +++++ sim/bfin/dv-bfin_cec.c | 1 + sim/bfin/sim-main.h | 1 - sim/bpf/ChangeLog | 4 ++++ sim/bpf/bpf.c | 1 + sim/common/ChangeLog | 7 +++++++ sim/common/cgen-run.c | 1 + sim/common/cgen-utils.c | 1 + sim/common/nrun.c | 1 + sim/common/sim-basics.h | 1 - sim/common/sim-core.c | 1 + sim/common/sim-engine.c | 1 + sim/common/sim-reason.c | 1 + sim/common/sim-resume.c | 1 + sim/common/sim-signal.c | 1 + sim/common/sim-stop.c | 1 + sim/common/sim-watch.c | 1 + sim/cr16/ChangeLog | 5 +++++ sim/cr16/interp.c | 1 + sim/cr16/simops.c | 1 + sim/cris/ChangeLog | 4 ++++ sim/cris/traps.c | 1 + sim/d10v/ChangeLog | 5 +++++ sim/d10v/interp.c | 1 + sim/d10v/simops.c | 1 + sim/example-synacor/ChangeLog | 4 ++++ sim/example-synacor/sim-main.c | 1 + sim/frv/ChangeLog | 5 +++++ sim/frv/interrupts.c | 1 + sim/frv/traps.c | 1 + sim/ft32/ChangeLog | 4 ++++ sim/ft32/interp.c | 1 + sim/h8300/ChangeLog | 4 ++++ sim/h8300/compile.c | 1 + sim/iq2000/ChangeLog | 4 ++++ sim/iq2000/iq2000.c | 1 + sim/lm32/ChangeLog | 4 ++++ sim/lm32/traps.c | 1 + sim/m32r/ChangeLog | 5 +++++ sim/m32r/traps-linux.c | 1 + sim/m32r/traps.c | 1 + sim/m68hc11/ChangeLog | 6 ++++++ sim/m68hc11/dv-m68hc11eepr.c | 1 + sim/m68hc11/interrupts.c | 1 + sim/m68hc11/m68hc11_sim.c | 1 + sim/m68hc11/sim-main.h | 2 +- sim/mcore/ChangeLog | 4 ++++ sim/mcore/interp.c | 1 + sim/microblaze/ChangeLog | 4 ++++ sim/microblaze/interp.c | 1 + sim/mips/ChangeLog | 4 ++++ sim/mips/interp.c | 1 + sim/mn10300/ChangeLog | 6 ++++++ sim/mn10300/interp.c | 1 + sim/mn10300/mn10300_sim.h | 1 + sim/mn10300/op_utils.c | 1 + sim/mn10300/sim-main.h | 1 - sim/moxie/ChangeLog | 4 ++++ sim/moxie/interp.c | 1 + sim/msp430/ChangeLog | 5 +++++ sim/msp430/msp430-sim.c | 1 + sim/msp430/sim-main.h | 1 - sim/or1k/ChangeLog | 4 ++++ sim/or1k/traps.c | 1 + sim/ppc/ChangeLog | 4 ++++ sim/ppc/sim-main.h | 1 - sim/pru/ChangeLog | 4 ++++ sim/pru/interp.c | 1 + sim/riscv/ChangeLog | 4 ++++ sim/riscv/sim-main.c | 1 + sim/v850/ChangeLog | 4 ++++ sim/v850/simops.c | 1 + 78 files changed, 169 insertions(+), 6 deletions(-) diff --git a/sim/aarch64/ChangeLog b/sim/aarch64/ChangeLog index a522fcf0ef7..f5d1990119a 100644 --- a/sim/aarch64/ChangeLog +++ b/sim/aarch64/ChangeLog @@ -1,3 +1,8 @@ +2021-06-18 Mike Frysinger + + * cpustate.c: Include sim-signal.h. + * memory.c, simulator.c: Likewise. + 2021-06-17 Mike Frysinger * configure.ac: Delete SIM_AC_OPTION_ENDIAN call. diff --git a/sim/aarch64/cpustate.c b/sim/aarch64/cpustate.c index 6007d74872d..45a08623f95 100644 --- a/sim/aarch64/cpustate.c +++ b/sim/aarch64/cpustate.c @@ -26,6 +26,7 @@ #include #include "sim-main.h" +#include "sim-signal.h" #include "cpustate.h" #include "simulator.h" #include "libiberty.h" diff --git a/sim/aarch64/memory.c b/sim/aarch64/memory.c index 22caf617074..cd2df334da5 100644 --- a/sim/aarch64/memory.c +++ b/sim/aarch64/memory.c @@ -33,6 +33,7 @@ #include "simulator.h" #include "sim-core.h" +#include "sim-signal.h" static inline void mem_error (sim_cpu *cpu, const char *message, uint64_t addr) diff --git a/sim/aarch64/simulator.c b/sim/aarch64/simulator.c index be1c2987636..0970aceda9f 100644 --- a/sim/aarch64/simulator.c +++ b/sim/aarch64/simulator.c @@ -34,6 +34,8 @@ #include "cpustate.h" #include "memory.h" +#include "sim-signal.h" + #define NO_SP 0 #define SP_OK 1 diff --git a/sim/avr/ChangeLog b/sim/avr/ChangeLog index 156e7f26e56..6fa075c477c 100644 --- a/sim/avr/ChangeLog +++ b/sim/avr/ChangeLog @@ -1,3 +1,7 @@ +2021-06-18 Mike Frysinger + + * interp.c: Include sim-signal.h. + 2021-06-17 Mike Frysinger * configure.ac: Delete SIM_AC_OPTION_ENDIAN call. diff --git a/sim/avr/interp.c b/sim/avr/interp.c index 2bd72731b55..df7177ef23f 100644 --- a/sim/avr/interp.c +++ b/sim/avr/interp.c @@ -29,6 +29,7 @@ #include "sim-main.h" #include "sim-base.h" #include "sim-options.h" +#include "sim-signal.h" /* As AVR is a 8/16 bits processor, define handy types. */ typedef unsigned short int word; diff --git a/sim/bfin/ChangeLog b/sim/bfin/ChangeLog index fa97d8e6a76..1e83b2b6672 100644 --- a/sim/bfin/ChangeLog +++ b/sim/bfin/ChangeLog @@ -1,3 +1,8 @@ +2021-06-18 Mike Frysinger + + * dv-bfin_cec.c: Include sim-signal.h. + * sim-main.h: Delete sim-signal.h include. + 2021-06-17 Mike Frysinger * configure.ac: Delete SIM_AC_OPTION_ENDIAN call. diff --git a/sim/bfin/dv-bfin_cec.c b/sim/bfin/dv-bfin_cec.c index e80616d15d1..7ad3ea06800 100644 --- a/sim/bfin/dv-bfin_cec.c +++ b/sim/bfin/dv-bfin_cec.c @@ -24,6 +24,7 @@ #include #include "sim-main.h" +#include "sim-signal.h" #include "devices.h" #include "dv-bfin_cec.h" #include "dv-bfin_evt.h" diff --git a/sim/bfin/sim-main.h b/sim/bfin/sim-main.h index 18d0a00e0d6..0e5d1856621 100644 --- a/sim/bfin/sim-main.h +++ b/sim/bfin/sim-main.h @@ -22,7 +22,6 @@ #define _BFIN_MAIN_SIM_H_ #include "sim-basics.h" -#include "sim-signal.h" #include "arch.h" #include "sim-base.h" diff --git a/sim/bpf/ChangeLog b/sim/bpf/ChangeLog index 5e2b222438d..fd12bbf778c 100644 --- a/sim/bpf/ChangeLog +++ b/sim/bpf/ChangeLog @@ -1,3 +1,7 @@ +2021-06-18 Mike Frysinger + + * bpf.c: Include sim-signal.h. + 2021-06-17 Mike Frysinger * configure.ac: Delete SIM_AC_OPTION_ENDIAN call. diff --git a/sim/bpf/bpf.c b/sim/bpf/bpf.c index f9cdb824d1a..9e78960ddcc 100644 --- a/sim/bpf/bpf.c +++ b/sim/bpf/bpf.c @@ -24,6 +24,7 @@ #include "sim-main.h" #include "sim-fpu.h" +#include "sim-signal.h" #include "cgen-mem.h" #include "cgen-ops.h" #include "cpuall.h" diff --git a/sim/common/ChangeLog b/sim/common/ChangeLog index 682696c007f..61da7e916ef 100644 --- a/sim/common/ChangeLog +++ b/sim/common/ChangeLog @@ -1,3 +1,10 @@ +2021-06-18 Mike Frysinger + + * cgen-run.c: Include sim-signal.h. + * cgen-utils.c, nrun.c, sim-core.c, sim-engine.c, sim-reason.c, + sim-resume.c, sim-signal.c, sim-stop.c, sim-watch.c: Likewise. + * sim-basics.h: Delete sim-signal.h include. + 2021-06-18 Mike Frysinger * sim-basics.h: Delete libiberty.h include. diff --git a/sim/common/cgen-run.c b/sim/common/cgen-run.c index 9420942af8a..1b097e1f1ec 100644 --- a/sim/common/cgen-run.c +++ b/sim/common/cgen-run.c @@ -38,6 +38,7 @@ along with this program. If not, see . */ #include "sim-main.h" #include "sim-assert.h" +#include "sim-signal.h" #ifndef SIM_ENGINE_PREFIX_HOOK #define SIM_ENGINE_PREFIX_HOOK(sd) diff --git a/sim/common/cgen-utils.c b/sim/common/cgen-utils.c index 13107904678..529d80dfb15 100644 --- a/sim/common/cgen-utils.c +++ b/sim/common/cgen-utils.c @@ -22,6 +22,7 @@ along with this program. If not, see . */ #include "bfd.h" #include "sim-main.h" +#include "sim-signal.h" #include "dis-asm.h" #define MEMOPS_DEFINE_INLINE diff --git a/sim/common/nrun.c b/sim/common/nrun.c index ba293d1ce73..3fd78346f95 100644 --- a/sim/common/nrun.c +++ b/sim/common/nrun.c @@ -23,6 +23,7 @@ along with this program. If not, see . */ #include #include "sim-main.h" +#include "sim-signal.h" #include "sim/callback.h" #include "bfd.h" diff --git a/sim/common/sim-basics.h b/sim/common/sim-basics.h index a3dd5d93d58..32995a870d1 100644 --- a/sim/common/sim-basics.h +++ b/sim/common/sim-basics.h @@ -121,7 +121,6 @@ typedef enum { #include "sim-types.h" #include "sim-bits.h" #include "sim-endian.h" -#include "sim-signal.h" #include "sim-utils.h" diff --git a/sim/common/sim-core.c b/sim/common/sim-core.c index 6604f31ea97..2c568dc3e36 100644 --- a/sim/common/sim-core.c +++ b/sim/common/sim-core.c @@ -28,6 +28,7 @@ #include "sim-main.h" #include "sim-assert.h" +#include "sim-signal.h" #include "libiberty.h" #if (WITH_HW) diff --git a/sim/common/sim-engine.c b/sim/common/sim-engine.c index a5f84af2801..83f41f07deb 100644 --- a/sim/common/sim-engine.c +++ b/sim/common/sim-engine.c @@ -22,6 +22,7 @@ along with this program. If not, see . */ #include "sim-main.h" #include "sim-assert.h" +#include "sim-signal.h" #include #include diff --git a/sim/common/sim-reason.c b/sim/common/sim-reason.c index 73a57654c24..fa3683793d2 100644 --- a/sim/common/sim-reason.c +++ b/sim/common/sim-reason.c @@ -22,6 +22,7 @@ along with this program. If not, see . */ #include "sim-main.h" #include "sim-assert.h" +#include "sim-signal.h" #include diff --git a/sim/common/sim-resume.c b/sim/common/sim-resume.c index 8f854da8475..93b198aed05 100644 --- a/sim/common/sim-resume.c +++ b/sim/common/sim-resume.c @@ -22,6 +22,7 @@ along with this program. If not, see . */ #include "sim-main.h" #include "sim-assert.h" +#include "sim-signal.h" /* Halt the simulator after just one instruction */ diff --git a/sim/common/sim-signal.c b/sim/common/sim-signal.c index f9fef4c24c6..d5186043824 100644 --- a/sim/common/sim-signal.c +++ b/sim/common/sim-signal.c @@ -22,6 +22,7 @@ along with this program. If not, see . */ #include #include "sim-main.h" +#include "sim-signal.h" /* Convert SIM_SIGFOO to SIGFOO. What to do when the host doesn't have SIGFOO is handled on a case by case diff --git a/sim/common/sim-stop.c b/sim/common/sim-stop.c index aa48fc3e6f3..076d43d8101 100644 --- a/sim/common/sim-stop.c +++ b/sim/common/sim-stop.c @@ -22,6 +22,7 @@ along with this program. If not, see . */ #include "sim-main.h" #include "sim-assert.h" +#include "sim-signal.h" /* Generic implementation of sim_stop. */ diff --git a/sim/common/sim-watch.c b/sim/common/sim-watch.c index fa035b38054..bc6c44bcfd1 100644 --- a/sim/common/sim-watch.c +++ b/sim/common/sim-watch.c @@ -22,6 +22,7 @@ along with this program. If not, see . */ #include "sim-main.h" #include "sim-options.h" +#include "sim-signal.h" #include "libiberty.h" #include "sim-assert.h" diff --git a/sim/cr16/ChangeLog b/sim/cr16/ChangeLog index dc4c1e8b239..b79d0312937 100644 --- a/sim/cr16/ChangeLog +++ b/sim/cr16/ChangeLog @@ -1,3 +1,8 @@ +2021-06-18 Mike Frysinger + + * interp.c: Include sim-signal.h. + * simops.c: Likewise. + 2021-06-17 Mike Frysinger * configure.ac: Delete SIM_AC_OPTION_ENDIAN call. diff --git a/sim/cr16/interp.c b/sim/cr16/interp.c index 6e3438c9d80..e2aef013d16 100644 --- a/sim/cr16/interp.c +++ b/sim/cr16/interp.c @@ -30,6 +30,7 @@ #include "sim-main.h" #include "sim-options.h" +#include "sim-signal.h" #include "gdb/sim-cr16.h" #include "gdb/signals.h" diff --git a/sim/cr16/simops.c b/sim/cr16/simops.c index b383dfa1f92..afd870e595f 100644 --- a/sim/cr16/simops.c +++ b/sim/cr16/simops.c @@ -32,6 +32,7 @@ #include #include "sim-main.h" +#include "sim-signal.h" #include "simops.h" #include "targ-vals.h" diff --git a/sim/cris/ChangeLog b/sim/cris/ChangeLog index 61d064cd067..a69349a7660 100644 --- a/sim/cris/ChangeLog +++ b/sim/cris/ChangeLog @@ -1,3 +1,7 @@ +2021-06-18 Mike Frysinger + + * traps.c: Include sim-signal.h. + 2021-06-17 Mike Frysinger * configure.ac: Delete SIM_AC_OPTION_ENDIAN call. diff --git a/sim/cris/traps.c b/sim/cris/traps.c index 2ad408139d8..130a38053d1 100644 --- a/sim/cris/traps.c +++ b/sim/cris/traps.c @@ -24,6 +24,7 @@ along with this program. If not, see . */ #include "sim-main.h" #include "sim-syscall.h" #include "sim-options.h" +#include "sim-signal.h" #include "sim/callback.h" #include "bfd.h" /* FIXME: get rid of targ-vals.h usage everywhere else. */ diff --git a/sim/d10v/ChangeLog b/sim/d10v/ChangeLog index d5881766da7..429b4d00b7e 100644 --- a/sim/d10v/ChangeLog +++ b/sim/d10v/ChangeLog @@ -1,3 +1,8 @@ +2021-06-18 Mike Frysinger + + * interp.c: Include sim-signal.h. + * simops.c: Likewise. + 2021-06-17 Mike Frysinger * configure.ac: Delete SIM_AC_OPTION_ENDIAN call. diff --git a/sim/d10v/interp.c b/sim/d10v/interp.c index c0cdc034700..c48e39a27d6 100644 --- a/sim/d10v/interp.c +++ b/sim/d10v/interp.c @@ -9,6 +9,7 @@ #include "sim-main.h" #include "sim-options.h" +#include "sim-signal.h" #include "gdb/sim-d10v.h" #include "gdb/signals.h" diff --git a/sim/d10v/simops.c b/sim/d10v/simops.c index af725ad9bb9..64c888c4c42 100644 --- a/sim/d10v/simops.c +++ b/sim/d10v/simops.c @@ -11,6 +11,7 @@ #include #include "sim-main.h" +#include "sim-signal.h" #include "simops.h" #include "targ-vals.h" diff --git a/sim/example-synacor/ChangeLog b/sim/example-synacor/ChangeLog index 4f2c8c58715..a55ed0fdd55 100644 --- a/sim/example-synacor/ChangeLog +++ b/sim/example-synacor/ChangeLog @@ -1,3 +1,7 @@ +2021-06-18 Mike Frysinger + + * sim-main.c: Include sim-signal.h. + 2021-06-17 Mike Frysinger * configure.ac: Delete SIM_AC_OPTION_ENDIAN call. diff --git a/sim/example-synacor/sim-main.c b/sim/example-synacor/sim-main.c index d7a68b38bf4..ccefe1b759b 100644 --- a/sim/example-synacor/sim-main.c +++ b/sim/example-synacor/sim-main.c @@ -25,6 +25,7 @@ #include "defs.h" #include "sim-main.h" +#include "sim-signal.h" /* Get the register number from the number. */ static unsigned16 diff --git a/sim/frv/ChangeLog b/sim/frv/ChangeLog index 264d33e926c..16bbf486c5f 100644 --- a/sim/frv/ChangeLog +++ b/sim/frv/ChangeLog @@ -1,3 +1,8 @@ +2021-06-18 Mike Frysinger + + * interrupts.c: Include sim-signal.h. + * traps.c: Likewise. + 2021-06-17 Mike Frysinger * configure.ac: Delete SIM_AC_OPTION_ENDIAN call. diff --git a/sim/frv/interrupts.c b/sim/frv/interrupts.c index a657c68e241..99b27cffa94 100644 --- a/sim/frv/interrupts.c +++ b/sim/frv/interrupts.c @@ -24,6 +24,7 @@ along with this program. If not, see . */ #define WANT_CPU_FRVBF #include "sim-main.h" +#include "sim-signal.h" #include "bfd.h" #include diff --git a/sim/frv/traps.c b/sim/frv/traps.c index 91b424fc7e1..46cb8d92f29 100644 --- a/sim/frv/traps.c +++ b/sim/frv/traps.c @@ -28,6 +28,7 @@ along with this program. If not, see . */ #include "cgen-engine.h" #include "cgen-par.h" #include "sim-fpu.h" +#include "sim-signal.h" #include "sim/callback.h" #include "bfd.h" diff --git a/sim/ft32/ChangeLog b/sim/ft32/ChangeLog index bb7ea80d8f4..19ffbada539 100644 --- a/sim/ft32/ChangeLog +++ b/sim/ft32/ChangeLog @@ -1,3 +1,7 @@ +2021-06-18 Mike Frysinger + + * interp.c: Include sim-signal.h. + 2021-06-17 Mike Frysinger * configure.ac: Delete SIM_AC_OPTION_ENDIAN call. diff --git a/sim/ft32/interp.c b/sim/ft32/interp.c index 77ed8f8eb89..7da6ecd2937 100644 --- a/sim/ft32/interp.c +++ b/sim/ft32/interp.c @@ -33,6 +33,7 @@ #include "sim-main.h" #include "sim-options.h" +#include "sim-signal.h" #include "opcode/ft32.h" diff --git a/sim/h8300/ChangeLog b/sim/h8300/ChangeLog index 57ada187fb7..72e2926f084 100644 --- a/sim/h8300/ChangeLog +++ b/sim/h8300/ChangeLog @@ -1,3 +1,7 @@ +2021-06-18 Mike Frysinger + + * compile.c: Include sim-signal.h. + 2021-06-17 Mike Frysinger * compile.c (sim_open): Set current_target_byte_order. diff --git a/sim/h8300/compile.c b/sim/h8300/compile.c index 565eadfe3b1..1f3316e20ad 100644 --- a/sim/h8300/compile.c +++ b/sim/h8300/compile.c @@ -33,6 +33,7 @@ #include "sys/stat.h" #include "sys/types.h" #include "sim-options.h" +#include "sim-signal.h" #include "sim/callback.h" #ifndef SIGTRAP diff --git a/sim/iq2000/ChangeLog b/sim/iq2000/ChangeLog index 63797deb9ec..5318570f9de 100644 --- a/sim/iq2000/ChangeLog +++ b/sim/iq2000/ChangeLog @@ -1,3 +1,7 @@ +2021-06-18 Mike Frysinger + + * iq2000.c: Include sim-signal.h. + 2021-06-17 Mike Frysinger * configure.ac: Delete SIM_AC_OPTION_ENDIAN call. diff --git a/sim/iq2000/iq2000.c b/sim/iq2000/iq2000.c index 018c6a63a3f..362cc4acb19 100644 --- a/sim/iq2000/iq2000.c +++ b/sim/iq2000/iq2000.c @@ -24,6 +24,7 @@ #define WANT_CPU_IQ2000BF #include "sim-main.h" +#include "sim-signal.h" #include "cgen-mem.h" #include "cgen-ops.h" #include "targ-vals.h" diff --git a/sim/lm32/ChangeLog b/sim/lm32/ChangeLog index 57cbf650231..7aee807480c 100644 --- a/sim/lm32/ChangeLog +++ b/sim/lm32/ChangeLog @@ -1,3 +1,7 @@ +2021-06-18 Mike Frysinger + + * traps.c: Include sim-signal.h. + 2021-06-17 Mike Frysinger * configure.ac: Delete SIM_AC_OPTION_ENDIAN call. diff --git a/sim/lm32/traps.c b/sim/lm32/traps.c index 5b010f9d3fe..77b4accef4e 100644 --- a/sim/lm32/traps.c +++ b/sim/lm32/traps.c @@ -25,6 +25,7 @@ #define WANT_CPU_LM32BF #include "sim-main.h" +#include "sim-signal.h" #include "sim-syscall.h" #include "lm32-sim.h" #include "targ-vals.h" diff --git a/sim/m32r/ChangeLog b/sim/m32r/ChangeLog index 9ff4abc9b89..f6600506b89 100644 --- a/sim/m32r/ChangeLog +++ b/sim/m32r/ChangeLog @@ -1,3 +1,8 @@ +2021-06-18 Mike Frysinger + + * traps-linux.c: Include sim-signal.h. + * traps.c: + 2021-06-17 Mike Frysinger * configure.ac: Delete SIM_AC_OPTION_ENDIAN call. diff --git a/sim/m32r/traps-linux.c b/sim/m32r/traps-linux.c index 1e3a08497e9..8ff046590d4 100644 --- a/sim/m32r/traps-linux.c +++ b/sim/m32r/traps-linux.c @@ -22,6 +22,7 @@ #include "portability.h" #include "sim-main.h" +#include "sim-signal.h" #include "sim-syscall.h" #include "syscall.h" #include "targ-vals.h" diff --git a/sim/m32r/traps.c b/sim/m32r/traps.c index ffa09f1527f..4cec5c0d45c 100644 --- a/sim/m32r/traps.c +++ b/sim/m32r/traps.c @@ -21,6 +21,7 @@ #include "defs.h" #include "sim-main.h" +#include "sim-signal.h" #include "sim-syscall.h" #include "targ-vals.h" #include diff --git a/sim/m68hc11/ChangeLog b/sim/m68hc11/ChangeLog index 3b87798225f..dd9ccce12a0 100644 --- a/sim/m68hc11/ChangeLog +++ b/sim/m68hc11/ChangeLog @@ -1,3 +1,9 @@ +2021-06-18 Mike Frysinger + + * dv-m68hc11eepr.c: Include sim-signal.h. + * interrupts.c, m68hc11_sim.c: Likewise. + * sim-main.h: Delete sim-signal.h include. + 2021-06-17 Mike Frysinger * configure.ac: Delete SIM_AC_OPTION_ENDIAN call. diff --git a/sim/m68hc11/dv-m68hc11eepr.c b/sim/m68hc11/dv-m68hc11eepr.c index 1e4cb5eab05..ac67bf9e76a 100644 --- a/sim/m68hc11/dv-m68hc11eepr.c +++ b/sim/m68hc11/dv-m68hc11eepr.c @@ -25,6 +25,7 @@ #include "hw-main.h" #include "sim-assert.h" #include "sim-events.h" +#include "sim-signal.h" #include #include diff --git a/sim/m68hc11/interrupts.c b/sim/m68hc11/interrupts.c index 1adce508219..e6a9d739972 100644 --- a/sim/m68hc11/interrupts.c +++ b/sim/m68hc11/interrupts.c @@ -22,6 +22,7 @@ along with this program. If not, see . */ #include "sim-main.h" #include "sim-options.h" +#include "sim-signal.h" static const char *interrupt_names[] = { "R1", diff --git a/sim/m68hc11/m68hc11_sim.c b/sim/m68hc11/m68hc11_sim.c index 3c619c14ab0..bdf69e2ac2c 100644 --- a/sim/m68hc11/m68hc11_sim.c +++ b/sim/m68hc11/m68hc11_sim.c @@ -24,6 +24,7 @@ along with this program. If not, see . */ #include "sim-assert.h" #include "sim-module.h" #include "sim-options.h" +#include "sim-signal.h" #include diff --git a/sim/m68hc11/sim-main.h b/sim/m68hc11/sim-main.h index 18a7426011b..a48d7f4c8f1 100644 --- a/sim/m68hc11/sim-main.h +++ b/sim/m68hc11/sim-main.h @@ -21,7 +21,6 @@ along with this program. If not, see . */ #define _SIM_MAIN_H #include "sim-basics.h" -#include "sim-signal.h" #include "sim-base.h" #include "bfd.h" @@ -30,6 +29,7 @@ along with this program. If not, see . */ #include "sim/sim.h" #include "opcode/m68hc11.h" +#include "sim-signal.h" #include "sim-types.h" typedef unsigned8 uint8; diff --git a/sim/mcore/ChangeLog b/sim/mcore/ChangeLog index cf7d270e6ad..3757d295169 100644 --- a/sim/mcore/ChangeLog +++ b/sim/mcore/ChangeLog @@ -1,3 +1,7 @@ +2021-06-18 Mike Frysinger + + * interp.c: Include sim-signal.h. + 2021-06-17 Mike Frysinger * configure.ac: Delete SIM_AC_OPTION_ENDIAN call. diff --git a/sim/mcore/interp.c b/sim/mcore/interp.c index 3517068abf5..138dcccea4d 100644 --- a/sim/mcore/interp.c +++ b/sim/mcore/interp.c @@ -32,6 +32,7 @@ along with this program. If not, see . */ #include "sim-main.h" #include "sim-base.h" +#include "sim-signal.h" #include "sim-syscall.h" #include "sim-options.h" diff --git a/sim/microblaze/ChangeLog b/sim/microblaze/ChangeLog index 5d0224b36ce..abeac71e5b1 100644 --- a/sim/microblaze/ChangeLog +++ b/sim/microblaze/ChangeLog @@ -1,3 +1,7 @@ +2021-06-18 Mike Frysinger + + * interp.c: Include sim-signal.h. + 2021-06-17 Mike Frysinger * configure.ac: Delete SIM_AC_OPTION_ENDIAN call. diff --git a/sim/microblaze/interp.c b/sim/microblaze/interp.c index e451f2d68d1..94f50f1e4cd 100644 --- a/sim/microblaze/interp.c +++ b/sim/microblaze/interp.c @@ -30,6 +30,7 @@ #include "sim-main.h" #include "sim-options.h" +#include "sim-signal.h" #include "sim-syscall.h" #include "microblaze-dis.h" diff --git a/sim/mips/ChangeLog b/sim/mips/ChangeLog index 05d64616764..2ad72ef94c0 100644 --- a/sim/mips/ChangeLog +++ b/sim/mips/ChangeLog @@ -1,3 +1,7 @@ +2021-06-18 Mike Frysinger + + * interp.c: Include sim-signal.h. + 2021-06-17 Mike Frysinger * configure.ac: Delete SIM_AC_OPTION_ENDIAN call. diff --git a/sim/mips/interp.c b/sim/mips/interp.c index a6f504acc76..4ab908d4f7a 100644 --- a/sim/mips/interp.c +++ b/sim/mips/interp.c @@ -31,6 +31,7 @@ code on the hardware. #include "sim-options.h" #include "sim-assert.h" #include "sim-hw.h" +#include "sim-signal.h" #include "itable.h" diff --git a/sim/mn10300/ChangeLog b/sim/mn10300/ChangeLog index 6f6dceda053..6bdb23ee129 100644 --- a/sim/mn10300/ChangeLog +++ b/sim/mn10300/ChangeLog @@ -1,3 +1,9 @@ +2021-06-18 Mike Frysinger + + * interp.c: Include sim-signal.h. + * op_utils.c, sim-main.h: Likewise. + * mn10300_sim.h: Delete sim-signal.h include. + 2021-06-17 Mike Frysinger * configure.ac: Delete SIM_AC_OPTION_ENDIAN call. diff --git a/sim/mn10300/interp.c b/sim/mn10300/interp.c index b793d3c019f..f16a756c818 100644 --- a/sim/mn10300/interp.c +++ b/sim/mn10300/interp.c @@ -9,6 +9,7 @@ #include "bfd.h" #include "sim-assert.h" +#include "sim-signal.h" #include #include diff --git a/sim/mn10300/mn10300_sim.h b/sim/mn10300/mn10300_sim.h index 1f696d5b7be..f3e43a7c69a 100644 --- a/sim/mn10300/mn10300_sim.h +++ b/sim/mn10300/mn10300_sim.h @@ -7,6 +7,7 @@ #include "sim/sim.h" #include "bfd.h" #include "sim-fpu.h" +#include "sim-signal.h" extern SIM_DESC simulator; diff --git a/sim/mn10300/op_utils.c b/sim/mn10300/op_utils.c index cd0f1a667e4..df95be3b1ac 100644 --- a/sim/mn10300/op_utils.c +++ b/sim/mn10300/op_utils.c @@ -2,6 +2,7 @@ #include "defs.h" #include "sim-main.h" +#include "sim-signal.h" #include "sim-syscall.h" #include "targ-vals.h" diff --git a/sim/mn10300/sim-main.h b/sim/mn10300/sim-main.h index 87507294183..101586e5c70 100644 --- a/sim/mn10300/sim-main.h +++ b/sim/mn10300/sim-main.h @@ -25,7 +25,6 @@ #define SIM_ENGINE_HALT_HOOK(SD,LAST_CPU,CIA) /* disable this hook */ #include "sim-basics.h" -#include "sim-signal.h" #include /* For kill() in insns:do_trap */ diff --git a/sim/moxie/ChangeLog b/sim/moxie/ChangeLog index a0f5ccc2988..66f7b61751c 100644 --- a/sim/moxie/ChangeLog +++ b/sim/moxie/ChangeLog @@ -1,3 +1,7 @@ +2021-06-18 Mike Frysinger + + * interp.c: Include sim-signal.h. + 2021-06-17 Mike Frysinger * configure.ac: Delete SIM_AC_OPTION_ENDIAN call. diff --git a/sim/moxie/interp.c b/sim/moxie/interp.c index c70215f8c7a..447f52e6e40 100644 --- a/sim/moxie/interp.c +++ b/sim/moxie/interp.c @@ -34,6 +34,7 @@ along with this program. If not, see . */ #include "sim-base.h" #include "sim-options.h" #include "sim-io.h" +#include "sim-signal.h" #include "targ-vals.h" typedef int word; diff --git a/sim/msp430/ChangeLog b/sim/msp430/ChangeLog index a78d476516c..08743987d43 100644 --- a/sim/msp430/ChangeLog +++ b/sim/msp430/ChangeLog @@ -1,3 +1,8 @@ +2021-06-18 Mike Frysinger + + * msp430-sim.c: Include sim-signal.h. + * sim-main.h: Delete sim-signal.h include. + 2021-06-17 Mike Frysinger * configure.ac: Delete SIM_AC_OPTION_ENDIAN call. diff --git a/sim/msp430/msp430-sim.c b/sim/msp430/msp430-sim.c index ed0393317c1..c9bb9c78db6 100644 --- a/sim/msp430/msp430-sim.c +++ b/sim/msp430/msp430-sim.c @@ -30,6 +30,7 @@ #include #include "opcode/msp430-decode.h" #include "sim-main.h" +#include "sim-signal.h" #include "sim-syscall.h" #include "targ-vals.h" diff --git a/sim/msp430/sim-main.h b/sim/msp430/sim-main.h index fdfa5d09456..68910046997 100644 --- a/sim/msp430/sim-main.h +++ b/sim/msp430/sim-main.h @@ -22,7 +22,6 @@ #define _MSP430_MAIN_SIM_H_ #include "sim-basics.h" -#include "sim-signal.h" #include "msp430-sim.h" #include "sim-base.h" diff --git a/sim/or1k/ChangeLog b/sim/or1k/ChangeLog index 4140fd6e6a5..33799acf029 100644 --- a/sim/or1k/ChangeLog +++ b/sim/or1k/ChangeLog @@ -1,3 +1,7 @@ +2021-06-18 Mike Frysinger + + * traps.c: Include sim-signal.h. + 2021-06-17 Mike Frysinger * configure.ac: Delete SIM_AC_OPTION_ENDIAN call. diff --git a/sim/or1k/traps.c b/sim/or1k/traps.c index bb428fa4a88..91f0d2bdd13 100644 --- a/sim/or1k/traps.c +++ b/sim/or1k/traps.c @@ -23,6 +23,7 @@ #define WANT_CPU #include "sim-main.h" +#include "sim-signal.h" #include "cgen-ops.h" /* Implement the sim invalid instruction function. This will set the error diff --git a/sim/ppc/ChangeLog b/sim/ppc/ChangeLog index fc3f62f0bc3..6f2531fcc3d 100644 --- a/sim/ppc/ChangeLog +++ b/sim/ppc/ChangeLog @@ -1,3 +1,7 @@ +2021-06-18 Mike Frysinger + + * sim-main.h: Delete sim-signal.h include. + 2021-06-17 Mike Frysinger * Makefile.in (ENDIAN_CFLAGS): Delete. diff --git a/sim/ppc/sim-main.h b/sim/ppc/sim-main.h index 1e565c119ed..047b36cbce4 100644 --- a/sim/ppc/sim-main.h +++ b/sim/ppc/sim-main.h @@ -1,5 +1,4 @@ #include "sim-basics.h" -#include "sim-signal.h" typedef unsigned32 sim_cia; diff --git a/sim/pru/ChangeLog b/sim/pru/ChangeLog index 81033cf2e0a..6e06c7391db 100644 --- a/sim/pru/ChangeLog +++ b/sim/pru/ChangeLog @@ -1,3 +1,7 @@ +2021-06-18 Mike Frysinger + + * interp.c: Include sim-signal.h. + 2021-06-17 Mike Frysinger * configure.ac: Delete SIM_AC_OPTION_ENDIAN call. diff --git a/sim/pru/interp.c b/sim/pru/interp.c index 09045dc4cb0..fc8bbe5c4c8 100644 --- a/sim/pru/interp.c +++ b/sim/pru/interp.c @@ -31,6 +31,7 @@ #include "sim-main.h" #include "sim-assert.h" #include "sim-options.h" +#include "sim-signal.h" #include "sim-syscall.h" #include "pru.h" diff --git a/sim/riscv/ChangeLog b/sim/riscv/ChangeLog index 5c7973f5f95..925fa0cc576 100644 --- a/sim/riscv/ChangeLog +++ b/sim/riscv/ChangeLog @@ -1,3 +1,7 @@ +2021-06-18 Mike Frysinger + + * sim-main.c: Include sim-signal.h. + 2021-06-17 Mike Frysinger * configure.ac: Delete SIM_AC_OPTION_ENDIAN call. diff --git a/sim/riscv/sim-main.c b/sim/riscv/sim-main.c index a09ae033cac..0faf9395ae5 100644 --- a/sim/riscv/sim-main.c +++ b/sim/riscv/sim-main.c @@ -28,6 +28,7 @@ #include #include "sim-main.h" +#include "sim-signal.h" #include "sim-syscall.h" #include "opcode/riscv.h" diff --git a/sim/v850/ChangeLog b/sim/v850/ChangeLog index 2af2fc25dfc..23f432cfd5d 100644 --- a/sim/v850/ChangeLog +++ b/sim/v850/ChangeLog @@ -1,3 +1,7 @@ +2021-06-18 Mike Frysinger + + * simops.c: Include sim-signal.h. + 2021-06-17 Mike Frysinger * configure.ac: Delete SIM_AC_OPTION_ENDIAN call. diff --git a/sim/v850/simops.c b/sim/v850/simops.c index 800a5904ea4..6a111044f65 100644 --- a/sim/v850/simops.c +++ b/sim/v850/simops.c @@ -2,6 +2,7 @@ #include "defs.h" #include "sim-main.h" +#include "sim-signal.h" #include "v850_sim.h" #include "simops.h" -- 2.30.2