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

fix progbuf cache: another two cases for invalidation 

Continuation of the previous patch. There are two more cases
when progbuf cache in OpenOCD shall be invalidated:

- When OpenOCD resets the debug module undergoes reset (dmactive=0),
  e.g. during target examination

- When the user manually performs that very same operation
  (via riscv dmi_write)

Change-Id: I53f8f08250eeedcbd55ab4361d5665370b063680
Signed-off-by: Jan Matyas <matyas@codasip.com>
This commit is contained in:
Jan Matyas 2022-02-14 14:10:17 +01:00
parent feb83b78b7
commit 8274cc58c1
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1568,6 +1568,9 @@ static int examine(struct target *target)
dmi_write(target, DM_DMCONTROL, 0); dmi_write(target, DM_DMCONTROL, 0);
dmi_write(target, DM_DMCONTROL, DM_DMCONTROL_DMACTIVE); dmi_write(target, DM_DMCONTROL, DM_DMCONTROL_DMACTIVE);
dm->was_reset = true; dm->was_reset = true;
/* The DM gets reset, so forget any cached progbuf entries. */
riscv013_invalidate_cached_debug_buffer(target);
} }
dmi_write(target, DM_DMCONTROL, DM_DMCONTROL_HARTSELLO | dmi_write(target, DM_DMCONTROL, DM_DMCONTROL_HARTSELLO |
@ -2371,7 +2374,7 @@ static int assert_reset(struct target *target)
/* The DM might have gotten reset if OpenOCD called us in some reset that /* The DM might have gotten reset if OpenOCD called us in some reset that
* involves SRST being toggled. So clear our cache which may be out of * involves SRST being toggled. So clear our cache which may be out of
* date. */ * date. */
memset(dm->progbuf_cache, 0, sizeof(dm->progbuf_cache)); riscv013_invalidate_cached_debug_buffer(target);
return ERROR_OK; return ERROR_OK;
} }

11
src/target/riscv/riscv.c
View File

@ -2798,9 +2798,14 @@ COMMAND_HANDLER(riscv_dmi_write)
/* Perform the DMI write */ /* Perform the DMI write */
int retval = r->dmi_write(target, address, value); int retval = r->dmi_write(target, address, value);
/* If the user tinkered with progbuf registers, we need to /* Invalidate our cached progbuf copy:
drop our cached copy of the progbuf */ - if the user tinkered directly with a progbuf register
if (address >= DM_PROGBUF0 && address <= DM_PROGBUF15) { - if debug module was reset, in which case progbuf registers
may not retain their value.
*/
bool progbufTouched = (address >= DM_PROGBUF0 && address <= DM_PROGBUF15);
bool dmDeactivated = (address == DM_DMCONTROL && (value & DM_DMCONTROL_DMACTIVE) == 0);
if (progbufTouched || dmDeactivated) {
if (r->invalidate_cached_debug_buffer) if (r->invalidate_cached_debug_buffer)
r->invalidate_cached_debug_buffer(target); r->invalidate_cached_debug_buffer(target);
} }