From: Tobias Platen <tplaten@posteo.de>
Date: Fri, 29 May 2020 15:20:10 +0000 (+0200)
Subject: DataMerger: rename addr_match_i to addr_array_i
X-Git-Tag: div_pipeline~745
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=ae81465fc65fdcd6564b47c8026b12b7b4777058;p=soc.git

DataMerger: rename addr_match_i to addr_array_i
---

diff --git a/src/soc/experiment/l0_cache.py b/src/soc/experiment/l0_cache.py
index ab1e2378..40a46a37 100644
--- a/src/soc/experiment/l0_cache.py
+++ b/src/soc/experiment/l0_cache.py
@@ -195,14 +195,14 @@ class DataMerger(Elaboratable):
         #(1) pick a row
         m.submodules.pick = pick = PriorityEncoder(self.array_size)
         for j in range(self.array_size):
-            comb += pick.i[j].eq(self.addr_match_i[j].bool())
+            comb += pick.i[j].eq(self.addr_array_i[j].bool())
         valid = ~pick.n
         idx = pick.o
         #(2) merge
         with m.If(valid):
             l = []
             for j in range(self.array_size):
-                select = self.addr_match_i[idx][j]
+                select = self.addr_array_i[idx][j]
                 l.append(Mux(select, self.data_i[j], 0))
             comb += self.data_o.eq(ortreereduce(l))