aboutsummaryrefslogtreecommitdiff
path: root/sim/common
diff options
context:
space:
mode:
authorAndrew Cagney <cagney@redhat.com>2002-06-09 15:45:54 +0000
committerAndrew Cagney <cagney@redhat.com>2002-06-09 15:45:54 +0000
commit3c25f8c7b071182238e0833c72552ee0e72fd2ae (patch)
tree72f9fd7da4b0bc3057d07dbc142ab9faa014e42a /sim/common
parent1029b7fa6a31d4cbb42e8d14c67ff4fdbbd4bd8c (diff)
downloadgdb-3c25f8c7b071182238e0833c72552ee0e72fd2ae.zip
gdb-3c25f8c7b071182238e0833c72552ee0e72fd2ae.tar.gz
gdb-3c25f8c7b071182238e0833c72552ee0e72fd2ae.tar.bz2
Move include/callback.h and include/remote-sim.h to include/gdb/.
Update accordingly.
Diffstat (limited to 'sim/common')
-rw-r--r--sim/common/ChangeLog21
-rw-r--r--sim/common/Make-common.in41
-rw-r--r--sim/common/callback.c2
-rw-r--r--sim/common/gentmap.c2
-rw-r--r--sim/common/run.c4
-rw-r--r--sim/common/sim-basics.h4
-rw-r--r--sim/common/sim-load.c4
-rw-r--r--sim/common/syscall.c2
8 files changed, 47 insertions, 33 deletions
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 <cagney@redhat.com>
+
+ * 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 <kazu@cs.umass.edu>
* 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 <time.h>
#include <sys/types.h>
#include <sys/stat.h>
-#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 <errno.h>\n");
printf ("#include <fcntl.h>\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 <time.h>
#include <sys/types.h>
#include <sys/stat.h>
-#include "callback.h"
+#include "gdb/callback.h"
#include "targ-vals.h"
#ifndef ENOSYS