DataMerger: rename addr_match_i to addr_array_i
authorTobias Platen <tplaten@posteo.de>
Fri, 29 May 2020 15:20:10 +0000 (17:20 +0200)
committerTobias Platen <tplaten@posteo.de>
Fri, 29 May 2020 15:20:10 +0000 (17:20 +0200)
src/soc/experiment/l0_cache.py

index ab1e23781c73785c5b7efc203d7bf4894e15e211..40a46a3790de2372ce1124cb4cbb76440ff8b176 100644 (file)
@@ -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))