Fix missing array check on top-level export explode decision

README.md

@@ -20,7 +20,9 @@ Pass the elaborated output of the [SystemRDL Compiler](http://systemrdl-compiler
 to the exporter.
 
 ```python
-from ralbot.ipxact import RDLCompiler, IPXACTExporter
+import sys
+from systemrdl import RDLCompiler, RDLCompileError
+from ralbot.ipxact import IPXACTExporter
 
 rdlc = RDLCompiler()
 

ralbot/ipxact/__about__.py

@@ -1 +1 @@
-__version__ = "1.2.0"
+__version__ = "1.2.1"

ralbot/ipxact/exporter.py

@@ -74,8 +74,11 @@ def export(self, node, path):
         # addressBlock groups
         explode = False
 
-        # If top node is an addrmap, and it contains 1 or more children that are
-        # exclusively addrmap or mem, then it makes more sense to "explode" the
+        # If top node is an addrmap, and it contains 1 or more children that
+        # are:
+        # - exclusively addrmap or mem
+        # - and None of them are arrays
+        # ... then it makes more sense to "explode" the
         # top-level node and make each of it's children their own addressBlock
         # (explode --> True)
         #
@@ -89,7 +92,7 @@ def export(self, node, path):
                 if not isinstance(child, AddressableNode):
                     continue
 
-                if isinstance(child, (AddrmapNode, MemNode)):
+                if isinstance(child, (AddrmapNode, MemNode)) and not child.is_array:
                     addrblockable_children += 1
                 else:
                     non_addrblockable_children += 1