summaryrefslogtreecommitdiff
path: root/sim/cris
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2015-04-16 02:11:12 -0400
committerMike Frysinger <vapier@gentoo.org>2015-04-17 02:44:30 -0400
commit034685f9ce92cf6dfb6656745365b6a5904a8e84 (patch)
treec4b591263048d0a9d89af68c9abd8e69786ed2f7 /sim/cris
parent27b97b40bca216097d16d53fa9408a70cd281479 (diff)
downloadbinutils-gdb-034685f9ce92cf6dfb6656745365b6a5904a8e84.tar.gz
sim: replace CIA_{GET,SET} with CPU_PC_{GET,SET}
The CIA_{GET,SET} macros serve the same function as CPU_PC_{GET,SET} except the latter adds a layer of indirection via the sim state. This lets models set up different functions at runtime and doesn't reach so directly into the arch-specific cpu state. It also doesn't make sense to have two sets of macros that do exactly the same thing, so lets standardize on the one that gets us more.
Diffstat (limited to 'sim/cris')
-rw-r--r--sim/cris/ChangeLog6
-rw-r--r--sim/cris/crisv10f.c2
-rw-r--r--sim/cris/crisv32f.c2
-rw-r--r--sim/cris/sim-main.h3
4 files changed, 8 insertions, 5 deletions
diff --git a/sim/cris/ChangeLog b/sim/cris/ChangeLog
index 89275296b3b..b8b16312997 100644
--- a/sim/cris/ChangeLog
+++ b/sim/cris/ChangeLog
@@ -1,3 +1,9 @@
+2015-04-17 Mike Frysinger <vapier@gentoo.org>
+
+ * crisv10f.c (deliver_interrupt): Change CIA_GET to CPU_PC_GET.
+ * crisv32f.c (deliver_interrupt): Likewise.
+ * sim-main.h (CIA_GET, CIA_SET): Delete.
+
2015-04-15 Mike Frysinger <vapier@gentoo.org>
* Makefile.in (SIM_OBJS): Delete sim-cpu.o.
diff --git a/sim/cris/crisv10f.c b/sim/cris/crisv10f.c
index 562b4c902e8..906a32f5dba 100644
--- a/sim/cris/crisv10f.c
+++ b/sim/cris/crisv10f.c
@@ -86,7 +86,7 @@ MY (deliver_interrupt) (SIM_CPU *current_cpu,
GET_H_SR (H_SR_PRE_V32_IBR) + vec * 4, 4) == 0)
{
/* Nothing to do actually; either abort or send a signal. */
- sim_core_signal (sd, current_cpu, CIA_GET (current_cpu), 0, 4,
+ sim_core_signal (sd, current_cpu, CPU_PC_GET (current_cpu), 0, 4,
GET_H_SR (H_SR_PRE_V32_IBR) + vec * 4,
read_transfer, sim_core_unmapped_signal);
return 0;
diff --git a/sim/cris/crisv32f.c b/sim/cris/crisv32f.c
index 3a0135d034d..dabd8b382b4 100644
--- a/sim/cris/crisv32f.c
+++ b/sim/cris/crisv32f.c
@@ -615,7 +615,7 @@ MY (deliver_interrupt) (SIM_CPU *current_cpu,
GET_H_SR (H_SR_EBP) + vec * 4, 4) == 0)
{
/* Nothing to do actually; either abort or send a signal. */
- sim_core_signal (sd, current_cpu, CIA_GET (current_cpu), 0, 4,
+ sim_core_signal (sd, current_cpu, CPU_PC_GET (current_cpu), 0, 4,
GET_H_SR (H_SR_EBP) + vec * 4,
read_transfer, sim_core_unmapped_signal);
return 0;
diff --git a/sim/cris/sim-main.h b/sim/cris/sim-main.h
index df6c5cf81e8..5985308fa8d 100644
--- a/sim/cris/sim-main.h
+++ b/sim/cris/sim-main.h
@@ -39,9 +39,6 @@ typedef struct _sim_cpu SIM_CPU;
/* These must be defined before sim-base.h. */
typedef USI sim_cia;
-#define CIA_GET(cpu) CPU_PC_GET (cpu)
-#define CIA_SET(cpu,val) CPU_PC_SET ((cpu), (val))
-
#define SIM_ENGINE_HALT_HOOK(sd, cpu, cia) \
do { \
if (cpu) /* Null if ctrl-c. */ \