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/bfin/ChangeLog | 5 +++++ sim/bfin/Makefile.in | 1 - sim/bfin/sim-main.h | 6 +----- 3 files changed, 6 insertions(+), 6 deletions(-) (limited to 'sim/bfin') diff --git a/sim/bfin/ChangeLog b/sim/bfin/ChangeLog index cd73580..db379c3 100644 --- a/sim/bfin/ChangeLog +++ b/sim/bfin/ChangeLog @@ -1,3 +1,8 @@ +2015-04-15 Mike Frysinger + + * Makefile.in (SIM_OBJS): Delete sim-cpu.o. + * sim-main.h (STATE_CPU): Delete. + 2015-04-13 Mike Frysinger * configure: Regenerate. diff --git a/sim/bfin/Makefile.in b/sim/bfin/Makefile.in index 38531a9..dc42339 100644 --- 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 \ diff --git a/sim/bfin/sim-main.h b/sim/bfin/sim-main.h index 1b58e75..f8c2ba2 100644 --- 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) -- cgit v1.1