aboutsummaryrefslogtreecommitdiff
path: root/sim/arm
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/arm
parentf95f4ed2c4680fea68399691481b277ece11570e (diff)
downloadgdb-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/arm')
-rw-r--r--sim/arm/ChangeLog5
-rw-r--r--sim/arm/Makefile.in1
-rw-r--r--sim/arm/sim-main.h5
3 files changed, 5 insertions, 6 deletions
diff --git a/sim/arm/ChangeLog b/sim/arm/ChangeLog
index 4078d71..c98903d 100644
--- a/sim/arm/ChangeLog
+++ b/sim/arm/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/arm/Makefile.in b/sim/arm/Makefile.in
index 5c37723..745b62a 100644
--- a/sim/arm/Makefile.in
+++ b/sim/arm/Makefile.in
@@ -22,7 +22,6 @@ SIM_EXTRA_CFLAGS = -DMODET
SIM_OBJS = \
wrapper.o \
$(SIM_NEW_COMMON_OBJS) \
- sim-cpu.o \
sim-hload.o \
armemu26.o armemu32.o arminit.o armos.o armsupp.o \
armvirt.o bag.o thumbemu.o \
diff --git a/sim/arm/sim-main.h b/sim/arm/sim-main.h
index d020972..8b64287 100644
--- a/sim/arm/sim-main.h
+++ b/sim/arm/sim-main.h
@@ -44,11 +44,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;
};