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.

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 86ee50a24ae290eb36ed5a023976682b33da8f0e..0481f843308c6246b1b5e688427fd81edbb3837d 100644 (file)
--- 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 210bc2f730b1c2923d87408acf33164d06a8a3b7..9b7b346c0d78b572bf709349126df76fd07425cd 100644 (file)
--- 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 1522ca4fa58709c06a33081ead07ff80b4d86117..1830e348a06017516dd227bb7afffb5af33782f3 100644 (file)
--- 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 a54a36559814b2ad94ff179f4ffc36269bc9af9e..625d0505ec670cd44b6bc51755c4cb6dcadd5b9d 100644 (file)
--- 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 6eefe1bff60fcc431cf82bb2d1b0f99c49903916..39a7214028f299bbdfde34f888a130d7957478ff 100644 (file)
--- 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