zcy
/
tinyriscv-openocd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

aarch64: slightly simplify breakpoint set function 

Set HDE bit through helper function instead of manual mem_ap access.

Change-Id: I68c157870f3f3c47a875d425ade6e975d8075424
Signed-off-by: Matthias Welwarsky <matthias.welwarsky@sysgo.com>
gitignore-build
Matthias Welwarsky 2016-09-26 11:44:25 +02:00
parent 40ce7374d3
commit fc3ce94bba
1 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/target/aarch64.c
View File

@ -861,7 +861,6 @@ 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");
@ -940,12 +939,8 @@ 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 + CPUV8_DBG_DSCR, &dscr);
/* Ensure that halting debug mode is enable */ /* Ensure that halting debug mode is enable */
dscr = dscr | DSCR_HDE; retval = aarch64_set_dscr_bits(target, DSCR_HDE, DSCR_HDE);
retval = mem_ap_write_atomic_u32(armv8->debug_ap,
armv8->debug_base + CPUV8_DBG_DSCR, dscr);
if (retval != ERROR_OK) { if (retval != ERROR_OK) {
LOG_DEBUG("Failed to set DSCR.HDE"); LOG_DEBUG("Failed to set DSCR.HDE");
return retval; return retval;