From 3c25f8c7b071182238e0833c72552ee0e72fd2ae Mon Sep 17 00:00:00 2001 From: Andrew Cagney Date: Sun, 9 Jun 2002 15:45:54 +0000 Subject: [PATCH] Move include/callback.h and include/remote-sim.h to include/gdb/. Update accordingly. --- gdb/ChangeLog | 9 +++++++++ gdb/Makefile.in | 7 ++++--- gdb/remote-rdp.c | 2 +- gdb/remote-sim.c | 4 ++-- include/ChangeLog | 5 +++++ include/gdb/ChangeLog | 5 +++++ include/{ => gdb}/callback.h | 0 include/{ => gdb}/remote-sim.h | 0 sim/arm/ChangeLog | 5 +++++ sim/arm/armos.c | 2 +- sim/arm/wrapper.c | 4 ++-- sim/common/ChangeLog | 21 +++++++++++++++++++++ sim/common/Make-common.in | 41 +++++++++++++++++------------------------ sim/common/callback.c | 2 +- sim/common/gentmap.c | 2 +- sim/common/run.c | 4 ++-- sim/common/sim-basics.h | 4 ++-- sim/common/sim-load.c | 4 ++-- sim/common/syscall.c | 2 +- sim/d10v/ChangeLog | 7 +++++++ sim/d10v/Makefile.in | 2 +- sim/d10v/d10v_sim.h | 4 ++-- sim/d10v/gencode.c | 1 - sim/d10v/interp.c | 4 ++-- sim/erc32/ChangeLog | 5 +++++ sim/erc32/interf.c | 2 +- sim/erc32/sis.h | 4 ++-- sim/h8300/ChangeLog | 4 ++++ sim/h8300/compile.c | 4 ++-- sim/h8500/ChangeLog | 4 ++++ sim/h8500/compile.c | 4 ++-- sim/m68hc11/ChangeLog | 5 +++++ sim/m68hc11/Makefile.in | 2 +- sim/m68hc11/sim-main.h | 4 ++-- sim/mcore/ChangeLog | 4 ++++ sim/mcore/interp.c | 4 ++-- sim/mips/ChangeLog | 4 ++++ sim/mips/interp.c | 4 ++-- sim/mn10200/ChangeLog | 5 +++++ sim/mn10200/Makefile.in | 2 +- sim/mn10200/mn10200_sim.h | 4 ++-- sim/mn10300/ChangeLog | 6 ++++++ sim/mn10300/Makefile.in | 2 +- sim/mn10300/mn10300_sim.h | 4 ++-- sim/mn10300/tconfig.in | 4 ++-- sim/ppc/ChangeLog | 5 +++++ sim/ppc/main.c | 4 ++-- sim/ppc/sim_calls.c | 4 ++-- sim/sh/ChangeLog | 4 ++++ sim/sh/interp.c | 4 ++-- sim/w65/ChangeLog | 4 ++++ sim/w65/interp.c | 4 ++-- sim/z8k/ChangeLog | 5 +++++ sim/z8k/iface.c | 4 ++-- sim/z8k/support.c | 4 ++-- 55 files changed, 182 insertions(+), 82 deletions(-) rename include/{ => gdb}/callback.h (100%) rename include/{ => gdb}/remote-sim.h (100%) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index dec4058..ecc6213 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,12 @@ +2002-06-09 Andrew Cagney + + * Makefile.in (callback_h): Define. + (remote_sim_h): Update path to remote-sim.h. + (remote-rdp.o): Add $(callback_h). + (remote-sim.o): Use $(callback_h). + * remote-sim.c: Include "gdb/callback.h" and "gdb/remote-sim.h". + * remote-rdp.c: Include "gdb/callback.h". + 2002-06-09 Mark Kettenis * osabi.h (gdb_osabi): Add GDB_OSABI_GO32 and GDB_OSABI_NETWARE. diff --git a/gdb/Makefile.in b/gdb/Makefile.in index 1919422..0f8f7b4 100644 --- a/gdb/Makefile.in +++ b/gdb/Makefile.in @@ -568,8 +568,9 @@ LINTFILES = $(SFILES) $(YYFILES) $(CONFIG_SRCS) init.c getopt_h = $(INCLUDE_DIR)/getopt.h floatformat_h = $(INCLUDE_DIR)/floatformat.h bfd_h = $(BFD_DIR)/bfd.h +callback_h = $(INCLUDE_DIR)/gdb/callback.h dis_asm_h = $(INCLUDE_DIR)/dis-asm.h -remote_sim_h = $(INCLUDE_DIR)/remote-sim.h +remote_sim_h = $(INCLUDE_DIR)/gdb/remote-sim.h demangle_h = $(INCLUDE_DIR)/demangle.h obstack_h = $(INCLUDE_DIR)/obstack.h sim_d10v_h = $(INCLUDE_DIR)/gdb/sim-d10v.h @@ -1975,7 +1976,7 @@ rdi-share/libangsd.a: force fi remote-rdp.o: remote-rdp.c $(defs_h) $(gdbcore_h) \ - $(inferior_h) $(gdb_string_h) $(arm_tdep_h) + $(inferior_h) $(gdb_string_h) $(arm_tdep_h) $(callback_h) remote-bug.o: remote-bug.c $(defs_h) $(gdbcore_h) $(serial_h) \ $(inferior_h) $(target_h) $(terminal_h) $(remote_utils_h) \ @@ -2012,7 +2013,7 @@ remote-sds.o: remote-sds.c $(bfd_h) $(defs_h) $(gdbcmd_h) \ $(gdb_string_h) $(regcache_h) remote-sim.o: remote-sim.c $(defs_h) $(inferior_h) $(value_h) $(gdb_string_h) \ - $(terminal_h) $(target_h) $(gdbcore_h) $(INCLUDE_DIR)/callback.h \ + $(terminal_h) $(target_h) $(gdbcore_h) $(callback_h) \ $(remote_sim_h) $(remote_utils_h) $(command_h) $(regcache_h) \ $(sim_regno_h) diff --git a/gdb/remote-rdp.c b/gdb/remote-rdp.c index 280e79c..34a42ab 100644 --- a/gdb/remote-rdp.c +++ b/gdb/remote-rdp.c @@ -41,7 +41,7 @@ #include "defs.h" #include "inferior.h" #include "value.h" -#include "callback.h" +#include "gdb/callback.h" #include "command.h" #include #include diff --git a/gdb/remote-sim.c b/gdb/remote-sim.c index 4096d7d..221efe4 100644 --- a/gdb/remote-sim.c +++ b/gdb/remote-sim.c @@ -35,8 +35,8 @@ #include "terminal.h" #include "target.h" #include "gdbcore.h" -#include "callback.h" -#include "remote-sim.h" +#include "gdb/callback.h" +#include "gdb/remote-sim.h" #include "remote-utils.h" #include "command.h" #include "regcache.h" diff --git a/include/ChangeLog b/include/ChangeLog index 55bd90d..1f04e1b 100644 --- a/include/ChangeLog +++ b/include/ChangeLog @@ -1,3 +1,8 @@ +2002-06-09 Andrew Cagney + + * remote-sim.h: Move to directory gdb/. + * callback.h: Move to directory gdb/. + 2002-06-07 Charles Wilson * bfdlink.h (struct bfd_link_info): Change type of diff --git a/include/gdb/ChangeLog b/include/gdb/ChangeLog index 44e3582..571861b 100644 --- a/include/gdb/ChangeLog +++ b/include/gdb/ChangeLog @@ -1,3 +1,8 @@ +2002-06-08 Andrew Cagney + + * callback.h: Copy to here from directory above. + * remote-sim.h: Copy to here from directory above. + 2002-06-01 Andrew Cagney * sim-d10v.h (sim_d10v_regs): Expand to include all registers. diff --git a/include/callback.h b/include/gdb/callback.h similarity index 100% rename from include/callback.h rename to include/gdb/callback.h diff --git a/include/remote-sim.h b/include/gdb/remote-sim.h similarity index 100% rename from include/remote-sim.h rename to include/gdb/remote-sim.h diff --git a/sim/arm/ChangeLog b/sim/arm/ChangeLog index 85de967..f7dfd13 100644 --- a/sim/arm/ChangeLog +++ b/sim/arm/ChangeLog @@ -1,3 +1,8 @@ +2002-06-09 Andrew Cagney + + * wrapper.c: Include "gdb/callback.h" and "gdb/remote-sim.h". + * armos.c: Include "gdb/callback.h". + 2002-05-29 Nick Clifton * armcopro.c (XScale_check_memacc): Set the FSR and FAR registers diff --git a/sim/arm/armos.c b/sim/arm/armos.c index 4635932..ccf9a57 100644 --- a/sim/arm/armos.c +++ b/sim/arm/armos.c @@ -83,7 +83,7 @@ extern int _fisatty (FILE *); /* For RDIError_BreakpointReached. */ #include "dbg_rdi.h" -#include "callback.h" +#include "gdb/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 0ff2cd9..9aa462e 100644 --- a/sim/arm/wrapper.c +++ b/sim/arm/wrapper.c @@ -28,8 +28,8 @@ #include #include #include -#include "callback.h" -#include "remote-sim.h" +#include "gdb/callback.h" +#include "gdb/remote-sim.h" #include "armdefs.h" #include "armemu.h" #include "dbg_rdi.h" diff --git a/sim/common/ChangeLog b/sim/common/ChangeLog index 8400639..f7c7391 100644 --- a/sim/common/ChangeLog +++ b/sim/common/ChangeLog @@ -1,3 +1,24 @@ +2002-06-08 Andrew Cagney + + * gentmap.c (gen_targ_map_c): Generate "gdb/callback.h". + * sim-basics.h: Include "gdb/callback.h" and "gdb/remote-sim.h". + * run.c: Ditto. + * sim-load.c: Ditto. + * callback.c: Ditto. + * syscall.c: Ditto. + * Make-common.in (callback_h): Define. + (remote_sim_h): Define. + (run.o): Update. + (callback.o): Update. + (syscall.o): Update. + (sim-load.o): + (nrun.o): Update. + (sim-hload.o): Update. + (sim-io.o): Update. + (sim-reason.o): Update. + (sim-reg.o): Update. + (sim-resume.o): Update. + 2002-05-30 Kazu Hirata * run.c: Fix formatting. diff --git a/sim/common/Make-common.in b/sim/common/Make-common.in index 519b213..6662efd 100644 --- a/sim/common/Make-common.in +++ b/sim/common/Make-common.in @@ -248,6 +248,9 @@ LIB_OBJS = callback.o syscall.o targ-map.o $(SIM_OBJS) RUNTESTFLAGS = +callback_h = $(srcroot)/include/gdb/callback.h +remote_sim_h = $(srcroot)/include/gdb/remote-sim.h + all: $(SIM_EXTRA_ALL) libsim.a run .gdbinit libsim.a: $(LIB_OBJS) @@ -259,8 +262,7 @@ run: $(SIM_RUN_OBJS) libsim.a $(LIBDEPS) $(CC) $(ALL_CFLAGS) -o run$(EXEEXT) \ $(SIM_RUN_OBJS) libsim.a $(EXTRA_LIBS) -run.o: $(srccom)/run.c config.h tconfig.h \ - $(srcroot)/include/remote-sim.h $(srcroot)/include/callback.h +run.o: $(srccom)/run.c config.h tconfig.h $(remote_sim_h) $(callback_h) $(CC) -c $(srccom)/run.c $(ALL_CFLAGS) # FIXME: Ideally, callback.o and friends live in a library outside of @@ -268,12 +270,10 @@ run.o: $(srccom)/run.c config.h tconfig.h \ # devo/libremote because this directory would contain more than just # a library). -callback.o: $(srccom)/callback.c config.h tconfig.h \ - $(srcroot)/include/callback.h targ-vals.h +callback.o: $(srccom)/callback.c config.h tconfig.h $(callback_h) targ-vals.h $(CC) -c $(srccom)/callback.c $(ALL_CFLAGS) -syscall.o: $(srccom)/syscall.c config.h tconfig.h \ - $(srcroot)/include/callback.h targ-vals.h +syscall.o: $(srccom)/syscall.c config.h tconfig.h $(callback_h) targ-vals.h $(CC) -c $(srccom)/syscall.c $(ALL_CFLAGS) targ-map.o: targ-map.c targ-vals.h @@ -399,21 +399,18 @@ sim-fpu.o: $(srccom)/sim-fpu.c $(sim-fpu_h) \ $(SIM_EXTRA_DEPS) $(CC) -c $(srccom)/sim-fpu.c $(ALL_CFLAGS) -sim-hload.o: $(srccom)/sim-hload.c $(sim-assert_h) \ - $(srcroot)/include/remote-sim.h \ +sim-hload.o: $(srccom)/sim-hload.c $(sim-assert_h) $(remote_sim_h) \ $(SIM_EXTRA_DEPS) $(CC) -c $(srccom)/sim-hload.c $(ALL_CFLAGS) -sim-hrw.o: $(srccom)/sim-hrw.c $(sim-assert_h) $(sim_core_h) \ - $(srcroot)/include/remote-sim.h \ +sim-hrw.o: $(srccom)/sim-hrw.c $(sim-assert_h) $(sim_core_h) $(remote_sim_h) \ $(SIM_EXTRA_DEPS) $(CC) -c $(srccom)/sim-hrw.c $(ALL_CFLAGS) sim-hw.o: $(srccom)/sim-hw.c $(sim_main_headers) $(CC) -c $(srccom)/sim-hw.c $(ALL_CFLAGS) -sim-info.o: $(srccom)/sim-info.c $(sim-assert_h) \ - $(srcroot)/include/remote-sim.h \ +sim-info.o: $(srccom)/sim-info.c $(sim-assert_h) $(remote_sim_h) \ $(SIM_EXTRA_DEPS) $(CC) -c $(srccom)/sim-info.c $(ALL_CFLAGS) @@ -423,8 +420,8 @@ sim-inline.c: $(srccom)/sim-inline.c cat $(srccom)/$@ >> tmp-$@ $(SHELL) $(srcdir)/../../move-if-change tmp-$@ $@ -sim-io.o: $(srccom)/sim-io.c $(sim_main_headers) $(sim-io_h) \ - $(srcroot)/include/remote-sim.h targ-vals.h +sim-io.o: $(srccom)/sim-io.c $(sim_main_headers) $(sim-io_h) $(remote_sim_h) \ + targ-vals.h $(CC) -c $(srccom)/sim-io.c $(ALL_CFLAGS) sim-memopt.o: $(srccom)/sim-memopt.c $(sim_main_headers) \ @@ -439,16 +436,13 @@ sim-options.o: $(srccom)/sim-options.c $(sim_main_headers) \ $(sim-options_h) $(sim-io_h) $(CC) -c $(srccom)/sim-options.c $(ALL_CFLAGS) -sim-reason.o: $(srccom)/sim-reason.c $(sim_main_headers) \ - $(srcroot)/include/remote-sim.h +sim-reason.o: $(srccom)/sim-reason.c $(sim_main_headers) $(remote_sim_h) $(CC) -c $(srccom)/sim-reason.c $(ALL_CFLAGS) -sim-reg.o: $(srccom)/sim-reg.c $(sim_main_headers) \ - $(srcroot)/include/remote-sim.h +sim-reg.o: $(srccom)/sim-reg.c $(sim_main_headers) $(remote_sim_h) $(CC) -c $(srccom)/sim-reg.c $(ALL_CFLAGS) -sim-resume.o: $(srccom)/sim-resume.c $(sim_main_headers) \ - $(srcroot)/include/remote-sim.h +sim-resume.o: $(srccom)/sim-resume.c $(sim_main_headers) $(remote_sim_h) $(CC) -c $(srccom)/sim-resume.c $(ALL_CFLAGS) sim-run.o: $(srccom)/sim-run.c $(sim_main_headers) @@ -478,7 +472,7 @@ sim-utils.o: $(srccom)/sim-utils.c $(sim_main_headers) sim-watch.o: $(srccom)/sim-watch.c $(sim_main_headers) $(CC) -c $(srccom)/sim-watch.c $(ALL_CFLAGS) -sim-load.o: $(srccom)/sim-load.c $(srcroot)/include/callback.h +sim-load.o: $(srccom)/sim-load.c $(callback_h) $(CC) -c $(srccom)/sim-load.c $(ALL_CFLAGS) sim-break.o: $(srccom)/sim-break.c $(sim_main_headers) \ @@ -547,8 +541,7 @@ dv-sockser.o: $(srccom)/dv-sockser.h $(sim_main_headers) $(CC) -c $(srccom)/dv-sockser.c $(ALL_CFLAGS) -nrun.o: $(srccom)/nrun.c config.h tconfig.h \ - $(srcroot)/include/remote-sim.h $(srcroot)/include/callback.h \ +nrun.o: $(srccom)/nrun.c config.h tconfig.h $(remote_sim_h) $(callback_h) \ $(sim_main_headers) $(CC) -c $(srccom)/nrun.c $(ALL_CFLAGS) @@ -685,7 +678,7 @@ cgen-arch: force $(SHELL) $(srccom)/cgen.sh arch $(srcdir) \ $(CGEN) $(CGENDIR) "$(CGENFLAGS)" \ $(arch) "$(FLAGS)" ignored "$(isa)" $(mach) ignored ignored - + cgen-cpu: force $(SHELL) $(srccom)/cgen.sh cpu $(srcdir) \ $(CGEN) $(CGENDIR) "$(CGENFLAGS)" \ diff --git a/sim/common/callback.c b/sim/common/callback.c index af5de14..db0fff6 100644 --- a/sim/common/callback.c +++ b/sim/common/callback.c @@ -46,7 +46,7 @@ #include #include #include -#include "callback.h" +#include "gdb/callback.h" #include "targ-vals.h" #ifdef HAVE_UNISTD_H diff --git a/sim/common/gentmap.c b/sim/common/gentmap.c index e4f5d0d..897a6f7 100644 --- a/sim/common/gentmap.c +++ b/sim/common/gentmap.c @@ -68,7 +68,7 @@ gen_targ_map_c () printf ("#include \n"); printf ("#include \n"); printf ("#include \"ansidecl.h\"\n"); - printf ("#include \"callback.h\"\n"); + printf ("#include \"gdb/callback.h\"\n"); printf ("#include \"targ-vals.h\"\n"); printf ("\n"); diff --git a/sim/common/run.c b/sim/common/run.c index a2180a1..d8c86cd 100644 --- a/sim/common/run.c +++ b/sim/common/run.c @@ -43,8 +43,8 @@ with this program; if not, write to the Free Software Foundation, Inc., #include "libiberty.h" #include "bfd.h" -#include "callback.h" -#include "remote-sim.h" +#include "gdb/callback.h" +#include "gdb/remote-sim.h" #include "ansidecl.h" #include "run-sim.h" diff --git a/sim/common/sim-basics.h b/sim/common/sim-basics.h index fc34b21..a7d7a1e 100644 --- a/sim/common/sim-basics.h +++ b/sim/common/sim-basics.h @@ -132,8 +132,8 @@ typedef enum { #endif #include "ansidecl.h" -#include "callback.h" -#include "remote-sim.h" +#include "gdb/callback.h" +#include "gdb/remote-sim.h" #include "sim-config.h" diff --git a/sim/common/sim-load.c b/sim/common/sim-load.c index bfe3f15..314d2dd 100644 --- a/sim/common/sim-load.c +++ b/sim/common/sim-load.c @@ -36,8 +36,8 @@ along with this program; if not, write to the Free Software Foundation, Inc., #include "bfd.h" #include "sim-utils.h" -#include "callback.h" -#include "remote-sim.h" +#include "gdb/callback.h" +#include "gdb/remote-sim.h" static void eprintf PARAMS ((host_callback *, const char *, ...)); static void xprintf PARAMS ((host_callback *, const char *, ...)); diff --git a/sim/common/syscall.c b/sim/common/syscall.c index e0a3b88..75121cf 100644 --- a/sim/common/syscall.c +++ b/sim/common/syscall.c @@ -46,7 +46,7 @@ #include #include #include -#include "callback.h" +#include "gdb/callback.h" #include "targ-vals.h" #ifndef ENOSYS diff --git a/sim/d10v/ChangeLog b/sim/d10v/ChangeLog index 67b3ab7..91d71f3 100644 --- a/sim/d10v/ChangeLog +++ b/sim/d10v/ChangeLog @@ -1,3 +1,10 @@ +2002-06-09 Andrew Cagney + + * Makefile.in (INCLUDE): Update path to callback.h. + * gencode.c: Do not include "callback.h". + * d10v_sim.h: Include "gdb/callback.h" and "gdb/remote-sim.h". + * interp.c: Ditto. + 2002-06-08 Andrew Cagney * interp.c (sim_fetch_register): Fix name of enum used in cast. diff --git a/sim/d10v/Makefile.in b/sim/d10v/Makefile.in index 7ea6059..f46c54d 100644 --- a/sim/d10v/Makefile.in +++ b/sim/d10v/Makefile.in @@ -22,7 +22,7 @@ SIM_OBJS = interp.o table.o simops.o endian.o sim-load.o SIM_EXTRA_CLEAN = clean-extra SIM_EXTRA_CFLAGS = -DNEED_UI_LOOP_HOOK -DSIM_HAVE_ENVIRONMENT -INCLUDE = d10v_sim.h $(srcroot)/include/callback.h targ-vals.h endian.c \ +INCLUDE = d10v_sim.h $(srcroot)/include/gdb/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 377a001..ca14006 100644 --- a/sim/d10v/d10v_sim.h +++ b/sim/d10v/d10v_sim.h @@ -3,7 +3,7 @@ #include #include #include "ansidecl.h" -#include "callback.h" +#include "gdb/callback.h" #include "opcode/d10v.h" #include "bfd.h" @@ -21,7 +21,7 @@ extern int d10v_debug; -#include "remote-sim.h" +#include "gdb/remote-sim.h" #include "sim-config.h" #include "sim-types.h" diff --git a/sim/d10v/gencode.c b/sim/d10v/gencode.c index 2d1269b..b66297d 100644 --- a/sim/d10v/gencode.c +++ b/sim/d10v/gencode.c @@ -3,7 +3,6 @@ #include #include #include "ansidecl.h" -#include "callback.h" #include "opcode/d10v.h" static void write_header PARAMS ((void)); diff --git a/sim/d10v/interp.c b/sim/d10v/interp.c index 37a2e11..e465a80 100644 --- a/sim/d10v/interp.c +++ b/sim/d10v/interp.c @@ -1,8 +1,8 @@ #include #include "sysdep.h" #include "bfd.h" -#include "callback.h" -#include "remote-sim.h" +#include "gdb/callback.h" +#include "gdb/remote-sim.h" #include "d10v_sim.h" #include "gdb/sim-d10v.h" diff --git a/sim/erc32/ChangeLog b/sim/erc32/ChangeLog index f2ff600..d68e663 100644 --- a/sim/erc32/ChangeLog +++ b/sim/erc32/ChangeLog @@ -1,3 +1,8 @@ +2002-06-08 Andrew Cagney + + * sis.h: Include "gdb/remote-sim.h" and "gdb/callback.h". + * interf.c: Include "gdb/remote-sim.h". + Tue May 23 21:39:23 2000 Andrew Cagney * configure: Regenerated to track ../common/aclocal.m4 changes. diff --git a/sim/erc32/interf.c b/sim/erc32/interf.c index d0a781e..1931886 100644 --- a/sim/erc32/interf.c +++ b/sim/erc32/interf.c @@ -31,7 +31,7 @@ #include #include "sim-config.h" -#include "remote-sim.h" +#include "gdb/remote-sim.h" #ifndef fprintf extern fprintf(); diff --git a/sim/erc32/sis.h b/sim/erc32/sis.h index 2a895c0..5bdd770 100644 --- a/sim/erc32/sis.h +++ b/sim/erc32/sis.h @@ -21,8 +21,8 @@ */ #include "ansidecl.h" -#include "callback.h" -#include "remote-sim.h" +#include "gdb/callback.h" +#include "gdb/remote-sim.h" #include "end.h" diff --git a/sim/h8300/ChangeLog b/sim/h8300/ChangeLog index 09aa6fb..443b222 100644 --- a/sim/h8300/ChangeLog +++ b/sim/h8300/ChangeLog @@ -1,3 +1,7 @@ +2002-06-08 Andrew Cagney + + * compile.c: Include "gdb/callback.h" and "gdb/remote-sim.h". + 2002-05-19 Kazu Hirata * compile.c: Fix formatting. diff --git a/sim/h8300/compile.c b/sim/h8300/compile.c index 27530db..b8c5ef3 100644 --- a/sim/h8300/compile.c +++ b/sim/h8300/compile.c @@ -32,8 +32,8 @@ #endif #include "ansidecl.h" #include "bfd.h" -#include "callback.h" -#include "remote-sim.h" +#include "gdb/callback.h" +#include "gdb/remote-sim.h" #ifndef SIGTRAP # define SIGTRAP 5 diff --git a/sim/h8500/ChangeLog b/sim/h8500/ChangeLog index af4f784..eeb4d6d 100644 --- a/sim/h8500/ChangeLog +++ b/sim/h8500/ChangeLog @@ -1,3 +1,7 @@ +2002-06-08 Andrew Cagney + + * compile.c: Include "gdb/callback.h" and "gdb/remote-sim.h". + Tue May 23 21:39:23 2000 Andrew Cagney * configure: Regenerated to track ../common/aclocal.m4 changes. diff --git a/sim/h8500/compile.c b/sim/h8500/compile.c index 1aad644..aec8ce9 100644 --- a/sim/h8500/compile.c +++ b/sim/h8500/compile.c @@ -31,8 +31,8 @@ #include #include "ansidecl.h" #include "bfd.h" -#include "callback.h" -#include "remote-sim.h" +#include "gdb/callback.h" +#include "gdb/remote-sim.h" #define O_RECOMPILE 85 #define DEFINE_TABLE diff --git a/sim/m68hc11/ChangeLog b/sim/m68hc11/ChangeLog index 1273414..ee0cd2e 100644 --- a/sim/m68hc11/ChangeLog +++ b/sim/m68hc11/ChangeLog @@ -1,3 +1,8 @@ +2002-06-09 Andrew Cagney + + * Makefile.in (INCLUDE): Update path to callback.h. + * sim-main.h: Include "gdb/callback.h" and "gdb/remote-sim.h". + 2002-03-07 Stephane Carrez * m68hc11_sim.c (cpu_move8): Call sim_engine_abort in default case. diff --git a/sim/m68hc11/Makefile.in b/sim/m68hc11/Makefile.in index 51e873b..a054a32 100644 --- a/sim/m68hc11/Makefile.in +++ b/sim/m68hc11/Makefile.in @@ -42,7 +42,7 @@ SIM_EXTRA_CLEAN = clean-extra SIM_EXTRA_OBJS = @m68hc11_extra_objs@ -INCLUDE = $(srcdir)/../../include/callback.h \ +INCLUDE = $(srcdir)/../../include/gdb/callback.h \ interrupts.h sim-main.h diff --git a/sim/m68hc11/sim-main.h b/sim/m68hc11/sim-main.h index a47e7aa..75c3b5b 100644 --- a/sim/m68hc11/sim-main.h +++ b/sim/m68hc11/sim-main.h @@ -36,8 +36,8 @@ typedef address_word sim_cia; #include "opcode/m68hc11.h" -#include "callback.h" -#include "remote-sim.h" +#include "gdb/callback.h" +#include "gdb/remote-sim.h" #include "opcode/m68hc11.h" #include "sim-types.h" diff --git a/sim/mcore/ChangeLog b/sim/mcore/ChangeLog index a5e5ef9..066f0f3 100644 --- a/sim/mcore/ChangeLog +++ b/sim/mcore/ChangeLog @@ -1,3 +1,7 @@ +2002-06-08 Andrew Cagney + + * interp.c: Include "gdb/callback.h" and "gdb/remote-sim.h". + Tue May 23 21:39:23 2000 Andrew Cagney * configure: Regenerated to track ../common/aclocal.m4 changes. diff --git a/sim/mcore/interp.c b/sim/mcore/interp.c index 456e481..79c7d2e 100644 --- a/sim/mcore/interp.c +++ b/sim/mcore/interp.c @@ -24,9 +24,9 @@ with this program; if not, write to the Free Software Foundation, Inc., #include #include /* for byte ordering macros */ #include "bfd.h" -#include "callback.h" +#include "gdb/callback.h" #include "libiberty.h" -#include "remote-sim.h" +#include "gdb/remote-sim.h" #ifndef NUM_ELEM #define NUM_ELEM(A) (sizeof (A) / sizeof (A)[0]) diff --git a/sim/mips/ChangeLog b/sim/mips/ChangeLog index 51366db..e0e664b 100644 --- a/sim/mips/ChangeLog +++ b/sim/mips/ChangeLog @@ -1,3 +1,7 @@ +2002-06-08 Andrew Cagney + + * interp.c: Include "gdb/callback.h" and "gdb/remote-sim.h". + 2002-06-07 Chris Demetriou Ed Satterthwaite diff --git a/sim/mips/interp.c b/sim/mips/interp.c index 8cc6318..d069d2b 100644 --- a/sim/mips/interp.c +++ b/sim/mips/interp.c @@ -61,8 +61,8 @@ code on the hardware. #include "getopt.h" #include "libiberty.h" #include "bfd.h" -#include "callback.h" /* GDB simulator callback interface */ -#include "remote-sim.h" /* GDB simulator interface */ +#include "gdb/callback.h" /* GDB simulator callback interface */ +#include "gdb/remote-sim.h" /* GDB simulator interface */ #include "sysdep.h" diff --git a/sim/mn10200/ChangeLog b/sim/mn10200/ChangeLog index 6e99724..ddc51c9 100644 --- a/sim/mn10200/ChangeLog +++ b/sim/mn10200/ChangeLog @@ -1,3 +1,8 @@ +2002-06-09 Andrew Cagney + + * Makefile.in (INCLUDE): Update path to callback.h. + * mn10200_sim.h: Include "gdb/callback.h" and "gdb/remote-sim.h". + 2001-04-15 J.T. Conklin * Makefile.in (simops.o): Add simops.h to dependency list. diff --git a/sim/mn10200/Makefile.in b/sim/mn10200/Makefile.in index bcc15c8..563a4ed 100644 --- a/sim/mn10200/Makefile.in +++ b/sim/mn10200/Makefile.in @@ -25,7 +25,7 @@ SIM_EXTRA_CLEAN = clean-extra # Select mn10200 support in nltvals.def. NL_TARGET = -DNL_TARGET_mn10200 -INCLUDE = mn10200_sim.h $(srcdir)/../../include/callback.h +INCLUDE = mn10200_sim.h $(srcdir)/../../include/gdb/callback.h ## COMMON_POST_CONFIG_FRAG diff --git a/sim/mn10200/mn10200_sim.h b/sim/mn10200/mn10200_sim.h index a7b7c4d..2f85aa0 100644 --- a/sim/mn10200/mn10200_sim.h +++ b/sim/mn10200/mn10200_sim.h @@ -1,10 +1,10 @@ #include #include #include "ansidecl.h" -#include "callback.h" +#include "gdb/callback.h" #include "opcode/mn10200.h" #include -#include "remote-sim.h" +#include "gdb/remote-sim.h" #ifndef INLINE #ifdef __GNUC__ diff --git a/sim/mn10300/ChangeLog b/sim/mn10300/ChangeLog index 59f4515..7245767 100644 --- a/sim/mn10300/ChangeLog +++ b/sim/mn10300/ChangeLog @@ -1,3 +1,9 @@ +2002-06-09 Andrew Cagney + + * Makefile.in (INCLUDE): Update path to callback.h. + * mn10300_sim.h: Include "gdb/callback.h" and "gdb/remote-sim.h". + * tconfig.in: Ditto. + 2001-05-06 Jim Blandy * mn10300.igen: Doc fixes. diff --git a/sim/mn10300/Makefile.in b/sim/mn10300/Makefile.in index f3a52ed..1f493ec 100644 --- a/sim/mn10300/Makefile.in +++ b/sim/mn10300/Makefile.in @@ -48,7 +48,7 @@ SIM_EXTRA_CLEAN = clean-extra # Select mn10300 support in nltvals.def. NL_TARGET = -DNL_TARGET_mn10300 -INCLUDE = mn10300_sim.h $(srcdir)/../../include/callback.h +INCLUDE = mn10300_sim.h $(srcdir)/../../include/gdb/callback.h # List of extra flags to always pass to $(CC). SIM_EXTRA_CFLAGS = @sim_gen@ -DPOLL_QUIT_INTERVAL=0x20 diff --git a/sim/mn10300/mn10300_sim.h b/sim/mn10300/mn10300_sim.h index da6c259..6a2c571 100644 --- a/sim/mn10300/mn10300_sim.h +++ b/sim/mn10300/mn10300_sim.h @@ -1,10 +1,10 @@ #include #include #include "ansidecl.h" -#include "callback.h" +#include "gdb/callback.h" #include "opcode/mn10300.h" #include -#include "remote-sim.h" +#include "gdb/remote-sim.h" #include "bfd.h" #ifndef INLINE diff --git a/sim/mn10300/tconfig.in b/sim/mn10300/tconfig.in index 521b6e7..14ca8e7 100644 --- a/sim/mn10300/tconfig.in +++ b/sim/mn10300/tconfig.in @@ -2,8 +2,8 @@ /* FIXME: This is unnecessarily necessary: */ #include "ansidecl.h" -#include "callback.h" -#include "remote-sim.h" +#include "gdb/callback.h" +#include "gdb/remote-sim.h" #include "sim-module.h" MODULE_INSTALL_FN dv_sockser_install; diff --git a/sim/ppc/ChangeLog b/sim/ppc/ChangeLog index dce9499..0aea7d4 100644 --- a/sim/ppc/ChangeLog +++ b/sim/ppc/ChangeLog @@ -1,3 +1,8 @@ +2002-06-08 Andrew Cagney + + * main.c: Include "gdb/callback.h" and "gdb/remote-sim.h". + * sim_calls.c: Ditto. + 2002-05-30 DJ Delorie * lf.c (lf_print__gnu_copyleft): Convert multiline strings to diff --git a/sim/ppc/main.c b/sim/ppc/main.c index f6ac87f..4df78ab 100644 --- a/sim/ppc/main.c +++ b/sim/ppc/main.c @@ -31,8 +31,8 @@ #include "events.h" /* FIXME: psim should provide the interface */ #include "bfd.h" -#include "callback.h" -#include "remote-sim.h" +#include "gdb/callback.h" +#include "gdb/remote-sim.h" #ifdef HAVE_STDLIB_H #include diff --git a/sim/ppc/sim_calls.c b/sim/ppc/sim_calls.c index 47af5b1..f2c2d19 100644 --- a/sim/ppc/sim_calls.c +++ b/sim/ppc/sim_calls.c @@ -42,8 +42,8 @@ #include "defs.h" #include "bfd.h" -#include "callback.h" -#include "remote-sim.h" +#include "gdb/callback.h" +#include "gdb/remote-sim.h" /* Define the rate at which the simulator should poll the host for a quit. */ diff --git a/sim/sh/ChangeLog b/sim/sh/ChangeLog index 541ed1f..62320a8 100644 --- a/sim/sh/ChangeLog +++ b/sim/sh/ChangeLog @@ -1,3 +1,7 @@ +2002-06-08 Andrew Cagney + + * interp.c: Include "gdb/callback.h" and "gdb/remote-sim.h". + 2001-01-30 Ben Elliston * interp.c (sim_create_inferior): Record program arguments for diff --git a/sim/sh/interp.c b/sim/sh/interp.c index 99f51d1..286dd2d 100644 --- a/sim/sh/interp.c +++ b/sim/sh/interp.c @@ -27,8 +27,8 @@ #include "sysdep.h" #include "bfd.h" -#include "callback.h" -#include "remote-sim.h" +#include "gdb/callback.h" +#include "gdb/remote-sim.h" /* This file is local - if newlib changes, then so should this. */ #include "syscall.h" diff --git a/sim/w65/ChangeLog b/sim/w65/ChangeLog index 088f8b2..ea4ffbe 100644 --- a/sim/w65/ChangeLog +++ b/sim/w65/ChangeLog @@ -1,3 +1,7 @@ +2002-06-08 Andrew Cagney + + * interp.c: Include "gdb/callback.h" and "gdb/remote-sim.h". + Tue May 23 21:39:23 2000 Andrew Cagney * configure: Regenerated to track ../common/aclocal.m4 changes. diff --git a/sim/w65/interp.c b/sim/w65/interp.c index 36c4e32..a4b325a 100644 --- a/sim/w65/interp.c +++ b/sim/w65/interp.c @@ -33,8 +33,8 @@ #endif #include #include "bfd.h" -#include "callback.h" -#include "remote-sim.h" +#include "gdb/callback.h" +#include "gdb/remote-sim.h" #include "../../newlib/libc/sys/w65/sys/syscall.h" #include "interp.h" diff --git a/sim/z8k/ChangeLog b/sim/z8k/ChangeLog index da38d37..b6f5ed8 100644 --- a/sim/z8k/ChangeLog +++ b/sim/z8k/ChangeLog @@ -1,3 +1,8 @@ +2002-06-09 Andrew Cagney + + * iface.c: Include "gdb/callback.h" and "gdb/remote-sim.h". + * support.c: Ditto. + 2002-06-06 Andrew Cagney * writecode.c (lookup_inst): Generate inverse table on-the-fly. diff --git a/sim/z8k/iface.c b/sim/z8k/iface.c index 1b3883e..c76d63f 100644 --- a/sim/z8k/iface.c +++ b/sim/z8k/iface.c @@ -22,8 +22,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #include "tm.h" #include "signal.h" #include "bfd.h" -#include "callback.h" -#include "remote-sim.h" +#include "gdb/callback.h" +#include "gdb/remote-sim.h" #ifndef NULL #define NULL 0 diff --git a/sim/z8k/support.c b/sim/z8k/support.c index 7392364..e3cdc73 100644 --- a/sim/z8k/support.c +++ b/sim/z8k/support.c @@ -36,8 +36,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #include #include #include -#include "callback.h" -#include "remote-sim.h" +#include "gdb/callback.h" +#include "gdb/remote-sim.h" #include "syscall.h" static int get_now PARAMS ((void)); -- 2.7.4