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/cris | |
parent | f95f4ed2c4680fea68399691481b277ece11570e (diff) | |
download | gdb-78e9aa70febc3985a2c88dbc0c7a87d214231c3d.zip gdb-78e9aa70febc3985a2c88dbc0c7a87d214231c3d.tar.gz 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/cris')
-rw-r--r-- | sim/cris/ChangeLog | 5 | ||||
-rw-r--r-- | sim/cris/Makefile.in | 1 | ||||
-rw-r--r-- | sim/cris/sim-main.h | 5 |
3 files changed, 5 insertions, 6 deletions
diff --git a/sim/cris/ChangeLog b/sim/cris/ChangeLog index b1ac591..8927529 100644 --- a/sim/cris/ChangeLog +++ b/sim/cris/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/cris/Makefile.in b/sim/cris/Makefile.in index 5459c0e..945eaa6 100644 --- a/sim/cris/Makefile.in +++ b/sim/cris/Makefile.in @@ -24,7 +24,6 @@ CRISV32F_OBJS = crisv32f.o cpuv32.o decodev32.o modelv32.o mloopv32f.o SIM_OBJS = \ $(SIM_NEW_COMMON_OBJS) \ - sim-cpu.o \ sim-model.o \ sim-reg.o \ cgen-utils.o cgen-trace.o cgen-scache.o \ diff --git a/sim/cris/sim-main.h b/sim/cris/sim-main.h index 5ae292e..df6c5cf 100644 --- a/sim/cris/sim-main.h +++ b/sim/cris/sim-main.h @@ -226,11 +226,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; |