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/mn10300/ChangeLog | 5 +++++ sim/mn10300/Makefile.in | 1 - sim/mn10300/sim-main.h | 5 ----- 3 files changed, 5 insertions(+), 6 deletions(-) (limited to 'sim/mn10300') diff --git a/sim/mn10300/ChangeLog b/sim/mn10300/ChangeLog index 87985d6..eca9946 100644 --- a/sim/mn10300/ChangeLog +++ b/sim/mn10300/ChangeLog @@ -1,3 +1,8 @@ +2015-04-15 Mike Frysinger + + * Makefile.in (MN10300_OBJS): Delete sim-cpu.o. + * sim-main.h (STATE_CPU): Delete. + 2015-04-13 Mike Frysinger * configure: Regenerate. diff --git a/sim/mn10300/Makefile.in b/sim/mn10300/Makefile.in index 3b4c7d2..a85d932 100644 --- 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 046aa17..47c017e 100644 --- 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; -- cgit v1.1