From df68e12b3b3eb91e54d6d888b73049562566e0b3 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Wed, 12 May 2021 00:35:54 -0400 Subject: [PATCH] sim: create header namespace The gdb/callback.h & gdb/remote-sim.h headers have nothing to do with gdb and are really definitions for the libsim API under the sim/ tree. While gdb uses those headers as a client, it's not specific to it. So create a new sim/ namespace and move the headers there. --- gdb/ChangeLog | 5 +++++ gdb/remote-sim.c | 4 ++-- include/gdb/ChangeLog | 5 +++++ include/sim/ChangeLog | 4 ++++ include/{gdb => sim}/callback.h | 4 ++-- include/{gdb/remote-sim.h => sim/sim.h} | 6 +++--- sim/ChangeLog | 4 ++++ sim/README-HACKING | 2 +- sim/aarch64/ChangeLog | 5 +++++ sim/aarch64/cpustate.h | 2 +- sim/aarch64/interp.c | 4 ++-- sim/arm/ChangeLog | 5 +++++ sim/arm/armos.c | 2 +- sim/arm/wrapper.c | 4 ++-- sim/avr/ChangeLog | 4 ++++ sim/avr/interp.c | 2 +- sim/bfin/ChangeLog | 4 ++++ sim/bfin/interp.c | 2 +- sim/common/ChangeLog | 12 ++++++++++++ sim/common/Make-common.in | 4 ++-- sim/common/callback.c | 2 +- sim/common/gentmap.c | 2 +- sim/common/sim-basics.h | 4 ++-- sim/common/sim-close.c | 2 +- sim/common/sim-core.c | 2 +- sim/common/sim-load.c | 4 ++-- sim/common/sim-module.h | 2 +- sim/common/syscall.c | 2 +- sim/cr16/ChangeLog | 6 ++++++ sim/cr16/Makefile.in | 2 +- sim/cr16/cr16_sim.h | 4 ++-- sim/cr16/interp.c | 4 ++-- sim/d10v/ChangeLog | 6 ++++++ sim/d10v/Makefile.in | 2 +- sim/d10v/d10v_sim.h | 4 ++-- sim/d10v/interp.c | 4 ++-- sim/erc32/ChangeLog | 5 +++++ sim/erc32/interf.c | 2 +- sim/erc32/sis.h | 4 ++-- sim/example-synacor/ChangeLog | 4 ++++ sim/example-synacor/interp.c | 4 ++-- sim/ft32/ChangeLog | 4 ++++ sim/ft32/interp.c | 4 ++-- sim/m32c/ChangeLog | 5 +++++ sim/m32c/gdb-if.c | 4 ++-- sim/m32c/syscalls.c | 2 +- sim/m68hc11/ChangeLog | 4 ++++ sim/m68hc11/sim-main.h | 4 ++-- sim/mcore/ChangeLog | 4 ++++ sim/mcore/interp.c | 4 ++-- sim/microblaze/ChangeLog | 4 ++++ sim/microblaze/interp.c | 4 ++-- sim/mips/ChangeLog | 4 ++++ sim/mips/interp.c | 4 ++-- sim/mn10300/ChangeLog | 4 ++++ sim/mn10300/mn10300_sim.h | 4 ++-- sim/moxie/ChangeLog | 4 ++++ sim/moxie/interp.c | 2 +- sim/ppc/ChangeLog | 8 ++++++++ sim/ppc/Makefile.in | 4 ++-- sim/ppc/gdb-sim.c | 4 ++-- sim/ppc/main.c | 4 ++-- sim/ppc/psim.h | 2 +- sim/ppc/sim_calls.c | 4 ++-- sim/pru/ChangeLog | 4 ++++ sim/pru/interp.c | 4 ++-- sim/rl78/ChangeLog | 6 ++++++ sim/rl78/Makefile.in | 4 ++-- sim/rl78/gdb-if.c | 4 ++-- sim/rl78/load.h | 2 +- sim/rx/ChangeLog | 6 ++++++ sim/rx/gdb-if.c | 4 ++-- sim/rx/load.h | 2 +- sim/rx/syscalls.c | 2 +- sim/sh/ChangeLog | 4 ++++ sim/sh/interp.c | 4 ++-- 76 files changed, 211 insertions(+), 81 deletions(-) create mode 100644 include/sim/ChangeLog rename include/{gdb => sim}/callback.h (99%) rename include/{gdb/remote-sim.h => sim/sim.h} (99%) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index c94628c5c9b..17288692331 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,8 @@ +2021-05-14 Mike Frysinger + + * remote-sim.c: Change gdb/callback.h & gdb/remote-sim.h includes to + sim/callback.h & sim/sim.h. + 2021-05-13 Mike Frysinger * lm32-tdep.c: Delete gdb/callback.h, gdb/remote-sim.h, and diff --git a/gdb/remote-sim.c b/gdb/remote-sim.c index f2cf8dbd711..5bedc04011d 100644 --- a/gdb/remote-sim.c +++ b/gdb/remote-sim.c @@ -33,8 +33,8 @@ #include "target.h" #include "process-stratum-target.h" #include "gdbcore.h" -#include "gdb/callback.h" -#include "gdb/remote-sim.h" +#include "sim/callback.h" +#include "sim/sim.h" #include "command.h" #include "regcache.h" #include "sim-regno.h" diff --git a/include/gdb/ChangeLog b/include/gdb/ChangeLog index 32a0928a786..17d9cb61264 100644 --- a/include/gdb/ChangeLog +++ b/include/gdb/ChangeLog @@ -1,3 +1,8 @@ +2021-05-14 Mike Frysinger + + * callback.h: Moved to ../sim/callback.h. + * remote-sim.h: Moved to ../sim/sim.h. + 2021-02-04 Mike Frysinger * sim-riscv.h: New file. diff --git a/include/sim/ChangeLog b/include/sim/ChangeLog new file mode 100644 index 00000000000..f2aba1e15d8 --- /dev/null +++ b/include/sim/ChangeLog @@ -0,0 +1,4 @@ +2021-05-14 Mike Frysinger + + * callback.h: Moved from ../gdb/callback.h. + * sim.h: Moved from ../gdb/remote-sim.h. diff --git a/include/gdb/callback.h b/include/sim/callback.h similarity index 99% rename from include/gdb/callback.h rename to include/sim/callback.h index a2e02631628..f021f4d6e4d 100644 --- a/include/gdb/callback.h +++ b/include/sim/callback.h @@ -42,8 +42,8 @@ is ENVIRONMENT_OPERATING. */ -#ifndef CALLBACK_H -#define CALLBACK_H +#ifndef SIM_CALLBACK_H +#define SIM_CALLBACK_H /* ??? The reason why we check for va_start here should be documented. */ diff --git a/include/gdb/remote-sim.h b/include/sim/sim.h similarity index 99% rename from include/gdb/remote-sim.h rename to include/sim/sim.h index a3ba3aa36cd..72d0a619aaf 100644 --- a/include/gdb/remote-sim.h +++ b/include/sim/sim.h @@ -17,8 +17,8 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -#if !defined (REMOTE_SIM_H) -#define REMOTE_SIM_H 1 +#ifndef SIM_SIM_H +#define SIM_SIM_H 1 #ifdef __cplusplus extern "C" { @@ -296,4 +296,4 @@ char **sim_complete_command (SIM_DESC sd, const char *text, const char *word); } #endif -#endif /* !defined (REMOTE_SIM_H) */ +#endif /* !defined (SIM_SIM_H) */ diff --git a/sim/ChangeLog b/sim/ChangeLog index 236b156c696..61bb0f4e030 100644 --- a/sim/ChangeLog +++ b/sim/ChangeLog @@ -1,3 +1,7 @@ +2021-05-14 Mike Frysinger + + * README-HACKING: Update callback.h path. + 2021-05-12 Mike Frysinger * README-HACKING: Delete mention of SIM_AC_OPTION_ENVIRONMENT. diff --git a/sim/README-HACKING b/sim/README-HACKING index 69d08ff1ecf..d4867c9e79e 100644 --- a/sim/README-HACKING +++ b/sim/README-HACKING @@ -294,7 +294,7 @@ Userspace System Calls By default, the libgloss userspace is simulated. That means the system call numbers and calling convention matches that of libgloss. Simulating other userspaces (such as Linux) is pretty straightforward, but let's first focus -on the basics. The basic API is covered in include/gdb/callback.h. +on the basics. The basic API is covered in include/sim/callback.h. When an instruction is simulated that invokes the system call method (such as forcing a hardware trap or exception), your simulator code should set up the diff --git a/sim/aarch64/ChangeLog b/sim/aarch64/ChangeLog index fba3984299d..085aea6dfb6 100644 --- a/sim/aarch64/ChangeLog +++ b/sim/aarch64/ChangeLog @@ -1,3 +1,8 @@ +2021-05-14 Mike Frysinger + + * cpustate.h: Update include path. + * interp.c: Likewise. + 2021-05-04 Mike Frysinger * configure: Regenerate. diff --git a/sim/aarch64/cpustate.h b/sim/aarch64/cpustate.h index 00b62e1a6f5..c3f26376f49 100644 --- a/sim/aarch64/cpustate.h +++ b/sim/aarch64/cpustate.h @@ -27,7 +27,7 @@ #include #include -#include "gdb/remote-sim.h" +#include "sim/sim.h" /* Symbolic names used to identify general registers which also match the registers indices in machine code. diff --git a/sim/aarch64/interp.c b/sim/aarch64/interp.c index fae2b7a06bb..cc3cf6add34 100644 --- a/sim/aarch64/interp.c +++ b/sim/aarch64/interp.c @@ -29,8 +29,8 @@ #include "ansidecl.h" #include "bfd.h" -#include "gdb/callback.h" -#include "gdb/remote-sim.h" +#include "sim/callback.h" +#include "sim/sim.h" #include "gdb/signals.h" #include "gdb/sim-aarch64.h" diff --git a/sim/arm/ChangeLog b/sim/arm/ChangeLog index 27f651a9d5d..7124a6d0a32 100644 --- a/sim/arm/ChangeLog +++ b/sim/arm/ChangeLog @@ -1,3 +1,8 @@ +2021-05-14 Mike Frysinger + + * armos.c: Update include path. + * wrapper.c: Likewise. + 2021-05-04 Mike Frysinger * configure: Regenerate. diff --git a/sim/arm/armos.c b/sim/arm/armos.c index 2ce7051a44c..77b256fd5b3 100644 --- a/sim/arm/armos.c +++ b/sim/arm/armos.c @@ -54,7 +54,7 @@ /* For RDIError_BreakpointReached. */ #include "dbg_rdi.h" -#include "gdb/callback.h" +#include "sim/callback.h" extern host_callback *sim_callback; extern unsigned ARMul_OSInit (ARMul_State *); diff --git a/sim/arm/wrapper.c b/sim/arm/wrapper.c index 54a04f42428..d25184afa09 100644 --- a/sim/arm/wrapper.c +++ b/sim/arm/wrapper.c @@ -27,8 +27,8 @@ #include #include #include -#include "gdb/callback.h" -#include "gdb/remote-sim.h" +#include "sim/callback.h" +#include "sim/sim.h" #include "sim-main.h" #include "sim-options.h" #include "armemu.h" diff --git a/sim/avr/ChangeLog b/sim/avr/ChangeLog index 646f318b894..128d14bfb5b 100644 --- a/sim/avr/ChangeLog +++ b/sim/avr/ChangeLog @@ -1,3 +1,7 @@ +2021-05-14 Mike Frysinger + + * interp.c: Update include path. + 2021-05-04 Mike Frysinger * configure: Regenerate. diff --git a/sim/avr/interp.c b/sim/avr/interp.c index c806f4c46eb..df1f6e55401 100644 --- a/sim/avr/interp.c +++ b/sim/avr/interp.c @@ -23,7 +23,7 @@ #include "bfd.h" #include "libiberty.h" -#include "gdb/remote-sim.h" +#include "sim/sim.h" #include "sim-main.h" #include "sim-base.h" diff --git a/sim/bfin/ChangeLog b/sim/bfin/ChangeLog index b5f70d2bb68..3dff4ed2976 100644 --- a/sim/bfin/ChangeLog +++ b/sim/bfin/ChangeLog @@ -1,3 +1,7 @@ +2021-05-14 Mike Frysinger + + * interp.c: Update include path. + 2021-05-04 Mike Frysinger * configure: Regenerate. diff --git a/sim/bfin/interp.c b/sim/bfin/interp.c index a4333daa44d..aa5c245c829 100644 --- a/sim/bfin/interp.c +++ b/sim/bfin/interp.c @@ -29,7 +29,7 @@ #include #include -#include "gdb/callback.h" +#include "sim/callback.h" #include "gdb/signals.h" #include "sim-main.h" #include "sim-syscall.h" diff --git a/sim/common/ChangeLog b/sim/common/ChangeLog index 4fb31af3b18..fb0f8a851c6 100644 --- a/sim/common/ChangeLog +++ b/sim/common/ChangeLog @@ -1,3 +1,15 @@ +2021-05-14 Mike Frysinger + + * Make-common.in (callback_h, remote_sim_h): Update path. + * callback.c: Update include path. + * gentmap.c (gen_targ_map_c): Likewise. + * sim-basics.h: Likewise. + * sim-close.c: Likewise. + * sim-core.c: Likewise. + * sim-load.c: Likewise. + * sim-module.h: Likewise. + * syscall.c: Likewise. + 2021-05-08 Mike Frysinger * Make-common.in (modules.c): Touch $@ at the end. diff --git a/sim/common/Make-common.in b/sim/common/Make-common.in index 56b36b23572..d38c849c40d 100644 --- a/sim/common/Make-common.in +++ b/sim/common/Make-common.in @@ -258,8 +258,8 @@ LINK_FOR_BUILD = $(CC_FOR_BUILD) $(BUILD_CFLAGS) $(LDFLAGS_FOR_BUILD) -o $@ RUNTESTFLAGS = -callback_h = $(srcroot)/include/gdb/callback.h -remote_sim_h = $(srcroot)/include/gdb/remote-sim.h +callback_h = $(srcroot)/include/sim/callback.h +remote_sim_h = $(srcroot)/include/sim/sim.h all: libsim.a run$(EXEEXT) .gdbinit diff --git a/sim/common/callback.c b/sim/common/callback.c index 55280abb04b..9e6d456e537 100644 --- a/sim/common/callback.c +++ b/sim/common/callback.c @@ -35,7 +35,7 @@ #include #include #include -#include "gdb/callback.h" +#include "sim/callback.h" #include "targ-vals.h" /* For xmalloc. */ #include "libiberty.h" diff --git a/sim/common/gentmap.c b/sim/common/gentmap.c index a606fad0e4f..8085c3576ac 100644 --- a/sim/common/gentmap.c +++ b/sim/common/gentmap.c @@ -71,7 +71,7 @@ gen_targ_map_c (void) printf ("#include \n"); printf ("#include \n"); printf ("#include \"ansidecl.h\"\n"); - printf ("#include \"gdb/callback.h\"\n"); + printf ("#include \"sim/callback.h\"\n"); printf ("#include \"targ-vals.h\"\n"); printf ("\n"); diff --git a/sim/common/sim-basics.h b/sim/common/sim-basics.h index e822fb2eb81..7d9c831da51 100644 --- a/sim/common/sim-basics.h +++ b/sim/common/sim-basics.h @@ -119,8 +119,8 @@ typedef enum { /* Basic definitions - ordered so that nothing calls what comes after it. */ #include "ansidecl.h" -#include "gdb/callback.h" -#include "gdb/remote-sim.h" +#include "sim/callback.h" +#include "sim/sim.h" #include "sim-config.h" diff --git a/sim/common/sim-close.c b/sim/common/sim-close.c index 6878dfcbf31..e64d59e6361 100644 --- a/sim/common/sim-close.c +++ b/sim/common/sim-close.c @@ -20,7 +20,7 @@ #include "sim-main.h" #include "sim-module.h" -#include "gdb/remote-sim.h" +#include "sim/sim.h" /* Generic implementation of sim_close that works with simulators that use sim-module for all custom runtime options. */ diff --git a/sim/common/sim-core.c b/sim/common/sim-core.c index 9b1e1683210..222f9fd8fe9 100644 --- a/sim/common/sim-core.c +++ b/sim/common/sim-core.c @@ -454,7 +454,7 @@ sim_core_translate (sim_core_mapping *mapping, #if EXTERN_SIM_CORE_P -/* See include/gdb/remote-sim.h. */ +/* See include/sim/sim.h. */ char * sim_memory_map (SIM_DESC sd) { diff --git a/sim/common/sim-load.c b/sim/common/sim-load.c index 04681c524a0..b9d85ca2fd6 100644 --- a/sim/common/sim-load.c +++ b/sim/common/sim-load.c @@ -31,8 +31,8 @@ along with this program. If not, see . */ #include "bfd.h" #include "sim-utils.h" -#include "gdb/callback.h" -#include "gdb/remote-sim.h" +#include "sim/callback.h" +#include "sim/sim.h" static void eprintf (host_callback *, const char *, ...); static void xprintf (host_callback *, const char *, ...); diff --git a/sim/common/sim-module.h b/sim/common/sim-module.h index dad55719431..9c0918fb060 100644 --- a/sim/common/sim-module.h +++ b/sim/common/sim-module.h @@ -30,7 +30,7 @@ along with this program. If not, see . */ TODO: Add facilities for saving/restoring state to/from a file. */ -#include "gdb/remote-sim.h" +#include "sim/sim.h" /* Various function types. */ diff --git a/sim/common/syscall.c b/sim/common/syscall.c index f2883c493ac..258b3d694f4 100644 --- a/sim/common/syscall.c +++ b/sim/common/syscall.c @@ -40,7 +40,7 @@ #include #include #include -#include "gdb/callback.h" +#include "sim/callback.h" #include "targ-vals.h" #ifndef ENOSYS diff --git a/sim/cr16/ChangeLog b/sim/cr16/ChangeLog index 886ce9b469e..ae43ba170e5 100644 --- a/sim/cr16/ChangeLog +++ b/sim/cr16/ChangeLog @@ -1,3 +1,9 @@ +2021-05-14 Mike Frysinger + + * Makefile.in: Update path. + * cr16_sim.h: Update include path. + * interp.c: Likewise. + 2021-05-04 Mike Frysinger * configure: Regenerate. diff --git a/sim/cr16/Makefile.in b/sim/cr16/Makefile.in index 8cfe3ea3b26..6d6555a3261 100644 --- a/sim/cr16/Makefile.in +++ b/sim/cr16/Makefile.in @@ -27,7 +27,7 @@ SIM_EXTRA_CLEAN = clean-extra SIM_EXTRA_DEPS = simops.h -INCLUDE = cr16_sim.h $(srcroot)/include/gdb/callback.h targ-vals.h \ +INCLUDE = cr16_sim.h $(srcroot)/include/sim/callback.h targ-vals.h \ $(srcroot)/include/gdb/sim-cr16.h # This selects the cr16 newlib/libgloss syscall definitions. diff --git a/sim/cr16/cr16_sim.h b/sim/cr16/cr16_sim.h index 8232f0743f7..c3d590d537b 100644 --- a/sim/cr16/cr16_sim.h +++ b/sim/cr16/cr16_sim.h @@ -23,7 +23,7 @@ #include #include #include "ansidecl.h" -#include "gdb/callback.h" +#include "sim/callback.h" #include "opcode/cr16.h" #include "bfd.h" @@ -41,7 +41,7 @@ extern int cr16_debug; -#include "gdb/remote-sim.h" +#include "sim/sim.h" #include "sim-config.h" #include "sim-types.h" diff --git a/sim/cr16/interp.c b/sim/cr16/interp.c index 8f7fafa715e..7db7f56e21b 100644 --- a/sim/cr16/interp.c +++ b/sim/cr16/interp.c @@ -23,8 +23,8 @@ #include #include #include "bfd.h" -#include "gdb/callback.h" -#include "gdb/remote-sim.h" +#include "sim/callback.h" +#include "sim/sim.h" #include "sim-main.h" #include "sim-options.h" diff --git a/sim/d10v/ChangeLog b/sim/d10v/ChangeLog index cc70f28bc35..0a5c7a76202 100644 --- a/sim/d10v/ChangeLog +++ b/sim/d10v/ChangeLog @@ -1,3 +1,9 @@ +2021-05-14 Mike Frysinger + + * Makefile.in: Update path. + * d10v_sim.h: Update include path. + * interp.c: Likewise. + 2021-05-04 Mike Frysinger * configure: Regenerate. diff --git a/sim/d10v/Makefile.in b/sim/d10v/Makefile.in index 13b902dec5d..67c7efdf32b 100644 --- a/sim/d10v/Makefile.in +++ b/sim/d10v/Makefile.in @@ -28,7 +28,7 @@ SIM_EXTRA_CLEAN = clean-extra SIM_EXTRA_DEPS = simops.h -INCLUDE = d10v_sim.h $(srcroot)/include/gdb/callback.h targ-vals.h endian.c \ +INCLUDE = d10v_sim.h $(srcroot)/include/sim/callback.h targ-vals.h endian.c \ $(srcroot)/include/gdb/sim-d10v.h # This selects the d10v newlib/libgloss syscall definitions. diff --git a/sim/d10v/d10v_sim.h b/sim/d10v/d10v_sim.h index 64f974f01db..972402cc4d0 100644 --- a/sim/d10v/d10v_sim.h +++ b/sim/d10v/d10v_sim.h @@ -3,7 +3,7 @@ #include #include #include "ansidecl.h" -#include "gdb/callback.h" +#include "sim/callback.h" #include "opcode/d10v.h" #include "bfd.h" @@ -21,7 +21,7 @@ extern int d10v_debug; -#include "gdb/remote-sim.h" +#include "sim/sim.h" #include "sim-config.h" #include "sim-types.h" diff --git a/sim/d10v/interp.c b/sim/d10v/interp.c index 62507760af9..a0dc2f59685 100644 --- a/sim/d10v/interp.c +++ b/sim/d10v/interp.c @@ -2,8 +2,8 @@ #include #include #include "bfd.h" -#include "gdb/callback.h" -#include "gdb/remote-sim.h" +#include "sim/callback.h" +#include "sim/sim.h" #include "sim-main.h" #include "sim-options.h" diff --git a/sim/erc32/ChangeLog b/sim/erc32/ChangeLog index 67a763bf58b..950384a11cd 100644 --- a/sim/erc32/ChangeLog +++ b/sim/erc32/ChangeLog @@ -1,3 +1,8 @@ +2021-05-14 Mike Frysinger + + * interf.c: Update include path. + * sis.h: Likewise. + 2021-05-04 Mike Frysinger * configure: Regenerate. diff --git a/sim/erc32/interf.c b/sim/erc32/interf.c index c8e025b23e0..c199dabea37 100644 --- a/sim/erc32/interf.c +++ b/sim/erc32/interf.c @@ -28,7 +28,7 @@ #include #include "sim-config.h" -#include "gdb/remote-sim.h" +#include "sim/sim.h" #include "gdb/signals.h" #define PSR_CWP 0x7 diff --git a/sim/erc32/sis.h b/sim/erc32/sis.h index 428a6bdcf15..10c500f820a 100644 --- a/sim/erc32/sis.h +++ b/sim/erc32/sis.h @@ -15,8 +15,8 @@ #include "config.h" #include "ansidecl.h" -#include "gdb/callback.h" -#include "gdb/remote-sim.h" +#include "sim/callback.h" +#include "sim/sim.h" #include #include diff --git a/sim/example-synacor/ChangeLog b/sim/example-synacor/ChangeLog index f790f9232a7..d491f2add17 100644 --- a/sim/example-synacor/ChangeLog +++ b/sim/example-synacor/ChangeLog @@ -1,3 +1,7 @@ +2021-05-14 Mike Frysinger + + * interp.c: Update include path. + 2021-05-04 Mike Frysinger * configure: Regenerate. diff --git a/sim/example-synacor/interp.c b/sim/example-synacor/interp.c index d2080b6f7f2..e613e167828 100644 --- a/sim/example-synacor/interp.c +++ b/sim/example-synacor/interp.c @@ -22,8 +22,8 @@ specific simulator. Normally this file will be kept small and the target details will live in other files. - For more specific details on these functions, see the gdb/remote-sim.h - header file. */ + For more specific details on these functions, see the sim/sim.h header + file. */ #include "config.h" diff --git a/sim/ft32/ChangeLog b/sim/ft32/ChangeLog index 9389818f33c..185d16f3db0 100644 --- a/sim/ft32/ChangeLog +++ b/sim/ft32/ChangeLog @@ -1,3 +1,7 @@ +2021-05-14 Mike Frysinger + + * interp.c: Update include path. + 2021-05-04 Mike Frysinger * configure: Regenerate. diff --git a/sim/ft32/interp.c b/sim/ft32/interp.c index ba2297f4078..6120df179b5 100644 --- a/sim/ft32/interp.c +++ b/sim/ft32/interp.c @@ -25,9 +25,9 @@ #include #include "bfd.h" -#include "gdb/callback.h" +#include "sim/callback.h" #include "libiberty.h" -#include "gdb/remote-sim.h" +#include "sim/sim.h" #include "sim-main.h" #include "sim-options.h" diff --git a/sim/m32c/ChangeLog b/sim/m32c/ChangeLog index f8842f57af1..099d70d1b13 100644 --- a/sim/m32c/ChangeLog +++ b/sim/m32c/ChangeLog @@ -1,3 +1,8 @@ +2021-05-14 Mike Frysinger + + * gdb-if.c: Update include path. + * syscalls.c: Likewise. + 2021-05-07 Mike Frysinger * mem.c: Include errno.h. diff --git a/sim/m32c/gdb-if.c b/sim/m32c/gdb-if.c index c2aff064ff0..36986487673 100644 --- a/sim/m32c/gdb-if.c +++ b/sim/m32c/gdb-if.c @@ -28,8 +28,8 @@ along with this program. If not, see . */ #include "ansidecl.h" #include "libiberty.h" -#include "gdb/callback.h" -#include "gdb/remote-sim.h" +#include "sim/callback.h" +#include "sim/sim.h" #include "gdb/signals.h" #include "gdb/sim-m32c.h" diff --git a/sim/m32c/syscalls.c b/sim/m32c/syscalls.c index 86695cb4dde..e9400840be9 100644 --- a/sim/m32c/syscalls.c +++ b/sim/m32c/syscalls.c @@ -25,7 +25,7 @@ along with this program. If not, see . */ #include #include -#include "gdb/callback.h" +#include "sim/callback.h" #include "cpu.h" #include "mem.h" diff --git a/sim/m68hc11/ChangeLog b/sim/m68hc11/ChangeLog index e88f12e444d..6f2bef52e98 100644 --- a/sim/m68hc11/ChangeLog +++ b/sim/m68hc11/ChangeLog @@ -1,3 +1,7 @@ +2021-05-14 Mike Frysinger + + * sim-main.h: Update include path. + 2021-05-07 Mike Frysinger * dv-m68hc11tim.c (cycle_to_string): Increase buf to 128 bytes. diff --git a/sim/m68hc11/sim-main.h b/sim/m68hc11/sim-main.h index f42750f0a58..9b461ff0042 100644 --- a/sim/m68hc11/sim-main.h +++ b/sim/m68hc11/sim-main.h @@ -28,8 +28,8 @@ along with this program. If not, see . */ #include "opcode/m68hc11.h" -#include "gdb/callback.h" -#include "gdb/remote-sim.h" +#include "sim/callback.h" +#include "sim/sim.h" #include "opcode/m68hc11.h" #include "sim-types.h" diff --git a/sim/mcore/ChangeLog b/sim/mcore/ChangeLog index 7a003930984..d165f3c5182 100644 --- a/sim/mcore/ChangeLog +++ b/sim/mcore/ChangeLog @@ -1,3 +1,7 @@ +2021-05-14 Mike Frysinger + + * interp.c: Update include path. + 2021-05-04 Mike Frysinger * configure.ac: Delete SIM_AC_OPTION_WARNINGS call. diff --git a/sim/mcore/interp.c b/sim/mcore/interp.c index f726c1e7db7..5e8ad3b8a2f 100644 --- a/sim/mcore/interp.c +++ b/sim/mcore/interp.c @@ -24,9 +24,9 @@ along with this program. If not, see . */ #include #include #include "bfd.h" -#include "gdb/callback.h" +#include "sim/callback.h" #include "libiberty.h" -#include "gdb/remote-sim.h" +#include "sim/sim.h" #include "sim-main.h" #include "sim-base.h" diff --git a/sim/microblaze/ChangeLog b/sim/microblaze/ChangeLog index c78e896f4c7..efedaa53ebb 100644 --- a/sim/microblaze/ChangeLog +++ b/sim/microblaze/ChangeLog @@ -1,3 +1,7 @@ +2021-05-14 Mike Frysinger + + * interp.c: Update include path. + 2021-05-04 Mike Frysinger * interp.c (sim_engine_run): Call TRACE_INSN. diff --git a/sim/microblaze/interp.c b/sim/microblaze/interp.c index bff73279d26..1b89bb49408 100644 --- a/sim/microblaze/interp.c +++ b/sim/microblaze/interp.c @@ -22,9 +22,9 @@ #include #include #include "bfd.h" -#include "gdb/callback.h" +#include "sim/callback.h" #include "libiberty.h" -#include "gdb/remote-sim.h" +#include "sim/sim.h" #include "sim-main.h" #include "sim-options.h" diff --git a/sim/mips/ChangeLog b/sim/mips/ChangeLog index c8cf4e2501e..963e85ae092 100644 --- a/sim/mips/ChangeLog +++ b/sim/mips/ChangeLog @@ -1,3 +1,7 @@ +2021-05-14 Mike Frysinger + + * interp.c: Update include path. + 2021-05-04 Mike Frysinger * dv-tx3904sio.c: Include stdlib.h. diff --git a/sim/mips/interp.c b/sim/mips/interp.c index 64259cc3fed..49b79f91dbc 100644 --- a/sim/mips/interp.c +++ b/sim/mips/interp.c @@ -48,8 +48,8 @@ code on the hardware. #include "libiberty.h" #include "bfd.h" #include "elf-bfd.h" -#include "gdb/callback.h" /* GDB simulator callback interface */ -#include "gdb/remote-sim.h" /* GDB simulator interface */ +#include "sim/callback.h" /* GDB simulator callback interface */ +#include "sim/sim.h" /* GDB simulator interface */ #include "sim-syscall.h" /* Simulator system call support */ char* pr_addr (SIM_ADDR addr); diff --git a/sim/mn10300/ChangeLog b/sim/mn10300/ChangeLog index a9ba8d74891..fce17ed96e1 100644 --- a/sim/mn10300/ChangeLog +++ b/sim/mn10300/ChangeLog @@ -1,3 +1,7 @@ +2021-05-14 Mike Frysinger + + * mn10300_sim.h: Update include path. + 2021-05-04 Mike Frysinger * op_utils.c: Delete sys/times.h include. diff --git a/sim/mn10300/mn10300_sim.h b/sim/mn10300/mn10300_sim.h index f70d486612b..c63efaa6c76 100644 --- a/sim/mn10300/mn10300_sim.h +++ b/sim/mn10300/mn10300_sim.h @@ -1,10 +1,10 @@ #include #include #include "ansidecl.h" -#include "gdb/callback.h" +#include "sim/callback.h" #include "opcode/mn10300.h" #include -#include "gdb/remote-sim.h" +#include "sim/sim.h" #include "bfd.h" #include "sim-fpu.h" diff --git a/sim/moxie/ChangeLog b/sim/moxie/ChangeLog index 26864471b8a..20d2ecfc60f 100644 --- a/sim/moxie/ChangeLog +++ b/sim/moxie/ChangeLog @@ -1,3 +1,7 @@ +2021-05-14 Mike Frysinger + + * interp.c: Update include path. + 2021-05-04 Mike Frysinger * interp.c: Delete sys/times.h include. diff --git a/sim/moxie/interp.c b/sim/moxie/interp.c index 4228dd5a466..135716386f7 100644 --- a/sim/moxie/interp.c +++ b/sim/moxie/interp.c @@ -26,7 +26,7 @@ along with this program. If not, see . */ #include #include "bfd.h" #include "libiberty.h" -#include "gdb/remote-sim.h" +#include "sim/sim.h" #include "sim-main.h" #include "sim-base.h" diff --git a/sim/ppc/ChangeLog b/sim/ppc/ChangeLog index 5f7f3067612..e1ed6d624af 100644 --- a/sim/ppc/ChangeLog +++ b/sim/ppc/ChangeLog @@ -1,3 +1,11 @@ +2021-05-14 Mike Frysinger + + * Makefile.in: Update path. + * gdb-sim.c: Update include path. + * main.c: Likewise. + * psim.h: Likewise. + * sim_calls.c: Likewise. + 2021-04-22 Tom Tromey * mon.c: Update includes. diff --git a/sim/ppc/Makefile.in b/sim/ppc/Makefile.in index 7686937f421..63b957d1b4f 100644 --- a/sim/ppc/Makefile.in +++ b/sim/ppc/Makefile.in @@ -168,8 +168,8 @@ all: run $(TARGETLIB) $(GDB_OBJ) # Headers outside sim/ppc. ANSIDECL_H = $(srcroot)/include/ansidecl.h BFD_H = ../../bfd/bfd.h -GDB_CALLBACK_H = $(srcroot)/include/gdb/callback.h -GDB_REMOTE_SIM_H = $(srcroot)/include/gdb/remote-sim.h +GDB_CALLBACK_H = $(srcroot)/include/sim/callback.h +GDB_REMOTE_SIM_H = $(srcroot)/include/sim/sim.h GDB_SIM_PPC_H = $(srcroot)/include/gdb/sim-ppc.h COMMON_SIM_BASE_H = $(srcroot)/sim/common/sim-base.h COMMON_SIM_BASICS_H = $(srcroot)/sim/common/sim-basics.h diff --git a/sim/ppc/gdb-sim.c b/sim/ppc/gdb-sim.c index 8b4e5e31072..7217d9c9c52 100644 --- a/sim/ppc/gdb-sim.c +++ b/sim/ppc/gdb-sim.c @@ -24,8 +24,8 @@ #include "ansidecl.h" #include "sim_callbacks.h" -#include "gdb/callback.h" -#include "gdb/remote-sim.h" +#include "sim/callback.h" +#include "sim/sim.h" #include "gdb/sim-ppc.h" /* Return the register name for the supplied SPR if any, or NULL if diff --git a/sim/ppc/main.c b/sim/ppc/main.c index 1e73444ff83..f3f2e9ef338 100644 --- a/sim/ppc/main.c +++ b/sim/ppc/main.c @@ -30,8 +30,8 @@ #include "events.h" /* FIXME: psim should provide the interface */ #include "bfd.h" -#include "gdb/callback.h" -#include "gdb/remote-sim.h" +#include "sim/callback.h" +#include "sim/sim.h" #include #ifdef HAVE_UNISTD_H diff --git a/sim/ppc/psim.h b/sim/ppc/psim.h index 07852c2109b..c38b03d8994 100644 --- a/sim/ppc/psim.h +++ b/sim/ppc/psim.h @@ -23,7 +23,7 @@ #include "basics.h" -#include "gdb/remote-sim.h" +#include "sim/sim.h" /* the system object */ /* typedef struct _psim psim; */ diff --git a/sim/ppc/sim_calls.c b/sim/ppc/sim_calls.c index c8364f09004..ce4464aa8ea 100644 --- a/sim/ppc/sim_calls.c +++ b/sim/ppc/sim_calls.c @@ -32,8 +32,8 @@ #include "libiberty.h" #include "bfd.h" -#include "gdb/callback.h" -#include "gdb/remote-sim.h" +#include "sim/callback.h" +#include "sim/sim.h" #include "gdb/signals.h" /* Define the rate at which the simulator should poll the host diff --git a/sim/pru/ChangeLog b/sim/pru/ChangeLog index ac947a3ddcc..5849e1d5911 100644 --- a/sim/pru/ChangeLog +++ b/sim/pru/ChangeLog @@ -1,3 +1,7 @@ +2021-05-14 Mike Frysinger + + * interp.c: Update include path. + 2021-05-04 Mike Frysinger * configure: Regenerate. diff --git a/sim/pru/interp.c b/sim/pru/interp.c index 8d247f3795f..6398c6714f2 100644 --- a/sim/pru/interp.c +++ b/sim/pru/interp.c @@ -23,9 +23,9 @@ #include #include #include "bfd.h" -#include "gdb/callback.h" +#include "sim/callback.h" #include "libiberty.h" -#include "gdb/remote-sim.h" +#include "sim/sim.h" #include "sim-main.h" #include "sim-assert.h" #include "sim-options.h" diff --git a/sim/rl78/ChangeLog b/sim/rl78/ChangeLog index f26d4d7a3ef..8ffa97ccfa4 100644 --- a/sim/rl78/ChangeLog +++ b/sim/rl78/ChangeLog @@ -1,3 +1,9 @@ +2021-05-14 Mike Frysinger + + * Makefile.in: Update path. + * gdb-if.c: Update include path. + * load.h: Likewise. + 2021-05-05 Mike Frysinger * gdb-if.c: Include libiberty.h. diff --git a/sim/rl78/Makefile.in b/sim/rl78/Makefile.in index 675f87be9b9..a7e5a97b5d2 100644 --- a/sim/rl78/Makefile.in +++ b/sim/rl78/Makefile.in @@ -40,8 +40,8 @@ arch = rl78 err.o : err.h fpu.o : cpu.h fpu.h gdb-if.o : cpu.h mem.h load.h \ - $(srcdir)/../../include/gdb/callback.h \ - $(srcdir)/../../include/gdb/remote-sim.h \ + $(srcdir)/../../include/sim/callback.h \ + $(srcdir)/../../include/sim/sim.h \ $(srcdir)/../../include/gdb/signals.h \ $(srcdir)/../../include/gdb/sim-rl78.h load.o : ../../bfd/bfd.h cpu.h mem.h diff --git a/sim/rl78/gdb-if.c b/sim/rl78/gdb-if.c index f4b6754f587..87e343cdd48 100644 --- a/sim/rl78/gdb-if.c +++ b/sim/rl78/gdb-if.c @@ -28,8 +28,8 @@ along with this program. If not, see . */ #include "ansidecl.h" #include "libiberty.h" -#include "gdb/callback.h" -#include "gdb/remote-sim.h" +#include "sim/callback.h" +#include "sim/sim.h" #include "gdb/signals.h" #include "gdb/sim-rl78.h" diff --git a/sim/rl78/load.h b/sim/rl78/load.h index 7461c2162ba..1eaf0457787 100644 --- a/sim/rl78/load.h +++ b/sim/rl78/load.h @@ -23,7 +23,7 @@ #define SIM_RL78_LOAD_H_ #include "bfd.h" -#include "gdb/callback.h" +#include "sim/callback.h" void rl78_load (bfd *, host_callback *callbacks, const char * const simname); diff --git a/sim/rx/ChangeLog b/sim/rx/ChangeLog index b941cafcd57..cbb3b471d4d 100644 --- a/sim/rx/ChangeLog +++ b/sim/rx/ChangeLog @@ -1,3 +1,9 @@ +2021-05-14 Mike Frysinger + + * gdb-if.c: Update include path. + * load.h: Likewise. + * syscalls.c: Likewise. + 2021-05-05 Mike Frysinger * gdb-if.c: Include libiberty.h. diff --git a/sim/rx/gdb-if.c b/sim/rx/gdb-if.c index ec419109588..4a0f0701a56 100644 --- a/sim/rx/gdb-if.c +++ b/sim/rx/gdb-if.c @@ -28,8 +28,8 @@ along with this program. If not, see . */ #include "ansidecl.h" #include "libiberty.h" -#include "gdb/callback.h" -#include "gdb/remote-sim.h" +#include "sim/callback.h" +#include "sim/sim.h" #include "gdb/signals.h" #include "gdb/sim-rx.h" diff --git a/sim/rx/load.h b/sim/rx/load.h index bb227769cac..562fa235aeb 100644 --- a/sim/rx/load.h +++ b/sim/rx/load.h @@ -20,7 +20,7 @@ along with this program. If not, see . */ #include "bfd.h" -#include "gdb/callback.h" +#include "sim/callback.h" extern int default_machine; diff --git a/sim/rx/syscalls.c b/sim/rx/syscalls.c index 0c75c7dcdf8..73ca0f2b190 100644 --- a/sim/rx/syscalls.c +++ b/sim/rx/syscalls.c @@ -26,7 +26,7 @@ along with this program. If not, see . */ #include #include -#include "gdb/callback.h" +#include "sim/callback.h" #include "cpu.h" #include "mem.h" diff --git a/sim/sh/ChangeLog b/sim/sh/ChangeLog index d3c94d98197..be77f8c351e 100644 --- a/sim/sh/ChangeLog +++ b/sim/sh/ChangeLog @@ -1,3 +1,7 @@ +2021-05-14 Mike Frysinger + + * interp.c: Update include path. + 2021-05-04 Mike Frysinger * configure: Regenerate. diff --git a/sim/sh/interp.c b/sim/sh/interp.c index fa361bacc22..5fb6aff02f0 100644 --- a/sim/sh/interp.c +++ b/sim/sh/interp.c @@ -50,8 +50,8 @@ #endif #include "bfd.h" -#include "gdb/callback.h" -#include "gdb/remote-sim.h" +#include "sim/callback.h" +#include "sim/sim.h" #include "gdb/sim-sh.h" #include "sim-main.h" -- 2.30.2