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

riscv: move value read to after autoexec is cleared.

This commit is contained in:
Megan Wachs 2017-04-04 16:33:17 -07:00
parent 9c1f6ea28b
commit 14e26040b8
1 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1868,12 +1868,25 @@ static int read_memory(struct target *target, uint32_t address,
uint32_t abstractcs; uint32_t abstractcs;
for (uint32_t i = 0; i < count; i++) { for (uint32_t i = 0; i < count; i++) {
uint32_t value = dmi_read(target, DMI_DATA0);
// On last iteration, turn off autoexec before reading the value // On last iteration, turn off autoexec before reading the value
// so that we don't inadvertently read too far into memory. // so that we don't inadvertently read too far into memory.
if ((count > 1) && ((i + 1) == count)) { if ((count > 1) && ((i + 1) == count)) {
dmi_write(target, DMI_ABSTRACTAUTO, 0); dmi_write(target, DMI_ABSTRACTAUTO, 0);
} }
uint32_t value = dmi_read(target, DMI_DATA0);
// If autoexec was set, the above dmi_read started an abstract command.
// If we just immediately loop and do another read here,
// we'll probably get a busy error. Wait for idle first,
// or otherwise take ac_command_busy into account (this defeats the purpose
// of autoexec, this whole code needs optimization).
if ((count > 1) && ((i + 1) < count)) {
if (wait_for_idle(target, &abstractcs) != ERROR_OK) {
dmi_write(target, DMI_ABSTRACTAUTO, 0);
return ERROR_FAIL;
}
}
switch (size) { switch (size) {
case 1: case 1:
buffer[i] = value; buffer[i] = value;
@ -1891,14 +1904,8 @@ static int read_memory(struct target *target, uint32_t address,
default: default:
return ERROR_FAIL; return ERROR_FAIL;
} }
// The above dmi_read started an abstract command. If we just
// immediately read here, we'll probably get a busy error. Wait for idle first,
// or otherwise take ac_command_busy into account (this defeats the purpose
// of autoexec, this whole code needs optimization).
if (wait_for_idle(target, &abstractcs) != ERROR_OK) {
return ERROR_FAIL;
}
} }
abstractcs = dmi_read(target, DMI_ABSTRACTCS); abstractcs = dmi_read(target, DMI_ABSTRACTCS);
unsigned cmderr = get_field(abstractcs, DMI_ABSTRACTCS_CMDERR); unsigned cmderr = get_field(abstractcs, DMI_ABSTRACTCS_CMDERR);
if (cmderr == CMDERR_BUSY) { if (cmderr == CMDERR_BUSY) {