diff options
| author | Spencer Oliver <spen@spen-soft.co.uk> | 2012-02-05 12:03:04 +0000 |
|---|---|---|
| committer | Spencer Oliver <spen@spen-soft.co.uk> | 2012-02-06 11:00:36 +0000 |
| commit | 374127301ec1d72033b9d573b72c7abdfd61990d (patch) | |
| tree | b56f5f4bba1718f9ac482d1fabdff18f5d170196 /src/target/arm_semihosting.c | |
| parent | de0130a0aad83c1ef692ee4d68ab996a8668424d (diff) | |
| download | riscv-openocd-374127301ec1d72033b9d573b72c7abdfd61990d.zip riscv-openocd-374127301ec1d72033b9d573b72c7abdfd61990d.tar.gz riscv-openocd-374127301ec1d72033b9d573b72c7abdfd61990d.tar.bz2 | |
build: cleanup src/target directory
Change-Id: Ia055b6d2b5f6449a38afd0539a8c66e7d7e0c059
Signed-off-by: Spencer Oliver <spen@spen-soft.co.uk>
Reviewed-on: http://openocd.zylin.com/430
Tested-by: jenkins
Diffstat (limited to 'src/target/arm_semihosting.c')
| -rw-r--r-- | src/target/arm_semihosting.c | 22 |
1 files changed, 7 insertions, 15 deletions
diff --git a/src/target/arm_semihosting.c b/src/target/arm_semihosting.c index fba580b..115c7d4 100644 --- a/src/target/arm_semihosting.c +++ b/src/target/arm_semihosting.c @@ -323,7 +323,7 @@ static int do_semihosting(struct target *target) if (l < s) result = -1; else { - retval = target_write_buffer(target, a, s, (void*)arg); + retval = target_write_buffer(target, a, s, (void *)arg); if (retval != ERROR_OK) return retval; result = 0; @@ -392,8 +392,7 @@ static int do_semihosting(struct target *target) /* REVISIT this looks wrong ... ARM11 and Cortex-A8 * should work this way at least sometimes. */ - if (is_arm7_9(target_to_arm7_9(target))) - { + if (is_arm7_9(target_to_arm7_9(target))) { uint32_t spsr; /* return value in R0 */ @@ -402,7 +401,7 @@ static int do_semihosting(struct target *target) /* LR --> PC */ buf_set_u32(arm->core_cache->reg_list[15].value, 0, 32, - buf_get_u32(arm_reg_current(arm,14)->value, 0, 32)); + buf_get_u32(arm_reg_current(arm, 14)->value, 0, 32)); arm->core_cache->reg_list[15].dirty = 1; /* saved PSR --> current PSR */ @@ -418,9 +417,7 @@ static int do_semihosting(struct target *target) if (spsr & 0x20) arm->core_state = ARM_STATE_THUMB; - } - else - { + } else { /* resume execution, this will be pc+2 to skip over the * bkpt instruction */ @@ -454,8 +451,7 @@ int arm_semihosting(struct target *target, int *retval) if (!arm->is_semihosting) return 0; - if (is_arm7_9(target_to_arm7_9(target))) - { + if (is_arm7_9(target_to_arm7_9(target))) { if (arm->core_mode != ARM_MODE_SVC) return 0; @@ -510,9 +506,7 @@ int arm_semihosting(struct target *target, int *retval) if (insn != 0xEF123456) return 0; } - } - else if (is_armv7m(target_to_armv7m(target))) - { + } else if (is_armv7m(target_to_armv7m(target))) { uint16_t insn; if (target->debug_reason != DBG_REASON_BREAKPOINT) @@ -529,9 +523,7 @@ int arm_semihosting(struct target *target, int *retval) /* bkpt 0xAB */ if (insn != 0xBEAB) return 0; - } - else - { + } else { LOG_ERROR("Unsupported semi-hosting Target"); return 0; } |