From cb3d71a63ddcd4092f0c4b51593c3dafc33e7c9d Mon Sep 17 00:00:00 2001
From: Ross Thompson <ross1728@gmail.com>
Date: Fri, 11 Feb 2022 22:27:27 -0600
Subject: [PATCH] Reduced complexity of the address selection during flush.

---
 pipelined/src/cache/cache.sv    | 4 ++--
 pipelined/src/cache/cachefsm.sv | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pipelined/src/cache/cache.sv b/pipelined/src/cache/cache.sv
index 4e4dd67e8..bf34a680b 100644
--- a/pipelined/src/cache/cache.sv
+++ b/pipelined/src/cache/cache.sv
@@ -71,8 +71,8 @@ module cache #(parameter LINELEN,  NUMLINES,  NUMWAYS, DCACHE = 1) (
   logic [1:0]                 SelAdr;
   logic [SETLEN-1:0]          RAdr;
   logic [LINELEN-1:0]         CacheWriteData;
-  logic                       SetValid, ClearValid;
-  logic                       SetDirty, ClearDirty;
+  logic                       ClearValid;
+  logic                       ClearDirty;
   logic [LINELEN-1:0]         ReadDataLineWay [NUMWAYS-1:0];
   logic [NUMWAYS-1:0]         WayHit;
   logic                       CacheHit;
diff --git a/pipelined/src/cache/cachefsm.sv b/pipelined/src/cache/cachefsm.sv
index c0e4a29de..3b9201fa1 100644
--- a/pipelined/src/cache/cachefsm.sv
+++ b/pipelined/src/cache/cachefsm.sv
@@ -236,10 +236,10 @@ module cachefsm
                       (CurrState == STATE_CPU_BUSY & (CPUBusy & `REPLAY)) |
                       resetDelay) ? 2'b01 :
                      ((CurrState == STATE_FLUSH) | 
-                      (CurrState == STATE_FLUSH_CHECK & ~(VictimDirty & FlushFlag)) |
+                      (CurrState == STATE_FLUSH_CHECK) |
                       (CurrState == STATE_FLUSH_INCR) |
                       (CurrState == STATE_FLUSH_WRITE_BACK) |
-                      (CurrState == STATE_FLUSH_CLEAR_DIRTY & ~(FlushFlag))) ? 2'b10 : 
+                      (CurrState == STATE_FLUSH_CLEAR_DIRTY)) ? 2'b10 : 
                      2'b00;