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.

diff --git a/sim/arm/ChangeLog b/sim/arm/ChangeLog
index cb5b1cfe8de95c9ebce6973661f15536555f4e33..4d932108a43931eb2de2a16b3543c430e9e301e0 100644 (file)
--- 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.

diff --git a/sim/arm/sim-main.h b/sim/arm/sim-main.h
index ae622bd1cb426e0c5cc956e6060975e3cd5165bb..9a37b989ae0588039cd140c8b6515a595abdee5c 100644 (file)
--- 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"
 

diff --git a/sim/avr/ChangeLog b/sim/avr/ChangeLog
index 9b4ca2aecb544612beafe8149412423354714a48..c486303508bb6cb50ef4e51ea094fd6d10c4aced 100644 (file)
--- 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.

diff --git a/sim/avr/sim-main.h b/sim/avr/sim-main.h
index 52904e385e261faae0fc0ea47e31e999e3b314b9..e0cac221df77e944c71761b19fdd4643964bb526 100644 (file)
--- 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 {

diff --git a/sim/bfin/ChangeLog b/sim/bfin/ChangeLog
index 036db1620601ed9894b18f7453499bd1223d02ca..64d20c30a09ce3d66579da33eafa116e4eb40d4f 100644 (file)
--- 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.

diff --git a/sim/bfin/sim-main.h b/sim/bfin/sim-main.h
index 1fbfa08a9917e3ec9f3819555023d377836456c7..a3e4230b0ea359f17d8bfce449e8deaf4d6e9b20 100644 (file)
--- 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"

diff --git a/sim/common/ChangeLog b/sim/common/ChangeLog
index f437768cead937c6cccea2d5457c1c46fac57ab2..858e432ea5ec32981606ac223b8ef76d198c92dc 100644 (file)
--- 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.

diff --git a/sim/common/sim-base.h b/sim/common/sim-base.h
index e90e07ca340ebf7d7b254f24676173134493fc37..21f61f4dc1f8a21ee85b5d424207274a983e7291 100644 (file)
--- 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"

diff --git a/sim/cr16/ChangeLog b/sim/cr16/ChangeLog
index 8b15b74e732a22626570794e3925a98a7d1f99cf..1108bdbe7cbe734c18764aaddc12a12b9b0562f5 100644 (file)
--- 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.

diff --git a/sim/cr16/sim-main.h b/sim/cr16/sim-main.h
index 1a8022912c67b59e8ec85d7620c02f8b66e80bd7..a63b93e56f065e23bfddfd639a10c28847d60a0c 100644 (file)
--- 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"
 

diff --git a/sim/cris/ChangeLog b/sim/cris/ChangeLog
index 4c81975125c2694b5a1fd24f98bdad6edbcc0563..ff1cc938d879dd9538c64937780070ffd3babfac 100644 (file)
--- 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.

diff --git a/sim/cris/sim-main.h b/sim/cris/sim-main.h
index 7eb74b5fbe78261931bd33208b2e7ffc61c57872..6e501061bfffee64a603c9d61be2a1a394e2413d 100644 (file)
--- 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"

diff --git a/sim/d10v/ChangeLog b/sim/d10v/ChangeLog
index a56d3ab7b6c76d0a8cba5c15d56e3aa84b276333..8960e6bdae8ffd9cdcd8ab120cdfa82b4bb7f22f 100644 (file)
--- 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.

diff --git a/sim/d10v/sim-main.h b/sim/d10v/sim-main.h
index a7d59ddf8370143f6944f216b7411232de687c90..0b87811d5704107216c27ae44dfbc24cde5ba5c3 100644 (file)
--- 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"
 

diff --git a/sim/frv/ChangeLog b/sim/frv/ChangeLog
index 750695f6e03c2325d834ca5d22aa3c95e86b22e5..c3562e8eb3fb09b4dc02b53cfb6d48a89beb2c3a 100644 (file)
--- 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.

diff --git a/sim/frv/sim-main.h b/sim/frv/sim-main.h
index fd12c4fa9453015f50d71786cd11c0385bab697c..077a47d581dd30de19a4ae09ca248dcfd27a3cc5 100644 (file)
--- 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 \

diff --git a/sim/ft32/ChangeLog b/sim/ft32/ChangeLog
index 62748893f5df5227f272a1c240fd764c2ce6f611..3553e68a72fbd4aaa4edce4aac5c5c715a511dc4 100644 (file)
--- 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.

diff --git a/sim/ft32/sim-main.h b/sim/ft32/sim-main.h
index a270a5df04e62ce9ca74bbf363b5532bc7d94f9b..b27a690ab053a566862356af020a57ee23c2b73b 100644 (file)
--- 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 {

diff --git a/sim/h8300/ChangeLog b/sim/h8300/ChangeLog
index 814a835e38e45914c2bb00e87adc5af7a3c20e7c..c7eb47494eea0cfca3de336e21ba009a65814b1e 100644 (file)
--- 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.

diff --git a/sim/h8300/sim-main.h b/sim/h8300/sim-main.h
index e95c4d90e86601c3d0319c5d6b088b00010e593d..6dbc1ac1c2b2475af14999ed8a7827bdee9ca5c9 100644 (file)
--- 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 */

diff --git a/sim/iq2000/ChangeLog b/sim/iq2000/ChangeLog
index c9ea375be0dfff8ca460360b9997895e440b4a39..a9db07a6dd75f47bf2dd23e1ac136e246ebd511f 100644 (file)
--- 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.

diff --git a/sim/iq2000/sim-main.h b/sim/iq2000/sim-main.h
index ce3babadf73f6f370e7455293c20cda4823364c0..bc45c78309ac92471c86c47f847a3c353a8ef5bd 100644 (file)
--- 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"

diff --git a/sim/lm32/ChangeLog b/sim/lm32/ChangeLog
index 3109bbc5aa3ad5f5ca18bef866d5a14807821e2a..e267eaa6b1baaed13da92043d04a219630795251 100644 (file)
--- 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.

diff --git a/sim/lm32/sim-main.h b/sim/lm32/sim-main.h
index d37f74bb47448c654bd82314fc59095df33a1227..9a6ba1adf478470a91a2c68137f6dba05ffafce4 100644 (file)
--- 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"

diff --git a/sim/m32r/ChangeLog b/sim/m32r/ChangeLog
index dc82037128a35d2311b04473b7b71c8d43524110..ff4767b8a30186f52350e4bbd1ab3d6a204614eb 100644 (file)
--- 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.

diff --git a/sim/m32r/sim-main.h b/sim/m32r/sim-main.h
index 6839a4152b8cad6760703132eab13eb3326d85d7..d296c538eba7ab4f825ae842042d7ff4144a248b 100644 (file)
--- 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"

diff --git a/sim/m68hc11/ChangeLog b/sim/m68hc11/ChangeLog
index a5c9c5aa6235bb7189297fcc465e613284911155..957abb58a159e342c44b99f4eedf6310858f419d 100644 (file)
--- 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.

diff --git a/sim/m68hc11/sim-main.h b/sim/m68hc11/sim-main.h
index 4f41db929bfb7018df21eb5e3afadfd6b9ba9d21..d1fc582e6811092da695a453377462c7efcb1483 100644 (file)
--- 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"
 

diff --git a/sim/mcore/ChangeLog b/sim/mcore/ChangeLog
index 98ebb1e92d1b9eb390445bb4377eb373f22fed49..915cc28556109a52e69c4842f14cdf0f2b2b0c91 100644 (file)
--- 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.

diff --git a/sim/mcore/sim-main.h b/sim/mcore/sim-main.h
index 25698c187c984c91445a06d7ce87704b6860e319..be50ec132b10880db844b5727e015ae1f290a817 100644 (file)
--- 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"
 

diff --git a/sim/microblaze/ChangeLog b/sim/microblaze/ChangeLog
index 560cc134a36db4d1d458b4b48f115f11abd6485f..cd4be04ad50583904acec997e6f170bc41262522 100644 (file)
--- 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.

diff --git a/sim/microblaze/sim-main.h b/sim/microblaze/sim-main.h
index 4a5c5dfebe3560cec85e664ff1fba9186bc8a7ef..ab4e6afd0d8ca0f09f4781d2a5fd123b2c7023b5 100644 (file)
--- 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.

diff --git a/sim/mips/ChangeLog b/sim/mips/ChangeLog
index 177d1d3e2b604585d98c0086b8120a88ba3f0ce4..51b4b297166db18560cb5be046fe02ca472a289d 100644 (file)
--- 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.

diff --git a/sim/mips/sim-main.h b/sim/mips/sim-main.h
index 8826857472d386fe84a85e0372062bd1a067ce47..e6bbd518c04d8c2141e7bdf19210982fa00621a5 100644 (file)
--- 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"
 

diff --git a/sim/mn10300/ChangeLog b/sim/mn10300/ChangeLog
index 1b649e23d86f17f66fd727c61c53233b4fc78e37..bee772f5570f87acf23d8cc6d6bb54c1d5b61b44 100644 (file)
--- 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.

diff --git a/sim/mn10300/sim-main.h b/sim/mn10300/sim-main.h
index 2ddbfb951a0a9ebfe9b5f90d7f50e0c75ce7254a..847506e4fe9157a1c5a66c3262f0b5a0891b7d6f 100644 (file)
--- 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)  \

diff --git a/sim/moxie/ChangeLog b/sim/moxie/ChangeLog
index 6ea5fef929262ae9fa117f001a95be89dca0cc79..22277bd77d8f7adb62210feb9f8e1536692cef2b 100644 (file)
--- 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.

diff --git a/sim/moxie/sim-main.h b/sim/moxie/sim-main.h
index c60437ef36e830f294685ddc58e0c33c135f274c..b1a64fcd9f77a657f4cde03eb51792b81c9cd6c1 100644 (file)
--- 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"
 

diff --git a/sim/msp430/ChangeLog b/sim/msp430/ChangeLog
index ce816935ca95805f1c91a56c458a45398f53ee49..c2205b5d7f0499dce10e56b9bd1ccff3d394d55c 100644 (file)
--- 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.

diff --git a/sim/msp430/sim-main.h b/sim/msp430/sim-main.h
index fdc4151313e99e311da55da9d53f14092710ad62..f08f3e41222678c608735d96186c2733e5ea3763 100644 (file)
--- 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"
 

diff --git a/sim/sh/ChangeLog b/sim/sh/ChangeLog
index b776ad0dbe97621ae8b2b905a3cb0122180b30fa..2127ab8cfacadf8e935b71fe625b60f6f6f7f1b5 100644 (file)
--- 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.

diff --git a/sim/sh/sim-main.h b/sim/sh/sim-main.h
index e2e17d7f166933af215d1a88b03169dbc1b7a78e..e67df28910914c220b8219b4b772fcb81e0f20af 100644 (file)
--- 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

diff --git a/sim/sh64/ChangeLog b/sim/sh64/ChangeLog
index 0dac7a7b01d37240ee2aca3659dba979654a19de..f75140ef7e4a8ff60eb9d3c5ae8a46dd01d42346 100644 (file)
--- 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.

diff --git a/sim/sh64/sim-main.h b/sim/sh64/sim-main.h
index 8fb595ed82004498ac01162e595fb1344aa5621b..1a1a2b7fbfa38acc472a3e3c663f2f029934daa9 100644 (file)
--- 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"

diff --git a/sim/v850/ChangeLog b/sim/v850/ChangeLog
index 6b815d61961df66d6d56e445bd26c7feb2f43e53..f47e33f8b27c543af67eb7651c8a75c0daec493e 100644 (file)
--- 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.

diff --git a/sim/v850/sim-main.h b/sim/v850/sim-main.h
index 16cbd9707ae9adf186a12b8459700833c1bdfa38..5127d2801025fff1277a1ccbda98abbb9d4e116e 100644 (file)
--- 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"