Hardware
/
litex
mirror of https://github.com/enjoy-digital/litex.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

bus/csr/SRAM: better handling of writes to memories larger than the CSR width

This commit is contained in:
Sebastien Bourdeauducq 2013-05-30 18:45:04 +02:00
parent f0b0942055
commit ebbd5ebcd2
1 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
migen/bus/csr.py
View File

@ -58,13 +58,9 @@ class SRAM(Module):
mem = mem_or_size mem = mem_or_size
else: else:
mem = Memory(data_width, mem_or_size//(data_width//8), init=init) mem = Memory(data_width, mem_or_size//(data_width//8), init=init)
if mem.width > data_width: csrw_per_memw = (mem.width + data_width - 1)//data_width
csrw_per_memw = (mem.width + data_width - 1)//data_width word_bits = log2_int(csrw_per_memw)
word_bits = bits_for(csrw_per_memw-1) page_bits = log2_int(mem.depth*csrw_per_memw, False)
else:
csrw_per_memw = 1
word_bits = 0
page_bits = _compute_page_bits(mem.depth + word_bits)
if page_bits: if page_bits:
self._page = CSRStorage(page_bits, name=mem.name_override + "_page") self._page = CSRStorage(page_bits, name=mem.name_override + "_page")
else: else:
@ -80,8 +76,7 @@ class SRAM(Module):
### ###
port = mem.get_port(write_capable=not read_only, port = mem.get_port(write_capable=not read_only)
we_granularity=data_width if not read_only and word_bits else 0)
self.specials += mem, port self.specials += mem, port
sel = Signal() sel = Signal()
@ -100,9 +95,15 @@ class SRAM(Module):
) )
] ]
if not read_only: if not read_only:
wregs = []
for i in range(csrw_per_memw-1):
wreg = Signal(data_width)
self.sync += If(sel & self.bus.we & (self.bus.adr[:word_bits] == i), wreg.eq(self.bus.dat_w))
wregs.append(wreg)
memword_chunks = [self.bus.dat_w] + list(reversed(wregs))
self.comb += [ self.comb += [
If(sel & self.bus.we, port.we.eq((1 << word_bits) >> self.bus.adr[:self.word_bits])), port.we.eq(sel & self.bus.we & (self.bus.adr[:word_bits] == csrw_per_memw - 1)),
port.dat_w.eq(Replicate(self.bus.dat_w, csrw_per_memw)) port.dat_w.eq(Cat(*memword_chunks))
] ]
else: else:
self.comb += If(sel_r, self.bus.dat_r.eq(port.dat_r)) self.comb += If(sel_r, self.bus.dat_r.eq(port.dat_r))