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.

10 files changed, 24 insertions, 12 deletions

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