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

Workaround single step wedges by not waiting for flush before halting

Browse Source
This commit is contained in:
Peter Rugg
2021-07-02 16:41:35 +01:00
committed by Jonathan Woodruff
parent 9ea66bed86
commit 8ef44b0a6c
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src_Core/CPU/Core.bsv
View File

@@ -857,9 +857,6 @@ module mkCore#(CoreId coreId)(Core);
`endif // SELF_INV_CACHE
rule readyToFetch(
`ifdef INCLUDE_GDB_CONTROL
(rg_core_run_state == CORE_RUNNING) &&
`endif
!flush_reservation && !flush_tlbs && !update_vm_info
&& iTlb.flush_done && dTlb.flush_done
`ifdef SECURITY_OR_INCLUDE_GDB_CONTROL
@@ -875,16 +872,19 @@ module mkCore#(CoreId coreId)(Core);
`endif
);
fetchStage.done_flushing();
endrule
`ifdef INCLUDE_GDB_CONTROL
if (commitStage.is_debug_halted) begin
started <= False;
rg_core_run_state <= CORE_HALTING;
if (verbosity >= 1)
$display ("%0d: %m.rule readyToFetch: halting for debug mode", cur_cycle);
end
`endif
rule readyToHalt(
(rg_core_run_state == CORE_RUNNING) &&
commitStage.is_debug_halted
);
started <= False;
rg_core_run_state <= CORE_HALTING;
if (verbosity >= 1)
$display ("%0d: %m.rule readyToHalt: halting for debug mode", cur_cycle);
endrule
`endif
`ifdef PERF_COUNT
// incr cycle count