diff options
| author | Tomas Vanek <vanekt@fbl.cz> | 2019-02-07 14:18:17 +0100 |
|---|---|---|
| committer | Matthias Welwarsky <matthias@welwarsky.de> | 2019-04-01 09:32:38 +0100 |
| commit | 16432e681e0d776d7f40f14ad0aed3f7e17b848b (patch) | |
| tree | 2f0b2f575498c6f6a0f6713bf41391cfdc314025 | |
| parent | a7479fa89def9d8b1854d629dfdaa0ba17132617 (diff) | |
| download | riscv-openocd-16432e681e0d776d7f40f14ad0aed3f7e17b848b.zip riscv-openocd-16432e681e0d776d7f40f14ad0aed3f7e17b848b.tar.gz riscv-openocd-16432e681e0d776d7f40f14ad0aed3f7e17b848b.tar.bz2 | |
target/cortex_m: simplify cortex_m_unset_breakpoint()
Cortex-M uses only 2 byte breakpoint instruction.
cortex_m_unset_breakpoint() does not need to check breakpoint->length,
use the length as the size argument in target_write_memory()
Change-Id: I20bb869f6abce2fc61f0469e34a638bc4dc6f7ce
Signed-off-by: Tomas Vanek <vanekt@fbl.cz>
Reviewed-on: http://openocd.zylin.com/4889
Tested-by: jenkins
Reviewed-by: Matthias Welwarsky <matthias@welwarsky.de>
Reviewed-by: Jānis Skujenieks <janis.skujenieks@gmail.com>
Reviewed-by: Christopher Head <chead@zaber.com>
| -rw-r--r-- | src/target/cortex_m.c | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/src/target/cortex_m.c b/src/target/cortex_m.c index 4bada39..8223de7 100644 --- a/src/target/cortex_m.c +++ b/src/target/cortex_m.c @@ -1260,17 +1260,11 @@ int cortex_m_unset_breakpoint(struct target *target, struct breakpoint *breakpoi comparator_list[fp_num].fpcr_value); } else { /* restore original instruction (kept in target endianness) */ - if (breakpoint->length == 4) { - retval = target_write_memory(target, breakpoint->address & 0xFFFFFFFE, 4, 1, + retval = target_write_memory(target, breakpoint->address & 0xFFFFFFFE, + breakpoint->length, 1, breakpoint->orig_instr); - if (retval != ERROR_OK) - return retval; - } else { - retval = target_write_memory(target, breakpoint->address & 0xFFFFFFFE, 2, 1, - breakpoint->orig_instr); - if (retval != ERROR_OK) - return retval; - } + if (retval != ERROR_OK) + return retval; } breakpoint->set = false; |