sim: unify sim-cpu usage

Now that all the targets are utilizing CPU_PC_{FETCH,STORE}, and the
cpu state is multicore, and the STATE_CPU defines match, we can move
it all to the common code.

diff --git a/sim/arm/ChangeLog b/sim/arm/ChangeLog
index 4078d71f1a5e50b3fca175c38e54c2d04da923aa..c98903d42b742d973ae1f27f666a2b87499fc5ea 100644 (file)
--- a/sim/arm/ChangeLog
+++ b/sim/arm/ChangeLog
@@ -1,3 +1,8 @@
+2015-04-15  Mike Frysinger  <vapier@gentoo.org>
+
+       * Makefile.in (SIM_OBJS): Delete sim-cpu.o.
+       * sim-main.h (STATE_CPU): Delete.
+
 2015-04-13  Mike Frysinger  <vapier@gentoo.org>
 
        * configure: Regenerate.

diff --git a/sim/arm/Makefile.in b/sim/arm/Makefile.in
index 5c3772308dc4df877b67bf227c3b4592140f7e76..745b62a8e7733a0b8d1f1cd809a31608d27f9c4e 100644 (file)
--- a/sim/arm/Makefile.in
+++ b/sim/arm/Makefile.in
@@ -22,7 +22,6 @@ SIM_EXTRA_CFLAGS = -DMODET
 SIM_OBJS = \
        wrapper.o \
        $(SIM_NEW_COMMON_OBJS) \
-       sim-cpu.o \
        sim-hload.o \
        armemu26.o armemu32.o arminit.o armos.o armsupp.o \
        armvirt.o bag.o thumbemu.o \

diff --git a/sim/arm/sim-main.h b/sim/arm/sim-main.h
index d0209728646ecf550bd19550e49c7a08ca0c4b21..8b64287a22b7df0d3d94d670219f538255d6eb6f 100644 (file)
--- a/sim/arm/sim-main.h
+++ b/sim/arm/sim-main.h
@@ -44,11 +44,6 @@ struct _sim_cpu {
 struct sim_state {
 
   sim_cpu *cpu[MAX_NR_PROCESSORS];
-#if (WITH_SMP)
-#define STATE_CPU(sd,n) ((sd)->cpu[n])
-#else
-#define STATE_CPU(sd,n) ((sd)->cpu[0])
-#endif
 
   sim_state_base base;
 };

diff --git a/sim/avr/ChangeLog b/sim/avr/ChangeLog
index d8b2a29c11771c13262e9760ae403d261da4208d..0dd4faf6bcef39b50c990010885f9e101cdbff19 100644 (file)
--- a/sim/avr/ChangeLog
+++ b/sim/avr/ChangeLog
@@ -1,3 +1,8 @@
+2015-04-15  Mike Frysinger  <vapier@gentoo.org>
+
+       * Makefile.in (SIM_OBJS): Delete sim-cpu.o.
+       * sim-main.h (STATE_CPU): Delete.
+
 2015-04-13  Mike Frysinger  <vapier@gentoo.org>
 
        * configure: Regenerate.

diff --git a/sim/avr/Makefile.in b/sim/avr/Makefile.in
index d7b77d015c159f5cb85bb72a617917e349edb8c1..80a1230e9d594c679b74b8b9ed096dffde230a93 100644 (file)
--- a/sim/avr/Makefile.in
+++ b/sim/avr/Makefile.in
@@ -19,7 +19,6 @@
 SIM_OBJS = \
        $(SIM_NEW_COMMON_OBJS) \
        interp.o \
-       sim-cpu.o \
        sim-hload.o \
        sim-reason.o \
        sim-resume.o \

diff --git a/sim/avr/sim-main.h b/sim/avr/sim-main.h
index 025eb151ab9378afdab27be0b4ac89c085362228..fc30e1173767e4ef82eac661ba0bb6c92f412fcd 100644 (file)
--- a/sim/avr/sim-main.h
+++ b/sim/avr/sim-main.h
@@ -39,11 +39,6 @@ struct _sim_cpu {
 struct sim_state {
 
   sim_cpu *cpu[MAX_NR_PROCESSORS];
-#if (WITH_SMP)
-#define STATE_CPU(sd,n) ((sd)->cpu[n])
-#else
-#define STATE_CPU(sd,n) ((sd)->cpu[0])
-#endif
 
   sim_state_base base;
 };

diff --git a/sim/bfin/ChangeLog b/sim/bfin/ChangeLog
index cd735800458d4d2233b0c9b5575b983fdc052ba8..db379c333dd75afcef4a9a6eb2b7a92f58d83607 100644 (file)
--- a/sim/bfin/ChangeLog
+++ b/sim/bfin/ChangeLog
@@ -1,3 +1,8 @@
+2015-04-15  Mike Frysinger  <vapier@gentoo.org>
+
+       * Makefile.in (SIM_OBJS): Delete sim-cpu.o.
+       * sim-main.h (STATE_CPU): Delete.
+
 2015-04-13  Mike Frysinger  <vapier@gentoo.org>
 
        * configure: Regenerate.

diff --git a/sim/bfin/Makefile.in b/sim/bfin/Makefile.in
index 38531a9e69a9f07e4caa3256021375ab930a3855..dc42339583dcba247616d53740cd9584e308f5df 100644 (file)
--- a/sim/bfin/Makefile.in
+++ b/sim/bfin/Makefile.in
@@ -27,7 +27,6 @@ SIM_OBJS = \
        gui.o \
        interp.o \
        machs.o \
-       sim-cpu.o \
        sim-hload.o \
        sim-model.o \
        sim-reason.o \

diff --git a/sim/bfin/sim-main.h b/sim/bfin/sim-main.h
index 1b58e75a91d72d1b73387e1c4f357a25456a58ea..f8c2ba2a3dca127728bd5dd6e12ab61591721f3c 100644 (file)
--- a/sim/bfin/sim-main.h
+++ b/sim/bfin/sim-main.h
@@ -46,11 +46,7 @@ struct _sim_cpu {
 
 struct sim_state {
   sim_cpu *cpu[MAX_NR_PROCESSORS];
-#if (WITH_SMP)
-#define STATE_CPU(sd,n) ((sd)->cpu[n])
-#else
-#define STATE_CPU(sd,n) ((sd)->cpu[0])
-#endif
+
   /* ... simulator specific members ... */
   struct bfin_board_data board;
 #define STATE_BOARD_DATA(sd) (&(sd)->board)

diff --git a/sim/common/ChangeLog b/sim/common/ChangeLog
index 5c0667b8a120008fe01f4145c02ac6a619f6bc0e..316771d33115284a66a70f0cf0ad6a63d6834603 100644 (file)
--- a/sim/common/ChangeLog
+++ b/sim/common/ChangeLog
@@ -1,3 +1,8 @@
+2015-04-15  Mike Frysinger  <vapier@gentoo.org>
+
+       * Makefile.in (SIM_NEW_COMMON_OBJS): Add sim-cpu.o.
+       * sim-main.h (STATE_CPU): Remove from comment and define.
+
 2015-04-13  Mike Frysinger  <vapier@gentoo.org>
 
        * acinclude.m4 (ACX_PKGVERSION): Change GDB to SIM.

diff --git a/sim/common/Make-common.in b/sim/common/Make-common.in
index d42fea610310a0dbf11f3f01381e11e838534fd2..2d1bb8a1a4108d786e678b8cf4792d0e2bc25932 100644 (file)
--- a/sim/common/Make-common.in
+++ b/sim/common/Make-common.in
@@ -176,6 +176,7 @@ SIM_NEW_COMMON_OBJS = \
        sim-command.o \
        sim-config.o \
        sim-core.o \
+       sim-cpu.o \
        sim-endian.o \
        sim-engine.o \
        sim-events.o \

diff --git a/sim/common/sim-base.h b/sim/common/sim-base.h
index f7a33cd9f4b1770a87097f81d2e2c00bfe317125..0dae541094cd6e8b1d3c1c296598c3e727d1da78 100644 (file)
--- a/sim/common/sim-base.h
+++ b/sim/common/sim-base.h
@@ -44,11 +44,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
      struct sim_state {
        sim_cpu *cpu[MAX_NR_PROCESSORS];
-     #if (WITH_SMP)
-     #define STATE_CPU(sd,n) ((sd)->cpu[n])
-     #else
-     #define STATE_CPU(sd,n) ((sd)->cpu[0])
-     #endif
        ... simulator specific members ...
        sim_state_base base;
      };
@@ -116,6 +111,15 @@ extern struct sim_state *current_state;
 #endif
 
 
+/* We require all sims to dynamically allocate cpus.  See comment up top about
+   struct sim_state.  */
+#if (WITH_SMP)
+# define STATE_CPU(sd, n) ((sd)->cpu[n])
+#else
+# define STATE_CPU(sd, n) ((sd)->cpu[0])
+#endif
+
+
 typedef struct {
 
   /* Simulator's argv[0].  */

diff --git a/sim/cr16/ChangeLog b/sim/cr16/ChangeLog
index 272d7ca7e5ae33a3c446306872d0464201da5284..4aa642964128f4881397c4db400460e8acc03b29 100644 (file)
--- a/sim/cr16/ChangeLog
+++ b/sim/cr16/ChangeLog
@@ -1,3 +1,8 @@
+2015-04-15  Mike Frysinger  <vapier@gentoo.org>
+
+       * Makefile.in (SIM_OBJS): Delete sim-cpu.o.
+       * sim-main.h (STATE_CPU): Delete.
+
 2015-04-13  Mike Frysinger  <vapier@gentoo.org>
 
        * configure: Regenerate.

diff --git a/sim/cr16/Makefile.in b/sim/cr16/Makefile.in
index 3918cedbabd5601a7db061f320cc2529844cebbe..5d1632d973c799dd5b9fcd5406a9f20015598b7c 100644 (file)
--- a/sim/cr16/Makefile.in
+++ b/sim/cr16/Makefile.in
@@ -19,7 +19,6 @@
 
 SIM_OBJS = \
        $(SIM_NEW_COMMON_OBJS) \
-       sim-cpu.o \
        sim-hload.o \
        interp.o \
        table.o \

diff --git a/sim/cr16/sim-main.h b/sim/cr16/sim-main.h
index 2be0e2390da59b4226c882d3db61ee5d3695e34b..ec94a82920eafa92bac6151064896fd736856b21 100644 (file)
--- a/sim/cr16/sim-main.h
+++ b/sim/cr16/sim-main.h
@@ -43,11 +43,6 @@ struct _sim_cpu {
 struct sim_state {
 
   sim_cpu *cpu[MAX_NR_PROCESSORS];
-#if (WITH_SMP)
-#define STATE_CPU(sd,n) ((sd)->cpu[n])
-#else
-#define STATE_CPU(sd,n) ((sd)->cpu[0])
-#endif
 
   sim_state_base base;
 };

diff --git a/sim/cris/ChangeLog b/sim/cris/ChangeLog
index b1ac59136fc912f49f9313ba3c1cba02b4db4483..89275296b3be71be97c48ab908cc570d7f77454d 100644 (file)
--- a/sim/cris/ChangeLog
+++ b/sim/cris/ChangeLog
@@ -1,3 +1,8 @@
+2015-04-15  Mike Frysinger  <vapier@gentoo.org>
+
+       * Makefile.in (SIM_OBJS): Delete sim-cpu.o.
+       * sim-main.h (STATE_CPU): Delete.
+
 2015-04-15  Mike Frysinger  <vapier@gentoo.org>
 
        * sim-main.h (struct sim_state): Change cpu to an array of pointers.

diff --git a/sim/cris/Makefile.in b/sim/cris/Makefile.in
index 5459c0e7a2e8a894219ec9e01cc70917edcdb1a4..945eaa60b7a0e095bc4c5c59a18753d4a80a3a63 100644 (file)
--- a/sim/cris/Makefile.in
+++ b/sim/cris/Makefile.in
@@ -24,7 +24,6 @@ CRISV32F_OBJS = crisv32f.o cpuv32.o decodev32.o modelv32.o mloopv32f.o
 
 SIM_OBJS = \
        $(SIM_NEW_COMMON_OBJS) \
-       sim-cpu.o \
        sim-model.o \
        sim-reg.o \
        cgen-utils.o cgen-trace.o cgen-scache.o \

diff --git a/sim/cris/sim-main.h b/sim/cris/sim-main.h
index 5ae292e998740a46dbeb220e0a55ef12f7b74460..df6c5cf81e8066212f8f8add02b13e45c923aae1 100644 (file)
--- a/sim/cris/sim-main.h
+++ b/sim/cris/sim-main.h
@@ -226,11 +226,6 @@ struct _sim_cpu {
 
 struct sim_state {
   sim_cpu *cpu[MAX_NR_PROCESSORS];
-#if (WITH_SMP)
-#define STATE_CPU(sd,n) ((sd)->cpu[n])
-#else
-#define STATE_CPU(sd,n) ((sd)->cpu[0])
-#endif
 
   CGEN_STATE cgen_state;
 

diff --git a/sim/d10v/ChangeLog b/sim/d10v/ChangeLog
index 331f359f7d27aa3ec8189b6dfbfca308a38d98cb..4ce1df84aa5835f14ea05bbef0ed67bc8c9212c2 100644 (file)
--- a/sim/d10v/ChangeLog
+++ b/sim/d10v/ChangeLog
@@ -1,3 +1,8 @@
+2015-04-15  Mike Frysinger  <vapier@gentoo.org>
+
+       * Makefile.in (SIM_OBJS): Delete sim-cpu.o.
+       * sim-main.h (STATE_CPU): Delete.
+
 2015-04-13  Mike Frysinger  <vapier@gentoo.org>
 
        * configure: Regenerate.

diff --git a/sim/d10v/Makefile.in b/sim/d10v/Makefile.in
index 167e76bd8bf1514c79f23304e869483ee646e303..27b0008d12aad5b8d66b862f2fb1903bb00bc124 100644 (file)
--- a/sim/d10v/Makefile.in
+++ b/sim/d10v/Makefile.in
@@ -20,7 +20,6 @@
 SIM_OBJS = \
        interp.o \
        $(SIM_NEW_COMMON_OBJS) \
-       sim-cpu.o \
        sim-hload.o \
        table.o \
        simops.o \

diff --git a/sim/d10v/sim-main.h b/sim/d10v/sim-main.h
index ac32f29b4d180ad5b52a13b32a20c96a3252b840..c83c78c8ed37a70827a95c8dfdc856d82421c36e 100644 (file)
--- a/sim/d10v/sim-main.h
+++ b/sim/d10v/sim-main.h
@@ -43,11 +43,6 @@ struct _sim_cpu {
 struct sim_state {
 
   sim_cpu *cpu[MAX_NR_PROCESSORS];
-#if (WITH_SMP)
-#define STATE_CPU(sd,n) ((sd)->cpu[n])
-#else
-#define STATE_CPU(sd,n) ((sd)->cpu[0])
-#endif
 
   sim_state_base base;
 };

diff --git a/sim/frv/ChangeLog b/sim/frv/ChangeLog
index 8e7e995b4b4b0a63b378d65241a8f0dc189bada7..05ae18a160f8e22cfc83828aa7f59f8fad3b7ea6 100644 (file)
--- a/sim/frv/ChangeLog
+++ b/sim/frv/ChangeLog
@@ -1,3 +1,8 @@
+2015-04-15  Mike Frysinger  <vapier@gentoo.org>
+
+       * Makefile.in (SIM_OBJS): Delete sim-cpu.o.
+       * sim-main.h (STATE_CPU): Delete.
+
 2015-04-15  Mike Frysinger  <vapier@gentoo.org>
 
        * sim-main.h (struct sim_state): Change cpu to an array of pointers.

diff --git a/sim/frv/Makefile.in b/sim/frv/Makefile.in
index 415d2abd4247bcc3edc36eb37503af6962749d3a..6dc5616a56b432b5e2463ad917a0326bcbb36419 100644 (file)
--- a/sim/frv/Makefile.in
+++ b/sim/frv/Makefile.in
@@ -21,7 +21,6 @@ FRV_OBJS = frv.o cpu.o decode.o sem.o model.o mloop.o cgen-par.o
 
 SIM_OBJS = \
        $(SIM_NEW_COMMON_OBJS) \
-       sim-cpu.o \
        sim-hload.o \
        sim-model.o \
        sim-reg.o \

diff --git a/sim/frv/sim-main.h b/sim/frv/sim-main.h
index e7dc1a2d9159ff9cd6390becf0da171a7e3307eb..1fd60b58cfe0c93af2e52171979efc5c52d417d0 100644 (file)
--- a/sim/frv/sim-main.h
+++ b/sim/frv/sim-main.h
@@ -119,11 +119,6 @@ struct _sim_cpu {
 
 struct sim_state {
   sim_cpu *cpu[MAX_NR_PROCESSORS];
-#if (WITH_SMP)
-#define STATE_CPU(sd,n) ((sd)->cpu[n])
-#else
-#define STATE_CPU(sd,n) ((sd)->cpu[0])
-#endif
 
   CGEN_STATE cgen_state;
 

diff --git a/sim/ft32/ChangeLog b/sim/ft32/ChangeLog
index f3208e6f6cf99891569acc880d958e8e085e0a26..07fb6a6860a553c4cbd5397498fd08d0118f62aa 100644 (file)
--- a/sim/ft32/ChangeLog
+++ b/sim/ft32/ChangeLog
@@ -1,3 +1,8 @@
+2015-04-15  Mike Frysinger  <vapier@gentoo.org>
+
+       * Makefile.in (SIM_OBJS): Delete sim-cpu.o.
+       * sim-main.h (STATE_CPU): Delete.
+
 2015-04-13  Mike Frysinger  <vapier@gentoo.org>
 
        * configure: Regenerate.

diff --git a/sim/ft32/Makefile.in b/sim/ft32/Makefile.in
index c124bf37164ecfa240f43d273aa7183471f74375..69bf06090048af123bc33d8522547f99d7d5f67d 100644 (file)
--- a/sim/ft32/Makefile.in
+++ b/sim/ft32/Makefile.in
@@ -24,7 +24,6 @@ SIM_OBJS = \
        sim-bits.o      \
        sim-config.o    \
        sim-core.o      \
-       sim-cpu.o       \
        sim-endian.o    \
        sim-events.o    \
        sim-fpu.o       \

diff --git a/sim/ft32/sim-main.h b/sim/ft32/sim-main.h
index 6cb7c7ecffd32c6f7e6273a261afb12a16dcc3a8..1aa4248dc30e673658e886428b78a82fa178a03d 100644 (file)
--- a/sim/ft32/sim-main.h
+++ b/sim/ft32/sim-main.h
@@ -46,11 +46,6 @@ struct _sim_cpu {
 struct sim_state {
 
   sim_cpu *cpu[MAX_NR_PROCESSORS];
-#if (WITH_SMP)
-#define STATE_CPU(sd,n) ((sd)->cpu[n])
-#else
-#define STATE_CPU(sd,n) ((sd)->cpu[0])
-#endif
 
   sim_state_base base;
 };

diff --git a/sim/h8300/ChangeLog b/sim/h8300/ChangeLog
index 1740b3db50e72219c002b9e8e894778f72e4b4af..eaf30889876e9c50417ef8ea96be4d0ad28acbd2 100644 (file)
--- a/sim/h8300/ChangeLog
+++ b/sim/h8300/ChangeLog
@@ -1,3 +1,8 @@
+2015-04-15  Mike Frysinger  <vapier@gentoo.org>
+
+       * Makefile.in (SIM_OBJS): Delete sim-cpu.o.
+       * sim-main.h (STATE_CPU): Delete.
+
 2015-04-15  Mike Frysinger  <vapier@gentoo.org>
 
        * compile.c: Include sim-options.h.

diff --git a/sim/h8300/Makefile.in b/sim/h8300/Makefile.in
index 9b89aea2abff086728b1f9f9783072b2f6c7e224..da68255b6bc2df58cd1d8bcff58f22ef69b55a63 100644 (file)
--- a/sim/h8300/Makefile.in
+++ b/sim/h8300/Makefile.in
@@ -19,7 +19,6 @@
 
 SIM_OBJS = compile.o \
           $(SIM_NEW_COMMON_OBJS) \
-          sim-cpu.o \
           sim-load.o
 
 ## COMMON_POST_CONFIG_FRAG

diff --git a/sim/h8300/sim-main.h b/sim/h8300/sim-main.h
index 7126fa35c005988bcc5f61f1cb4f513d6f4927f1..8b075052f124d6f3c2c1c405a0c2d6ea181396fc 100644 (file)
--- a/sim/h8300/sim-main.h
+++ b/sim/h8300/sim-main.h
@@ -155,11 +155,6 @@ struct sim_state {
 
 #define CIA_GET(CPU)           (cpu_get_pc (CPU))
 #define CIA_SET(CPU, VAL)      (cpu_set_pc ((CPU), (VAL)))
-#if (WITH_SMP)
-#define STATE_CPU(sd,n) ((sd)->cpu[n])
-#else
-#define STATE_CPU(sd,n) ((sd)->cpu[0])
-#endif
 #define cpu_set_pc(CPU, VAL)   (((CPU)->pc)  = (VAL))
 #define cpu_get_pc(CPU)                (((CPU)->pc))
 

diff --git a/sim/iq2000/ChangeLog b/sim/iq2000/ChangeLog
index b590cb043a88c5394327f79ae19fea6b7a834edb..4278ae6f63ee6bb139cd64f86c197026e1714a13 100644 (file)
--- a/sim/iq2000/ChangeLog
+++ b/sim/iq2000/ChangeLog
@@ -1,3 +1,8 @@
+2015-04-15  Mike Frysinger  <vapier@gentoo.org>
+
+       * Makefile.in (SIM_OBJS): Delete sim-cpu.o.
+       * sim-main.h (STATE_CPU): Delete.
+
 2015-04-15  Mike Frysinger  <vapier@gentoo.org>
 
        * sim-main.h (struct sim_state): Change cpu to an array of pointers.

diff --git a/sim/iq2000/Makefile.in b/sim/iq2000/Makefile.in
index 3e07c53d4c270e3819f7d876b501f29a0956d5d6..0871877f11603b549e4f4336602013a3e7e993af 100644 (file)
--- a/sim/iq2000/Makefile.in
+++ b/sim/iq2000/Makefile.in
@@ -21,7 +21,6 @@ IQ2000_OBJS = iq2000.o cpu.o decode.o sem.o model.o mloop.o
 
 SIM_OBJS = \
        $(SIM_NEW_COMMON_OBJS) \
-       sim-cpu.o \
        sim-hload.o \
        sim-model.o \
        sim-reg.o \

diff --git a/sim/iq2000/sim-main.h b/sim/iq2000/sim-main.h
index 623c0a6e575e5fcd7126449c046fc7f0f61e17b8..1498eb4b1f14ea749a0a1af8fdb8e4cab23f8efb 100644 (file)
--- a/sim/iq2000/sim-main.h
+++ b/sim/iq2000/sim-main.h
@@ -58,11 +58,6 @@ struct _sim_cpu {
 
 struct sim_state {
   sim_cpu *cpu[MAX_NR_PROCESSORS];
-#if (WITH_SMP)
-#define STATE_CPU(sd,n) ((sd)->cpu[n])
-#else
-#define STATE_CPU(sd,n) ((sd)->cpu[0])
-#endif
 
   CGEN_STATE cgen_state;
 

diff --git a/sim/lm32/ChangeLog b/sim/lm32/ChangeLog
index 94a1ccddbf432d59c05c0bd30ebfa37d27572474..6464b772b2c3b7f31ec1bc12c4a21dae77c898a7 100644 (file)
--- a/sim/lm32/ChangeLog
+++ b/sim/lm32/ChangeLog
@@ -1,3 +1,8 @@
+2015-04-15  Mike Frysinger  <vapier@gentoo.org>
+
+       * Makefile.in (SIM_OBJS): Delete sim-cpu.o.
+       * sim-main.h (STATE_CPU): Delete.
+
 2015-04-15  Mike Frysinger  <vapier@gentoo.org>
 
        * sim-main.h (struct sim_state): Change cpu to an array of pointers.

diff --git a/sim/lm32/Makefile.in b/sim/lm32/Makefile.in
index ea2dd2d9f1fcdc0258f2ebe38e7343e4aacc75ad..8bbe01463dccaa007573530b91f8314cb1d67470 100644 (file)
--- a/sim/lm32/Makefile.in
+++ b/sim/lm32/Makefile.in
@@ -6,7 +6,6 @@
 # List of object files, less common parts.
 SIM_OBJS = \
        $(SIM_NEW_COMMON_OBJS) \
-       sim-cpu.o \
        sim-hload.o \
        sim-model.o \
        sim-reg.o \

diff --git a/sim/lm32/sim-main.h b/sim/lm32/sim-main.h
index d98560753d2c7b24ff3670314f1b23d3e155fb0f..dcb5ac099d0c65e5caad72c63dfe00e13f382faa 100644 (file)
--- a/sim/lm32/sim-main.h
+++ b/sim/lm32/sim-main.h
@@ -84,11 +84,6 @@ struct _sim_cpu
 struct sim_state
 {
   sim_cpu *cpu[MAX_NR_PROCESSORS];
-#if (WITH_SMP)
-#define STATE_CPU(sd,n) ((sd)->cpu[n])
-#else
-#define STATE_CPU(sd,n) ((sd)->cpu[0])
-#endif
 
   CGEN_STATE cgen_state;
 

diff --git a/sim/m32r/ChangeLog b/sim/m32r/ChangeLog
index c8a285cfeafe52f046452355328907ddc20addf2..ab156178c9829d340811d25121791c071e5d13c7 100644 (file)
--- a/sim/m32r/ChangeLog
+++ b/sim/m32r/ChangeLog
@@ -1,3 +1,8 @@
+2015-04-15  Mike Frysinger  <vapier@gentoo.org>
+
+       * Makefile.in (SIM_OBJS): Delete sim-cpu.o.
+       * sim-main.h (STATE_CPU): Delete.
+
 2015-04-15  Mike Frysinger  <vapier@gentoo.org>
 
        * sim-main.h (struct sim_state): Change cpu to an array of pointers.

diff --git a/sim/m32r/Makefile.in b/sim/m32r/Makefile.in
index 8f134f3009f411aa5bb494f8b60b127ee031943c..7090e5f19bdf7acc3a95b879302c0e902f9deb9b 100644 (file)
--- a/sim/m32r/Makefile.in
+++ b/sim/m32r/Makefile.in
@@ -26,7 +26,6 @@ TRAPS_OBJ = @traps_obj@
 
 SIM_OBJS = \
        $(SIM_NEW_COMMON_OBJS) \
-       sim-cpu.o \
        sim-hload.o \
        sim-model.o \
        sim-reg.o \

diff --git a/sim/m32r/sim-main.h b/sim/m32r/sim-main.h
index 96c1ec1747d0e50a1a3db7975e016e7ea255cfbf..9f859e2b6ca20cd9ce73c89a29be140b73ac187b 100644 (file)
--- a/sim/m32r/sim-main.h
+++ b/sim/m32r/sim-main.h
@@ -69,11 +69,6 @@ struct _sim_cpu {
 
 struct sim_state {
   sim_cpu *cpu[MAX_NR_PROCESSORS];
-#if (WITH_SMP)
-#define STATE_CPU(sd,n) ((sd)->cpu[n])
-#else
-#define STATE_CPU(sd,n) ((sd)->cpu[0])
-#endif
 
   CGEN_STATE cgen_state;
 

diff --git a/sim/m68hc11/ChangeLog b/sim/m68hc11/ChangeLog
index adedfc4b823ceec542adcc12cc415f36df5473ea..64cb223dd811296d993bd73e910dc8a4ff243796 100644 (file)
--- a/sim/m68hc11/ChangeLog
+++ b/sim/m68hc11/ChangeLog
@@ -1,3 +1,8 @@
+2015-04-15  Mike Frysinger  <vapier@gentoo.org>
+
+       * Makefile.in (SIM_OBJS): Delete sim-cpu.o.
+       * sim-main.h (STATE_CPU): Delete.
+
 2015-04-13  Mike Frysinger  <vapier@gentoo.org>
 
        * configure: Regenerate.

diff --git a/sim/m68hc11/Makefile.in b/sim/m68hc11/Makefile.in
index 7db38973c51da01e772355a0b8d11d37e6068ff5..9b931a19958122e22bdb3a46a1c4c2b53cf3d6a1 100644 (file)
--- a/sim/m68hc11/Makefile.in
+++ b/sim/m68hc11/Makefile.in
@@ -22,7 +22,6 @@ M68HC11_OBJS = interp.o m68hc11int.o m68hc12int.o \
 
 SIM_OBJS = $(M68HC11_OBJS) \
        $(SIM_NEW_COMMON_OBJS) \
-       sim-cpu.o \
        sim-load.o \
        sim-hload.o \
        sim-stop.o \

diff --git a/sim/m68hc11/sim-main.h b/sim/m68hc11/sim-main.h
index be3fc3d8e8813377d7d4a65f6bc6cee938dfc4e4..9c0a1ed00fc2e16005376f535498d8e38b894860 100644 (file)
--- a/sim/m68hc11/sim-main.h
+++ b/sim/m68hc11/sim-main.h
@@ -577,12 +577,6 @@ extern void m68hc11cpu_set_port (struct hw *me, sim_cpu *cpu,
 #define CIA_GET(CPU)      (cpu_get_pc (CPU))
 #define CIA_SET(CPU,VAL)  (cpu_set_pc ((CPU), (VAL)))
 
-#if (WITH_SMP)
-#define STATE_CPU(sd,n) ((sd)->cpu[n])
-#else
-#define STATE_CPU(sd,n) ((sd)->cpu[0])
-#endif
-
 struct sim_state {
   sim_cpu        *cpu[MAX_NR_PROCESSORS];
   device         *devices;

diff --git a/sim/mcore/ChangeLog b/sim/mcore/ChangeLog
index f8f29a8cf12ef0c5efa38943b6be3c651f6c957d..152864e8db5f8ce07fc1b2ad381a6485d2b2ef0e 100644 (file)
--- a/sim/mcore/ChangeLog
+++ b/sim/mcore/ChangeLog
@@ -1,3 +1,8 @@
+2015-04-15  Mike Frysinger  <vapier@gentoo.org>
+
+       * Makefile.in (SIM_OBJS): Delete sim-cpu.o.
+       * sim-main.h (STATE_CPU): Delete.
+
 2015-04-13  Mike Frysinger  <vapier@gentoo.org>
 
        * configure: Regenerate.

diff --git a/sim/mcore/Makefile.in b/sim/mcore/Makefile.in
index a54c92ce9fbfad3bc2c75901a24eab6140de796f..407b600f973d42d35c6a4df2a1db1793e948653a 100644 (file)
--- a/sim/mcore/Makefile.in
+++ b/sim/mcore/Makefile.in
@@ -20,7 +20,6 @@
 SIM_OBJS = \
        interp.o \
        $(SIM_NEW_COMMON_OBJS) \
-       sim-cpu.o \
        sim-hload.o \
        sim-stop.o
 

diff --git a/sim/mcore/sim-main.h b/sim/mcore/sim-main.h
index 96954b8c2ed28c48d34258526db93d99d8185c3c..80b467a11722e446bf2a9366fcc80a0edb3faa27 100644 (file)
--- a/sim/mcore/sim-main.h
+++ b/sim/mcore/sim-main.h
@@ -43,11 +43,6 @@ struct _sim_cpu {
 struct sim_state {
 
   sim_cpu *cpu[MAX_NR_PROCESSORS];
-#if (WITH_SMP)
-#define STATE_CPU(sd,n) ((sd)->cpu[n])
-#else
-#define STATE_CPU(sd,n) ((sd)->cpu[0])
-#endif
 
   sim_state_base base;
 };

diff --git a/sim/microblaze/ChangeLog b/sim/microblaze/ChangeLog
index 7285fd7745ce2a711c54b62a427150c4ecd30211..9fd188c1fd70038fc1018370439b37478713c3d3 100644 (file)
--- a/sim/microblaze/ChangeLog
+++ b/sim/microblaze/ChangeLog
@@ -1,3 +1,8 @@
+2015-04-15  Mike Frysinger  <vapier@gentoo.org>
+
+       * Makefile.in (SIM_OBJS): Delete sim-cpu.o.
+       * sim-main.h (STATE_CPU): Delete.
+
 2015-04-13  Mike Frysinger  <vapier@gentoo.org>
 
        * configure: Regenerate.

diff --git a/sim/microblaze/Makefile.in b/sim/microblaze/Makefile.in
index 0085948dd9ed62d2af5c6a4a099b2dbf1c595eba..6c631291b18e220cb7b9b063f607c9fac7f14d97 100644 (file)
--- a/sim/microblaze/Makefile.in
+++ b/sim/microblaze/Makefile.in
@@ -20,7 +20,6 @@
 SIM_OBJS = \
        interp.o \
        $(SIM_NEW_COMMON_OBJS) \
-       sim-cpu.o \
        sim-hload.o \
        sim-reason.o \
        sim-stop.o

diff --git a/sim/microblaze/sim-main.h b/sim/microblaze/sim-main.h
index cf1a5f9930e9b29075db2cf85c0d5ca292d50d50..68f8223857aea9037cdc5e3bf14c63b21aa05577 100644 (file)
--- a/sim/microblaze/sim-main.h
+++ b/sim/microblaze/sim-main.h
@@ -62,11 +62,6 @@ struct _sim_cpu {
 struct sim_state {
 
   sim_cpu *cpu[MAX_NR_PROCESSORS];
-#if (WITH_SMP)
-#define STATE_CPU(sd,n) ((sd)->cpu[n])
-#else
-#define STATE_CPU(sd,n) ((sd)->cpu[0])
-#endif
 
   sim_state_base base;
 };

diff --git a/sim/mips/ChangeLog b/sim/mips/ChangeLog
index 7577dc679e72bb113891eae816d9f163e19a998f..249e8c57386514965af7f6afc021c5da3c22fd4f 100644 (file)
--- a/sim/mips/ChangeLog
+++ b/sim/mips/ChangeLog
@@ -1,3 +1,8 @@
+2015-04-15  Mike Frysinger  <vapier@gentoo.org>
+
+       * Makefile.in (SIM_OBJS): Delete sim-cpu.o.
+       * sim-main.h (STATE_CPU): Delete.
+
 2015-04-13  Mike Frysinger  <vapier@gentoo.org>
 
        * configure: Regenerate.

diff --git a/sim/mips/Makefile.in b/sim/mips/Makefile.in
index 96131ae547ce65b71c1eba4c1336421ddc7565dd..17eeab6ae0e3933208b6561428da37c30f1c8821 100644 (file)
--- a/sim/mips/Makefile.in
+++ b/sim/mips/Makefile.in
@@ -46,7 +46,6 @@ SIM_OBJS = \
        cp1.o \
        mdmx.o \
        dsp.o \
-       sim-cpu.o \
        sim-main.o \
        sim-hload.o \
        sim-stop.o \

diff --git a/sim/mips/sim-main.h b/sim/mips/sim-main.h
index e27636c12f770f041c20db722a8a9b2ac316ed11..a04450402049e41af67f81ddd38b342eb584fe8d 100644 (file)
--- a/sim/mips/sim-main.h
+++ b/sim/mips/sim-main.h
@@ -489,11 +489,6 @@ struct sim_state {
   struct swatch watch;
 
   sim_cpu *cpu[MAX_NR_PROCESSORS];
-#if (WITH_SMP)
-#define STATE_CPU(sd,n) ((sd)->cpu[n])
-#else
-#define STATE_CPU(sd,n) ((sd)->cpu[0])
-#endif
 
   sim_state_base base;
 };

diff --git a/sim/mn10300/ChangeLog b/sim/mn10300/ChangeLog
index 87985d6ccdb074f373233a83e224fb255eab81a1..eca9946adce8ed04ed42611743e053b553accd44 100644 (file)
--- a/sim/mn10300/ChangeLog
+++ b/sim/mn10300/ChangeLog
@@ -1,3 +1,8 @@
+2015-04-15  Mike Frysinger  <vapier@gentoo.org>
+
+       * Makefile.in (MN10300_OBJS): Delete sim-cpu.o.
+       * sim-main.h (STATE_CPU): Delete.
+
 2015-04-13  Mike Frysinger  <vapier@gentoo.org>
 
        * configure: Regenerate.

diff --git a/sim/mn10300/Makefile.in b/sim/mn10300/Makefile.in
index 3b4c7d2a3b12fd225f8777ac0d58b32795bf2589..a85d932ba75cdcda0988fd269a7c72295ec50618 100644 (file)
--- a/sim/mn10300/Makefile.in
+++ b/sim/mn10300/Makefile.in
@@ -21,7 +21,6 @@ MN10300_OBJS = \
        itable.o semantics.o idecode.o icache.o engine.o irun.o support.o \
        $(SIM_NEW_COMMON_OBJS) \
        op_utils.o \
-       sim-cpu.o \
        sim-hload.o \
        sim-resume.o \
        sim-reason.o \

diff --git a/sim/mn10300/sim-main.h b/sim/mn10300/sim-main.h
index 046aa17f596971eff7935c7e1e61eea38e5afb6b..47c017e57689b206f06fcfdd8ceabaa86146d570 100644 (file)
--- a/sim/mn10300/sim-main.h
+++ b/sim/mn10300/sim-main.h
@@ -86,11 +86,6 @@ struct sim_state {
 
   /* the processors proper */
   sim_cpu *cpu[MAX_NR_PROCESSORS];
-#if (WITH_SMP)
-#define STATE_CPU(sd,n) ((sd)->cpu[n])
-#else
-#define STATE_CPU(sd,n) ((sd)->cpu[0])
-#endif
 
   /* The base class.  */
   sim_state_base base;

diff --git a/sim/moxie/ChangeLog b/sim/moxie/ChangeLog
index 32b4f456d2ae4eee2639446e8b649c4745e9d8b6..b2cf6f6a59b199c92a181485ffd5f4273d1576da 100644 (file)
--- a/sim/moxie/ChangeLog
+++ b/sim/moxie/ChangeLog
@@ -1,3 +1,8 @@
+2015-04-15  Mike Frysinger  <vapier@gentoo.org>
+
+       * Makefile.in (SIM_OBJS): Delete sim-cpu.o.
+       * sim-main.h (STATE_CPU): Delete.
+
 2015-04-13  Mike Frysinger  <vapier@gentoo.org>
 
        * configure: Regenerate.

diff --git a/sim/moxie/Makefile.in b/sim/moxie/Makefile.in
index ff6bed9ff409b93d09b2e76608f792f3c7a2a9a0..21dfe0108d11b92410cf1833cedc49deef2b58bc 100644 (file)
--- a/sim/moxie/Makefile.in
+++ b/sim/moxie/Makefile.in
@@ -22,7 +22,6 @@ dtbdir = @datadir@/gdb/dtb
 SIM_OBJS = \
        $(SIM_NEW_COMMON_OBJS) \
        interp.o \
-       sim-cpu.o \
        sim-hload.o \
        sim-reason.o \
        sim-resume.o \

diff --git a/sim/moxie/sim-main.h b/sim/moxie/sim-main.h
index cb1ce7233e9558a9a4853e3ea6af2af9f60dcca8..5a9f7c7119219bc1f91e8dcaf5a2ed71f5a2c96f 100644 (file)
--- a/sim/moxie/sim-main.h
+++ b/sim/moxie/sim-main.h
@@ -47,11 +47,6 @@ struct _sim_cpu {
 struct sim_state {
 
   sim_cpu *cpu[MAX_NR_PROCESSORS];
-#if (WITH_SMP)
-#define STATE_CPU(sd,n) ((sd)->cpu[n])
-#else
-#define STATE_CPU(sd,n) ((sd)->cpu[0])
-#endif
 
   sim_state_base base;
 };

diff --git a/sim/msp430/ChangeLog b/sim/msp430/ChangeLog
index 9347ed5df1c044ec702dcc535b338d8ddc6a90b4..37204f2f960f2016462cd42abb414041bf10ea78 100644 (file)
--- a/sim/msp430/ChangeLog
+++ b/sim/msp430/ChangeLog
@@ -1,3 +1,8 @@
+2015-04-15  Mike Frysinger  <vapier@gentoo.org>
+
+       * Makefile.in (SIM_OBJS): Delete sim-cpu.o.
+       * sim-main.h (STATE_CPU): Delete.
+
 2015-04-13  Mike Frysinger  <vapier@gentoo.org>
 
        * configure: Regenerate.

diff --git a/sim/msp430/Makefile.in b/sim/msp430/Makefile.in
index 3ab384f3a8b1a31595cfa5e8c37440ae7d747191..4653d975ad27e30ae54dd288a7c0cdaeff8c565b 100644 (file)
--- a/sim/msp430/Makefile.in
+++ b/sim/msp430/Makefile.in
@@ -28,7 +28,6 @@ SIM_OBJS = \
        $(SIM_NEW_COMMON_OBJS) \
        msp430-sim.o \
        trace.o \
-       sim-cpu.o \
        sim-hload.o \
        sim-reason.o \
        sim-reg.o \

diff --git a/sim/msp430/sim-main.h b/sim/msp430/sim-main.h
index f625bd513f4d52dde1d6697227ccc993c9bd95e2..d71217e928ad8f6328867dd5071f57eb29b192b2 100644 (file)
--- a/sim/msp430/sim-main.h
+++ b/sim/msp430/sim-main.h
@@ -42,12 +42,6 @@ struct sim_state
 {
   sim_cpu *cpu[MAX_NR_PROCESSORS];
 
-#if (WITH_SMP)
-#error WITH_SMP not supported by MSP430 sim
-#else
-#define STATE_CPU(sd,n) ((sd)->cpu[0])
-#endif
-
   asymbol **symbol_table;
   long number_of_symbols;
 #define STATE_SYMBOL_TABLE(sd)   ((sd)->symbol_table)

diff --git a/sim/sh/ChangeLog b/sim/sh/ChangeLog
index 23efac2a889516bd156090877d0feedb8bd4b2ae..9b5c69e2a7bc7c6a0edfddf53c7e1826d964de81 100644 (file)
--- a/sim/sh/ChangeLog
+++ b/sim/sh/ChangeLog
@@ -1,3 +1,8 @@
+2015-04-15  Mike Frysinger  <vapier@gentoo.org>
+
+       * Makefile.in (SIM_OBJS): Delete sim-cpu.o.
+       * sim-main.h (STATE_CPU): Delete.
+
 2015-04-13  Mike Frysinger  <vapier@gentoo.org>
 
        * configure: Regenerate.

diff --git a/sim/sh/Makefile.in b/sim/sh/Makefile.in
index 19c15abb2ac6518fda03327e644486cd68f6f6e5..236af86d89e5dc0362a7e3e7b26d1fc734e8ca2e 100644 (file)
--- a/sim/sh/Makefile.in
+++ b/sim/sh/Makefile.in
@@ -20,7 +20,6 @@
 SIM_OBJS = \
        interp.o \
        $(SIM_NEW_COMMON_OBJS) \
-       sim-cpu.o \
        sim-hload.o \
        sim-stop.o \
        table.o

diff --git a/sim/sh/sim-main.h b/sim/sh/sim-main.h
index e15a26af6befc7a66e0eeede722d4f0535cb340b..3ae5f0fef940c8205be3f815b34ed0a58a9cb2ea 100644 (file)
--- a/sim/sh/sim-main.h
+++ b/sim/sh/sim-main.h
@@ -142,11 +142,6 @@ struct _sim_cpu {
 struct sim_state {
 
   sim_cpu *cpu[MAX_NR_PROCESSORS];
-#if (WITH_SMP)
-#define STATE_CPU(sd,n) ((sd)->cpu[n])
-#else
-#define STATE_CPU(sd,n) ((sd)->cpu[0])
-#endif
 
   sim_state_base base;
 };

diff --git a/sim/sh64/ChangeLog b/sim/sh64/ChangeLog
index 5bbc7a3f511495e4dc1404616f632b090376ff39..7146868906ecd94a5821debea6a1218164469d72 100644 (file)
--- a/sim/sh64/ChangeLog
+++ b/sim/sh64/ChangeLog
@@ -1,3 +1,8 @@
+2015-04-15  Mike Frysinger  <vapier@gentoo.org>
+
+       * Makefile.in (SIM_OBJS): Delete sim-cpu.o.
+       * sim-main.h (STATE_CPU): Delete.
+
 2015-04-15  Mike Frysinger  <vapier@gentoo.org>
 
        * sim-main.h (struct sim_state): Change cpu to an array of pointers.

diff --git a/sim/sh64/Makefile.in b/sim/sh64/Makefile.in
index 19c9957a13ed7588cb1d67e77bcaf706df0ce29b..99ed4e8f5272e3177bb719304e72e36f89fb264f 100644 (file)
--- a/sim/sh64/Makefile.in
+++ b/sim/sh64/Makefile.in
@@ -23,7 +23,6 @@ SH64_OBJS = sh64.o cpu.o sh-desc.o \
 
 SIM_OBJS = \
        $(SIM_NEW_COMMON_OBJS) \
-       sim-cpu.o \
        sim-hload.o \
        sim-model.o \
        sim-reg.o \

diff --git a/sim/sh64/sim-main.h b/sim/sh64/sim-main.h
index 5ae4309916aff326057e873336af2a563aa84bbd..b988e8eff6241ac33fe160c3ddd9e962fc9ef75b 100644 (file)
--- a/sim/sh64/sim-main.h
+++ b/sim/sh64/sim-main.h
@@ -54,11 +54,6 @@ struct _sim_cpu {
 
 struct sim_state {
   sim_cpu *cpu[MAX_NR_PROCESSORS];
-#if (WITH_SMP)
-#define STATE_CPU(sd,n) ((sd)->cpu[n])
-#else
-#define STATE_CPU(sd,n) ((sd)->cpu[0])
-#endif
 
   CGEN_STATE cgen_state;
 

diff --git a/sim/v850/ChangeLog b/sim/v850/ChangeLog
index 62c6ef05a7438c30f67228a5c776f6369a0fae45..bcc9bd5a8fbd8ba8c38346e2c231625118e98188 100644 (file)
--- a/sim/v850/ChangeLog
+++ b/sim/v850/ChangeLog
@@ -1,3 +1,8 @@
+2015-04-15  Mike Frysinger  <vapier@gentoo.org>
+
+       * Makefile.in (SIM_OBJS): Delete sim-cpu.o.
+       * sim-main.h (STATE_CPU): Delete.
+
 2015-04-13  Mike Frysinger  <vapier@gentoo.org>
 
        * configure: Regenerate.

diff --git a/sim/v850/Makefile.in b/sim/v850/Makefile.in
index e78fda955dd08b3f14549c7b33849f56402db1a1..726ed5e06f22a606393ee6ae9244072a027e95ed 100644 (file)
--- a/sim/v850/Makefile.in
+++ b/sim/v850/Makefile.in
@@ -23,7 +23,6 @@ SIM_OBJS = \
        $(SIM_NEW_COMMON_OBJS) \
        simops.o interp.o \
        itable.o semantics.o idecode.o icache.o engine.o irun.o support.o \
-       sim-cpu.o \
        sim-hload.o \
        sim-resume.o \
        sim-reason.o \

diff --git a/sim/v850/sim-main.h b/sim/v850/sim-main.h
index 102c91785b66e55463890bc453019030be041332..0a025651803d0c7ac475363c2953a48f0f526633 100644 (file)
--- a/sim/v850/sim-main.h
+++ b/sim/v850/sim-main.h
@@ -66,11 +66,6 @@ struct _sim_cpu
 
 struct sim_state {
   sim_cpu *cpu[MAX_NR_PROCESSORS];
-#if (WITH_SMP)
-#define STATE_CPU(sd,n) ((sd)->cpu[n])
-#else
-#define STATE_CPU(sd,n) ((sd)->cpu[0])
-#endif
 #if 0
   SIM_ADDR rom_size;
   SIM_ADDR low_end;