From 78e9aa70febc3985a2c88dbc0c7a87d214231c3d Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Wed, 15 Apr 2015 02:13:23 -0400 Subject: 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. --- sim/sh64/ChangeLog | 5 +++++ sim/sh64/Makefile.in | 1 - sim/sh64/sim-main.h | 5 ----- 3 files changed, 5 insertions(+), 6 deletions(-) (limited to 'sim/sh64') diff --git a/sim/sh64/ChangeLog b/sim/sh64/ChangeLog index 5bbc7a3..7146868 100644 --- a/sim/sh64/ChangeLog +++ b/sim/sh64/ChangeLog @@ -1,5 +1,10 @@ 2015-04-15 Mike Frysinger + * Makefile.in (SIM_OBJS): Delete sim-cpu.o. + * sim-main.h (STATE_CPU): Delete. + +2015-04-15 Mike Frysinger + * sim-main.h (struct sim_state): Change cpu to an array of pointers. (STATE_CPU): Handle WITH_SMP. diff --git a/sim/sh64/Makefile.in b/sim/sh64/Makefile.in index 19c9957..99ed4e8 100644 --- 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 5ae4309..b988e8e 100644 --- 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; -- cgit v1.1