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/arm/ChangeLog | 4 ++++ sim/arm/sim-main.h | 3 --- 2 files changed, 4 insertions(+), 3 deletions(-) (limited to 'sim/arm') diff --git a/sim/arm/ChangeLog b/sim/arm/ChangeLog index 01105f8..fbb78ec 100644 --- a/sim/arm/ChangeLog +++ b/sim/arm/ChangeLog @@ -1,5 +1,9 @@ 2015-04-17 Mike Frysinger + * sim-main.h (CIA_GET, CIA_SET): Delete. + +2015-04-17 Mike Frysinger + * wrapper.c (arm_pc_get, arm_pc_set): New functions. (sim_open): Declare new local var i. Call CPU_PC_FETCH & CPU_PC_STORE for all cpus. diff --git a/sim/arm/sim-main.h b/sim/arm/sim-main.h index 8b64287..087ddd5 100644 --- a/sim/arm/sim-main.h +++ b/sim/arm/sim-main.h @@ -33,9 +33,6 @@ typedef struct _sim_cpu SIM_CPU; extern struct ARMul_State *state; -#define CIA_GET(cpu) PC -#define CIA_SET(cpu,val) ARMul_SetPC (state, (val)) - struct _sim_cpu { sim_cpu_base base; -- cgit v1.1