From 70a84b56c8652b57898e14ecfabebc14569358b4 Mon Sep 17 00:00:00 2001
From: Noah Limpert <nlimpert@g.hmc.edu>
Date: Wed, 17 Nov 2021 12:39:05 -0800
Subject: [PATCH] Updated IFU variable naming for clarity

---
 .../src/wally/wallypipelinedhart.sv           | 47 ++++++++++++-------
 1 file changed, 31 insertions(+), 16 deletions(-)

diff --git a/wally-pipelined/src/wally/wallypipelinedhart.sv b/wally-pipelined/src/wally/wallypipelinedhart.sv
index 1cecad7c0..439a764b0 100644
--- a/wally-pipelined/src/wally/wallypipelinedhart.sv
+++ b/wally-pipelined/src/wally/wallypipelinedhart.sv
@@ -155,26 +155,41 @@ module wallypipelinedhart (
 
   
   ifu ifu(
-    .clk, .reset, 
-    .StallF, .StallD, .StallE, .StallM, .StallW, 
-    .FlushF, .FlushD, .FlushE, .FlushM, .FlushW, 
-    .InstrInF(InstrRData), .InstrAckF, .PCF, .InstrPAdrF, .InstrReadF, .ICacheStallF, 
+    .clk, .reset,
+    .StallF, .StallD, .StallE, .StallM, .StallW,
+    .FlushF, .FlushD, .FlushE, .FlushM, .FlushW,
+
+    // Fetch
+    .InstrInF(InstrRData), .InstrAckF, .PCF, .InstrPAdrF,
+    .InstrReadF, .ICacheStallF,
+
+    // Execute
     .PCLinkE, .PCSrcE, .PCTargetE, .PCE,
     .BPPredWrongE, 
-    .RetM, .TrapM, 
-    .PrivilegedNextPCM, .InvalidateICacheM,
-    .InstrD, .InstrM, 
-    .PCM, .InstrClassM, 
-    .BPPredDirWrongM,.BTBPredPCWrongM,.RASPredPCWrongM, .BPPredClassNonCFIWrongM,
-    .IllegalBaseInstrFaultD, .ITLBInstrPageFaultF, .IllegalIEUInstrFaultD,
-    .InstrMisalignedFaultM, .InstrMisalignedAdrM,
+  
+    // Mem
+    .RetM, .TrapM, .PrivilegedNextPCM, .InvalidateICacheM,
+    .InstrD, .InstrM, . PCM, .InstrClassM, .BPPredDirWrongM,
+    .BTBPredPCWrongM, .RASPredPCWrongM, .BPPredClassNonCFIWrongM,
+  
+    // Writeback
+
+    // output logic
+    // Faults
+    .IllegalBaseInstrFaultD, .ITLBInstrPageFaultF,
+    .IllegalIEUInstrFaultD, .InstrMisalignedFaultM,
+    .InstrMisalignedAdrM,
+
+    // mmu management
     .PrivilegeModeW, .PTE, .PageType, .SATP_REGW,
-    .STATUS_MXR, .STATUS_SUM, .STATUS_MPRV, .STATUS_MPP,
-    .ITLBWriteF, .ITLBFlushF,
-    .WalkerInstrPageFaultF,
-    .ITLBMissF,
-    .PMPCFG_ARRAY_REGW, .PMPADDR_ARRAY_REGW, 
+    .STATUS_MXR, .STATUS_SUM, .STATUS_MPRV,
+    .STATUS_MPP, .ITLBWriteF, .ITLBFlushF,
+    .WalkerInstrPageFaultF, .ITLBMissF,
+
+    // pmp/pma (inside mmu) signals.  *** temporarily from AHB bus but eventually replace with internal versions pre H
+    .PMPCFG_ARRAY_REGW,  .PMPADDR_ARRAY_REGW,
     .InstrAccessFaultF
+
 	  
 	  ); // instruction fetch unit: PC, branch prediction, instruction cache