sim: d10v: 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 d10v_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.

6 files changed, 14 insertions, 4 deletions

diff --git a/sim/d10v/d10v_sim.h b/sim/d10v/d10v-sim.h
index e78ea2f..df12fe2 100644
--- a/sim/d10v/d10v_sim.h
+++ b/sim/d10v/d10v-sim.h
@@ -1,3 +1,6 @@
+#ifndef D10V_SIM_H
+#define D10V_SIM_H
+
 #include <stdio.h>
 #include <ctype.h>
 #include <limits.h>
@@ -476,3 +479,5 @@ extern void write_longlong (uint8_t *addr, int64_t data);
    PSW is masked for zero bits. */
 
 extern reg_t move_to_cr (SIM_DESC, SIM_CPU *, int cr, reg_t mask, reg_t val, int psw_hw_p);
+
+#endif
diff --git a/sim/d10v/endian.c b/sim/d10v/endian.c
index 44e80e6..e6212ba 100644
--- a/sim/d10v/endian.c
+++ b/sim/d10v/endian.c
@@ -1,5 +1,5 @@
 /* If we're being compiled as a .c file, rather than being included in
-   d10v_sim.h, then ENDIAN_INLINE won't be defined yet.  */
+   d10v-sim.h, then ENDIAN_INLINE won't be defined yet.  */
 
 /* This must come before any other includes.  */
 #include "defs.h"
@@ -10,6 +10,8 @@
 #define ENDIAN_INLINE
 #endif
 
+#include "d10v-sim.h"
+
 ENDIAN_INLINE uint16_t
 get_word (const uint8_t *x)
 {
diff --git a/sim/d10v/gencode.c b/sim/d10v/gencode.c
index 6e006d0..3a37bac 100644
--- a/sim/d10v/gencode.c
+++ b/sim/d10v/gencode.c
@@ -42,7 +42,7 @@ write_template (void)
   struct d10v_opcode *opcode;
   int i,j;
 
-  printf ("#include \"sim-main.h\"\n");
+  printf ("#include \"d10v-sim.h\"\n");
   printf ("#include \"simops.h\"\n");
 
   for (opcode = (struct d10v_opcode *)d10v_opcodes; opcode->name; opcode++)
@@ -103,6 +103,7 @@ write_opcodes (void)
   
   /* write out opcode table */
   printf ("#include \"sim-main.h\"\n");
+  printf ("#include \"d10v-sim.h\"\n");
   printf ("#include \"simops.h\"\n\n");
   printf ("struct simops Simops[] = {\n");
   
diff --git a/sim/d10v/interp.c b/sim/d10v/interp.c
index ae8b670..9beedf8 100644
--- a/sim/d10v/interp.c
+++ b/sim/d10v/interp.c
@@ -18,6 +18,8 @@
 #include <stdlib.h>
 #include <assert.h>
 
+#include "d10v-sim.h"
+
 #include "target-newlib-syscall.h"
 
 enum _leftright { LEFT_FIRST, RIGHT_FIRST };
diff --git a/sim/d10v/sim-main.h b/sim/d10v/sim-main.h
index 4e6771a..3e0b74c 100644
--- a/sim/d10v/sim-main.h
+++ b/sim/d10v/sim-main.h
@@ -22,6 +22,4 @@
 #include "sim-basics.h"
 #include "sim-base.h"
 
-#include "d10v_sim.h"
-
 #endif
diff --git a/sim/d10v/simops.c b/sim/d10v/simops.c
index a2eb367..96ed29f 100644
--- a/sim/d10v/simops.c
+++ b/sim/d10v/simops.c
@@ -17,6 +17,8 @@
 #include "simops.h"
 #include "target-newlib-syscall.h"
 
+#include "d10v-sim.h"
+
 #define EXCEPTION(sig) sim_engine_halt (sd, cpu, NULL, PC, sim_stopped, sig)
 
 enum op_types {