Skip to content

[cherry-pick] fix error detection during trigger removal #12

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

Merged
merged 1 commit into from
Oct 7, 2025
Merged

[cherry-pick] fix error detection during trigger removal #12

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
36 changes: 28 additions & 8 deletions src/target/riscv/riscv.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1669,22 +1669,38 @@ static int remove_trigger(struct target *target, int unique_id)

bool done = false;
for (unsigned int i = 0; i < r->trigger_count; i++) {
if (r->trigger_unique_id[i] == unique_id) {
riscv_reg_set(target, GDB_REGNO_TSELECT, i);
riscv_reg_set(target, GDB_REGNO_TDATA1, 0);
r->trigger_unique_id[i] = -1;
LOG_TARGET_DEBUG(target, "Stop using resource %d for bp %d",
i, unique_id);
done = true;
if (r->trigger_unique_id[i] != unique_id)
continue;
done = false;
result = riscv_reg_set(target, GDB_REGNO_TSELECT, i);
if (result == ERROR_OK)
result = riscv_reg_set(target, GDB_REGNO_TDATA1, 0);
if (result != ERROR_OK) {
LOG_TARGET_ERROR(target,
"Could not free resource %u for bp %d. "
"Target is in a potentially unrecoverable state!",
i, unique_id);
return ERROR_FAIL;
}
r->trigger_unique_id[i] = -1;
LOG_TARGET_DEBUG(target, "Stop using resource %u for bp %d",
i, unique_id);
done = true;
}
if (!done) {
LOG_TARGET_ERROR(target,
"Couldn't find the hardware resources used by hardware trigger.");
return ERROR_TARGET_RESOURCE_NOT_AVAILABLE;
}

riscv_reg_set(target, GDB_REGNO_TSELECT, tselect);
result = riscv_reg_set(target, GDB_REGNO_TSELECT, tselect);
if (result != ERROR_OK) {
LOG_TARGET_ERROR(target,
"Could not restore tselect after bp %d removal. "
"Target is in a potentially unrecoverable state!",
unique_id);
return ERROR_FAIL;
}

return ERROR_OK;
}
Expand Down Expand Up @@ -1713,6 +1729,8 @@ int riscv_remove_breakpoint(struct target *target,
return ERROR_TARGET_RESOURCE_NOT_AVAILABLE;
}

/* FIXME: we should clear this flag even if remove_trigger fails for cases
* when all HW resources from Trigger Module were de-allocated */
breakpoint->is_set = false;

return ERROR_OK;
Expand Down Expand Up @@ -1763,6 +1781,8 @@ int riscv_remove_watchpoint(struct target *target,
int result = remove_trigger(target, trigger.unique_id);
if (result != ERROR_OK)
return result;
/* FIXME: we should clear this flag even if remove_trigger fails for cases
* when all HW resources from Trigger Module were de-allocated */
watchpoint->is_set = false;

return ERROR_OK;
Expand Down