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.

diff --git a/sim/aarch64/ChangeLog b/sim/aarch64/ChangeLog
index a522fcf0ef77235a58b41a5de0d39d5a19906058..f5d1990119a66bca45cd3afc1d624e50bccd89db 100644 (file)
--- a/sim/aarch64/ChangeLog
+++ b/sim/aarch64/ChangeLog
@@ -1,3 +1,8 @@
+2021-06-18  Mike Frysinger  <vapier@gentoo.org>
+
+       * cpustate.c: Include sim-signal.h.
+       * memory.c, simulator.c: Likewise.
+
 2021-06-17  Mike Frysinger  <vapier@gentoo.org>
 
        * configure.ac: Delete SIM_AC_OPTION_ENDIAN call.

diff --git a/sim/aarch64/cpustate.c b/sim/aarch64/cpustate.c
index 6007d74872d1858c731423ca0565cac17fe40521..45a08623f95551ce8a13d4b9f1457155c62bd394 100644 (file)
--- a/sim/aarch64/cpustate.c
+++ b/sim/aarch64/cpustate.c
@@ -26,6 +26,7 @@
 #include <math.h>
 
 #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 22caf617074d7844c7f6302f041d163adf400169..cd2df334da56a5cac05a68f0a7bd8b565061e65b 100644 (file)
--- 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 be1c2987636a1a882237ce663ecc6723341de8a9..0970aceda9f2e1522204ca016109fa8224480602 100644 (file)
--- 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 156e7f26e566c13bdc18c02b80122d09edcb1d6c..6fa075c477c1e65e9666b4b88bfb501f18a19767 100644 (file)
--- a/sim/avr/ChangeLog
+++ b/sim/avr/ChangeLog
@@ -1,3 +1,7 @@
+2021-06-18  Mike Frysinger  <vapier@gentoo.org>
+
+       * interp.c: Include sim-signal.h.
+
 2021-06-17  Mike Frysinger  <vapier@gentoo.org>
 
        * configure.ac: Delete SIM_AC_OPTION_ENDIAN call.

diff --git a/sim/avr/interp.c b/sim/avr/interp.c
index 2bd72731b5553486e52b72c52cbb3295d7498755..df7177ef23f5b37c5da9d1b12a2cbebeb1e3bb19 100644 (file)
--- 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 fa97d8e6a761a460e162a7f60a7a4c0eb7adeb4d..1e83b2b667247443cccfc2b2eff82c13b6f5d041 100644 (file)
--- a/sim/bfin/ChangeLog
+++ b/sim/bfin/ChangeLog
@@ -1,3 +1,8 @@
+2021-06-18  Mike Frysinger  <vapier@gentoo.org>
+
+       * dv-bfin_cec.c: Include sim-signal.h.
+       * sim-main.h: Delete sim-signal.h include.
+
 2021-06-17  Mike Frysinger  <vapier@gentoo.org>
 
        * 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 e80616d15d154e43dd04fe979383190bc5fde265..7ad3ea0680066399dcd16e306d14893d1a9be1be 100644 (file)
--- a/sim/bfin/dv-bfin_cec.c
+++ b/sim/bfin/dv-bfin_cec.c
@@ -24,6 +24,7 @@
 #include <strings.h>
 
 #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 18d0a00e0d64552da3475d9fa48de74249217715..0e5d1856621ac8fbaa75b9ee8d06f8d5204ab8b3 100644 (file)
--- 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 5e2b222438d369e114db255972033ca34a638b70..fd12bbf778cfe296bd0d07583035d6b500e263ac 100644 (file)
--- a/sim/bpf/ChangeLog
+++ b/sim/bpf/ChangeLog
@@ -1,3 +1,7 @@
+2021-06-18  Mike Frysinger  <vapier@gentoo.org>
+
+       * bpf.c: Include sim-signal.h.
+
 2021-06-17  Mike Frysinger  <vapier@gentoo.org>
 
        * configure.ac: Delete SIM_AC_OPTION_ENDIAN call.

diff --git a/sim/bpf/bpf.c b/sim/bpf/bpf.c
index f9cdb824d1a9b9a78d81d4aaed8946dd8770aafe..9e78960ddcc517d44e2c9c7ad967f2be7a9a5b34 100644 (file)
--- 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 682696c007f1e30f439e4c1856bb3005ed3bd4f9..61da7e916efc0756784db0c205e4963bd7d5262d 100644 (file)
--- a/sim/common/ChangeLog
+++ b/sim/common/ChangeLog
@@ -1,3 +1,10 @@
+2021-06-18  Mike Frysinger  <vapier@gentoo.org>
+
+       * 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  <vapier@gentoo.org>
 
        * sim-basics.h: Delete libiberty.h include.

diff --git a/sim/common/cgen-run.c b/sim/common/cgen-run.c
index 9420942af8ad74291f61573d3e1b4b8ef8e004cf..1b097e1f1ec86c3f8b260cfb4a740c5d2abcc498 100644 (file)
--- a/sim/common/cgen-run.c
+++ b/sim/common/cgen-run.c
@@ -38,6 +38,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #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 13107904678c9ef9222dbf6ebd09f687e23fb938..529d80dfb15c2001690b1d0323d108e672beab7d 100644 (file)
--- a/sim/common/cgen-utils.c
+++ b/sim/common/cgen-utils.c
@@ -22,6 +22,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #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 ba293d1ce73677cf7ab721dcdbffcbcc18931bff..3fd78346f957473a09e5e901fe9138a9a0928cba 100644 (file)
--- a/sim/common/nrun.c
+++ b/sim/common/nrun.c
@@ -23,6 +23,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 #include <string.h>
 
 #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 a3dd5d93d58498385768bca157acae89afc548f3..32995a870d13959103188b0c9892d8851b54105d 100644 (file)
--- 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 6604f31ea97b910c5e11626dcd58d4470042ebc4..2c568dc3e36496bdc97e13a591b62b16ca4f09dd 100644 (file)
--- 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 a5f84af2801b9265fa389676fe577b09a5903570..83f41f07deb7eb034a926fa00dbf30be22d15d45 100644 (file)
--- a/sim/common/sim-engine.c
+++ b/sim/common/sim-engine.c
@@ -22,6 +22,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "sim-main.h"
 #include "sim-assert.h"
+#include "sim-signal.h"
 
 #include <stdio.h>
 #include <stdlib.h>

diff --git a/sim/common/sim-reason.c b/sim/common/sim-reason.c
index 73a57654c246d8749780dbcf4e6ab360d240a812..fa3683793d2d4cd09d8d2d75b682117972fda3e6 100644 (file)
--- a/sim/common/sim-reason.c
+++ b/sim/common/sim-reason.c
@@ -22,6 +22,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "sim-main.h"
 #include "sim-assert.h"
+#include "sim-signal.h"
 
 #include <stdlib.h>
 

diff --git a/sim/common/sim-resume.c b/sim/common/sim-resume.c
index 8f854da84751d8fe1d2571725a9e7631e5dc20bd..93b198aed056ce96c3d83175c8a63ee647cb0706 100644 (file)
--- a/sim/common/sim-resume.c
+++ b/sim/common/sim-resume.c
@@ -22,6 +22,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #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 f9fef4c24c64bf61a0ac901cf970ff6ae26bf4e9..d5186043824066c5f1b38552a425cc1d73306645 100644 (file)
--- a/sim/common/sim-signal.c
+++ b/sim/common/sim-signal.c
@@ -22,6 +22,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include <signal.h>
 #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 aa48fc3e6f36999ad13893fbfd844d746632cb57..076d43d81019cac2a626d1672d170706d17daa2d 100644 (file)
--- a/sim/common/sim-stop.c
+++ b/sim/common/sim-stop.c
@@ -22,6 +22,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #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 fa035b3805494c973b18a4b192c5110981c0fee3..bc6c44bcfd17937796f7e0720ca468a4ca36a3b9 100644 (file)
--- a/sim/common/sim-watch.c
+++ b/sim/common/sim-watch.c
@@ -22,6 +22,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #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 dc4c1e8b239c3857ce7860439dd61a23d85a4000..b79d031293779b230f89c409a78f6dff5e16e642 100644 (file)
--- a/sim/cr16/ChangeLog
+++ b/sim/cr16/ChangeLog
@@ -1,3 +1,8 @@
+2021-06-18  Mike Frysinger  <vapier@gentoo.org>
+
+       * interp.c: Include sim-signal.h.
+       * simops.c: Likewise.
+
 2021-06-17  Mike Frysinger  <vapier@gentoo.org>
 
        * configure.ac: Delete SIM_AC_OPTION_ENDIAN call.

diff --git a/sim/cr16/interp.c b/sim/cr16/interp.c
index 6e3438c9d809ccd7161c9497eeecd0529459a1f3..e2aef013d16016b681ea574cc8ea8bbd29a4be2e 100644 (file)
--- 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 b383dfa1f926bd2d72a8961e8d118f3e31062e38..afd870e595fa81a3b645caaae85256f54b5d10e4 100644 (file)
--- a/sim/cr16/simops.c
+++ b/sim/cr16/simops.c
@@ -32,6 +32,7 @@
 #include <sys/time.h>
 
 #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 61d064cd067eb63148be24c75222b13e24e7b3ad..a69349a7660d15c283d936c3d214db58feea3fa0 100644 (file)
--- a/sim/cris/ChangeLog
+++ b/sim/cris/ChangeLog
@@ -1,3 +1,7 @@
+2021-06-18  Mike Frysinger  <vapier@gentoo.org>
+
+       * traps.c: Include sim-signal.h.
+
 2021-06-17  Mike Frysinger  <vapier@gentoo.org>
 
        * configure.ac: Delete SIM_AC_OPTION_ENDIAN call.

diff --git a/sim/cris/traps.c b/sim/cris/traps.c
index 2ad408139d830e1f85d52a26730e698d90208231..130a38053d1fb341e8cb28c2f811aa9d6def6a3c 100644 (file)
--- a/sim/cris/traps.c
+++ b/sim/cris/traps.c
@@ -24,6 +24,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 #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 d5881766da7fa3762bc1f3b65136cfb418f93dc8..429b4d00b7e65e0ffe111e7036542fb729ddc2fd 100644 (file)
--- a/sim/d10v/ChangeLog
+++ b/sim/d10v/ChangeLog
@@ -1,3 +1,8 @@
+2021-06-18  Mike Frysinger  <vapier@gentoo.org>
+
+       * interp.c: Include sim-signal.h.
+       * simops.c: Likewise.
+
 2021-06-17  Mike Frysinger  <vapier@gentoo.org>
 
        * configure.ac: Delete SIM_AC_OPTION_ENDIAN call.

diff --git a/sim/d10v/interp.c b/sim/d10v/interp.c
index c0cdc034700d2a3e2b2f97a7259cfbbee8bc00c6..c48e39a27d6b97a896719d4d5649a121d7954c6c 100644 (file)
--- 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 af725ad9bb99f0815ce882700b0d8c3ed60ef7f0..64c888c4c42934f0d0ef6c747c5a4847336de182 100644 (file)
--- a/sim/d10v/simops.c
+++ b/sim/d10v/simops.c
@@ -11,6 +11,7 @@
 #include <string.h>
 
 #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 4f2c8c58715174519e7463993bb81314a49c6c33..a55ed0fdd55b262f90566f23ab200d78ff19ee7e 100644 (file)
--- a/sim/example-synacor/ChangeLog
+++ b/sim/example-synacor/ChangeLog
@@ -1,3 +1,7 @@
+2021-06-18  Mike Frysinger  <vapier@gentoo.org>
+
+       * sim-main.c: Include sim-signal.h.
+
 2021-06-17  Mike Frysinger  <vapier@gentoo.org>
 
        * 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 d7a68b38bf46c3ec8b6a3bd3e5ed1ac8296fbff6..ccefe1b759b55fa22c6a051db67c2d75099470c5 100644 (file)
--- 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"
 \f
 /* Get the register number from the number.  */
 static unsigned16

diff --git a/sim/frv/ChangeLog b/sim/frv/ChangeLog
index 264d33e926c2b83ba25a5182d8371059be4186ce..16bbf486c5fdcfcef53a5ed608058a7484cc3b49 100644 (file)
--- a/sim/frv/ChangeLog
+++ b/sim/frv/ChangeLog
@@ -1,3 +1,8 @@
+2021-06-18  Mike Frysinger  <vapier@gentoo.org>
+
+       * interrupts.c: Include sim-signal.h.
+       * traps.c: Likewise.
+
 2021-06-17  Mike Frysinger  <vapier@gentoo.org>
 
        * configure.ac: Delete SIM_AC_OPTION_ENDIAN call.

diff --git a/sim/frv/interrupts.c b/sim/frv/interrupts.c
index a657c68e241722d8d320a332792e25a6394cbfa6..99b27cffa948cecfee5d1d32e2abb43736e10233 100644 (file)
--- a/sim/frv/interrupts.c
+++ b/sim/frv/interrupts.c
@@ -24,6 +24,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 #define WANT_CPU_FRVBF
 
 #include "sim-main.h"
+#include "sim-signal.h"
 #include "bfd.h"
 #include <stdlib.h>
 

diff --git a/sim/frv/traps.c b/sim/frv/traps.c
index 91b424fc7e1e7c648887417be0d69bdfc1a2c254..46cb8d92f29e893da9ff69268fd37a8ffaf889bd 100644 (file)
--- a/sim/frv/traps.c
+++ b/sim/frv/traps.c
@@ -28,6 +28,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 #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 bb7ea80d8f4578c404cb84d1a48de11bec0606d5..19ffbada53971964277a300dbc013e3140bb6150 100644 (file)
--- a/sim/ft32/ChangeLog
+++ b/sim/ft32/ChangeLog
@@ -1,3 +1,7 @@
+2021-06-18  Mike Frysinger  <vapier@gentoo.org>
+
+       * interp.c: Include sim-signal.h.
+
 2021-06-17  Mike Frysinger  <vapier@gentoo.org>
 
        * configure.ac: Delete SIM_AC_OPTION_ENDIAN call.

diff --git a/sim/ft32/interp.c b/sim/ft32/interp.c
index 77ed8f8eb897969c37bb947998d420168e0b35fe..7da6ecd2937a76485de1fd2327ff236fd5ad3832 100644 (file)
--- 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 57ada187fb7eb9e8b4c2bd50e3d448a447bfcfef..72e2926f0846095fd50359b4dcf952e0310c01f8 100644 (file)
--- a/sim/h8300/ChangeLog
+++ b/sim/h8300/ChangeLog
@@ -1,3 +1,7 @@
+2021-06-18  Mike Frysinger  <vapier@gentoo.org>
+
+       * compile.c: Include sim-signal.h.
+
 2021-06-17  Mike Frysinger  <vapier@gentoo.org>
 
        * compile.c (sim_open): Set current_target_byte_order.

diff --git a/sim/h8300/compile.c b/sim/h8300/compile.c
index 565eadfe3b144cb1b1aa8770f0af6e65699c60b7..1f3316e20ad977f566e1b0592e4f557c1c8173ce 100644 (file)
--- 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 63797deb9eca9f4094e5adb4e89e82da7c2fe073..5318570f9de8017e36541d6eed98621807ee350b 100644 (file)
--- a/sim/iq2000/ChangeLog
+++ b/sim/iq2000/ChangeLog
@@ -1,3 +1,7 @@
+2021-06-18  Mike Frysinger  <vapier@gentoo.org>
+
+       * iq2000.c: Include sim-signal.h.
+
 2021-06-17  Mike Frysinger  <vapier@gentoo.org>
 
        * configure.ac: Delete SIM_AC_OPTION_ENDIAN call.

diff --git a/sim/iq2000/iq2000.c b/sim/iq2000/iq2000.c
index 018c6a63a3f31a8e4245b51eb38bcddeb0faf1aa..362cc4acb192cad61ace11d69028885b822f58e7 100644 (file)
--- 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 57cbf6502317e4edfe870ea3f95452d9d1668f64..7aee807480c39da39792f388f8db2f16b48b9e94 100644 (file)
--- a/sim/lm32/ChangeLog
+++ b/sim/lm32/ChangeLog
@@ -1,3 +1,7 @@
+2021-06-18  Mike Frysinger  <vapier@gentoo.org>
+
+       * traps.c: Include sim-signal.h.
+
 2021-06-17  Mike Frysinger  <vapier@gentoo.org>
 
        * configure.ac: Delete SIM_AC_OPTION_ENDIAN call.

diff --git a/sim/lm32/traps.c b/sim/lm32/traps.c
index 5b010f9d3fedb434439457635bbc5c8402622c0b..77b4accef4ee77961b5e2caf4339197f3aac6227 100644 (file)
--- 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 9ff4abc9b898fccb4efe6e503c43e1f22ec9bc28..f6600506b8979877eec486d63b4fdd08de2ad8a0 100644 (file)
--- a/sim/m32r/ChangeLog
+++ b/sim/m32r/ChangeLog
@@ -1,3 +1,8 @@
+2021-06-18  Mike Frysinger  <vapier@gentoo.org>
+
+       * traps-linux.c: Include sim-signal.h.
+       * traps.c:
+
 2021-06-17  Mike Frysinger  <vapier@gentoo.org>
 
        * configure.ac: Delete SIM_AC_OPTION_ENDIAN call.

diff --git a/sim/m32r/traps-linux.c b/sim/m32r/traps-linux.c
index 1e3a08497e90fc155895860d59bbb7b00373f66d..8ff046590d40b4332bd7abf75b6cc6222438bcd5 100644 (file)
--- 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 ffa09f1527f021bb35a33308451f6d9e9b6c1492..4cec5c0d45ce40f49658a6a8a81289bbd35f2ef7 100644 (file)
--- 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 <stdlib.h>

diff --git a/sim/m68hc11/ChangeLog b/sim/m68hc11/ChangeLog
index 3b87798225f14b2a30e3272e06bd2a4f251a700c..dd9ccce12a050f32097d8c5939857c46cdc64af9 100644 (file)
--- a/sim/m68hc11/ChangeLog
+++ b/sim/m68hc11/ChangeLog
@@ -1,3 +1,9 @@
+2021-06-18  Mike Frysinger  <vapier@gentoo.org>
+
+       * 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  <vapier@gentoo.org>
 
        * configure.ac: Delete SIM_AC_OPTION_ENDIAN call.

diff --git a/sim/m68hc11/dv-m68hc11eepr.c b/sim/m68hc11/dv-m68hc11eepr.c
index 1e4cb5eab0540761e2bdf3e1235b6327ac8de42a..ac67bf9e76aa4323e663e89f9f60f51274915fb9 100644 (file)
--- 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 <unistd.h>
 #include <fcntl.h>

diff --git a/sim/m68hc11/interrupts.c b/sim/m68hc11/interrupts.c
index 1adce5082190b71b43cf55df79bdbfd99f9f3586..e6a9d73997273b96b0e32c3b29501993c4e88f85 100644 (file)
--- a/sim/m68hc11/interrupts.c
+++ b/sim/m68hc11/interrupts.c
@@ -22,6 +22,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #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 3c619c14ab0bc1a35e6a1e741fe566d6f1cc023e..bdf69e2ac2c2806ac64b370b938f7d1382ae9c91 100644 (file)
--- a/sim/m68hc11/m68hc11_sim.c
+++ b/sim/m68hc11/m68hc11_sim.c
@@ -24,6 +24,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 #include "sim-assert.h"
 #include "sim-module.h"
 #include "sim-options.h"
+#include "sim-signal.h"
 
 #include <stdlib.h>
 

diff --git a/sim/m68hc11/sim-main.h b/sim/m68hc11/sim-main.h
index 18a7426011b01bb564ea72a24e2ddc0b6bc54131..a48d7f4c8f1d7a457e504808c2214c7a7e176825 100644 (file)
--- a/sim/m68hc11/sim-main.h
+++ b/sim/m68hc11/sim-main.h
@@ -21,7 +21,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 #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 <http://www.gnu.org/licenses/>.  */
 
 #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 cf7d270e6ad0b078075195a1c7527bd2caf7fae6..3757d295169a2e38a2ad1d45c14a30dd4def2260 100644 (file)
--- a/sim/mcore/ChangeLog
+++ b/sim/mcore/ChangeLog
@@ -1,3 +1,7 @@
+2021-06-18  Mike Frysinger  <vapier@gentoo.org>
+
+       * interp.c: Include sim-signal.h.
+
 2021-06-17  Mike Frysinger  <vapier@gentoo.org>
 
        * configure.ac: Delete SIM_AC_OPTION_ENDIAN call.

diff --git a/sim/mcore/interp.c b/sim/mcore/interp.c
index 3517068abf5b4c127796a2cd2887bffda059e9f1..138dcccea4d3f642dcb22eeaf328a67eb6025e90 100644 (file)
--- a/sim/mcore/interp.c
+++ b/sim/mcore/interp.c
@@ -32,6 +32,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #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 5d0224b36ce40a39dba40f1b9b4555fd5eebf637..abeac71e5b1164a7feb62e49ab39734eed4dedce 100644 (file)
--- a/sim/microblaze/ChangeLog
+++ b/sim/microblaze/ChangeLog
@@ -1,3 +1,7 @@
+2021-06-18  Mike Frysinger  <vapier@gentoo.org>
+
+       * interp.c: Include sim-signal.h.
+
 2021-06-17  Mike Frysinger  <vapier@gentoo.org>
 
        * configure.ac: Delete SIM_AC_OPTION_ENDIAN call.

diff --git a/sim/microblaze/interp.c b/sim/microblaze/interp.c
index e451f2d68d1454c6a8ae3dc3b4c7ecc8285cb471..94f50f1e4cd97be142d4251a7ee2af1c508200f2 100644 (file)
--- 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 05d6461676452e5d854f7dffadcfd4c5d5132350..2ad72ef94c0c13a397dfe882bf862ff2eaf5e910 100644 (file)
--- a/sim/mips/ChangeLog
+++ b/sim/mips/ChangeLog
@@ -1,3 +1,7 @@
+2021-06-18  Mike Frysinger  <vapier@gentoo.org>
+
+       * interp.c: Include sim-signal.h.
+
 2021-06-17  Mike Frysinger  <vapier@gentoo.org>
 
        * configure.ac: Delete SIM_AC_OPTION_ENDIAN call.

diff --git a/sim/mips/interp.c b/sim/mips/interp.c
index a6f504acc764f4ea1004f74e76ea4f1de351b071..4ab908d4f7a002fee64d86a2dd1a3f7518e1b3c1 100644 (file)
--- 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 6f6dceda0530cbc6d1900f4e3d959db0eda509ea..6bdb23ee1297f8aa88a797a671f233a8726c0f5d 100644 (file)
--- a/sim/mn10300/ChangeLog
+++ b/sim/mn10300/ChangeLog
@@ -1,3 +1,9 @@
+2021-06-18  Mike Frysinger  <vapier@gentoo.org>
+
+       * 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  <vapier@gentoo.org>
 
        * configure.ac: Delete SIM_AC_OPTION_ENDIAN call.

diff --git a/sim/mn10300/interp.c b/sim/mn10300/interp.c
index b793d3c019feecec143e52a83a563ec5dc3b23d4..f16a756c818dfb42c3114e14b8f48c33d4401fd2 100644 (file)
--- 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 <stdlib.h>
 #include <string.h>

diff --git a/sim/mn10300/mn10300_sim.h b/sim/mn10300/mn10300_sim.h
index 1f696d5b7bef824fba8c3a3e69f5d886d42fb071..f3e43a7c69ad16259267ffa303a9b4caa8c2a63f 100644 (file)
--- 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 cd0f1a667e494c07055421bfebc47c3c1ef2bc90..df95be3b1ac4e7ea02ab397fc122c7bbfb388239 100644 (file)
--- 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 875072941839d85de4b7ac2f07e6dda906968051..101586e5c70db53ba303d91f3fd603cfc9ed3816 100644 (file)
--- 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 <signal.h> /* For kill() in insns:do_trap */
 

diff --git a/sim/moxie/ChangeLog b/sim/moxie/ChangeLog
index a0f5ccc29889b12cefa94dbc421ddc3f7a18ba1c..66f7b61751c3e95c8483c0773aec3db17af880b0 100644 (file)
--- a/sim/moxie/ChangeLog
+++ b/sim/moxie/ChangeLog
@@ -1,3 +1,7 @@
+2021-06-18  Mike Frysinger  <vapier@gentoo.org>
+
+       * interp.c: Include sim-signal.h.
+
 2021-06-17  Mike Frysinger  <vapier@gentoo.org>
 
        * configure.ac: Delete SIM_AC_OPTION_ENDIAN call.

diff --git a/sim/moxie/interp.c b/sim/moxie/interp.c
index c70215f8c7a4066e9083ce6b3d6d354a57af3af5..447f52e6e40212ec7447709a8ade663ced9893e1 100644 (file)
--- a/sim/moxie/interp.c
+++ b/sim/moxie/interp.c
@@ -34,6 +34,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 #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 a78d476516c9d74a7aa0a60574caffa4c6f2d3df..08743987d432fd472c25d7a4775267d703b22016 100644 (file)
--- a/sim/msp430/ChangeLog
+++ b/sim/msp430/ChangeLog
@@ -1,3 +1,8 @@
+2021-06-18  Mike Frysinger  <vapier@gentoo.org>
+
+       * msp430-sim.c: Include sim-signal.h.
+       * sim-main.h: Delete sim-signal.h include.
+
 2021-06-17  Mike Frysinger  <vapier@gentoo.org>
 
        * configure.ac: Delete SIM_AC_OPTION_ENDIAN call.

diff --git a/sim/msp430/msp430-sim.c b/sim/msp430/msp430-sim.c
index ed0393317c1b03fca37aa2d465e62ded701c0445..c9bb9c78db6f3e10dc3d9f382a5aad0c10e9d17e 100644 (file)
--- a/sim/msp430/msp430-sim.c
+++ b/sim/msp430/msp430-sim.c
@@ -30,6 +30,7 @@
 #include <assert.h>
 #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 fdfa5d094560b32bff951ec758f15f0f55fe99c2..68910046997b2a2d1111dc464f3f939bc91de5fe 100644 (file)
--- 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 4140fd6e6a5552b4f31f5f68e1a599bb36e31f81..33799acf029e64c8b641ed2622a2706e1a48f999 100644 (file)
--- a/sim/or1k/ChangeLog
+++ b/sim/or1k/ChangeLog
@@ -1,3 +1,7 @@
+2021-06-18  Mike Frysinger  <vapier@gentoo.org>
+
+       * traps.c: Include sim-signal.h.
+
 2021-06-17  Mike Frysinger  <vapier@gentoo.org>
 
        * configure.ac: Delete SIM_AC_OPTION_ENDIAN call.

diff --git a/sim/or1k/traps.c b/sim/or1k/traps.c
index bb428fa4a8860ada67dead6abdfcaaa304d34bcb..91f0d2bdd1360804bb25ee13c169eb24b63c2fc0 100644 (file)
--- 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 fc3f62f0bc3c887b9c076fc414bf72fb843dbc27..6f2531fcc3d32a7124dceec9febce65e9f51f7e8 100644 (file)
--- a/sim/ppc/ChangeLog
+++ b/sim/ppc/ChangeLog
@@ -1,3 +1,7 @@
+2021-06-18  Mike Frysinger  <vapier@gentoo.org>
+
+       * sim-main.h: Delete sim-signal.h include.
+
 2021-06-17  Mike Frysinger  <vapier@gentoo.org>
 
        * Makefile.in (ENDIAN_CFLAGS): Delete.

diff --git a/sim/ppc/sim-main.h b/sim/ppc/sim-main.h
index 1e565c119ed4a582efbaf478ae7eab3124b55856..047b36cbce4b08cbd84167ec5b991f3a3bcf3ede 100644 (file)
--- 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 81033cf2e0a961d207f165ff642033d541579edb..6e06c7391db4dccc4caabac6072c79d83d36f97e 100644 (file)
--- a/sim/pru/ChangeLog
+++ b/sim/pru/ChangeLog
@@ -1,3 +1,7 @@
+2021-06-18  Mike Frysinger  <vapier@gentoo.org>
+
+       * interp.c: Include sim-signal.h.
+
 2021-06-17  Mike Frysinger  <vapier@gentoo.org>
 
        * configure.ac: Delete SIM_AC_OPTION_ENDIAN call.

diff --git a/sim/pru/interp.c b/sim/pru/interp.c
index 09045dc4cb0afb9b9e2ae19727b9a1d29863a597..fc8bbe5c4c858ce5bd7c8c1e4adb51f9b890c564 100644 (file)
--- 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 5c7973f5f95f6caaa99cd9d3934e65a95856c3ca..925fa0cc576915df5141ca6c1ea9ec088c025861 100644 (file)
--- a/sim/riscv/ChangeLog
+++ b/sim/riscv/ChangeLog
@@ -1,3 +1,7 @@
+2021-06-18  Mike Frysinger  <vapier@gentoo.org>
+
+       * sim-main.c: Include sim-signal.h.
+
 2021-06-17  Mike Frysinger  <vapier@gentoo.org>
 
        * configure.ac: Delete SIM_AC_OPTION_ENDIAN call.

diff --git a/sim/riscv/sim-main.c b/sim/riscv/sim-main.c
index a09ae033cac256218d5e6783b3064bf5df03cf7b..0faf9395ae5222217e7951d6e6a70a819b82100c 100644 (file)
--- a/sim/riscv/sim-main.c
+++ b/sim/riscv/sim-main.c
@@ -28,6 +28,7 @@
 #include <time.h>
 
 #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 2af2fc25dfc80c8400e6c18c0af9aab6c9764755..23f432cfd5d19ccc654db50e4a21a2e94a84ae97 100644 (file)
--- a/sim/v850/ChangeLog
+++ b/sim/v850/ChangeLog
@@ -1,3 +1,7 @@
+2021-06-18  Mike Frysinger  <vapier@gentoo.org>
+
+       * simops.c: Include sim-signal.h.
+
 2021-06-17  Mike Frysinger  <vapier@gentoo.org>
 
        * configure.ac: Delete SIM_AC_OPTION_ENDIAN call.

diff --git a/sim/v850/simops.c b/sim/v850/simops.c
index 800a5904ea447494b1c5c7a7d270fd18d28d1611..6a111044f6526268e4191d9438019d240ab8ff03 100644 (file)
--- 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"