Clean up some stuff

This commit is contained in:
Jarred Allen 2021-03-25 00:46:51 -04:00
parent 15e786da0b
commit fdecd6c56c
3 changed files with 4 additions and 5 deletions

View File

@ -71,7 +71,7 @@ module ahblite (
output logic [3:0] HSIZED, output logic [3:0] HSIZED,
output logic HWRITED, output logic HWRITED,
// Stalls // Stalls
output logic InstrStall,/*InstrUpdate, */DataStall output logic /*InstrUpdate, */DataStall
// *** add a chip-level ready signal as part of handshake // *** add a chip-level ready signal as part of handshake
); );
@ -135,8 +135,7 @@ module ahblite (
// stall signals // stall signals
assign #2 DataStall = (NextBusState == MEMREAD) || (NextBusState == MEMWRITE) || assign #2 DataStall = (NextBusState == MEMREAD) || (NextBusState == MEMWRITE) ||
(NextBusState == ATOMICREAD) || (NextBusState == ATOMICWRITE) || (NextBusState == ATOMICREAD) || (NextBusState == ATOMICWRITE);
(NextBusState == MMUTRANSLATE) || (NextBusState == MMUIDLE);
// *** Could get finer grained stalling if we distinguish between MMU // *** Could get finer grained stalling if we distinguish between MMU
// instruction address translation and data address translation // instruction address translation and data address translation
assign #1 InstrStall = (NextBusState == INSTRREAD) || (NextBusState == INSTRREADC) || assign #1 InstrStall = (NextBusState == INSTRREAD) || (NextBusState == INSTRREADC) ||

View File

@ -29,7 +29,7 @@ module hazard(
// Detect hazards // Detect hazards
input logic BPPredWrongE, CSRWritePendingDEM, RetM, TrapM, input logic BPPredWrongE, CSRWritePendingDEM, RetM, TrapM,
input logic LoadStallD, MulDivStallD, CSRRdStallD, input logic LoadStallD, MulDivStallD, CSRRdStallD,
input logic InstrStall, DataStall, ICacheStallF, input logic DataStall, ICacheStallF,
// Stall & flush outputs // Stall & flush outputs
output logic StallF, StallD, StallE, StallM, StallW, output logic StallF, StallD, StallE, StallM, StallW,
output logic FlushF, FlushD, FlushE, FlushM, FlushW output logic FlushF, FlushD, FlushE, FlushM, FlushW

View File

@ -111,7 +111,7 @@ module wallypipelinedhart (
logic [`XLEN-1:0] InstrPAdrF; logic [`XLEN-1:0] InstrPAdrF;
logic [`XLEN-1:0] InstrRData; logic [`XLEN-1:0] InstrRData;
logic InstrReadF; logic InstrReadF;
logic DataStall, InstrStall; logic DataStall;
logic InstrAckF, MemAckW; logic InstrAckF, MemAckW;
logic BPPredWrongE, BPPredWrongM; logic BPPredWrongE, BPPredWrongM;