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

Revert "Give commit redirect priority over branch/execute redirect."

Browse Source 
This reverts commit 7bc17965b6.
This commit is contained in:
Jonathan Woodruff
2025-07-03 11:46:43 +01:00
parent d8d7fc3d2b
commit 86c1c65261
1 changed files with 1 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src_Core/CPU/Core.bsv
View File

@@ -337,8 +337,6 @@ module mkCore#(CoreId coreId)(Core);
endinterface); endinterface);
MMIOCore mmio <- mkMMIOCore(mmioInIfc); MMIOCore mmio <- mkMMIOCore(mmioInIfc);
PulseWire commitRedirect <- mkPulseWire;
// fix point module to instantiate other function units // fix point module to instantiate other function units
module mkCoreFixPoint#(CoreFixPoint fix)(CoreFixPoint); module mkCoreFixPoint#(CoreFixPoint fix)(CoreFixPoint);
// spec update // spec update
@@ -422,7 +420,7 @@ module mkCore#(CoreId coreId)(Core);
method setRegReadyAggr = writeAggr(aluWrAggrPort(i)); method setRegReadyAggr = writeAggr(aluWrAggrPort(i));
interface sendBypass = sendBypassIfc; interface sendBypass = sendBypassIfc;
method writeRegFile = writeCons(aluWrConsPort(i)); method writeRegFile = writeCons(aluWrConsPort(i));
method Action redirect(CapMem new_pc, SpecTag spec_tag, InstTag inst_tag, SpecBits spec_bits) if (!commitRedirect); method Action redirect(CapMem new_pc, SpecTag spec_tag, InstTag inst_tag, SpecBits spec_bits);
if (verbose) begin if (verbose) begin
$display("[ALU redirect - %d] ", i, fshow(new_pc), $display("[ALU redirect - %d] ", i, fshow(new_pc),
"; ", fshow(spec_tag), "; ", fshow(inst_tag)); "; ", fshow(spec_tag), "; ", fshow(inst_tag));
@@ -528,7 +526,6 @@ module mkCore#(CoreId coreId)(Core);
interface memExeIfc = memExe; interface memExeIfc = memExe;
method Action killAll; method Action killAll;
globalSpecUpdate.incorrectSpec(True, ?, ?, 0); globalSpecUpdate.incorrectSpec(True, ?, ?, 0);
commitRedirect.send();
endmethod endmethod
interface doStatsIfc = doStatsReg; interface doStatsIfc = doStatsReg;
method pendingIncorrectSpec = globalSpecUpdate.pendingIncorrectSpec; method pendingIncorrectSpec = globalSpecUpdate.pendingIncorrectSpec;