diff options
author | Spencer Oliver <spen@spen-soft.co.uk> | 2012-01-19 10:06:37 +0000 |
---|---|---|
committer | Spencer Oliver <spen@spen-soft.co.uk> | 2012-01-23 11:38:26 +0000 |
commit | 3a550e5b5fe011e526b150a5d234b48e8e2aaad6 (patch) | |
tree | 580b224fcee5ebf6001246e19850384390c8dfde /src/target/arm_simulator.c | |
parent | 9db465810a43e934f4f3c267ac279140c7c156dd (diff) |
cleanup: rename armv4_5 to arm for readability
Nothing more than a name change, just to make reading
the code a bit simpler.
Change-Id: I73a16b7302b48ce07d9688162955aae71d11eb45
Signed-off-by: Spencer Oliver <spen@spen-soft.co.uk>
Reviewed-on: http://openocd.zylin.com/390
Tested-by: jenkins
Reviewed-by: Øyvind Harboe <oyvindharboe@gmail.com>
Diffstat (limited to 'src/target/arm_simulator.c')
-rw-r--r-- | src/target/arm_simulator.c | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/src/target/arm_simulator.c b/src/target/arm_simulator.c index 1723b438..a0ffdde5 100644 --- a/src/target/arm_simulator.c +++ b/src/target/arm_simulator.c @@ -781,71 +781,71 @@ static int arm_simulate_step_core(struct target *target, static uint32_t armv4_5_get_reg(struct arm_sim_interface *sim, int reg) { - struct arm *armv4_5 = (struct arm *)sim->user_data; + struct arm *arm = (struct arm *)sim->user_data; - return buf_get_u32(armv4_5->core_cache->reg_list[reg].value, 0, 32); + return buf_get_u32(arm->core_cache->reg_list[reg].value, 0, 32); } static void armv4_5_set_reg(struct arm_sim_interface *sim, int reg, uint32_t value) { - struct arm *armv4_5 = (struct arm *)sim->user_data; + struct arm *arm = (struct arm *)sim->user_data; - buf_set_u32(armv4_5->core_cache->reg_list[reg].value, 0, 32, value); + buf_set_u32(arm->core_cache->reg_list[reg].value, 0, 32, value); } static uint32_t armv4_5_get_reg_mode(struct arm_sim_interface *sim, int reg) { - struct arm *armv4_5 = (struct arm *)sim->user_data; + struct arm *arm = (struct arm *)sim->user_data; - return buf_get_u32(ARMV4_5_CORE_REG_MODE(armv4_5->core_cache, - armv4_5->core_mode, reg).value, 0, 32); + return buf_get_u32(ARMV4_5_CORE_REG_MODE(arm->core_cache, + arm->core_mode, reg).value, 0, 32); } static void armv4_5_set_reg_mode(struct arm_sim_interface *sim, int reg, uint32_t value) { - struct arm *armv4_5 = (struct arm *)sim->user_data; + struct arm *arm = (struct arm *)sim->user_data; - buf_set_u32(ARMV4_5_CORE_REG_MODE(armv4_5->core_cache, - armv4_5->core_mode, reg).value, 0, 32, value); + buf_set_u32(ARMV4_5_CORE_REG_MODE(arm->core_cache, + arm->core_mode, reg).value, 0, 32, value); } static uint32_t armv4_5_get_cpsr(struct arm_sim_interface *sim, int pos, int bits) { - struct arm *armv4_5 = (struct arm *)sim->user_data; + struct arm *arm = (struct arm *)sim->user_data; - return buf_get_u32(armv4_5->cpsr->value, pos, bits); + return buf_get_u32(arm->cpsr->value, pos, bits); } static enum arm_state armv4_5_get_state(struct arm_sim_interface *sim) { - struct arm *armv4_5 = (struct arm *)sim->user_data; + struct arm *arm = (struct arm *)sim->user_data; - return armv4_5->core_state; + return arm->core_state; } static void armv4_5_set_state(struct arm_sim_interface *sim, enum arm_state mode) { - struct arm *armv4_5 = (struct arm *)sim->user_data; + struct arm *arm = (struct arm *)sim->user_data; - armv4_5->core_state = mode; + arm->core_state = mode; } static enum arm_mode armv4_5_get_mode(struct arm_sim_interface *sim) { - struct arm *armv4_5 = (struct arm *)sim->user_data; + struct arm *arm = (struct arm *)sim->user_data; - return armv4_5->core_mode; + return arm->core_mode; } int arm_simulate_step(struct target *target, uint32_t *dry_run_pc) { - struct arm *armv4_5 = target_to_arm(target); + struct arm *arm = target_to_arm(target); struct arm_sim_interface sim; - sim.user_data = armv4_5; + sim.user_data = arm; sim.get_reg = &armv4_5_get_reg; sim.set_reg = &armv4_5_set_reg; sim.get_reg_mode = &armv4_5_get_reg_mode; |