X-Git-Url: http://git.joshuawise.com/firearm.git/blobdiff_plain/8b417b452a3b1f51f7cec4d2daed4c902607f000..fd003c7a793fb17fb6dc7ba52873b883b28a578b:/ICache.v

diff --git a/ICache.v b/ICache.v
index 8106259..e6754b7 100644
--- a/ICache.v
+++ b/ICache.v
@@ -32,7 +32,7 @@ module ICache(
 	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
@@ -48,10 +48,11 @@ module ICache(
 	reg [31:0] prev_rd_addr = 32'hFFFFFFFF;
 	
 	wire cache_hit = cache_valid[rd_idx] && (cache_tags[rd_idx] == rd_tag);
-	
-	always @(*) begin	/* XXX does this work nowadays? */
+
+	wire [31:0] curdata = cache_data[rd_idx][rd_didx_word];
+	always @(*) begin
 		rd_wait = rd_req && !cache_hit;
-		rd_data = cache_data[rd_idx][rd_didx_word];
+		rd_data = curdata;
 	end
 	
 	reg [3:0] cache_fill_pos = 0;
@@ -70,14 +71,16 @@ module ICache(
 		if (cache_fill_pos != 0 && ((prev_rd_addr != {rd_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_ack && bus_ready) begin	/* Started the fill, and we have data. */
 				$display("ICACHE: FILL: rd addr %08x; bus addr %08x; bus data %08x", rd_addr, bus_addr, bus_rdata);
 				cache_data[rd_idx][cache_fill_pos] <= bus_rdata;
 				cache_fill_pos <= cache_fill_pos + 1;
 				if (cache_fill_pos == 15) begin	/* Done? */
 					cache_tags[rd_idx] <= rd_tag;
 					cache_valid[rd_idx] <= 1;
-				end
+					$display("ICACHE: Fill complete for line %x, tag %x", rd_idx, rd_tag);
+				end else
+					cache_valid[rd_idx] <= 0;
 			end
 		end
 	end