bank: support raw registers
This commit is contained in:
parent
d21e095397
commit
135a2eb868
|
@ -22,14 +22,20 @@ class Bank:
|
||||||
bwcases = []
|
bwcases = []
|
||||||
for i in range(nregs):
|
for i in range(nregs):
|
||||||
reg = self.description[i]
|
reg = self.description[i]
|
||||||
nfields = len(reg.fields)
|
if reg.raw is None:
|
||||||
bwra = [Constant(i, BV(nbits))]
|
bwra = [Constant(i, BV(nbits))]
|
||||||
|
nfields = len(reg.fields)
|
||||||
for j in range(nfields):
|
for j in range(nfields):
|
||||||
field = reg.fields[j]
|
field = reg.fields[j]
|
||||||
if field.access_bus == WRITE_ONLY or field.access_bus == READ_WRITE:
|
if field.access_bus == WRITE_ONLY or field.access_bus == READ_WRITE:
|
||||||
bwra.append(field.storage.eq(self.interface.d_i[j]))
|
bwra.append(field.storage.eq(self.interface.d_i[j]))
|
||||||
if len(bwra) > 1:
|
if len(bwra) > 1:
|
||||||
bwcases.append(bwra)
|
bwcases.append(bwra)
|
||||||
|
else:
|
||||||
|
comb.append(reg.dev_r.eq(self.interface.d_i[:reg.raw.width]))
|
||||||
|
comb.append(reg.dev_re.eq(self._sel & \
|
||||||
|
self.interface.we_i & \
|
||||||
|
(self.interface.a_i[:nbits] == Constant(i, BV(nbits)))))
|
||||||
if bwcases:
|
if bwcases:
|
||||||
sync.append(If(self._sel & self.interface.we_i, Case(self.interface.a_i[:nbits], *bwcases)))
|
sync.append(If(self._sel & self.interface.we_i, Case(self.interface.a_i[:nbits], *bwcases)))
|
||||||
|
|
||||||
|
@ -37,6 +43,7 @@ class Bank:
|
||||||
brcases = []
|
brcases = []
|
||||||
for i in range(nregs):
|
for i in range(nregs):
|
||||||
reg = self.description[i]
|
reg = self.description[i]
|
||||||
|
if reg.raw is None:
|
||||||
nfields = len(reg.fields)
|
nfields = len(reg.fields)
|
||||||
brs = []
|
brs = []
|
||||||
reg_readable = False
|
reg_readable = False
|
||||||
|
@ -52,6 +59,8 @@ class Bank:
|
||||||
brcases.append([Constant(i, BV(nbits)), self.interface.d_o.eq(f.Cat(*brs))])
|
brcases.append([Constant(i, BV(nbits)), self.interface.d_o.eq(f.Cat(*brs))])
|
||||||
else:
|
else:
|
||||||
brcases.append([Constant(i, BV(nbits)), self.interface.d_o.eq(brs[0])])
|
brcases.append([Constant(i, BV(nbits)), self.interface.d_o.eq(brs[0])])
|
||||||
|
else:
|
||||||
|
brcases.append([Constant(i, BV(nbits)), self.interface.d_o.eq(reg.dev_w)])
|
||||||
if brcases:
|
if brcases:
|
||||||
sync.append(self.interface.d_o.eq(Constant(0, BV(8))))
|
sync.append(self.interface.d_o.eq(Constant(0, BV(8))))
|
||||||
sync.append(If(self._sel, Case(self.interface.a_i[:nbits], *brcases)))
|
sync.append(If(self._sel, Case(self.interface.a_i[:nbits], *brcases)))
|
||||||
|
@ -60,6 +69,7 @@ class Bank:
|
||||||
|
|
||||||
# Device access
|
# Device access
|
||||||
for reg in self.description:
|
for reg in self.description:
|
||||||
|
if reg.raw is None:
|
||||||
for field in reg.fields:
|
for field in reg.fields:
|
||||||
if field.access_dev == READ_ONLY or field.access_dev == READ_WRITE:
|
if field.access_dev == READ_ONLY or field.access_dev == READ_WRITE:
|
||||||
comb.append(field.dev_r.eq(field.storage))
|
comb.append(field.dev_r.eq(field.storage))
|
||||||
|
|
|
@ -1,8 +1,14 @@
|
||||||
from migen.fhdl.structure import *
|
from migen.fhdl.structure import *
|
||||||
|
|
||||||
class Register:
|
class Register:
|
||||||
def __init__(self, name):
|
def __init__(self, name, raw=None):
|
||||||
self.name = name
|
self.name = name
|
||||||
|
self.raw = raw
|
||||||
|
if raw is not None:
|
||||||
|
self.dev_re = Signal(name=name + "_re")
|
||||||
|
self.dev_r = Signal(raw, name + "_r")
|
||||||
|
self.dev_w = Signal(raw, name + "_w")
|
||||||
|
else:
|
||||||
self.fields = []
|
self.fields = []
|
||||||
|
|
||||||
def add_field(self, f):
|
def add_field(self, f):
|
||||||
|
|
Loading…
Reference in New Issue