mirror of
https://github.com/openhwgroup/cvw
synced 2025-02-11 06:05:49 +00:00
.* resolved in ifu.sv
This commit is contained in:
parent
2a77bc8053
commit
e4f214090d
@ -141,7 +141,7 @@ module ifu (
|
|||||||
.STATUS_MPP,
|
.STATUS_MPP,
|
||||||
.PrivilegeModeW,
|
.PrivilegeModeW,
|
||||||
.InstrAccessFaultF,
|
.InstrAccessFaultF,
|
||||||
.PMPCFG_ARRAY_REGW, //bitfields?
|
.PMPCFG_ARRAY_REGW,
|
||||||
.PMPADDR_ARRAY_REGW
|
.PMPADDR_ARRAY_REGW
|
||||||
);
|
);
|
||||||
|
|
||||||
@ -158,7 +158,9 @@ module ifu (
|
|||||||
//assign InstrReadF = ~StallD; // *** & ICacheMissF; add later
|
//assign InstrReadF = ~StallD; // *** & ICacheMissF; add later
|
||||||
// assign InstrReadF = 1; // *** & ICacheMissF; add later
|
// assign InstrReadF = 1; // *** & ICacheMissF; add later
|
||||||
|
|
||||||
icache icache(.*,
|
icache icache(.clk, .reset, .StallF, .ExceptionM, .PendingInterruptM, .InstrInF, .InstrAckF,
|
||||||
|
.InstrPAdrF, .InstrReadF, .CompressedF, .ICacheStallF, .ITLBMissF, .ITLBWriteF, .FinalInstrRawF,
|
||||||
|
|
||||||
.PCNextF(PCNextFPhys),
|
.PCNextF(PCNextFPhys),
|
||||||
.PCPF(PCPFmmu),
|
.PCPF(PCPFmmu),
|
||||||
.WalkerInstrPageFaultF,
|
.WalkerInstrPageFaultF,
|
||||||
@ -206,7 +208,11 @@ module ifu (
|
|||||||
generate
|
generate
|
||||||
if (`BPRED_ENABLED == 1) begin : bpred
|
if (`BPRED_ENABLED == 1) begin : bpred
|
||||||
// I am making the port connection explicit for now as I want to see them and they will be changing.
|
// I am making the port connection explicit for now as I want to see them and they will be changing.
|
||||||
bpred bpred(.*,
|
|
||||||
|
bpred bpred(.clk, .reset,
|
||||||
|
.StallF, .StallD, .StallE,
|
||||||
|
.FlushF, .FlushD, .FlushE,
|
||||||
|
|
||||||
.PCNextF(PCNextF),
|
.PCNextF(PCNextF),
|
||||||
.BPPredPCF(BPPredPCF),
|
.BPPredPCF(BPPredPCF),
|
||||||
.SelBPPredF(SelBPPredF),
|
.SelBPPredF(SelBPPredF),
|
||||||
@ -248,7 +254,8 @@ module ifu (
|
|||||||
flopenrc #(`XLEN) PCDReg(clk, reset, FlushD, ~StallD, PCF, PCD);
|
flopenrc #(`XLEN) PCDReg(clk, reset, FlushD, ~StallD, PCF, PCD);
|
||||||
|
|
||||||
// expand 16-bit compressed instructions to 32 bits
|
// expand 16-bit compressed instructions to 32 bits
|
||||||
decompress decomp(.*);
|
|
||||||
|
decompress decomp(.InstrRawD, .InstrD, .IllegalCompInstrD);
|
||||||
assign IllegalIEUInstrFaultD = IllegalBaseInstrFaultD | IllegalCompInstrD; // illegal if bad 32 or 16-bit instr
|
assign IllegalIEUInstrFaultD = IllegalBaseInstrFaultD | IllegalCompInstrD; // illegal if bad 32 or 16-bit instr
|
||||||
// *** combine these with others in better way, including M, F
|
// *** combine these with others in better way, including M, F
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user