diff options
| author | Mike Frysinger <vapier@gentoo.org> | 2022-12-22 22:35:11 -0500 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2022-12-23 08:32:58 -0500 |
| commit | e79b75a3cfcccdd7d6f6ee548f855ca6c109d97e (patch) | |
| tree | 9aafe5f8ff45eefb90e602935db5640457bdd387 | |
| parent | e50840893dc03b2363bab84880fefebe0f8db07d (diff) | |
| download | fsf-binutils-gdb-e79b75a3cfcccdd7d6f6ee548f855ca6c109d97e.zip fsf-binutils-gdb-e79b75a3cfcccdd7d6f6ee548f855ca6c109d97e.tar.gz fsf-binutils-gdb-e79b75a3cfcccdd7d6f6ee548f855ca6c109d97e.tar.bz2 | |
sim: cr16: move arch-specific settings to internal header
There's no need for these settings to be in sim-main.h which is shared
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.
| -rw-r--r-- | sim/cr16/cr16-sim.h (renamed from sim/cr16/cr16_sim.h) | 1 | ||||
| -rw-r--r-- | sim/cr16/gencode.c | 3 | ||||
| -rw-r--r-- | sim/cr16/interp.c | 2 | ||||
| -rw-r--r-- | sim/cr16/sim-main.h | 2 | ||||
| -rw-r--r-- | sim/cr16/simops.c | 2 |
5 files changed, 7 insertions, 3 deletions
diff --git a/sim/cr16/cr16_sim.h b/sim/cr16/cr16-sim.h index 86ee50a..0481f84 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 210bc2f..9b7b346 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 1522ca4..1830e34 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 a54a365..625d050 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 6eefe1b..39a7214 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 |