Dennis/srdl2sv
1
0
Fork 0
mirror of https://github.com/Silicon1602/srdl2sv.git synced 2024-11-14 03:03:35 +00:00
Code Issues Projects Releases Wiki Activity

Add check for uniqueness of enum member names within a scope

Browse Source
This commit is contained in:
Dennis Potter 2021-06-03 16:46:49 +02:00
parent ec492d619a
commit f4432f5b49
Signed by: Dennis
GPG Key ID: 186A8AD440942BAF
2 changed files with 39 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
srdl2sv/components/addrmap.py
View File

@ -1,5 +1,6 @@
import re import re
import importlib.resources as pkg_resources import importlib.resources as pkg_resources
from sys import exit
import yaml import yaml
from systemrdl import node from systemrdl import node
@ -127,14 +128,21 @@ class AddrMap(Component):
output_ports_rtl[-1] = output_ports_rtl[-1].rstrip(',') output_ports_rtl[-1] = output_ports_rtl[-1].rstrip(',')
import_package_list = [] import_package_list = []
[import_package_list.append( try:
AddrMap.templ_dict['import_package']['rtl'].format( import_package_list = [[
name = self.name)) for x in self.get_package_names()] AddrMap.templ_dict['import_package']['rtl'].format(
name = self.name),
',\n'
] for x in self.get_package_names()][0][:-1]
import_package_list.append(';')
except IndexError:
pass
self.rtl_header.append( self.rtl_header.append(
AddrMap.templ_dict['module_declaration']['rtl'].format( AddrMap.templ_dict['module_declaration']['rtl'].format(
name = self.name, name = self.name,
import_package_list = ',\n'.join(import_package_list), import_package_list = ''.join(import_package_list),
resets = '\n'.join(reset_ports_rtl), resets = '\n'.join(reset_ports_rtl),
inputs = '\n'.join(input_ports_rtl), inputs = '\n'.join(input_ports_rtl),
outputs = '\n'.join(output_ports_rtl))) outputs = '\n'.join(output_ports_rtl)))
@ -191,11 +199,18 @@ class AddrMap(Component):
return names return names
def get_package_rtl(self, tab_width: int = 4, real_tabs = False) -> dict(): def get_package_rtl(self, tab_width: int = 4, real_tabs = False) -> dict():
if not self.config['enums']:
return dict()
# First go through all registers in this scope to generate a package # First go through all registers in this scope to generate a package
package_rtl = [] package_rtl = []
enum_rtl = [] enum_rtl = []
rtl_return = dict() rtl_return = dict()
# Need to keep track of enum names since they shall be unique
# per scope
enum_members = dict()
for i in self.registers.values(): for i in self.registers.values():
for key, value in i.get_typedefs().items(): for key, value in i.get_typedefs().items():
variable_list = [] variable_list = []
@ -204,6 +219,25 @@ class AddrMap(Component):
max([len(x[0]) for x in value.members]), 40) max([len(x[0]) for x in value.members]), 40)
for var in value.members: for var in value.members:
if var[0] not in enum_members:
enum_members[var[0]] = "::".join([self.name, key])
else:
self.logger.fatal(
"Enum member '{}' was found at multiple locations in the same "\
"main scope: \n"\
" -- 1st occurance: '{}'\n"\
" -- 2nd occurance: '{}'\n\n"\
"This is not legal because all these enums will be defined "\
"in the same SystemVerilog scope. To share the same enum among "\
"different registers, define them on a higher level in the "\
"hierarchy.\n\n"\
"Exiting...".format(
var[0],
enum_members[var[0]],
"::".join([self.name, key])))
exit(1)
variable_list.append( variable_list.append(
AddrMap.templ_dict['enum_var_list_item']['rtl'].format( AddrMap.templ_dict['enum_var_list_item']['rtl'].format(
value = var[1], value = var[1],

2
srdl2sv/components/templates/addrmap.yaml
View File

@ -2,7 +2,7 @@
module_declaration: module_declaration:
rtl: |- rtl: |-
module {name} module {name}
{import_package_list}; {import_package_list}
( (
// Clock & Resets // Clock & Resets
input reg_clk, input reg_clk,