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

Merge remote-tracking branch 'origin/CHERI' into jdw57_prediction

Browse Source
This commit is contained in:
Jonathan Woodruff
2022-03-25 13:06:22 +00:00
parent ad7bcbb559 d0c1d97a2a
commit 6d7f95571f
17 changed files with 42 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src_Core/CPU/Core.bsv
View File

@@ -748,7 +748,17 @@ module mkCore#(CoreId coreId)(Core);
CommitStage commitStage <- mkCommitStage(commitInput);
`ifdef RVFI
mkConnection(commitStage.rvfi, rvfi_bridge.rvfi);
// XXX Currently RVFI can only be connected to the outside world
// via the RVFI_DII bridge i.e. when DII is also being used.
rule drop;
let packets <- commitStage.rvfi.get();
for (Integer i = 0; i < valueOf(SupSize); i = i+1) begin
if (isValid(packets[i])) $display("%d: RVFI ", cur_cycle, fshow(packets[i].Valid));
end
`ifdef RVFI_DII
rvfi_bridge.rvfi.put(packets);
`endif
endrule
`endif
// send rob enq time to reservation stations

2
src_Core/CPU/MMIO_AXI4_Adapter.bsv
View File

@@ -76,7 +76,7 @@ endinterface
module mkMMIO_AXI4_Adapter (MMIO_AXI4_Adapter_IFC);
// Verbosity: 0: quiet; 1: transactions
Integer verbosity = 1;
Integer verbosity = 0;
Reg #(Bit #(4)) cfg_verbosity <- mkConfigReg (fromInteger (verbosity));
// ================================================================