From: Luke Kenneth Casson Leighton <lkcl@lkcl.net>
Date: Wed, 30 Sep 2020 12:52:17 +0000 (+0100)
Subject: clean up row store and wb adr in icache
X-Git-Tag: 24jan2021_ls180~267
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=b60a20e624d3e1a8dde8e4d9f6ae2cc7002c42fc;p=soc.git

clean up row store and wb adr in icache
---

diff --git a/src/soc/experiment/icache.py b/src/soc/experiment/icache.py
index 0c942538..4788fda2 100644
--- a/src/soc/experiment/icache.py
+++ b/src/soc/experiment/icache.py
@@ -939,6 +939,7 @@ class ICache(Elaboratable):
                               is_last_row(r.store_row, r.end_row_ix)):
                         # Complete wishbone cycle
                         sync += r.wb.cyc.eq(0)
+                        sync += r.req_adr.eq(0) # be nice, clear addr
 
                         # Cache line is now valid
                         cv = Signal(INDEX_BITS)
@@ -950,20 +951,23 @@ class ICache(Elaboratable):
 
                         sync += r.state.eq(State.IDLE)
 
-                    # Increment store row counter
-                    sync += r.store_row.eq(next_row(r.store_row))
-
-                    # Calculate the next row address
-                    rarange = Signal(LINE_OFF_BITS - ROW_OFF_BITS)
-                    comb += rarange.eq(
-                             r.req_adr[ROW_OFF_BITS:LINE_OFF_BITS] + 1
-                            )
-                    sync += r.req_adr[ROW_OFF_BITS:LINE_OFF_BITS].eq(
-                             rarange
-                            )
-                    sync += Display("RARANGE r.req_adr:%x rarange:%x "
-                                    "stbs_zero:%x stbs_done:%x",
-                                    r.req_adr, rarange, stbs_zero, stbs_done)
+                    # not completed, move on to next request in row
+                    with m.Else():
+                        # Increment store row counter
+                        sync += r.store_row.eq(next_row(r.store_row))
+
+                        # Calculate the next row address
+                        rarange = Signal(LINE_OFF_BITS - ROW_OFF_BITS)
+                        comb += rarange.eq(
+                                 r.req_adr[ROW_OFF_BITS:LINE_OFF_BITS] + 1
+                                )
+                        sync += r.req_adr[ROW_OFF_BITS:LINE_OFF_BITS].eq(
+                                 rarange
+                                )
+                        sync += Display("RARANGE r.req_adr:%x rarange:%x "
+                                        "stbs_zero:%x stbs_done:%x",
+                                        r.req_adr, rarange,
+                                        stbs_zero, stbs_done)
 
 
         # TLB miss and protection fault processing