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.
2015-04-15 02:13:23 -04:00 · 2015-04-15 02:13:23 -04:00 · 78e9aa70fe
commit 78e9aa70fe
parent f95f4ed2c4
69 changed files with 126 additions and 139 deletions
--- 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.
--- 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 \
--- 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;
 };
--- 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.
--- 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 \
--- 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;
 };
--- 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.
--- 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 \
--- 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)
--- 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.
--- 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 \
--- 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].  */
--- 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.
--- 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 \
--- 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;
 };
--- 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.
--- 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 \
--- 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;

--- 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.
--- 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 \
--- 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;
 };
--- 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.
--- 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 \
--- 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;

--- 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.
--- 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	\
--- 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;
 };
--- 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.
--- 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
--- 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))

--- 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.
--- 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 \
--- 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;

--- 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.
--- 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 \
--- 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;

--- 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.
--- 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 \
--- 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;

--- 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.
--- 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 \
--- 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;
--- 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.
--- 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

--- 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;
 };
--- 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.
--- 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
--- 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;
 };
--- 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.
--- 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 \
--- 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;
 };
--- 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.
--- 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 \
--- 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;
--- 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.
--- 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 \
--- 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;
 };
--- 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.
--- 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 \
--- 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)
--- 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.
--- 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
--- 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;
 };
--- 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.
--- 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 \
--- 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;

--- 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.
--- 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 \
--- 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;