aboutsummaryrefslogtreecommitdiff
path: root/sim/m68hc11
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2015-04-15 02:13:23 -0400
committerMike Frysinger <vapier@gentoo.org>2015-04-15 02:19:52 -0400
commit78e9aa70febc3985a2c88dbc0c7a87d214231c3d (patch)
tree1a0eb199746ae7edea7336a3a60b53daa42a7275 /sim/m68hc11
parentf95f4ed2c4680fea68399691481b277ece11570e (diff)
downloadfsf-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/m68hc11')
-rw-r--r--sim/m68hc11/ChangeLog5
-rw-r--r--sim/m68hc11/Makefile.in1
-rw-r--r--sim/m68hc11/sim-main.h6
3 files changed, 5 insertions, 7 deletions
diff --git a/sim/m68hc11/ChangeLog b/sim/m68hc11/ChangeLog
index adedfc4..64cb223 100644
--- a/sim/m68hc11/ChangeLog
+++ b/sim/m68hc11/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/m68hc11/Makefile.in b/sim/m68hc11/Makefile.in
index 7db3897..9b931a1 100644
--- a/sim/m68hc11/Makefile.in
+++ b/sim/m68hc11/Makefile.in
@@ -22,7 +22,6 @@ M68HC11_OBJS = interp.o m68hc11int.o m68hc12int.o \
SIM_OBJS = $(M68HC11_OBJS) \
$(SIM_NEW_COMMON_OBJS) \
- sim-cpu.o \
sim-load.o \
sim-hload.o \
sim-stop.o \
diff --git a/sim/m68hc11/sim-main.h b/sim/m68hc11/sim-main.h
index be3fc3d..9c0a1ed 100644
--- a/sim/m68hc11/sim-main.h
+++ b/sim/m68hc11/sim-main.h
@@ -577,12 +577,6 @@ extern void m68hc11cpu_set_port (struct hw *me, sim_cpu *cpu,
#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
-
struct sim_state {
sim_cpu *cpu[MAX_NR_PROCESSORS];
device *devices;