From 72175d87dbf736e56e5702f5e57f65824a9ab5ab Mon Sep 17 00:00:00 2001 From: Darius Rad Date: Mon, 8 Apr 2019 18:10:08 -0400 Subject: [PATCH] Ensure that halt asserted after ndm reset is not ignored. Issue halt if haltreq is asserted and the hart is running. This will ensure that the hart is always halted after ndmreset, as is done with OpenOCD. This corresponds to Flute commit 71d7e715f. --- src_Core/Debug_Module/DM_Run_Control.bsv | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src_Core/Debug_Module/DM_Run_Control.bsv b/src_Core/Debug_Module/DM_Run_Control.bsv index fa4148c..be671ac 100644 --- a/src_Core/Debug_Module/DM_Run_Control.bsv +++ b/src_Core/Debug_Module/DM_Run_Control.bsv @@ -225,7 +225,7 @@ module mkDM_Run_Control (DM_Run_Control_IFC); $display ("DM_Run_Control.write: hart0 resume request"); end // Halt hart(s) - else if (haltreq && !rg_dmcontrol_haltreq) begin + else if (haltreq && rg_hart0_running) begin f_hart0_run_halt_reqs.enq (False); $display ("DM_Run_Control.write: hart0 halt request"); end