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

Some cleanups.

Browse Source
This commit is contained in:
Jonathan Woodruff
2021-11-02 18:08:22 +00:00
parent 56173bf2c2
commit 7437c0c5e7
3 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -384,6 +384,7 @@ module mkRenameStage#(RenameInput inIfc)(RenameStage);
spec_bits: specTagManager.currentSpecBits
`ifdef RVFI_DII
, dii_pid: x.dii_pid
, traceBundle: unpack(0)
`endif
};
rob.enqPort[0].enq(y);
@@ -595,6 +596,7 @@ module mkRenameStage#(RenameInput inIfc)(RenameStage);
spec_bits: spec_bits
`ifdef RVFI_DII
, dii_pid: x.dii_pid
, traceBundle: unpack(0)
`endif
};
rob.enqPort[0].enq(y);
@@ -1147,6 +1149,7 @@ module mkRenameStage#(RenameInput inIfc)(RenameStage);
spec_bits: spec_bits
`ifdef RVFI_DII
, dii_pid: x.dii_pid
, traceBundle: unpack(0)
`endif
};
rob.enqPort[i].enq(y);

4
src_Core/RISCY_OOO/procs/lib/DirPredictor.bsv
View File

@@ -63,6 +63,10 @@ typedef GShareTrainInfo DirPredTrainInfo;
typedef TourTrainInfo DirPredTrainInfo;
`endif
<<<<<<< Updated upstream
=======
>>>>>>> Stashed changes
(* synthesize *)
module mkDirPredictor(DirPredictor#(DirPredTrainInfo));
`ifdef DIR_PRED_BHT

10
src_Core/RISCY_OOO/procs/lib/ReorderBuffer.bsv
View File

@@ -479,15 +479,7 @@ module mkReorderBufferRowEhr(ReorderBufferRowEhr#(aluExeNum, fpuMulDivExeNum)) p
dii_pid: dii_pid,
`endif
`ifdef RVFI
traceBundle: case (ppc_vaddr_csrData[pvc_deq_port]) matches
tagged VAddr .v: begin
case (lsqTag) matches
tagged Ld .l: return traceBundle[traceBundle_deq_port];
default: return traceBundle[traceBundle_deq_port];
endcase
end
default: return traceBundle[traceBundle_deq_port];
endcase,
traceBundle: traceBundle[traceBundle_deq_port],
`endif
spec_bits: spec_bits[sb_deq_port]
};