interesting
/
riscv-openocd
mirror of https://github.com/riscv/riscv-openocd.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

aarch64: Enable halting debug mode on breakpoint set 

Ensure that we allow halting debug mode after setting breakpoint

Change-Id: I6f0d7a4a4775a93c133fb1ec31dfe3324d9f7395
Signed-off-by: David Ung <david.ung.42@gmail.com>
Signed-off-by: Matthias Welwarsky <matthias.welwarsky@sysgo.com>
This commit is contained in:
David Ung 2015-04-23 13:22:13 -07:00 committed by Matthias Welwarsky
parent 236c9966dd
commit 5ee67ce024
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/target/aarch64.c
View File

@ -1247,6 +1247,7 @@ static int aarch64_set_breakpoint(struct target *target,
struct aarch64_common *aarch64 = target_to_aarch64(target); struct aarch64_common *aarch64 = target_to_aarch64(target);
struct armv8_common *armv8 = &aarch64->armv8_common; struct armv8_common *armv8 = &aarch64->armv8_common;
struct aarch64_brp *brp_list = aarch64->brp_list; struct aarch64_brp *brp_list = aarch64->brp_list;
uint32_t dscr;
if (breakpoint->set) { if (breakpoint->set) {
LOG_WARNING("breakpoint already set"); LOG_WARNING("breakpoint already set");
@ -1311,6 +1312,17 @@ static int aarch64_set_breakpoint(struct target *target,
breakpoint->set = 0x11; /* Any nice value but 0 */ breakpoint->set = 0x11; /* Any nice value but 0 */
} }
retval = mem_ap_read_atomic_u32(armv8->debug_ap,
armv8->debug_base + CPUDBG_DSCR, &dscr);
/* Ensure that halting debug mode is enable */
dscr = dscr | DSCR_HALT_DBG_MODE;
retval = mem_ap_write_atomic_u32(armv8->debug_ap,
armv8->debug_base + CPUDBG_DSCR, dscr);
if (retval != ERROR_OK) {
LOG_DEBUG("Failed to set DSCR.HDE");
return retval;
}
return ERROR_OK; return ERROR_OK;
} }