diff options
| author | Mike Frysinger <vapier@gentoo.org> | 2015-04-15 02:13:23 -0400 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2015-04-15 02:19:52 -0400 |
| commit | 78e9aa70febc3985a2c88dbc0c7a87d214231c3d (patch) | |
| tree | 1a0eb199746ae7edea7336a3a60b53daa42a7275 /sim/frv | |
| parent | f95f4ed2c4680fea68399691481b277ece11570e (diff) | |
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.
Diffstat (limited to 'sim/frv')
| -rw-r--r-- | sim/frv/ChangeLog | 5 | ||||
| -rw-r--r-- | sim/frv/Makefile.in | 1 | ||||
| -rw-r--r-- | sim/frv/sim-main.h | 5 |
3 files changed, 5 insertions, 6 deletions
diff --git a/sim/frv/ChangeLog b/sim/frv/ChangeLog index 8e7e995b4b..05ae18a160 100644 --- a/sim/frv/ChangeLog +++ b/sim/frv/ChangeLog @@ -1,5 +1,10 @@ 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. (STATE_CPU): Handle WITH_SMP. diff --git a/sim/frv/Makefile.in b/sim/frv/Makefile.in index 415d2abd42..6dc5616a56 100644 --- 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 e7dc1a2d91..1fd60b58cf 100644 --- 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; |