diff options
| author | Mike Frysinger <vapier@gentoo.org> | 2015-04-16 02:11:12 -0400 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2015-04-17 02:44:30 -0400 |
| commit | 034685f9ce92cf6dfb6656745365b6a5904a8e84 (patch) | |
| tree | c4b591263048d0a9d89af68c9abd8e69786ed2f7 /sim/frv | |
| parent | 27b97b40bca216097d16d53fa9408a70cd281479 (diff) | |
| download | gdb-034685f9ce92cf6dfb6656745365b6a5904a8e84.zip gdb-034685f9ce92cf6dfb6656745365b6a5904a8e84.tar.gz gdb-034685f9ce92cf6dfb6656745365b6a5904a8e84.tar.bz2 | |
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/frv')
| -rw-r--r-- | sim/frv/ChangeLog | 5 | ||||
| -rw-r--r-- | sim/frv/sim-main.h | 3 | ||||
| -rw-r--r-- | sim/frv/traps.c | 2 |
3 files changed, 6 insertions, 4 deletions
diff --git a/sim/frv/ChangeLog b/sim/frv/ChangeLog index 05ae18a..1724c35 100644 --- a/sim/frv/ChangeLog +++ b/sim/frv/ChangeLog @@ -1,3 +1,8 @@ +2015-04-17 Mike Frysinger <vapier@gentoo.org> + + * sim-main.h (CIA_GET, CIA_SET): Delete. + * traps.c (frv_sim_engine_halt_hook): Change CIA_SET to CPU_PC_SET. + 2015-04-15 Mike Frysinger <vapier@gentoo.org> * Makefile.in (SIM_OBJS): Delete sim-cpu.o. diff --git a/sim/frv/sim-main.h b/sim/frv/sim-main.h index 1fd60b5..275ac28 100644 --- a/sim/frv/sim-main.h +++ b/sim/frv/sim-main.h @@ -43,9 +43,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)) - void frv_sim_engine_halt_hook (SIM_DESC, SIM_CPU *, sim_cia); #define SIM_ENGINE_HALT_HOOK(SD, LAST_CPU, CIA) \ frv_sim_engine_halt_hook ((SD), (LAST_CPU), (CIA)) diff --git a/sim/frv/traps.c b/sim/frv/traps.c index 1f116b2..1263683 100644 --- a/sim/frv/traps.c +++ b/sim/frv/traps.c @@ -65,7 +65,7 @@ frv_sim_engine_halt_hook (SIM_DESC sd, SIM_CPU *current_cpu, sim_cia cia) { int i; if (current_cpu != NULL) - CIA_SET (current_cpu, cia); + CPU_PC_SET (current_cpu, cia); /* Invalidate the insn and data caches of all cpus. */ for (i = 0; i < MAX_NR_PROCESSORS; ++i) |