diff options
| author | Mike Frysinger <vapier@gentoo.org> | 2021-05-12 00:35:54 -0400 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2021-05-14 00:41:05 -0400 |
| commit | df68e12b3b3eb91e54d6d888b73049562566e0b3 (patch) | |
| tree | b60781365aba1b34bacad73f34987c22615438a4 /sim | |
| parent | 183aaaf72a8c0643de1aab1018e23fe020e2ff79 (diff) | |
| download | gdb-df68e12b3b3eb91e54d6d888b73049562566e0b3.zip gdb-df68e12b3b3eb91e54d6d888b73049562566e0b3.tar.gz gdb-df68e12b3b3eb91e54d6d888b73049562566e0b3.tar.bz2 | |
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.
Diffstat (limited to 'sim')
70 files changed, 190 insertions, 74 deletions
diff --git a/sim/ChangeLog b/sim/ChangeLog index 236b156..61bb0f4 100644 --- a/sim/ChangeLog +++ b/sim/ChangeLog @@ -1,3 +1,7 @@ +2021-05-14 Mike Frysinger <vapier@gentoo.org> + + * README-HACKING: Update callback.h path. + 2021-05-12 Mike Frysinger <vapier@gentoo.org> * README-HACKING: Delete mention of SIM_AC_OPTION_ENVIRONMENT. diff --git a/sim/README-HACKING b/sim/README-HACKING index 69d08ff..d4867c9 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 fba3984..085aea6 100644 --- a/sim/aarch64/ChangeLog +++ b/sim/aarch64/ChangeLog @@ -1,3 +1,8 @@ +2021-05-14 Mike Frysinger <vapier@gentoo.org> + + * cpustate.h: Update include path. + * interp.c: Likewise. + 2021-05-04 Mike Frysinger <vapier@gentoo.org> * configure: Regenerate. diff --git a/sim/aarch64/cpustate.h b/sim/aarch64/cpustate.h index 00b62e1..c3f2637 100644 --- a/sim/aarch64/cpustate.h +++ b/sim/aarch64/cpustate.h @@ -27,7 +27,7 @@ #include <stdint.h> #include <inttypes.h> -#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 fae2b7a..cc3cf6a 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 27f651a..7124a6d 100644 --- a/sim/arm/ChangeLog +++ b/sim/arm/ChangeLog @@ -1,3 +1,8 @@ +2021-05-14 Mike Frysinger <vapier@gentoo.org> + + * armos.c: Update include path. + * wrapper.c: Likewise. + 2021-05-04 Mike Frysinger <vapier@gentoo.org> * configure: Regenerate. diff --git a/sim/arm/armos.c b/sim/arm/armos.c index 2ce7051..77b256f 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 54a04f4..d25184a 100644 --- a/sim/arm/wrapper.c +++ b/sim/arm/wrapper.c @@ -27,8 +27,8 @@ #include <string.h> #include <bfd.h> #include <signal.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" #include "armemu.h" diff --git a/sim/avr/ChangeLog b/sim/avr/ChangeLog index 646f318..128d14b 100644 --- a/sim/avr/ChangeLog +++ b/sim/avr/ChangeLog @@ -1,3 +1,7 @@ +2021-05-14 Mike Frysinger <vapier@gentoo.org> + + * interp.c: Update include path. + 2021-05-04 Mike Frysinger <vapier@gentoo.org> * configure: Regenerate. diff --git a/sim/avr/interp.c b/sim/avr/interp.c index c806f4c..df1f6e5 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 b5f70d2..3dff4ed 100644 --- a/sim/bfin/ChangeLog +++ b/sim/bfin/ChangeLog @@ -1,3 +1,7 @@ +2021-05-14 Mike Frysinger <vapier@gentoo.org> + + * interp.c: Update include path. + 2021-05-04 Mike Frysinger <vapier@gentoo.org> * configure: Regenerate. diff --git a/sim/bfin/interp.c b/sim/bfin/interp.c index a4333da..aa5c245 100644 --- a/sim/bfin/interp.c +++ b/sim/bfin/interp.c @@ -29,7 +29,7 @@ #include <unistd.h> #include <sys/time.h> -#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 4fb31af..fb0f8a8 100644 --- a/sim/common/ChangeLog +++ b/sim/common/ChangeLog @@ -1,3 +1,15 @@ +2021-05-14 Mike Frysinger <vapier@gentoo.org> + + * 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 <vapier@gentoo.org> * Make-common.in (modules.c): Touch $@ at the end. diff --git a/sim/common/Make-common.in b/sim/common/Make-common.in index 56b36b2..d38c849 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 55280ab..9e6d456 100644 --- a/sim/common/callback.c +++ b/sim/common/callback.c @@ -35,7 +35,7 @@ #include <time.h> #include <sys/types.h> #include <sys/stat.h> -#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 a606fad..8085c35 100644 --- a/sim/common/gentmap.c +++ b/sim/common/gentmap.c @@ -71,7 +71,7 @@ gen_targ_map_c (void) printf ("#include <errno.h>\n"); printf ("#include <fcntl.h>\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 e822fb2..7d9c831 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 6878dfc..e64d59e 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 9b1e168..222f9fd 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 04681c5..b9d85ca 100644 --- a/sim/common/sim-load.c +++ b/sim/common/sim-load.c @@ -31,8 +31,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ #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 dad5571..9c0918f 100644 --- a/sim/common/sim-module.h +++ b/sim/common/sim-module.h @@ -30,7 +30,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ 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 f2883c4..258b3d6 100644 --- a/sim/common/syscall.c +++ b/sim/common/syscall.c @@ -40,7 +40,7 @@ #include <time.h> #include <sys/types.h> #include <sys/stat.h> -#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 886ce9b..ae43ba1 100644 --- a/sim/cr16/ChangeLog +++ b/sim/cr16/ChangeLog @@ -1,3 +1,9 @@ +2021-05-14 Mike Frysinger <vapier@gentoo.org> + + * Makefile.in: Update path. + * cr16_sim.h: Update include path. + * interp.c: Likewise. + 2021-05-04 Mike Frysinger <vapier@gentoo.org> * configure: Regenerate. diff --git a/sim/cr16/Makefile.in b/sim/cr16/Makefile.in index 8cfe3ea..6d6555a 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 8232f07..c3d590d 100644 --- a/sim/cr16/cr16_sim.h +++ b/sim/cr16/cr16_sim.h @@ -23,7 +23,7 @@ #include <ctype.h> #include <limits.h> #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 8f7fafa..7db7f56 100644 --- a/sim/cr16/interp.c +++ b/sim/cr16/interp.c @@ -23,8 +23,8 @@ #include <stdlib.h> #include <string.h> #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 cc70f28..0a5c7a7 100644 --- a/sim/d10v/ChangeLog +++ b/sim/d10v/ChangeLog @@ -1,3 +1,9 @@ +2021-05-14 Mike Frysinger <vapier@gentoo.org> + + * Makefile.in: Update path. + * d10v_sim.h: Update include path. + * interp.c: Likewise. + 2021-05-04 Mike Frysinger <vapier@gentoo.org> * configure: Regenerate. diff --git a/sim/d10v/Makefile.in b/sim/d10v/Makefile.in index 13b902d..67c7efd 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 64f974f..972402c 100644 --- a/sim/d10v/d10v_sim.h +++ b/sim/d10v/d10v_sim.h @@ -3,7 +3,7 @@ #include <ctype.h> #include <limits.h> #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 6250776..a0dc2f5 100644 --- a/sim/d10v/interp.c +++ b/sim/d10v/interp.c @@ -2,8 +2,8 @@ #include <inttypes.h> #include <signal.h> #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 67a763b..950384a 100644 --- a/sim/erc32/ChangeLog +++ b/sim/erc32/ChangeLog @@ -1,3 +1,8 @@ +2021-05-14 Mike Frysinger <vapier@gentoo.org> + + * interf.c: Update include path. + * sis.h: Likewise. + 2021-05-04 Mike Frysinger <vapier@gentoo.org> * configure: Regenerate. diff --git a/sim/erc32/interf.c b/sim/erc32/interf.c index c8e025b..c199dab 100644 --- a/sim/erc32/interf.c +++ b/sim/erc32/interf.c @@ -28,7 +28,7 @@ #include <dis-asm.h> #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 428a6bd..10c500f 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 <sim-config.h> #include <stdint.h> diff --git a/sim/example-synacor/ChangeLog b/sim/example-synacor/ChangeLog index f790f92..d491f2a 100644 --- a/sim/example-synacor/ChangeLog +++ b/sim/example-synacor/ChangeLog @@ -1,3 +1,7 @@ +2021-05-14 Mike Frysinger <vapier@gentoo.org> + + * interp.c: Update include path. + 2021-05-04 Mike Frysinger <vapier@gentoo.org> * configure: Regenerate. diff --git a/sim/example-synacor/interp.c b/sim/example-synacor/interp.c index d2080b6..e613e16 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 9389818..185d16f 100644 --- a/sim/ft32/ChangeLog +++ b/sim/ft32/ChangeLog @@ -1,3 +1,7 @@ +2021-05-14 Mike Frysinger <vapier@gentoo.org> + + * interp.c: Update include path. + 2021-05-04 Mike Frysinger <vapier@gentoo.org> * configure: Regenerate. diff --git a/sim/ft32/interp.c b/sim/ft32/interp.c index ba2297f..6120df1 100644 --- a/sim/ft32/interp.c +++ b/sim/ft32/interp.c @@ -25,9 +25,9 @@ #include <stdint.h> #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 f8842f5..099d70d 100644 --- a/sim/m32c/ChangeLog +++ b/sim/m32c/ChangeLog @@ -1,3 +1,8 @@ +2021-05-14 Mike Frysinger <vapier@gentoo.org> + + * gdb-if.c: Update include path. + * syscalls.c: Likewise. + 2021-05-07 Mike Frysinger <vapier@gentoo.org> * mem.c: Include errno.h. diff --git a/sim/m32c/gdb-if.c b/sim/m32c/gdb-if.c index c2aff06..3698648 100644 --- a/sim/m32c/gdb-if.c +++ b/sim/m32c/gdb-if.c @@ -28,8 +28,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ #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 86695cb..e940084 100644 --- a/sim/m32c/syscalls.c +++ b/sim/m32c/syscalls.c @@ -25,7 +25,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ #include <unistd.h> #include <sys/time.h> -#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 e88f12e..6f2bef5 100644 --- a/sim/m68hc11/ChangeLog +++ b/sim/m68hc11/ChangeLog @@ -1,3 +1,7 @@ +2021-05-14 Mike Frysinger <vapier@gentoo.org> + + * sim-main.h: Update include path. + 2021-05-07 Mike Frysinger <vapier@gentoo.org> * 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 f42750f..9b461ff 100644 --- a/sim/m68hc11/sim-main.h +++ b/sim/m68hc11/sim-main.h @@ -28,8 +28,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ #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 7a00393..d165f3c 100644 --- a/sim/mcore/ChangeLog +++ b/sim/mcore/ChangeLog @@ -1,3 +1,7 @@ +2021-05-14 Mike Frysinger <vapier@gentoo.org> + + * interp.c: Update include path. + 2021-05-04 Mike Frysinger <vapier@gentoo.org> * configure.ac: Delete SIM_AC_OPTION_WARNINGS call. diff --git a/sim/mcore/interp.c b/sim/mcore/interp.c index f726c1e..5e8ad3b 100644 --- a/sim/mcore/interp.c +++ b/sim/mcore/interp.c @@ -24,9 +24,9 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ #include <sys/param.h> #include <unistd.h> #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 c78e896..efedaa5 100644 --- a/sim/microblaze/ChangeLog +++ b/sim/microblaze/ChangeLog @@ -1,3 +1,7 @@ +2021-05-14 Mike Frysinger <vapier@gentoo.org> + + * interp.c: Update include path. + 2021-05-04 Mike Frysinger <vapier@gentoo.org> * interp.c (sim_engine_run): Call TRACE_INSN. diff --git a/sim/microblaze/interp.c b/sim/microblaze/interp.c index bff7327..1b89bb4 100644 --- a/sim/microblaze/interp.c +++ b/sim/microblaze/interp.c @@ -22,9 +22,9 @@ #include <string.h> #include <unistd.h> #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 c8cf4e2..963e85a 100644 --- a/sim/mips/ChangeLog +++ b/sim/mips/ChangeLog @@ -1,3 +1,7 @@ +2021-05-14 Mike Frysinger <vapier@gentoo.org> + + * interp.c: Update include path. + 2021-05-04 Mike Frysinger <vapier@gentoo.org> * dv-tx3904sio.c: Include stdlib.h. diff --git a/sim/mips/interp.c b/sim/mips/interp.c index 64259cc..49b79f9 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 a9ba8d7..fce17ed 100644 --- a/sim/mn10300/ChangeLog +++ b/sim/mn10300/ChangeLog @@ -1,3 +1,7 @@ +2021-05-14 Mike Frysinger <vapier@gentoo.org> + + * mn10300_sim.h: Update include path. + 2021-05-04 Mike Frysinger <vapier@gentoo.org> * op_utils.c: Delete sys/times.h include. diff --git a/sim/mn10300/mn10300_sim.h b/sim/mn10300/mn10300_sim.h index f70d486..c63efaa 100644 --- a/sim/mn10300/mn10300_sim.h +++ b/sim/mn10300/mn10300_sim.h @@ -1,10 +1,10 @@ #include <stdio.h> #include <ctype.h> #include "ansidecl.h" -#include "gdb/callback.h" +#include "sim/callback.h" #include "opcode/mn10300.h" #include <limits.h> -#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 2686447..20d2ecf 100644 --- a/sim/moxie/ChangeLog +++ b/sim/moxie/ChangeLog @@ -1,3 +1,7 @@ +2021-05-14 Mike Frysinger <vapier@gentoo.org> + + * interp.c: Update include path. + 2021-05-04 Mike Frysinger <vapier@gentoo.org> * interp.c: Delete sys/times.h include. diff --git a/sim/moxie/interp.c b/sim/moxie/interp.c index 4228dd5..1357163 100644 --- a/sim/moxie/interp.c +++ b/sim/moxie/interp.c @@ -26,7 +26,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ #include <unistd.h> #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 5f7f306..e1ed6d6 100644 --- a/sim/ppc/ChangeLog +++ b/sim/ppc/ChangeLog @@ -1,3 +1,11 @@ +2021-05-14 Mike Frysinger <vapier@gentoo.org> + + * 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 <tom@tromey.com> * mon.c: Update includes. diff --git a/sim/ppc/Makefile.in b/sim/ppc/Makefile.in index 7686937..63b957d 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 8b4e5e3..7217d9c 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 1e73444..f3f2e9e 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 <stdlib.h> #ifdef HAVE_UNISTD_H diff --git a/sim/ppc/psim.h b/sim/ppc/psim.h index 07852c2..c38b03d 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 c8364f0..ce4464a 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 ac947a3..5849e1d 100644 --- a/sim/pru/ChangeLog +++ b/sim/pru/ChangeLog @@ -1,3 +1,7 @@ +2021-05-14 Mike Frysinger <vapier@gentoo.org> + + * interp.c: Update include path. + 2021-05-04 Mike Frysinger <vapier@gentoo.org> * configure: Regenerate. diff --git a/sim/pru/interp.c b/sim/pru/interp.c index 8d247f3..6398c67 100644 --- a/sim/pru/interp.c +++ b/sim/pru/interp.c @@ -23,9 +23,9 @@ #include <stdint.h> #include <stddef.h> #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 f26d4d7..8ffa97c 100644 --- a/sim/rl78/ChangeLog +++ b/sim/rl78/ChangeLog @@ -1,3 +1,9 @@ +2021-05-14 Mike Frysinger <vapier@gentoo.org> + + * Makefile.in: Update path. + * gdb-if.c: Update include path. + * load.h: Likewise. + 2021-05-05 Mike Frysinger <vapier@gentoo.org> * gdb-if.c: Include libiberty.h. diff --git a/sim/rl78/Makefile.in b/sim/rl78/Makefile.in index 675f87b..a7e5a97 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 f4b6754..87e343c 100644 --- a/sim/rl78/gdb-if.c +++ b/sim/rl78/gdb-if.c @@ -28,8 +28,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ #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 7461c21..1eaf045 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 b941caf..cbb3b47 100644 --- a/sim/rx/ChangeLog +++ b/sim/rx/ChangeLog @@ -1,3 +1,9 @@ +2021-05-14 Mike Frysinger <vapier@gentoo.org> + + * gdb-if.c: Update include path. + * load.h: Likewise. + * syscalls.c: Likewise. + 2021-05-05 Mike Frysinger <vapier@gentoo.org> * gdb-if.c: Include libiberty.h. diff --git a/sim/rx/gdb-if.c b/sim/rx/gdb-if.c index ec41910..4a0f070 100644 --- a/sim/rx/gdb-if.c +++ b/sim/rx/gdb-if.c @@ -28,8 +28,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ #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 bb22776..562fa23 100644 --- a/sim/rx/load.h +++ b/sim/rx/load.h @@ -20,7 +20,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ #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 0c75c7d..73ca0f2 100644 --- a/sim/rx/syscalls.c +++ b/sim/rx/syscalls.c @@ -26,7 +26,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ #include <unistd.h> #include <sys/time.h> -#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 d3c94d9..be77f8c 100644 --- a/sim/sh/ChangeLog +++ b/sim/sh/ChangeLog @@ -1,3 +1,7 @@ +2021-05-14 Mike Frysinger <vapier@gentoo.org> + + * interp.c: Update include path. + 2021-05-04 Mike Frysinger <vapier@gentoo.org> * configure: Regenerate. diff --git a/sim/sh/interp.c b/sim/sh/interp.c index fa361ba..5fb6aff 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" |