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/h8300 | |
| parent | f95f4ed2c4680fea68399691481b277ece11570e (diff) | |
| download | fsf-binutils-gdb-78e9aa70febc3985a2c88dbc0c7a87d214231c3d.zip fsf-binutils-gdb-78e9aa70febc3985a2c88dbc0c7a87d214231c3d.tar.gz fsf-binutils-gdb-78e9aa70febc3985a2c88dbc0c7a87d214231c3d.tar.bz2 | |
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/h8300')
| -rw-r--r-- | sim/h8300/ChangeLog | 5 | ||||
| -rw-r--r-- | sim/h8300/Makefile.in | 1 | ||||
| -rw-r--r-- | sim/h8300/sim-main.h | 5 |
3 files changed, 5 insertions, 6 deletions
diff --git a/sim/h8300/ChangeLog b/sim/h8300/ChangeLog index 1740b3d..eaf3088 100644 --- a/sim/h8300/ChangeLog +++ b/sim/h8300/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> + * compile.c: Include sim-options.h. (sim_open): Call sim_cpu_alloc_all instead of sim_cpu_alloc. * sim-main.h (struct sim_state): Change cpu to an array of pointers. diff --git a/sim/h8300/Makefile.in b/sim/h8300/Makefile.in index 9b89aea..da68255 100644 --- a/sim/h8300/Makefile.in +++ b/sim/h8300/Makefile.in @@ -19,7 +19,6 @@ SIM_OBJS = compile.o \ $(SIM_NEW_COMMON_OBJS) \ - sim-cpu.o \ sim-load.o ## COMMON_POST_CONFIG_FRAG diff --git a/sim/h8300/sim-main.h b/sim/h8300/sim-main.h index 7126fa3..8b07505 100644 --- a/sim/h8300/sim-main.h +++ b/sim/h8300/sim-main.h @@ -155,11 +155,6 @@ struct sim_state { #define CIA_GET(CPU) (cpu_get_pc (CPU)) #define CIA_SET(CPU, VAL) (cpu_set_pc ((CPU), (VAL))) -#if (WITH_SMP) -#define STATE_CPU(sd,n) ((sd)->cpu[n]) -#else -#define STATE_CPU(sd,n) ((sd)->cpu[0]) -#endif #define cpu_set_pc(CPU, VAL) (((CPU)->pc) = (VAL)) #define cpu_get_pc(CPU) (((CPU)->pc)) |