Merge branch 'main' of https://github.com/davidharrishmc/riscv-wally into main

wally-pipelined/src/ifu/ifu.sv

@@ -115,6 +115,7 @@ module ifu (
   endgenerate
 
   assign PCFExt = {2'b00, PCF};
+  //
   mmu #(.TLB_ENTRIES(`ITLB_ENTRIES), .IMMU(1))
   immu(.PAdr(PCFExt[`PA_BITS-1:0]),
        .VAdr(PCF),
@@ -158,6 +159,10 @@ module ifu (
   //assign InstrReadF = ~StallD; // *** & ICacheMissF; add later
   // assign InstrReadF = 1; // *** & ICacheMissF; add later
 
+  // conditional
+  // 1. dtim // controlled by `MEM_IROM
+  // 2. cache // `MEM_ICACHE
+  // 3. wire pass-through
   icache icache(.clk, .reset, .StallF, .ExceptionM, .PendingInterruptM, .InstrInF, .InstrAckF,
   .InstrPAdrF, .InstrReadF, .CompressedF, .ICacheStallF, .ITLBMissF, .ITLBWriteF, .FinalInstrRawF,
 

wally-pipelined/src/lsu/lsu.sv

@@ -128,7 +128,9 @@ module lsu
   logic 		       MemAfterIWalkDone;
 
   assign AnyCPUReqM = (|MemRWM)  | (|AtomicM);
-  
+
+  // *** add generate to conditionally create hptw, lsuArb, and mmu
+  // based on `MEM_VIRTMEM
   hptw hptw(.clk(clk),
 	    .reset(reset),
 	    .SATP_REGW(SATP_REGW),
@@ -210,6 +212,7 @@ module lsu
        ); // *** the pma/pmp instruction access faults don't really matter here. is it possible to parameterize which outputs exist?
 
 
+  // Move generate from lrsc to outside this module.
   assign MemReadM = MemRWMtoLRSC[1] & ~(ExceptionM | PendingInterruptMtoDCache) & ~DTLBMissM; // & ~NonBusTrapM & ~DTLBMissM & CurrState != STATE_STALLED;
   lrsc lrsc(.clk, .reset, .FlushW, .StallWtoDCache, .MemReadM, .MemRWMtoLRSC, .AtomicMtoDCache, .MemPAdrM,
             .SquashSCW, .MemRWMtoDCache);
@@ -219,6 +222,7 @@ module lsu
   
 
   // Specify which type of page fault is occurring
+  // *** `MEM_VIRTMEM
   assign DTLBLoadPageFaultM = DTLBPageFaultM & MemRWMtoLRSC[1];
   assign DTLBStorePageFaultM = DTLBPageFaultM & MemRWMtoLRSC[0];
 
@@ -235,6 +239,10 @@ module lsu
   assign LoadMisalignedFaultM = DataMisalignedMfromDCache & MemRWMtoLRSC[1];
   assign StoreMisalignedFaultM = DataMisalignedMfromDCache & MemRWMtoLRSC[0];
 
+  // conditional
+  // 1. dtim // controlled by `MEM_DTIM
+  // 2. cache `MEM_DCACHE
+  // 3. wire pass-through
   dcache dcache(.clk(clk),
 		.reset(reset),
 		.StallWtoDCache(StallWtoDCache),