sim: unify sim_cia definition

Almost every target defines sim_cia the same way -- either using the
address_word type directly, or a type of equivalent size.  The only
odd one out is sh64 (who has 32bit address_word and 64bit cia), and
even that case doesn't seem to make sense.  We'll put off clean up
though of sh64 and at least set up a sensible default for everyone.

diff --git a/sim/arm/ChangeLog b/sim/arm/ChangeLog
index fbb78ecb256fae3594f649048151ad123d55f1f4..cb5b1cfe8de95c9ebce6973661f15536555f4e33 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_cia): Delete.
+
 2015-04-17  Mike Frysinger  <vapier@gentoo.org>
 
        * sim-main.h (CIA_GET, CIA_SET): Delete.

diff --git a/sim/arm/sim-main.h b/sim/arm/sim-main.h
index 087ddd51e5ebfa816fd189490c6469738eb4cd13..ae622bd1cb426e0c5cc956e6060975e3cd5165bb 100644 (file)
--- a/sim/arm/sim-main.h
+++ b/sim/arm/sim-main.h
@@ -21,8 +21,6 @@
 
 #include "sim-basics.h"
 
-typedef address_word sim_cia;
-
 typedef struct _sim_cpu SIM_CPU;
 
 #include "sim-base.h"

diff --git a/sim/avr/ChangeLog b/sim/avr/ChangeLog
index 81bab3b7abee36804e78efc046ffe33ce67fbbfa..9b4ca2aecb544612beafe8149412423354714a48 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_cia): Delete.
+
 2015-04-17  Mike Frysinger  <vapier@gentoo.org>
 
        * sim-main.h (CIA_GET, CIA_SET): Delete.

diff --git a/sim/avr/sim-main.h b/sim/avr/sim-main.h
index 6b49b8d43ea4c35bab745e96771aa7fe76416b7e..52904e385e261faae0fc0ea47e31e999e3b314b9 100644 (file)
--- a/sim/avr/sim-main.h
+++ b/sim/avr/sim-main.h
@@ -21,7 +21,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "sim-basics.h"
 
-typedef address_word sim_cia;
 extern unsigned int pc;
 
 typedef struct _sim_cpu SIM_CPU;

diff --git a/sim/bfin/ChangeLog b/sim/bfin/ChangeLog
index c27ef32d1b80e2f3fdda2d68645accd49b75a226..036db1620601ed9894b18f7453499bd1223d02ca 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_cia): Delete.
+
 2015-04-17  Mike Frysinger  <vapier@gentoo.org>
 
        * sim-main.h (CIA_GET, CIA_SET): Delete.

diff --git a/sim/bfin/sim-main.h b/sim/bfin/sim-main.h
index 614d1b6e5a58a91143a4aa7695e95a68c8bfab81..1fbfa08a9917e3ec9f3819555023d377836456c7 100644 (file)
--- a/sim/bfin/sim-main.h
+++ b/sim/bfin/sim-main.h
@@ -24,8 +24,6 @@
 #include "sim-basics.h"
 #include "sim-signal.h"
 
-typedef unsigned32 sim_cia;
-
 typedef struct _sim_cpu SIM_CPU;
 
 #include "bfin-sim.h"

diff --git a/sim/common/ChangeLog b/sim/common/ChangeLog
index d5c965cf16f40111177072834e0d4b3ea35b5e5e..f437768cead937c6cccea2d5457c1c46fac57ab2 100644 (file)
--- a/sim/common/ChangeLog
+++ b/sim/common/ChangeLog
@@ -1,3 +1,9 @@
+2015-04-18  Mike Frysinger  <vapier@gentoo.org>
+
+       * cgen-engine.h (CIA_ADDR): Delete.
+       * sim-base.h: Update sim_cia example.
+       [!CIA_ADDR] (sim_cia): New typedef.
+
 2015-04-17  Mike Frysinger  <vapier@gentoo.org>
 
        * cgen-utils.c (cgen_rtx_error): Change CIA_GET to CPU_PC_GET.

diff --git a/sim/common/cgen-engine.h b/sim/common/cgen-engine.h
index 3de1407b0d9654a1a20400470d3909a7a26826f0..70a4029bd4f4c86a5abf54ed1906fb58de4fbd41 100644 (file)
--- a/sim/common/cgen-engine.h
+++ b/sim/common/cgen-engine.h
@@ -186,8 +186,6 @@ do { \
 
 #if WITH_SCACHE
 
-#define CIA_ADDR(cia) (cia)
-
 #if WITH_SCACHE_PBB
 
 /* Return the scache pointer of the current insn.  */
@@ -280,8 +278,6 @@ do { \
 
 /* This is the "simple" engine case.  */
 
-#define CIA_ADDR(cia) (cia)
-
 #define SEM_SEM_ARG(vpc, sc) (sc)
 
 #define SEM_NEXT_VPC(sem_arg, pc, len) ((pc) + (len))

diff --git a/sim/common/sim-base.h b/sim/common/sim-base.h
index 0dae541094cd6e8b1d3c1c296598c3e727d1da78..e90e07ca340ebf7d7b254f24676173134493fc37 100644 (file)
--- a/sim/common/sim-base.h
+++ b/sim/common/sim-base.h
@@ -28,9 +28,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
    information), include ``sim-base.h'':
 
      #include "sim-basics.h"
-     typedef address_word sim_cia;
      /-* If `sim_cia' is not an integral value (e.g. a struct), define
          CIA_ADDR to return the integral value.  *-/
+     /-* typedef struct {...} sim_cia; *-/
      /-* #define CIA_ADDR(cia) (...) *-/
      #include "sim-base.h"
 
@@ -66,6 +66,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
    (e.g. for delay slot handling).  */
 #ifndef CIA_ADDR
 #define CIA_ADDR(cia) (cia)
+typedef address_word sim_cia;
 #endif
 #ifndef INVALID_INSTRUCTION_ADDRESS
 #define INVALID_INSTRUCTION_ADDRESS ((address_word)0 - 1)

diff --git a/sim/cr16/ChangeLog b/sim/cr16/ChangeLog
index 260164f77061b06660522906eb72acacad035a77..8b15b74e732a22626570794e3925a98a7d1f99cf 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_cia): Delete.
+
 2015-04-17  Mike Frysinger  <vapier@gentoo.org>
 
        * sim-main.h (CIA_GET, CIA_SET): Delete.

diff --git a/sim/cr16/sim-main.h b/sim/cr16/sim-main.h
index 96254f194135360b86572077b5a78f4cee389609..1a8022912c67b59e8ec85d7620c02f8b66e80bd7 100644 (file)
--- a/sim/cr16/sim-main.h
+++ b/sim/cr16/sim-main.h
@@ -21,7 +21,6 @@
 
 #include "sim-basics.h"
 
-typedef address_word sim_cia;
 typedef long int           word;
 typedef unsigned long int  uword;
 

diff --git a/sim/cris/ChangeLog b/sim/cris/ChangeLog
index b8b163129970adabbc1067e7ea3014f825753082..4c81975125c2694b5a1fd24f98bdad6edbcc0563 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_cia): Delete.
+
 2015-04-17  Mike Frysinger  <vapier@gentoo.org>
 
        * crisv10f.c (deliver_interrupt): Change CIA_GET to CPU_PC_GET.

diff --git a/sim/cris/sim-main.h b/sim/cris/sim-main.h
index 5985308fa8dac1de04ad0566bb7ac8a1f1d43c8f..7eb74b5fbe78261931bd33208b2e7ffc61c57872 100644 (file)
--- a/sim/cris/sim-main.h
+++ b/sim/cris/sim-main.h
@@ -36,9 +36,6 @@ typedef struct _sim_cpu SIM_CPU;
 #include "cris-opc.h"
 #include "arch.h"
 
-/* These must be defined before sim-base.h.  */
-typedef USI sim_cia;
-
 #define SIM_ENGINE_HALT_HOOK(sd, cpu, cia) \
 do { \
   if (cpu) /* Null if ctrl-c.  */ \

diff --git a/sim/d10v/ChangeLog b/sim/d10v/ChangeLog
index bac73a263efa484d321627a0769cdc06f7f169c5..a56d3ab7b6c76d0a8cba5c15d56e3aa84b276333 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_cia): Delete.
+
 2015-04-17  Mike Frysinger  <vapier@gentoo.org>
 
        * sim-main.h (CIA_GET, CIA_SET): Delete.

diff --git a/sim/d10v/sim-main.h b/sim/d10v/sim-main.h
index 7eb0b90c4214c0d9eb340cc276b16aca116cf1d7..a7d59ddf8370143f6944f216b7411232de687c90 100644 (file)
--- a/sim/d10v/sim-main.h
+++ b/sim/d10v/sim-main.h
@@ -21,7 +21,6 @@
 
 #include "sim-basics.h"
 
-typedef address_word sim_cia;
 typedef long int           word;
 typedef unsigned long int  uword;
 

diff --git a/sim/frv/ChangeLog b/sim/frv/ChangeLog
index 1724c35ebe07f067890ae8b29a551086c28813d3..750695f6e03c2325d834ca5d22aa3c95e86b22e5 100644 (file)
--- a/sim/frv/ChangeLog
+++ b/sim/frv/ChangeLog
@@ -1,3 +1,8 @@
+2015-04-18  Mike Frysinger  <vapier@gentoo.org>
+
+       * sim-main.h (sim_cia): Delete.
+       (frv_sim_engine_halt_hook): Move below includes.
+
 2015-04-17  Mike Frysinger  <vapier@gentoo.org>
 
        * sim-main.h (CIA_GET, CIA_SET): Delete.

diff --git a/sim/frv/sim-main.h b/sim/frv/sim-main.h
index 275ac28f1b265a741e0b4a3d9175f1e3ffc2ba02..fd12c4fa9453015f50d71786cd11c0385bab697c 100644 (file)
--- a/sim/frv/sim-main.h
+++ b/sim/frv/sim-main.h
@@ -40,10 +40,6 @@ typedef struct _sim_cpu SIM_CPU;
 #include "frv-opc.h"
 #include "arch.h"
 
-/* These must be defined before sim-base.h.  */
-typedef USI sim_cia;
-
-void frv_sim_engine_halt_hook (SIM_DESC, SIM_CPU *, sim_cia);
 #define SIM_ENGINE_HALT_HOOK(SD, LAST_CPU, CIA) \
   frv_sim_engine_halt_hook ((SD), (LAST_CPU), (CIA))
 
@@ -55,6 +51,8 @@ void frv_sim_engine_halt_hook (SIM_DESC, SIM_CPU *, sim_cia);
 #include "cache.h"
 #include "registers.h"
 #include "profile.h"
+
+void frv_sim_engine_halt_hook (SIM_DESC, SIM_CPU *, sim_cia);
 \f
 /* The _sim_cpu struct.  */
 

diff --git a/sim/ft32/ChangeLog b/sim/ft32/ChangeLog
index a3911083832e5d5caee7b30e43c95457353db7c7..62748893f5df5227f272a1c240fd764c2ce6f611 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_cia): Delete.
+
 2015-04-17  Mike Frysinger  <vapier@gentoo.org>
 
        * interp.c (ft32_read_item): Change CIA_GET to CPU_PC_GET.

diff --git a/sim/ft32/sim-main.h b/sim/ft32/sim-main.h
index a4f5f6dcef03629e700acde9ca42f12d9809f479..a270a5df04e62ce9ca74bbf363b5532bc7d94f9b 100644 (file)
--- a/sim/ft32/sim-main.h
+++ b/sim/ft32/sim-main.h
@@ -22,9 +22,6 @@
 #define SIM_MAIN_H
 
 #include "sim-basics.h"
-
-typedef address_word sim_cia;
-
 #include "sim-base.h"
 #include "bfd.h"
 

diff --git a/sim/h8300/ChangeLog b/sim/h8300/ChangeLog
index 1cc28f5c7a7203ef6a705789f1ea2df3c744cc8e..814a835e38e45914c2bb00e87adc5af7a3c20e7c 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_cia): Delete.
+
 2015-04-17  Mike Frysinger  <vapier@gentoo.org>
 
        * sim-main.h (CIA_GET, CIA_SET): Delete.

diff --git a/sim/h8300/sim-main.h b/sim/h8300/sim-main.h
index 450f8ca72829f5fe42b00f877e9aff1b4eac9dd2..e95c4d90e86601c3d0319c5d6b088b00010e593d 100644 (file)
--- a/sim/h8300/sim-main.h
+++ b/sim/h8300/sim-main.h
@@ -88,9 +88,6 @@ enum h8_typecodes {
 
 #include "sim-basics.h"
 
-/* Define sim_cia.  */
-typedef unsigned32 sim_cia;
-
 typedef struct _sim_cpu SIM_CPU;
 
 #include "sim-base.h"

diff --git a/sim/iq2000/ChangeLog b/sim/iq2000/ChangeLog
index 44e50028e0f84b903f4b2563392b8d5d83d60e30..c9ea375be0dfff8ca460360b9997895e440b4a39 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_cia): Delete.
+
 2015-04-17  Mike Frysinger  <vapier@gentoo.org>
 
        * sim-main.h (CIA_GET, CIA_SET): Delete.

diff --git a/sim/iq2000/sim-main.h b/sim/iq2000/sim-main.h
index 29d4b6292ec7e2552b624d1eff7f8c774e363d40..ce3babadf73f6f370e7455293c20cda4823364c0 100644 (file)
--- a/sim/iq2000/sim-main.h
+++ b/sim/iq2000/sim-main.h
@@ -23,9 +23,6 @@ typedef struct _sim_cpu SIM_CPU;
 /* Pull in IQ2000_{DATA,INSN}_{MASK,VALUE}.  */
 #include "elf/iq2000.h"
 
-/* These must be defined before sim-base.h.  */
-typedef USI sim_cia;
-
 #include "sim-base.h"
 #include "cgen-sim.h"
 #include "iq2000-sim.h"

diff --git a/sim/lm32/ChangeLog b/sim/lm32/ChangeLog
index e536d314094dd0fc05a0054d10f7d1bdc4a2a56e..3109bbc5aa3ad5f5ca18bef866d5a14807821e2a 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_cia): Delete.
+
 2015-04-17  Mike Frysinger  <vapier@gentoo.org>
 
        * dv-lm32cpu.c (deliver_lm32cpu_interrupt): Change CIA_GET to

diff --git a/sim/lm32/sim-main.h b/sim/lm32/sim-main.h
index 52122d2f4341ff41f193d1d9947457a69b0f2237..d37f74bb47448c654bd82314fc59095df33a1227 100644 (file)
--- a/sim/lm32/sim-main.h
+++ b/sim/lm32/sim-main.h
@@ -35,9 +35,6 @@ typedef struct _sim_cpu SIM_CPU;
 #include "lm32-opc.h"
 #include "arch.h"
 
-/* These must be defined before sim-base.h.  */
-typedef USI sim_cia;
-
 #define SIM_ENGINE_HALT_HOOK(sd, cpu, cia) \
 do { \
   if (cpu) /* null if ctrl-c */ \

diff --git a/sim/m32r/ChangeLog b/sim/m32r/ChangeLog
index d47cdfb0addf3b3abf8565e9bd0a298dc64d552f..dc82037128a35d2311b04473b7b71c8d43524110 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_cia): Delete.
+
 2015-04-17  Mike Frysinger  <vapier@gentoo.org>
 
        * sim-main.h (CIA_GET, CIA_SET): Delete.

diff --git a/sim/m32r/sim-main.h b/sim/m32r/sim-main.h
index 661d9cf9e3abf112b962e1199b1427da98ed340d..6839a4152b8cad6760703132eab13eb3326d85d7 100644 (file)
--- a/sim/m32r/sim-main.h
+++ b/sim/m32r/sim-main.h
@@ -15,9 +15,6 @@ typedef struct _sim_cpu SIM_CPU;
 #include "m32r-opc.h"
 #include "arch.h"
 
-/* These must be defined before sim-base.h.  */
-typedef USI sim_cia;
-
 #define SIM_ENGINE_HALT_HOOK(sd, cpu, cia) \
 do { \
   if (cpu) /* null if ctrl-c */ \

diff --git a/sim/m68hc11/ChangeLog b/sim/m68hc11/ChangeLog
index 714c000a02c4493de18f730174ad1bec8d732025..a5c9c5aa6235bb7189297fcc465e613284911155 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_cia): Delete.
+
 2015-04-17  Mike Frysinger  <vapier@gentoo.org>
 
        * sim-main.h (CIA_GET, CIA_SET): Delete.

diff --git a/sim/m68hc11/sim-main.h b/sim/m68hc11/sim-main.h
index ac57f989bd730d08d85b6e9727e93a4946e51e2b..4f41db929bfb7018df21eb5e3afadfd6b9ba9d21 100644 (file)
--- a/sim/m68hc11/sim-main.h
+++ b/sim/m68hc11/sim-main.h
@@ -26,8 +26,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "sim-basics.h"
 
-typedef address_word sim_cia;
-
 typedef struct _sim_cpu SIM_CPU;
 
 #include "sim-signal.h"

diff --git a/sim/mcore/ChangeLog b/sim/mcore/ChangeLog
index 89f17d8a37e8dcccb28bdd3581ff55404dc85bd4..98ebb1e92d1b9eb390445bb4377eb373f22fed49 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_cia): Delete.
+
 2015-04-17  Mike Frysinger  <vapier@gentoo.org>
 
        * interp.c (set_initial_gprs): Change CIA_SET to CPU_PC_SET.

diff --git a/sim/mcore/sim-main.h b/sim/mcore/sim-main.h
index f7000593fe9dda8f0ebf17702340400d03c5e7cc..25698c187c984c91445a06d7ce87704b6860e319 100644 (file)
--- a/sim/mcore/sim-main.h
+++ b/sim/mcore/sim-main.h
@@ -21,7 +21,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "sim-basics.h"
 
-typedef address_word sim_cia;
 typedef long int           word;
 typedef unsigned long int  uword;
 

diff --git a/sim/microblaze/ChangeLog b/sim/microblaze/ChangeLog
index 7bfb657700088990b8b1e749678caa11f6596061..560cc134a36db4d1d458b4b48f115f11abd6485f 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_cia): Delete.
+
 2015-04-17  Mike Frysinger  <vapier@gentoo.org>
 
        * interp.c (issue_messages, wbat, wlat, what, rbat, rlat, rhat,

diff --git a/sim/microblaze/sim-main.h b/sim/microblaze/sim-main.h
index e5d2b15754e1fe3ce469b7dcb91c2348740363cb..4a5c5dfebe3560cec85e664ff1fba9186bc8a7ef 100644 (file)
--- a/sim/microblaze/sim-main.h
+++ b/sim/microblaze/sim-main.h
@@ -21,8 +21,6 @@
 #include "microblaze.h"
 #include "sim-basics.h"
 
-typedef address_word sim_cia;
-
 typedef struct _sim_cpu SIM_CPU;
 
 #include "sim-base.h"

diff --git a/sim/mips/ChangeLog b/sim/mips/ChangeLog
index 00f7871e05ff05e95b4ba9320a2d00a74dbd3979..177d1d3e2b604585d98c0086b8120a88ba3f0ce4 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_cia): Delete.
+
 2015-04-17  Mike Frysinger  <vapier@gentoo.org>
 
        * dv-tx3904cpu.c (deliver_tx3904cpu_interrupt): Change CIA_GET to

diff --git a/sim/mips/sim-main.h b/sim/mips/sim-main.h
index 7a58bd30f506b6f5c2832159a195f14c75ef681d..8826857472d386fe84a85e0372062bd1a067ce47 100644 (file)
--- a/sim/mips/sim-main.h
+++ b/sim/mips/sim-main.h
@@ -34,8 +34,6 @@ mips_core_signal ((SD), (CPU), (CIA), (MAP), (NR_BYTES), (ADDR), (TRANSFER), (ER
 
 #include "sim-basics.h"
 
-typedef address_word sim_cia;
-
 typedef struct _sim_cpu SIM_CPU;
 
 #include "sim-base.h"

diff --git a/sim/mn10300/ChangeLog b/sim/mn10300/ChangeLog
index 91aa17963dce60d5d11fde1be863fe2655f2f0c8..1b649e23d86f17f66fd727c61c53233b4fc78e37 100644 (file)
--- a/sim/mn10300/ChangeLog
+++ b/sim/mn10300/ChangeLog
@@ -1,3 +1,8 @@
+2015-04-18  Mike Frysinger  <vapier@gentoo.org>
+
+       * sim-main.h (sim_cia): Delete.
+       (SIM_ADDR): Delete comment.
+
 2015-04-17  Mike Frysinger  <vapier@gentoo.org>
 
        * dv-mn103cpu.c (deliver_mn103cpu_interrupt): Change CIA_GET to

diff --git a/sim/mn10300/sim-main.h b/sim/mn10300/sim-main.h
index 3781da0ee112c3e06ca0db8e8774eb0b8eb50791..2ddbfb951a0a9ebfe9b5f90d7f50e0c75ce7254a 100644 (file)
--- a/sim/mn10300/sim-main.h
+++ b/sim/mn10300/sim-main.h
@@ -42,13 +42,8 @@
 #include "itable.h"
 #include "idecode.h"
 
-typedef instruction_address sim_cia;
 typedef struct _sim_cpu SIM_CPU;
 
-/* FIXME: Perhaps igen should generate access macros for
-   `instruction_address' that we could use.  */
-/*#define CIA_ADDR(cia) ((cia).ip) doesn't work for mn10300*/
-
 #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 6bdad25bccecc1fcfc1f069c10765a14122a91e2..6ea5fef929262ae9fa117f001a95be89dca0cc79 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_cia): Delete.
+
 2015-04-17  Mike Frysinger  <vapier@gentoo.org>
 
        * interp.c (wbat, wsat, wlat, rsat, rbat, rlat, sim_engine_run):

diff --git a/sim/moxie/sim-main.h b/sim/moxie/sim-main.h
index 3dd53fffc77f641bb8c6b9ff004632afa81f9aae..c60437ef36e830f294685ddc58e0c33c135f274c 100644 (file)
--- a/sim/moxie/sim-main.h
+++ b/sim/moxie/sim-main.h
@@ -22,8 +22,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "sim-basics.h"
 
-typedef address_word sim_cia;
-
 typedef struct _sim_cpu SIM_CPU;
 
 #include "sim-base.h"

diff --git a/sim/msp430/ChangeLog b/sim/msp430/ChangeLog
index 4567039b7c55c7452f473528524c2fb14e88f2eb..ce816935ca95805f1c91a56c458a45398f53ee49 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_cia): Delete.
+
 2015-04-17  Mike Frysinger  <vapier@gentoo.org>
 
        * sim-main.h (CIA_GET, CIA_SET): Delete.

diff --git a/sim/msp430/sim-main.h b/sim/msp430/sim-main.h
index 73f468000408f934af608a3b1f9d30cba846380d..fdc4151313e99e311da55da9d53f14092710ad62 100644 (file)
--- a/sim/msp430/sim-main.h
+++ b/sim/msp430/sim-main.h
@@ -24,8 +24,6 @@
 #include "sim-basics.h"
 #include "sim-signal.h"
 
-typedef unsigned32 sim_cia;
-
 typedef struct _sim_cpu SIM_CPU;
 
 #include "msp430-sim.h"

diff --git a/sim/sh/ChangeLog b/sim/sh/ChangeLog
index 472597e85213ff28393fc5c49d0710f014756472..b776ad0dbe97621ae8b2b905a3cb0122180b30fa 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_cia): Delete.
+
 2015-04-17  Mike Frysinger  <vapier@gentoo.org>
 
        * sim-main.h (CIA_GET, CIA_SET): Delete.

diff --git a/sim/sh/sim-main.h b/sim/sh/sim-main.h
index 405f1cb951e4347de568091bd6801513aaddaa30..e2e17d7f166933af215d1a88b03169dbc1b7a78e 100644 (file)
--- a/sim/sh/sim-main.h
+++ b/sim/sh/sim-main.h
@@ -21,8 +21,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "sim-basics.h"
 
-typedef address_word sim_cia;
-
 typedef struct _sim_cpu SIM_CPU;
 
 #include "sim-base.h"

diff --git a/sim/sh64/ChangeLog b/sim/sh64/ChangeLog
index 45b8d3f54f87359ce6ecc6a597370cc3c6846fe3..0dac7a7b01d37240ee2aca3659dba979654a19de 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 (CIA_ADDR): Define.
+
 2015-04-17  Mike Frysinger  <vapier@gentoo.org>
 
        * sim-main.h (CIA_GET, CIA_SET): Delete.

diff --git a/sim/sh64/sim-main.h b/sim/sh64/sim-main.h
index 99f0406342f175bef2a2951511eb5ad6c65d11c8..8fb595ed82004498ac01162e595fb1344aa5621b 100644 (file)
--- a/sim/sh64/sim-main.h
+++ b/sim/sh64/sim-main.h
@@ -21,6 +21,7 @@ typedef struct _sim_cpu SIM_CPU;
 
 /* These must be defined before sim-base.h.  */
 typedef UDI sim_cia;
+#define CIA_ADDR(cia) (cia)
 
 #include "sim-base.h"
 #include "cgen-sim.h"

diff --git a/sim/v850/ChangeLog b/sim/v850/ChangeLog
index dc3f38f23eef61f49aab9b8f8054e230f68549f3..6b815d61961df66d6d56e445bd26c7feb2f43e53 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_cia): Delete.
+
 2015-04-17  Mike Frysinger  <vapier@gentoo.org>
 
        * sim-main.h (CIA_GET, CIA_SET): Delete.

diff --git a/sim/v850/sim-main.h b/sim/v850/sim-main.h
index acdf1d77861e140a140e809265774b14dccaa9a3..16cbd9707ae9adf186a12b8459700833c1bdfa38 100644 (file)
--- a/sim/v850/sim-main.h
+++ b/sim/v850/sim-main.h
@@ -17,8 +17,6 @@
 #include "sim-signal.h"
 #include "sim-fpu.h"
 
-typedef address_word sim_cia;
-
 typedef struct _sim_cpu SIM_CPU;
 
 #include "sim-base.h"