X-Git-Url: http://git.joshuawise.com/firearm.git/blobdiff_plain/30066e0689c34c97bcc69d8fe0e5d8ac53b1296c..4dc317445bd5132ca57744d7faf27731ea10d3b9:/DCache.v

diff --git a/DCache.v b/DCache.v
index a3484a7..ccaa6b1 100644
--- a/DCache.v
+++ b/DCache.v
@@ -30,8 +30,8 @@ module DCache(
 	reg cache_valid [15:0];
 	reg [21:0] cache_tags [15:0];
 	reg [31:0] cache_data [15:0 /* line */] [15:0 /* word */];
-	
-	reg [4:0] i;
+
+	integer i;	
 	initial
 		for (i = 0; i < 16; i = i + 1)
 		begin
@@ -79,13 +79,15 @@ module DCache(
 		if (rd_req && (cache_fill_pos != 0) && ((prev_addr != {addr[31:6], 6'b0}) || cache_hit))	/* If this wasn't from the same line, or we've moved on somehow, reset the fill circuitry. */
 			cache_fill_pos <= 0;
 		else if (rd_req && !cache_hit) begin
-			if (bus_ready) begin	/* Started the fill, and we have data. */
+			if (bus_ready && bus_ack) begin	/* Started the fill, and we have data. */
+				$display("DCACHE: FILL: rd addr %08x; bus addr %08x; bus data %08x, bus_req %d, bus_ack %d", addr, bus_addr, bus_rdata, bus_req, bus_ack);
 				cache_data[idx][cache_fill_pos] <= bus_rdata;
 				cache_fill_pos <= cache_fill_pos + 1;
 				if (cache_fill_pos == 15) begin	/* Done? */
 					cache_tags[idx] <= tag;
 					cache_valid[idx] <= 1;
-				end
+				end else
+					cache_valid[idx] <= 0;
 			end
 		end else if (wr_req && cache_hit)
 			cache_data[idx][addr[5:2]] = wr_data;