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

Merge pull request #29 from CTSRD-CHERI/faf28_fix_rvfi_offset

Browse Source 
Fixed pc_wdata to be addresses instead of offsets
This commit is contained in:
Franz Fuchs
2024-12-16 12:19:26 +00:00
committed by GitHub
parent cf73e1a927 2983835e26
commit 995b978e59
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src_Core/RISCY_OOO/procs/RV64G_OOO/CommitStage.bsv
View File

@@ -257,7 +257,7 @@ function Maybe#(RVFI_DII_Execution#(DataSz,DataSz)) genRVFI(ToReorderBuffer rot,
end
tagged PPC .ppc: begin
CapPipe cp = cast(ppc);
next_pc = getOffset(cp);
next_pc = getAddr(cp);
end
tagged CSRData .csrdata: if (rot.iType == Csr) data = getAddr(csrdata);
endcase
@@ -1177,7 +1177,7 @@ module mkCommitStage#(CommitInput inIfc)(CommitStage);
if (verbose) $display("%t : [doCommitNormalInst - %d] ", $time(), i, fshow(inst_tag), " ; ", fshow(x));
`ifdef RVFI
CapPipe pipePc = cast(x.pc);
rvfis[i] = genRVFI(x, traceCnt + zeroExtend(whichTrace), getTSB(), getOffset(pipePc) + (is_16b_inst(x.orig_inst) ? 2:4), inIfc.lookupPAddr[i].sub(x.lsqTag));
rvfis[i] = genRVFI(x, traceCnt + zeroExtend(whichTrace), getTSB(), getAddr(pipePc) + (is_16b_inst(x.orig_inst) ? 2:4), inIfc.lookupPAddr[i].sub(x.lsqTag));
whichTrace = whichTrace + 1;
`endif