From 034685f9ce92cf6dfb6656745365b6a5904a8e84 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Thu, 16 Apr 2015 02:11:12 -0400 Subject: 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. --- sim/microblaze/ChangeLog | 4 ++++ sim/microblaze/sim-main.h | 3 --- 2 files changed, 4 insertions(+), 3 deletions(-) (limited to 'sim/microblaze') diff --git a/sim/microblaze/ChangeLog b/sim/microblaze/ChangeLog index 4223301..8ac3a26 100644 --- a/sim/microblaze/ChangeLog +++ b/sim/microblaze/ChangeLog @@ -1,5 +1,9 @@ 2015-04-17 Mike Frysinger + * sim-main.h (CIA_GET, CIA_SET): Delete. + +2015-04-17 Mike Frysinger + * interp.c (microblaze_pc_get, microblaze_pc_set): New functions. (sim_open): Call CPU_PC_FETCH & CPU_PC_STORE for all cpus. diff --git a/sim/microblaze/sim-main.h b/sim/microblaze/sim-main.h index 68f8223..1b34f3a 100644 --- a/sim/microblaze/sim-main.h +++ b/sim/microblaze/sim-main.h @@ -23,9 +23,6 @@ typedef address_word sim_cia; -#define CIA_GET(cpu) (cpu)->microblaze_cpu.spregs[0] -#define CIA_SET(cpu,val) (cpu)->microblaze_cpu.spregs[0] = (val) - typedef struct _sim_cpu SIM_CPU; #include "sim-base.h" -- cgit v1.1