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

tools/remote/csr_builder: allow comments in csv file and cleanup

This commit is contained in:
Florent Kermarrec 2019-04-24 12:25:49 +02:00
parent e8f3c49127
commit 27fbb814ab
1 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
litex/tools/remote/csr_builder.py
View File

@ -57,7 +57,8 @@ class CSRMemoryRegion:
class CSRBuilder: class CSRBuilder:
def __init__(self, comm, csr_csv, csr_data_width=None): def __init__(self, comm, csr_csv, csr_data_width=None):
self.constants = self.build_constants(csr_csv) self.items = self.get_csr_items(csr_csv)
self.constants = self.build_constants()
# Load csr_data_width from the constants, otherwise it must be provided # Load csr_data_width from the constants, otherwise it must be provided
constant_csr_data_width = self.constants.d.get('csr_data_width', None) constant_csr_data_width = self.constants.d.get('csr_data_width', None)
@ -70,23 +71,25 @@ class CSRBuilder:
csr_data_width, constant_csr_data_width)) csr_data_width, constant_csr_data_width))
self.csr_data_width = csr_data_width self.csr_data_width = csr_data_width
self.bases = self.build_bases(csr_csv) self.bases = self.build_bases()
self.regs = self.build_registers(csr_csv, comm.read, comm.write) self.regs = self.build_registers(comm.read, comm.write)
self.mems = self.build_memories(csr_csv) self.mems = self.build_memories()
def build_bases(self, csr_csv): @staticmethod
csv_reader = csv.reader(open(csr_csv), delimiter=',', quotechar='#') def get_csr_items(csr_csv):
return list(csv.reader(filter(lambda row: row[0] != "#", open(csr_csv))))
def build_bases(self):
d = {} d = {}
for item in csv_reader: for item in self.items:
group, name, addr, dummy0, dummy1 = item group, name, addr, dummy0, dummy1 = item
if group == "csr_base": if group == "csr_base":
d[name] = int(addr.replace("0x", ""), 16) d[name] = int(addr.replace("0x", ""), 16)
return CSRElements(d) return CSRElements(d)
def build_registers(self, csr_csv, readfn, writefn): def build_registers(self, readfn, writefn):
csv_reader = csv.reader(open(csr_csv), delimiter=',', quotechar='#')
d = {} d = {}
for item in csv_reader: for item in self.items:
group, name, addr, length, mode = item group, name, addr, length, mode = item
if group == "csr_register": if group == "csr_register":
addr = int(addr.replace("0x", ""), 16) addr = int(addr.replace("0x", ""), 16)
@ -94,10 +97,9 @@ class CSRBuilder:
d[name] = CSRRegister(readfn, writefn, name, addr, length, self.csr_data_width, mode) d[name] = CSRRegister(readfn, writefn, name, addr, length, self.csr_data_width, mode)
return CSRElements(d) return CSRElements(d)
def build_constants(self, csr_csv): def build_constants(self):
csv_reader = csv.reader(open(csr_csv), delimiter=',', quotechar='#')
d = {} d = {}
for item in csv_reader: for item in self.items:
group, name, value, dummy0, dummy1 = item group, name, value, dummy0, dummy1 = item
if group == "constant": if group == "constant":
try: try:
@ -106,10 +108,9 @@ class CSRBuilder:
d[name] = value d[name] = value
return CSRElements(d) return CSRElements(d)
def build_memories(self, csr_csv): def build_memories(self):
csv_reader = csv.reader(open(csr_csv), delimiter=',', quotechar='#')
d = {} d = {}
for item in csv_reader: for item in self.items:
group, name, base, size, dummy1 = item group, name, base, size, dummy1 = item
if group == "memory_region": if group == "memory_region":
d[name] = CSRMemoryRegion(int(base, 16), int(size)) d[name] = CSRMemoryRegion(int(base, 16), int(size))