From 5747469eae56101bd167b450bc4d802162b113c0 Mon Sep 17 00:00:00 2001 From: Palmer Dabbelt Date: Mon, 12 Jun 2017 17:46:31 -0700 Subject: [PATCH] Jump to the RTOS hartid after halting When I disappeared the polls everywhere I forgot to sanitize the hartid after halting. This is an invariant that GDB expects: when you return from a halt whatever thread is marked as currently selected is the thread that the next register accesses reference. --- src/target/riscv/riscv.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/target/riscv/riscv.c b/src/target/riscv/riscv.c index c232204ee..057b04b73 100644 --- a/src/target/riscv/riscv.c +++ b/src/target/riscv/riscv.c @@ -736,6 +736,8 @@ int riscv_openocd_poll(struct target *target) int riscv_openocd_halt(struct target *target) { + RISCV_INFO(r); + LOG_DEBUG("halting all harts"); int out = riscv_halt_all_harts(target); @@ -745,6 +747,11 @@ int riscv_openocd_halt(struct target *target) } register_cache_invalidate(target->reg_cache); + if (riscv_rtos_enabled(target)) { + target->rtos->current_threadid = r->rtos_hartid + 1; + target->rtos->current_thread = r->rtos_hartid + 1; + } + target->state = TARGET_HALTED; target->debug_reason = DBG_REASON_DBGRQ; target_call_event_callbacks(target, TARGET_EVENT_HALTED);