diff options
Diffstat (limited to 'sim/common')
| -rw-r--r-- | sim/common/ChangeLog | 8 | ||||
| -rw-r--r-- | sim/common/cgen-utils.c | 2 | ||||
| -rw-r--r-- | sim/common/sim-core.c | 4 | ||||
| -rw-r--r-- | sim/common/sim-engine.h | 2 | ||||
| -rw-r--r-- | sim/common/sim-run.c | 4 |
5 files changed, 14 insertions, 6 deletions
diff --git a/sim/common/ChangeLog b/sim/common/ChangeLog index 316771d..d5c965c 100644 --- a/sim/common/ChangeLog +++ b/sim/common/ChangeLog @@ -1,3 +1,11 @@ +2015-04-17 Mike Frysinger <vapier@gentoo.org> + + * cgen-utils.c (cgen_rtx_error): Change CIA_GET to CPU_PC_GET. + * sim-core.c (sim_core_read_buffer, sim_core_write_buffer): Likewise. + * sim-engine.h (SIM_ENGINE_HALT_HOOK): Change CIA_SET to CPU_PC_SET. + * sim-run.c (sim_engine_run): Change CIA_GET to CPU_PC_GET and + CIA_SET to CPU_PC_SET. + 2015-04-15 Mike Frysinger <vapier@gentoo.org> * Makefile.in (SIM_NEW_COMMON_OBJS): Add sim-cpu.o. diff --git a/sim/common/cgen-utils.c b/sim/common/cgen-utils.c index e1138af..7178677 100644 --- a/sim/common/cgen-utils.c +++ b/sim/common/cgen-utils.c @@ -434,5 +434,5 @@ cgen_rtx_error (SIM_CPU *cpu, const char * msg) sim_io_printf (sd, msg); sim_io_printf (sd, "\n"); - sim_engine_halt (sd, cpu, NULL, CIA_GET (cpu), sim_stopped, SIM_SIGTRAP); + sim_engine_halt (sd, cpu, NULL, CPU_PC_GET (cpu), sim_stopped, SIM_SIGTRAP); } diff --git a/sim/common/sim-core.c b/sim/common/sim-core.c index ccd2c02..43e9076 100644 --- a/sim/common/sim-core.c +++ b/sim/common/sim-core.c @@ -531,7 +531,7 @@ sim_core_read_buffer (SIM_DESC sd, if (mapping->device != NULL) { int nr_bytes = len - count; - sim_cia cia = cpu ? CIA_GET (cpu) : NULL_CIA; + sim_cia cia = cpu ? CPU_PC_GET (cpu) : NULL_CIA; if (raddr + nr_bytes - 1> mapping->bound) nr_bytes = mapping->bound - raddr + 1; if (device_io_read_buffer (mapping->device, @@ -598,7 +598,7 @@ sim_core_write_buffer (SIM_DESC sd, && mapping->device != NULL) { int nr_bytes = len - count; - sim_cia cia = cpu ? CIA_GET (cpu) : NULL_CIA; + sim_cia cia = cpu ? CPU_PC_GET (cpu) : NULL_CIA; if (raddr + nr_bytes - 1 > mapping->bound) nr_bytes = mapping->bound - raddr + 1; if (device_io_write_buffer (mapping->device, diff --git a/sim/common/sim-engine.h b/sim/common/sim-engine.h index 3fd0a20..73be175 100644 --- a/sim/common/sim-engine.h +++ b/sim/common/sim-engine.h @@ -69,7 +69,7 @@ extern void sim_engine_halt #if !defined (SIM_ENGINE_HALT_HOOK) #define SIM_ENGINE_HALT_HOOK(SD, LAST_CPU, CIA) \ -if ((LAST_CPU) != NULL) CIA_SET (LAST_CPU, CIA) +if ((LAST_CPU) != NULL) CPU_PC_SET (LAST_CPU, CIA) #endif /* NB: If a port uses the SIM_CPU_EXCEPTION_* hooks, the default diff --git a/sim/common/sim-run.c b/sim/common/sim-run.c index 6ab18b1..0bf2e4e 100644 --- a/sim/common/sim-run.c +++ b/sim/common/sim-run.c @@ -35,7 +35,7 @@ sim_engine_run (SIM_DESC sd, sim_cpu *cpu; SIM_ASSERT (STATE_MAGIC (sd) == SIM_MAGIC_NUMBER); cpu = STATE_CPU (sd, 0); - cia = CIA_GET (cpu); + cia = CPU_PC_GET (cpu); while (1) { instruction_word insn = IMEM32 (cia); @@ -43,7 +43,7 @@ sim_engine_run (SIM_DESC sd, /* process any events */ if (sim_events_tick (sd)) { - CIA_SET (cpu, cia); + CPU_PC_SET (cpu, cia); sim_events_process (sd); } } |