sim: unify SIM_CPU definition

Since every target typedefs this the same way, move it to the common code. We have to leave Blackfin behind here for now because of inter-dependencies on types and headers: sim-base.h includes sim-model.h which needs types in machs.h which needs types in bfim-sim.h which needs SIM_CPU.
2015-04-18 04:19:56 -04:00
parent 7e83aa92f2
commit 20bca71d82
46 changed files with 96 additions and 57 deletions
--- a/sim/arm/ChangeLog
+++ b/sim/arm/ChangeLog
@@ -1,3 +1,7 @@
+2015-04-18  Mike Frysinger  <vapier@gentoo.org>
+
+	* sim-main.h (SIM_CPU): Delete.
+
 2015-04-18  Mike Frysinger  <vapier@gentoo.org>

 	* sim-main.h (sim_cia): Delete.
--- a/sim/arm/sim-main.h
+++ b/sim/arm/sim-main.h
@@ -20,9 +20,6 @@
 #define SIM_MAIN_H

 #include "sim-basics.h"
-
-typedef struct _sim_cpu SIM_CPU;
-
 #include "sim-base.h"
 #include "bfd.h"

--- a/sim/avr/ChangeLog
+++ b/sim/avr/ChangeLog
@@ -1,3 +1,7 @@
+2015-04-18  Mike Frysinger  <vapier@gentoo.org>
+
+	* sim-main.h (SIM_CPU): Delete.
+
 2015-04-18  Mike Frysinger  <vapier@gentoo.org>

 	* sim-main.h (sim_cia): Delete.
--- a/sim/avr/sim-main.h
+++ b/sim/avr/sim-main.h
@@ -23,8 +23,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  */

 extern unsigned int pc;

-typedef struct _sim_cpu SIM_CPU;
-
 #include "sim-base.h"

 struct _sim_cpu {
--- a/sim/bfin/ChangeLog
+++ b/sim/bfin/ChangeLog
@@ -1,3 +1,7 @@
+2015-04-18  Mike Frysinger  <vapier@gentoo.org>
+
+	* sim-main.h (SIM_CPU): Add note to clean this up.
+
 2015-04-18  Mike Frysinger  <vapier@gentoo.org>

 	* sim-main.h (sim_cia): Delete.
--- a/sim/bfin/sim-main.h
+++ b/sim/bfin/sim-main.h
@@ -24,6 +24,8 @@
 #include "sim-basics.h"
 #include "sim-signal.h"

+/* TODO: Delete this.  Need to convert bu32/etc... to common sim types
+         and unwind the bfin-sim.h/machs.h include below first though.  */
 typedef struct _sim_cpu SIM_CPU;

 #include "bfin-sim.h"
--- a/sim/common/ChangeLog
+++ b/sim/common/ChangeLog
@@ -1,3 +1,7 @@
+2015-04-18  Mike Frysinger  <vapier@gentoo.org>
+
+	* sim-base.h (SIM_CPU): New typedef.
+
 2015-04-18  Mike Frysinger  <vapier@gentoo.org>

 	* cgen-engine.h (CIA_ADDR): Delete.
--- a/sim/common/sim-base.h
+++ b/sim/common/sim-base.h
@@ -72,6 +72,8 @@ typedef address_word sim_cia;
 #define INVALID_INSTRUCTION_ADDRESS ((address_word)0 - 1)
 #endif

+/* TODO: Probably should just delete SIM_CPU.  */
+typedef struct _sim_cpu SIM_CPU;
 typedef struct _sim_cpu sim_cpu;

 #include "sim-module.h"
--- a/sim/cr16/ChangeLog
+++ b/sim/cr16/ChangeLog
@@ -1,3 +1,7 @@
+2015-04-18  Mike Frysinger  <vapier@gentoo.org>
+
+	* sim-main.h (SIM_CPU): Delete.
+
 2015-04-18  Mike Frysinger  <vapier@gentoo.org>

 	* sim-main.h (sim_cia): Delete.
--- a/sim/cr16/sim-main.h
+++ b/sim/cr16/sim-main.h
@@ -24,8 +24,6 @@
 typedef long int           word;
 typedef unsigned long int  uword;

-typedef struct _sim_cpu SIM_CPU;
-
 #include "sim-base.h"
 #include "bfd.h"

--- a/sim/cris/ChangeLog
+++ b/sim/cris/ChangeLog
@@ -1,3 +1,7 @@
+2015-04-18  Mike Frysinger  <vapier@gentoo.org>
+
+	* sim-main.h (_sim_cpu, SIM_CPU): Delete.
+
 2015-04-18  Mike Frysinger  <vapier@gentoo.org>

 	* sim-main.h (sim_cia): Delete.
--- a/sim/cris/sim-main.h
+++ b/sim/cris/sim-main.h
@@ -26,9 +26,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  */

 #define USING_SIM_BASE_H

-struct _sim_cpu;
-typedef struct _sim_cpu SIM_CPU;
-
 #include "symcat.h"
 #include "sim-basics.h"
 #include "cgen-types.h"
--- a/sim/d10v/ChangeLog
+++ b/sim/d10v/ChangeLog
@@ -1,3 +1,7 @@
+2015-04-18  Mike Frysinger  <vapier@gentoo.org>
+
+	* sim-main.h (SIM_CPU): Delete.
+
 2015-04-18  Mike Frysinger  <vapier@gentoo.org>

 	* sim-main.h (sim_cia): Delete.
--- a/sim/d10v/sim-main.h
+++ b/sim/d10v/sim-main.h
@@ -24,8 +24,6 @@
 typedef long int           word;
 typedef unsigned long int  uword;

-typedef struct _sim_cpu SIM_CPU;
-
 #include "sim-base.h"
 #include "bfd.h"

--- a/sim/frv/ChangeLog
+++ b/sim/frv/ChangeLog
@@ -1,3 +1,7 @@
+2015-04-18  Mike Frysinger  <vapier@gentoo.org>
+
+	* sim-main.h (_sim_cpu, SIM_CPU): Delete.
+
 2015-04-18  Mike Frysinger  <vapier@gentoo.org>

 	* sim-main.h (sim_cia): Delete.
--- a/sim/frv/sim-main.h
+++ b/sim/frv/sim-main.h
@@ -21,9 +21,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  */

 #define USING_SIM_BASE_H /* FIXME: quick hack */

-struct _sim_cpu; /* FIXME: should be in sim-basics.h */
-typedef struct _sim_cpu SIM_CPU;
-
 /* Set the mask of unsupported traces.  */
 #define WITH_TRACE \
  (~(TRACE_alu | TRACE_decode | TRACE_memory | TRACE_model | TRACE_fpu \
--- a/sim/ft32/ChangeLog
+++ b/sim/ft32/ChangeLog
@@ -1,3 +1,7 @@
+2015-04-18  Mike Frysinger  <vapier@gentoo.org>
+
+	* sim-main.h (SIM_CPU): Delete.
+
 2015-04-18  Mike Frysinger  <vapier@gentoo.org>

 	* sim-main.h (sim_cia): Delete.
--- a/sim/ft32/sim-main.h
+++ b/sim/ft32/sim-main.h
@@ -25,8 +25,6 @@
 #include "sim-base.h"
 #include "bfd.h"

-typedef struct _sim_cpu SIM_CPU;
-
 #include "ft32-sim.h"

 struct _sim_cpu {
--- a/sim/h8300/ChangeLog
+++ b/sim/h8300/ChangeLog
@@ -1,3 +1,7 @@
+2015-04-18  Mike Frysinger  <vapier@gentoo.org>
+
+	* sim-main.h (SIM_CPU): Delete.
+
 2015-04-18  Mike Frysinger  <vapier@gentoo.org>

 	* sim-main.h (sim_cia): Delete.
--- a/sim/h8300/sim-main.h
+++ b/sim/h8300/sim-main.h
@@ -87,9 +87,6 @@ enum h8_typecodes {
 };

 #include "sim-basics.h"
-
-typedef struct _sim_cpu SIM_CPU;
-
 #include "sim-base.h"

 /* Structure used to describe addressing */
--- a/sim/iq2000/ChangeLog
+++ b/sim/iq2000/ChangeLog
@@ -1,3 +1,7 @@
+2015-04-18  Mike Frysinger  <vapier@gentoo.org>
+
+	* sim-main.h (_sim_cpu, SIM_CPU): Delete.
+
 2015-04-18  Mike Frysinger  <vapier@gentoo.org>

 	* sim-main.h (sim_cia): Delete.
--- a/sim/iq2000/sim-main.h
+++ b/sim/iq2000/sim-main.h
@@ -6,9 +6,6 @@

 #define USING_SIM_BASE_H /* FIXME: quick hack */

-struct _sim_cpu; /* FIXME: should be in sim-basics.h */
-typedef struct _sim_cpu SIM_CPU;
-
 /* sim-basics.h includes config.h but cgen-types.h must be included before
   sim-basics.h and cgen-types.h needs config.h.  */
 #include "config.h"
--- a/sim/lm32/ChangeLog
+++ b/sim/lm32/ChangeLog
@@ -1,3 +1,7 @@
+2015-04-18  Mike Frysinger  <vapier@gentoo.org>
+
+	* sim-main.h (_sim_cpu, SIM_CPU): Delete.
+
 2015-04-18  Mike Frysinger  <vapier@gentoo.org>

 	* sim-main.h (sim_cia): Delete.
--- a/sim/lm32/sim-main.h
+++ b/sim/lm32/sim-main.h
@@ -25,9 +25,6 @@

 #define USING_SIM_BASE_H	/* FIXME: quick hack */

-struct _sim_cpu;		/* FIXME: should be in sim-basics.h */
-typedef struct _sim_cpu SIM_CPU;
-
 #include "symcat.h"
 #include "sim-basics.h"
 #include "cgen-types.h"
--- a/sim/m32r/ChangeLog
+++ b/sim/m32r/ChangeLog
@@ -1,3 +1,7 @@
+2015-04-18  Mike Frysinger  <vapier@gentoo.org>
+
+	* sim-main.h (_sim_cpu, SIM_CPU): Delete.
+
 2015-04-18  Mike Frysinger  <vapier@gentoo.org>

 	* sim-main.h (sim_cia): Delete.
--- a/sim/m32r/sim-main.h
+++ b/sim/m32r/sim-main.h
@@ -5,9 +5,6 @@

 #define USING_SIM_BASE_H /* FIXME: quick hack */

-struct _sim_cpu; /* FIXME: should be in sim-basics.h */
-typedef struct _sim_cpu SIM_CPU;
-
 #include "symcat.h"
 #include "sim-basics.h"
 #include "cgen-types.h"
--- a/sim/m68hc11/ChangeLog
+++ b/sim/m68hc11/ChangeLog
@@ -1,3 +1,7 @@
+2015-04-18  Mike Frysinger  <vapier@gentoo.org>
+
+	* sim-main.h (SIM_CPU): Delete.
+
 2015-04-18  Mike Frysinger  <vapier@gentoo.org>

 	* sim-main.h (sim_cia): Delete.
--- a/sim/m68hc11/sim-main.h
+++ b/sim/m68hc11/sim-main.h
@@ -25,9 +25,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 #define SIM_HANDLES_LMA 1

 #include "sim-basics.h"
-
-typedef struct _sim_cpu SIM_CPU;
-
 #include "sim-signal.h"
 #include "sim-base.h"

--- a/sim/mcore/ChangeLog
+++ b/sim/mcore/ChangeLog
@@ -1,3 +1,7 @@
+2015-04-18  Mike Frysinger  <vapier@gentoo.org>
+
+	* sim-main.h (SIM_CPU): Delete.
+
 2015-04-18  Mike Frysinger  <vapier@gentoo.org>

 	* sim-main.h (sim_cia): Delete.
--- a/sim/mcore/sim-main.h
+++ b/sim/mcore/sim-main.h
@@ -24,8 +24,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 typedef long int           word;
 typedef unsigned long int  uword;

-typedef struct _sim_cpu SIM_CPU;
-
 #include "sim-base.h"
 #include "bfd.h"

--- a/sim/microblaze/ChangeLog
+++ b/sim/microblaze/ChangeLog
@@ -1,3 +1,7 @@
+2015-04-18  Mike Frysinger  <vapier@gentoo.org>
+
+	* sim-main.h (SIM_CPU): Delete.
+
 2015-04-18  Mike Frysinger  <vapier@gentoo.org>

 	* sim-main.h (sim_cia): Delete.
--- a/sim/microblaze/sim-main.h
+++ b/sim/microblaze/sim-main.h
@@ -20,9 +20,6 @@

 #include "microblaze.h"
 #include "sim-basics.h"
-
-typedef struct _sim_cpu SIM_CPU;
-
 #include "sim-base.h"

 /* The machine state.
--- a/sim/mips/ChangeLog
+++ b/sim/mips/ChangeLog
@@ -1,3 +1,7 @@
+2015-04-18  Mike Frysinger  <vapier@gentoo.org>
+
+	* sim-main.h (SIM_CPU): Delete.
+
 2015-04-18  Mike Frysinger  <vapier@gentoo.org>

 	* sim-main.h (sim_cia): Delete.
--- a/sim/mips/sim-main.h
+++ b/sim/mips/sim-main.h
@@ -33,9 +33,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 mips_core_signal ((SD), (CPU), (CIA), (MAP), (NR_BYTES), (ADDR), (TRANSFER), (ERROR))

 #include "sim-basics.h"
-
-typedef struct _sim_cpu SIM_CPU;
-
 #include "sim-base.h"
 #include "bfd.h"

--- a/sim/mn10300/ChangeLog
+++ b/sim/mn10300/ChangeLog
@@ -1,3 +1,7 @@
+2015-04-18  Mike Frysinger  <vapier@gentoo.org>
+
+	* sim-main.h (SIM_CPU): Delete.
+
 2015-04-18  Mike Frysinger  <vapier@gentoo.org>

 	* sim-main.h (sim_cia): Delete.
--- a/sim/mn10300/sim-main.h
+++ b/sim/mn10300/sim-main.h
@@ -42,8 +42,6 @@
 #include "itable.h"
 #include "idecode.h"

-typedef struct _sim_cpu SIM_CPU;
-
 #define WITH_WATCHPOINTS 1

 #define SIM_CORE_SIGNAL(SD,CPU,CIA,MAP,NR_BYTES,ADDR,TRANSFER,ERROR)  \
--- a/sim/moxie/ChangeLog
+++ b/sim/moxie/ChangeLog
@@ -1,3 +1,7 @@
+2015-04-18  Mike Frysinger  <vapier@gentoo.org>
+
+	* sim-main.h (SIM_CPU): Delete.
+
 2015-04-18  Mike Frysinger  <vapier@gentoo.org>

 	* sim-main.h (sim_cia): Delete.
--- a/sim/moxie/sim-main.h
+++ b/sim/moxie/sim-main.h
@@ -21,9 +21,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 #define SIM_MAIN_H

 #include "sim-basics.h"
-
-typedef struct _sim_cpu SIM_CPU;
-
 #include "sim-base.h"
 #include "bfd.h"

--- a/sim/msp430/ChangeLog
+++ b/sim/msp430/ChangeLog
@@ -1,3 +1,7 @@
+2015-04-18  Mike Frysinger  <vapier@gentoo.org>
+
+	* sim-main.h (SIM_CPU): Delete.
+
 2015-04-18  Mike Frysinger  <vapier@gentoo.org>

 	* sim-main.h (sim_cia): Delete.
--- a/sim/msp430/sim-main.h
+++ b/sim/msp430/sim-main.h
@@ -23,9 +23,6 @@

 #include "sim-basics.h"
 #include "sim-signal.h"
-
-typedef struct _sim_cpu SIM_CPU;
-
 #include "msp430-sim.h"
 #include "sim-base.h"

--- a/sim/sh/ChangeLog
+++ b/sim/sh/ChangeLog
@@ -1,3 +1,7 @@
+2015-04-18  Mike Frysinger  <vapier@gentoo.org>
+
+	* sim-main.h (SIM_CPU): Delete.
+
 2015-04-18  Mike Frysinger  <vapier@gentoo.org>

 	* sim-main.h (sim_cia): Delete.
--- a/sim/sh/sim-main.h
+++ b/sim/sh/sim-main.h
@@ -20,9 +20,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 #define SIM_MAIN_H

 #include "sim-basics.h"
-
-typedef struct _sim_cpu SIM_CPU;
-
 #include "sim-base.h"

 typedef struct
--- a/sim/sh64/ChangeLog
+++ b/sim/sh64/ChangeLog
@@ -1,3 +1,7 @@
+2015-04-18  Mike Frysinger  <vapier@gentoo.org>
+
+	* sim-main.h (_sim_cpu, SIM_CPU): Delete.
+
 2015-04-18  Mike Frysinger  <vapier@gentoo.org>

 	* sim-main.h (CIA_ADDR): Define.
--- a/sim/sh64/sim-main.h
+++ b/sim/sh64/sim-main.h
@@ -5,9 +5,6 @@

 #define USING_SIM_BASE_H /* FIXME: quick hack */

-struct _sim_cpu; /* FIXME: should be in sim-basics.h */
-typedef struct _sim_cpu SIM_CPU;
-
 /* sim-basics.h includes config.h but cgen-types.h must be included before
   sim-basics.h and cgen-types.h needs config.h.  */
 #include "config.h"
--- a/sim/v850/ChangeLog
+++ b/sim/v850/ChangeLog
@@ -1,3 +1,7 @@
+2015-04-18  Mike Frysinger  <vapier@gentoo.org>
+
+	* sim-main.h (SIM_CPU): Delete.
+
 2015-04-18  Mike Frysinger  <vapier@gentoo.org>

 	* sim-main.h (sim_cia): Delete.
--- a/sim/v850/sim-main.h
+++ b/sim/v850/sim-main.h
@@ -16,9 +16,6 @@
 #include "sim-basics.h"
 #include "sim-signal.h"
 #include "sim-fpu.h"
-
-typedef struct _sim_cpu SIM_CPU;
-
 #include "sim-base.h"

 #include "simops.h"