From dcf79403458ebb5c7f92507f95937235f61a4c14 Mon Sep 17 00:00:00 2001
From: dz333 <dzag@cs.cornell.edu>
Date: Thu, 17 Jun 2021 15:21:13 -0400
Subject: [PATCH] fix bug in lsq that caused bad BSV schedule

---
 Makefile                         | 1 -
 bscRuntime/memories/Memories.bsv | 1 +
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index a70dfc7b..213a6dd3 100644
--- a/Makefile
+++ b/Makefile
@@ -23,7 +23,6 @@ clean:
 	@sbt clean
 	@echo
 	@echo "Cleaning BSV Libraries"
-	@$(MAKE) -C $(BSV_LOCKS) clean
 	@$(MAKE) -C $(BSV_MEMS) clean
 	@echo
 
diff --git a/bscRuntime/memories/Memories.bsv b/bscRuntime/memories/Memories.bsv
index 438552fa..fdc9bbd6 100644
--- a/bscRuntime/memories/Memories.bsv
+++ b/bscRuntime/memories/Memories.bsv
@@ -351,6 +351,7 @@ module mkLSQ(BramPort#(addr, elem, MemId#(inflight), n) memwrap,
 					     ldQStr[i][1] <= tagged Invalid;					     
 					     //order this after reserve (so reserve addr ;write addr forwards data appropriately)
 					     if (wmask == '1) ldQData[i][1] <= tagged Valid b;
+					     else ldQData[i][1] <= tagged Invalid;
 					     //If the store doesn't actually write all of the data, we need to do a real load so don't forward
 					  end
 				    end