Closes #7: Add flag that disables unpacked arrays

srdl2sv/cli/cli.py

@@ -64,6 +64,12 @@ class CliArguments():
                   compiler from generating packages and it will prevent\
                   it from using enums in the port list.")
 
+        self.parser.add_argument(
+            "-u",
+            "--no-unpacked",
+            action="store_true",
+            help="Disable unpacked arrays in the module's I/O interface.")
+
         self.parser.add_argument(
             "--file-logging",
             choices=['DEBUG', 'INFO', 'WARNING', 'ERROR', 'CRITICAL', 'NONE'],
@@ -171,6 +177,10 @@ class CliArguments():
         config['enums'] = not args.no_enums
         config['list_args'].append(f"Enums Enabled    : {config['enums']}")
 
+        # Set unpacked arrays
+        config['unpacked_arrays'] = not args.no_unpacked
+        config['list_args'].append(f"Unpacked I/Os    : {config['enums']}")
+
         # Set bus
         config['bus'] = args.bus
         config['list_args'].append(f"Register Bus Type: {config['bus']}")

srdl2sv/components/addrmap.py

@@ -171,33 +171,60 @@ class AddrMap(Component):
 
 
         # Input ports
-        # Yay for unreadable code....
+        input_ports_rtl = []
-        input_ports_rtl = [
+        for (key, value) in input_dict_list:
-            AddrMap.templ_dict['input_port']['rtl'].format(
+            # TODO: Think about a better way to handle datatypes. Simply replacing them
-                name = key,
+            #       is not the most efficient way of handling it.
-                signal_type = value[0],
+            signal_type = value[0].replace('logic', '').strip()
-                signal_width = input_signal_width,
+
-                name_width = input_name_width,
+            if config['unpacked_arrays'] and value[1]:
-                unpacked_dim = '[{}]'.format(
+                unpacked_dim = f"[{']['.join([str(y) for y in value[1]])}]"
-                    ']['.join(
+            elif value[1]:
-                        [str(y) for y in value[1]]))
+                unpacked_dim = ''
-                    if value[1] else '')
+                signal_type = ''.join([
-            for (key, value) in input_dict_list
+                                    f"[{':0]['.join([str(y-1) for y in value[1]])}:0]",
-            ]
+                                    signal_type
+                                    ])
+            else:
+                unpacked_dim = ''
+
+            input_ports_rtl.append(
+                AddrMap.templ_dict['input_port']['rtl'].format(
+                    name = key,
+                    signal_type = signal_type,
+                    signal_width = input_signal_width,
+                    name_width = input_name_width,
+                    unpacked_dim = unpacked_dim,
+                )
+            )
 
         # Output ports
-        output_ports_rtl = [
+        output_ports_rtl = []
-            AddrMap.templ_dict['output_port']['rtl'].format(
+        for (key, value) in output_dict_list:
-                name = key,
+            # TODO: Think about a better way to handle datatypes. Simply replacing them
-                signal_width = output_signal_width,
+            #       is not the most efficient way of handling it.
-                name_width = output_name_width,
+            signal_type = value[0].replace('logic', '').strip()
-                signal_type = value[0],
+
-                unpacked_dim = '[{}]'.format(
+            if config['unpacked_arrays'] and value[1]:
-                    ']['.join(
+                unpacked_dim = f"[{']['.join([str(y) for y in value[1]])}]"
-                        [str(y) for y in value[1]]))
+            elif value[1]:
-                    if value[1] else '')
+                unpacked_dim = ''
-            for (key, value) in output_dict_list
+                signal_type = ''.join([
-            ]
+                                    f"[{':0]['.join([str(y-1) for y in value[1]])}:0]",
+                                    signal_type
+                                    ])
+            else:
+                unpacked_dim = ''
+
+            output_ports_rtl.append(
+                AddrMap.templ_dict['output_port']['rtl'].format(
+                    name = key,
+                    signal_type = signal_type,
+                    signal_width = output_signal_width,
+                    name_width = output_name_width,
+                    unpacked_dim = unpacked_dim,
+                )
+            )
 
         # Remove comma from last port entry
         output_ports_rtl[-1] = output_ports_rtl[-1].rstrip(',')

srdl2sv/components/field.py

@@ -1254,6 +1254,29 @@ class Field(Component):
             )
 
             # Save name of object
+            #
+            # If the field is multidimensional and packed arrays are turned off throw a
+            # warning. Structures like:
+            #
+            #   input [N:0] enum_name   input_name,
+            #
+            # are not supported and this tool does not support custom datatypes where
+            # packed dimensions are packed into another datatypes with the enum.
+            #
+            # For that reason, in such cases, a simple flat wire will be generated
+            if self.total_dimensions > 0 and not self.config['unpacked_arrays']:
+                self.logger.warning(
+                    "Using multidimensional registers/regfiles with "
+                    "enums and also using the option --no-unpacked "
+                    "is only partly supported. Rather than using the enum "
+                    "'%s', the flat wire with dimensions '[%i:0] will be used. "
+                    "Note that the SystemVerilog package that holds the enum can "
+                    "still be used.",
+                    '::'.join(['_'.join([scope, 'pkg']), enum_name]),
+                    self.obj.width-1)
+
+                raise AttributeError
+
             self.field_type =\
                 '::'.join(['_'.join([scope, 'pkg']), enum_name])