Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

target/riscv: detailed error messages for cases when resume operation fails #1165

Merged
merged 1 commit into from
Nov 18, 2024
Merged

target/riscv: detailed error messages for cases when resume operation fails #1165

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 17 additions & 5 deletions src/target/riscv/riscv-013.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5385,7 +5385,9 @@ static int riscv013_step_or_resume_current_hart(struct target *target,
LOG_TARGET_ERROR(target, "Hart is not halted!");
return ERROR_FAIL;
}
LOG_TARGET_DEBUG(target, "resuming (for step?=%d)", step);

LOG_TARGET_DEBUG(target, "resuming (operation=%s)",
step ? "single-step" : "resume");

if (riscv_reg_flush_all(target) != ERROR_OK)
return ERROR_FAIL;
Expand Down Expand Up @@ -5418,16 +5420,26 @@ static int riscv013_step_or_resume_current_hart(struct target *target,
return ERROR_OK;
}

JanMatCodasip marked this conversation as resolved.
Show resolved Hide resolved
LOG_TARGET_ERROR(target, "Failed to %s. dmstatus=0x%08x",
step ? "single-step" : "resume", dmstatus);

dm_write(target, DM_DMCONTROL, dmcontrol);
LOG_TARGET_ERROR(target,
" cancelling the resume request (dmcontrol.resumereq <- 0)");

LOG_TARGET_ERROR(target, "unable to resume");
if (dmstatus_read(target, &dmstatus, true) != ERROR_OK)
return ERROR_FAIL;
LOG_TARGET_ERROR(target, " dmstatus=0x%08x", dmstatus);

LOG_TARGET_ERROR(target, " dmstatus after cancellation=0x%08x", dmstatus);

if (step) {
LOG_TARGET_ERROR(target, " was stepping, halting");
riscv_halt(target);
LOG_TARGET_ERROR(target,
" trying to recover from a failed single-step, by requesting halt");
if (riscv_halt(target) == ERROR_OK)
LOG_TARGET_ERROR(target, " halt completed after failed single-step");
else
LOG_TARGET_ERROR(target, " could not halt, something is wrong with the taget");
// TODO: returning ERROR_OK is questionable, this code needs to be revised
return ERROR_OK;
}

Expand Down