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/mcore | |
| 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/mcore')
| -rw-r--r-- | sim/mcore/ChangeLog | 5 | ||||
| -rw-r--r-- | sim/mcore/Makefile.in | 1 | ||||
| -rw-r--r-- | sim/mcore/sim-main.h | 5 |
3 files changed, 5 insertions, 6 deletions
diff --git a/sim/mcore/ChangeLog b/sim/mcore/ChangeLog index f8f29a8cf1..152864e8db 100644 --- 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 a54c92ce9f..407b600f97 100644 --- 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 96954b8c2e..80b467a117 100644 --- 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; }; |