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/arm9tdmi.c | |
| parent | 9db465810a43e934f4f3c267ac279140c7c156dd (diff) | |
| download | riscv-openocd-3a550e5b5fe011e526b150a5d234b48e8e2aaad6.zip riscv-openocd-3a550e5b5fe011e526b150a5d234b48e8e2aaad6.tar.gz riscv-openocd-3a550e5b5fe011e526b150a5d234b48e8e2aaad6.tar.bz2 | |
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/arm9tdmi.c')
| -rw-r--r-- | src/target/arm9tdmi.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/src/target/arm9tdmi.c b/src/target/arm9tdmi.c index 493adb3..b3cd359 100644 --- a/src/target/arm9tdmi.c +++ b/src/target/arm9tdmi.c @@ -658,7 +658,7 @@ static void arm9tdmi_branch_resume_thumb(struct target *target) LOG_DEBUG("-"); struct arm7_9_common *arm7_9 = target_to_arm7_9(target); - struct arm *armv4_5 = &arm7_9->armv4_5_common; + struct arm *arm = &arm7_9->arm; struct arm_jtag *jtag_info = &arm7_9->jtag_info; struct reg *dbg_stat = &arm7_9->eice_cache->reg_list[EICE_DBG_STAT]; @@ -673,7 +673,7 @@ static void arm9tdmi_branch_resume_thumb(struct target *target) arm9tdmi_clock_out(jtag_info, ARMV4_5_NOP, 0, NULL, 0); /* nothing fetched, LDM in EXECUTE stage (2nd cycle) */ arm9tdmi_clock_out(jtag_info, ARMV4_5_NOP, - buf_get_u32(armv4_5->pc->value, 0, 32) | 1, NULL, 0); + buf_get_u32(arm->pc->value, 0, 32) | 1, NULL, 0); /* nothing fetched, LDM in EXECUTE stage (3rd cycle) */ arm9tdmi_clock_out(jtag_info, ARMV4_5_NOP, 0, NULL, 0); @@ -700,7 +700,8 @@ static void arm9tdmi_branch_resume_thumb(struct target *target) /* fetch NOP, LDR in Execute */ arm9tdmi_clock_out(jtag_info, ARMV4_5_T_NOP, 0, NULL, 0); /* nothing fetched, LDR in EXECUTE stage (2nd cycle) */ - arm9tdmi_clock_out(jtag_info, ARMV4_5_T_NOP, buf_get_u32(armv4_5->core_cache->reg_list[0].value, 0, 32), NULL, 0); + arm9tdmi_clock_out(jtag_info, ARMV4_5_T_NOP, + buf_get_u32(arm->core_cache->reg_list[0].value, 0, 32), NULL, 0); /* nothing fetched, LDR in EXECUTE stage (3rd cycle) */ arm9tdmi_clock_out(jtag_info, ARMV4_5_T_NOP, 0, NULL, 0); @@ -746,9 +747,9 @@ void arm9tdmi_disable_single_step(struct target *target) static void arm9tdmi_build_reg_cache(struct target *target) { struct reg_cache **cache_p = register_get_last_cache_p(&target->reg_cache); - struct arm *armv4_5 = target_to_arm(target); + struct arm *arm = target_to_arm(target); - (*cache_p) = arm_build_reg_cache(target, armv4_5); + (*cache_p) = arm_build_reg_cache(target, arm); } int arm9tdmi_init_target(struct command_context *cmd_ctx, @@ -817,7 +818,7 @@ static int arm9tdmi_target_create(struct target *target, Jim_Interp *interp) struct arm7_9_common *arm7_9 = calloc(1,sizeof(struct arm7_9_common)); arm9tdmi_init_arch_info(target, arm7_9, target->tap); - arm7_9->armv4_5_common.is_armv4 = true; + arm7_9->arm.is_armv4 = true; return ERROR_OK; } |