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

Fixed halt reason after single-step #618

Closed
wants to merge 1 commit into from
+6 −1
Closed

Fixed halt reason after single-step #618

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
7 changes: 6 additions & 1 deletion src/target/riscv/riscv.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2227,6 +2227,8 @@ int riscv_openocd_poll(struct target *target)
int riscv_openocd_step(struct target *target, int current,
target_addr_t address, int handle_breakpoints)
{
RISCV_INFO(r);

LOG_DEBUG("stepping rtos hart");

if (!current)
Expand All @@ -2249,8 +2251,11 @@ int riscv_openocd_step(struct target *target, int current,

target->state = TARGET_RUNNING;
target_call_event_callbacks(target, TARGET_EVENT_RESUMED);

target->state = TARGET_HALTED;
target->debug_reason = DBG_REASON_SINGLESTEP;
/* Read real debug reason from the target. Do not presume the target halted due
* to the single-step. There may be a higher-priority halt cause, e.g. a breakpoint. */
set_debug_reason(target, r->current_hartid);
target_call_event_callbacks(target, TARGET_EVENT_HALTED);
return out;
}
Expand Down