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

Merge pull request #18 from sifive/halt_correctly 

riscv: Ensure that hart is halted before attempting to examine it.
This commit is contained in:
Tim Newsome 2017-02-27 20:17:42 -08:00 committed by GitHub
parent b4d38d0997 7f13e90505
commit 8785b256cb
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/target/riscv/riscv-013.c
View File

@ -1539,7 +1539,7 @@ static int examine(struct target *target)
LOG_DEBUG(" authbusy=%d", get_field(dmcontrol, DMI_DMCONTROL_AUTHBUSY)); LOG_DEBUG(" authbusy=%d", get_field(dmcontrol, DMI_DMCONTROL_AUTHBUSY));
LOG_DEBUG(" version=%d", get_field(dmcontrol, DMI_DMCONTROL_VERSION)); LOG_DEBUG(" version=%d", get_field(dmcontrol, DMI_DMCONTROL_VERSION));
unsigned hartstatus = DMI_DMCONTROL_HARTSTATUS; unsigned hartstatus = get_field(dmcontrol, DMI_DMCONTROL_HARTSTATUS);
if (!get_field(dmcontrol, DMI_DMCONTROL_DMACTIVE)) { if (!get_field(dmcontrol, DMI_DMCONTROL_DMACTIVE)) {
LOG_ERROR("Debug Module did not become active. dmcontrol=0x%x", LOG_ERROR("Debug Module did not become active. dmcontrol=0x%x",
@ -1570,7 +1570,7 @@ static int examine(struct target *target)
LOG_DEBUG(" datacount=%d", info->datacount); LOG_DEBUG(" datacount=%d", info->datacount);
uint32_t accesscs = dmi_read(target, DMI_PROGBUFCS); uint32_t accesscs = dmi_read(target, DMI_PROGBUFCS);
info->progsize = get_field(abstractcs, DMI_PROGBUFCS_PROGSIZE); info->progsize = get_field(accesscs, DMI_PROGBUFCS_PROGSIZE);
LOG_DEBUG("accesscs=0x%x", accesscs); LOG_DEBUG("accesscs=0x%x", accesscs);
LOG_DEBUG(" progsize=%d", info->progsize); LOG_DEBUG(" progsize=%d", info->progsize);
@ -1606,6 +1606,7 @@ static int examine(struct target *target)
} }
if (hartstatus == 1) { if (hartstatus == 1) {
LOG_DEBUG("Hart currently running. Requesting halt.\n");
dmi_write(target, DMI_DMCONTROL, DMI_DMCONTROL_HALTREQ | dmi_write(target, DMI_DMCONTROL, DMI_DMCONTROL_HALTREQ |
DMI_DMCONTROL_DMACTIVE); DMI_DMCONTROL_DMACTIVE);
for (unsigned i = 0; i < 256; i++) { for (unsigned i = 0; i < 256; i++) {
@ -1644,6 +1645,7 @@ static int examine(struct target *target)
} }
if (hartstatus == 1) { if (hartstatus == 1) {
LOG_DEBUG("Resuming hart.\n");
// Resume if the hart had been running. // Resume if the hart had been running.
dmi_write(target, DMI_DMCONTROL, DMI_DMCONTROL_DMACTIVE | dmi_write(target, DMI_DMCONTROL, DMI_DMCONTROL_DMACTIVE |
DMI_DMCONTROL_RESUMEREQ); DMI_DMCONTROL_RESUMEREQ);