Cheri-research/Toooba
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases Wiki Activity

Avoid wedge on repeated debug resumes (with jdw57 and aj443)

Browse Source 
ConfigReg avoids a compile error
This commit is contained in:
Peter Rugg
2023-01-31 21:02:17 +00:00
parent 5c6e348788
commit 8ea0e07ce5
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src_Core/RISCY_OOO/procs/RV64G_OOO/RenameStage.bsv
View File

@@ -63,6 +63,7 @@ import ReservationStationAlu::*;
import ReservationStationMem::*;
import ReservationStationFpuMulDiv::*;
import SplitLSQ::*;
import ConfigReg::*;
import CHERICap::*;
import CHERICC_Fat::*;
import ISA_Decls_CHERI::*;
@@ -199,7 +200,7 @@ module mkRenameStage#(RenameInput inIfc)(RenameStage);
// Is set to Valid intrDebugStep on dcsr[stepbit]==1 and one instruction has been processed.
// Note (step): 1st instruction is guaranteed architectural, cannot possibly be speculative.
// Note (step): 1st instruction may trap; we halt pointing at the trap vector
Reg #(Maybe #(Interrupt)) rg_m_halt_req <- mkReg (tagged Invalid);
Reg #(Maybe #(Interrupt)) rg_m_halt_req <- mkConfigReg (tagged Invalid);
function Action fa_step_check;
action
@@ -1234,7 +1235,7 @@ module mkRenameStage#(RenameInput inIfc)(RenameStage);
`endif
`ifdef INCLUDE_GDB_CONTROL
method Action debug_halt_req () if (rg_m_halt_req == tagged Invalid);
method Action debug_halt_req ();
rg_m_halt_req <= tagged Valid intrDebugHalt;
if (verbosity >= 1)
$display ("%0d: %m.renameStage.renameStage.debug_halt_req", cur_cycle);