[PATCH 04/20] sim: cr16: move arch-specific settings to internal header

Mike Frysinger via Gdb-patches
2022-12-23T06:08:34Z

with common/ sim code, so drop the cr16_sim.h include and move it to
the few files that actually need it.

Also rename the file to standardize it a bit better with other ports.
---
sim/cr16/{cr16_sim.h => cr16-sim.h} | 1 +
sim/cr16/gencode.c | 3 ++-
sim/cr16/interp.c | 2 ++
sim/cr16/sim-main.h | 2 --
sim/cr16/simops.c | 2 ++
5 files changed, 7 insertions(+), 3 deletions(-)
rename sim/cr16/{cr16_sim.h => cr16-sim.h} (99%)

diff --git a/sim/cr16/cr16_sim.h b/sim/cr16/cr16-sim.h
similarity index 99%
rename from sim/cr16/cr16_sim.h
rename to sim/cr16/cr16-sim.h
index 86ee50a24ae2..0481f843308c 100644
--- a/sim/cr16/cr16_sim.h
+++ b/sim/cr16/cr16-sim.h
@@ -25,6 +25,7 @@
#include "sim/callback.h"
#include "opcode/cr16.h"
#include "bfd.h"
+#include "sim-main.h"

#define DEBUG_TRACE 0x00000001
#define DEBUG_VALUES 0x00000002
diff --git a/sim/cr16/gencode.c b/sim/cr16/gencode.c
index 210bc2f730b1..9b7b346c0d78 100644
--- a/sim/cr16/gencode.c
+++ b/sim/cr16/gencode.c
@@ -70,6 +70,7 @@ write_template (void)

printf ("#include \"defs.h\"\n");
printf ("#include \"sim-main.h\"\n");
+ printf ("#include \"cr16-sim.h\"\n");
printf ("#include \"simops.h\"\n\n");

for ( ; i < NUMOPCODES; i++)
@@ -134,7 +135,7 @@ write_opcodes (void)

/* write out opcode table. */
printf ("#include \"defs.h\"\n");
- printf ("#include \"sim-main.h\"\n");
+ printf ("#include \"cr16-sim.h\"\n");
printf ("#include \"simops.h\"\n\n");
printf ("struct simops Simops[] = {\n");

diff --git a/sim/cr16/interp.c b/sim/cr16/interp.c
index 1522ca4fa587..1830e348a060 100644
--- a/sim/cr16/interp.c
+++ b/sim/cr16/interp.c
@@ -38,6 +38,8 @@

#include "target-newlib-syscall.h"

+#include "cr16-sim.h"
+
struct _state State;

int cr16_debug;
diff --git a/sim/cr16/sim-main.h b/sim/cr16/sim-main.h
index a54a36559814..625d0505ec67 100644
--- a/sim/cr16/sim-main.h
+++ b/sim/cr16/sim-main.h
@@ -22,6 +22,4 @@
#include "sim-basics.h"
#include "sim-base.h"

-#include "cr16_sim.h"
-
#endif
diff --git a/sim/cr16/simops.c b/sim/cr16/simops.c
index 6eefe1bff60f..39a7214028f2 100644
--- a/sim/cr16/simops.c
+++ b/sim/cr16/simops.c
@@ -38,6 +38,8 @@
#include "simops.h"
#include "target-newlib-syscall.h"

+#include "cr16-sim.h"
+
#ifdef HAVE_UTIME_H
#include <utime.h>
#endif
--
2.39.0