Lab_NHMFL
/
upsilon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

swic.py: Fix generation of constants for control loop parameters

This commit is contained in:
Peter McGoron 2024-02-28 13:37:50 +00:00
parent 75d7f298e2
commit 35f55c8e1d
1 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
gateware/swic.py
View File

@ -125,7 +125,7 @@ class RegisterInterface(LiteXModule):
or CPU-read pico-write. These registers are stored as flip-flops. """ or CPU-read pico-write. These registers are stored as flip-flops. """
def __init__(self, registers): def __init__(self, registers):
""" """
:param registers: List of instances of SpecialRegister. :param special_registers: List of instances of SpecialRegister.
""" """
self.picobus = Interface(data_width = 32, address_width = 32, addressing="byte") self.picobus = Interface(data_width = 32, address_width = 32, addressing="byte")
@ -135,11 +135,9 @@ class RegisterInterface(LiteXModule):
main_case = {"default": self.picobus.dat_r.eq(0xEDACAF)} main_case = {"default": self.picobus.dat_r.eq(0xEDACAF)}
# Tuple list of (SpecialRegister, offset) # Tuple list of (SpecialRegister, offset)
self.registers = [] self.registers = [(reg, num*0x4) for num, reg in enumerate(registers)]
for num, reg in enumerate(registers):
self.registers.append((reg, num*0x4))
for reg, off in self.registers:
# Round up the width of the stored signal to a multiple of 8. # Round up the width of the stored signal to a multiple of 8.
wid = round_up_to_word(reg.width) wid = round_up_to_word(reg.width)
sig = Signal(wid) sig = Signal(wid)
@ -160,17 +158,17 @@ class RegisterInterface(LiteXModule):
return writes return writes
if reg.direction == "PR": if reg.direction == "PR":
pico_case[num*4] = self.picobus.dat_r.eq(sig) pico_case[off] = self.picobus.dat_r.eq(sig)
main_case[num*4] = If(self.mainbus.we, main_case[off] = If(self.mainbus.we,
*make_write_case(self.mainbus)).Else( *make_write_case(self.mainbus)).Else(
self.mainbus.dat_r.eq(sig)) self.mainbus.dat_r.eq(sig))
else: else:
main_case[num*4] = self.mainbus.dat_r.eq(sig) main_case[off] = self.mainbus.dat_r.eq(sig)
pico_case[num*4] = If(self.picobus.we, pico_case[off] = If(self.picobus.we,
*make_write_case(self.picobus)).Else( *make_write_case(self.picobus)).Else(
self.picobus.dat_r.eq(sig)) self.picobus.dat_r.eq(sig))
self.width = round_up_to_pow_2(len(registers)*0x4) self.width = round_up_to_pow_2(sum([off for _, off in self.registers]))
# Since array indices are exclusive in python (unlike in Verilog), # Since array indices are exclusive in python (unlike in Verilog),
# use the bit length of the power of 2, not the bit length of the # use the bit length of the power of 2, not the bit length of the
# maximum addressable value. # maximum addressable value.
@ -187,11 +185,11 @@ class RegisterInterface(LiteXModule):
# Generate addresses # Generate addresses
self.public_registers = {} self.public_registers = {}
for reg, off in self.public_registers: for reg, off in self.registers:
self.addresses[reg.name] = { self.public_registers[reg.name] = {
"width" : reg.width, "width" : reg.width,
"direction" : reg.direction, "direction" : reg.direction,
"offset": off "origin": off,
} }
class RegisterRead(LiteXModule): class RegisterRead(LiteXModule):