From 243728d089ec7b50fb7a5dc4f2df37f4885b6e74 Mon Sep 17 00:00:00 2001
From: Ross Thompson <ross1728@gmail.com>
Date: Tue, 28 Dec 2021 11:18:47 -0600
Subject: [PATCH] Moved all bus logic outside the dcache.  Still needs cleanup.

---
 wally-pipelined/src/lsu/lsu.sv | 25 +++++++------------------
 1 file changed, 7 insertions(+), 18 deletions(-)

diff --git a/wally-pipelined/src/lsu/lsu.sv b/wally-pipelined/src/lsu/lsu.sv
index 97f4c9d4..7b84e142 100644
--- a/wally-pipelined/src/lsu/lsu.sv
+++ b/wally-pipelined/src/lsu/lsu.sv
@@ -470,6 +470,9 @@ module lsu
 	
 	case(BusCurrState)
 	  STATE_BUS_READY: begin
+		if(IgnoreRequest) begin
+		  BusNextState = STATE_BUS_READY;
+		end else
 		// uncache write
 		if(MemRWMtoDCache[0] & ~CacheableMtoDCache) begin
 		  BusNextState = STATE_BUS_UNCACHED_WRITE;
@@ -537,39 +540,25 @@ module lsu
 		CommittedMfromBus = 1'b1;
 		
         if (FetchCountFlag & DCfromAHBAck) begin
-          BusNextState = STATE_BUS_FETCH_DONE;
+          BusNextState = STATE_BUS_READY;
+		  BUSACK = 1'b1;
         end else begin
           BusNextState = STATE_BUS_FETCH_WDV;
         end
       end
 
-      STATE_BUS_FETCH_DONE: begin
-		BusStall = 1'b1;
-        CntReset = 1'b1;
-		CommittedMfromBus = 1'b1;
-		BusNextState = STATE_BUS_READY;
-		BUSACK = 1'b1;
-      end
-	  
       STATE_BUS_EVICT_DIRTY: begin
 		BusStall = 1'b1;
         PreCntEn = 1'b1;
 		DCtoAHBWriteM = 1'b1;
 		CommittedMfromBus = 1'b1;
 		if(FetchCountFlag & DCfromAHBAck) begin
-		  BusNextState = STATE_BUS_WRITE_CACHE_BLOCK;
+		  BusNextState = STATE_BUS_READY;
+		  BUSACK = 1'b1;
 		end else begin
 		  BusNextState = STATE_BUS_EVICT_DIRTY;
 		end	  
       end
-		
-      STATE_BUS_WRITE_CACHE_BLOCK: begin
-		BusStall = 1'b1;
-        CntReset = 1'b1;
-		CommittedMfromBus = 1'b1;
-		BusNextState = STATE_BUS_READY;
-		BUSACK = 1'b1;
-      end
 	endcase
   end