Fix elaboration so alias registers inherit primary instance's interna…

…l/external type. #123
SystemRDL · Mar 4, 2022 · ee42ee7 · ee42ee7
1 parent ec825a6
commit ee42ee7
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 3 deletions.
diff --git a/systemrdl/core/ComponentVisitor.py b/systemrdl/core/ComponentVisitor.py
@@ -317,9 +317,14 @@ def resolve_inst_external(self, ctx: SystemRDLParser.Component_instsContext, com
                     src_ref_from_antlr(inst_type)
                 )
         elif isinstance(comp_inst, comp.Reg):
-            comp_inst.external = False
-            if (inst_type is not None) and (inst_type.type == SystemRDLParser.EXTERNAL_kw):
-                comp_inst.external = True
+            if inst_type is not None:
+                if inst_type.type == SystemRDLParser.EXTERNAL_kw:
+                    comp_inst.external = True
+                elif inst_type.type == SystemRDLParser.INTERNAL_kw:
+                    comp_inst.external = False
+            else:
+                # Leave as None. Elaborate step will resolve later.
+                comp_inst.external = None
 
         elif isinstance(comp_inst, comp.Regfile):
             if inst_type is not None:

diff --git a/systemrdl/core/elaborate.py b/systemrdl/core/elaborate.py
@@ -554,6 +554,12 @@ def enter_Reg(self, node: RegNode) -> None:
         if self.coerce_external_to is not None:
             # Is nested inside regfile that is coercing to a particular inst type
             node.inst.external = self.coerce_external_to
+        elif node.inst.external is None:
+            assert isinstance(node.inst, comp.Reg)
+            if node.inst.is_alias:
+                node.inst.external = node.inst.alias_primary_inst.external
+            else:
+                node.inst.external = False
 
 
     def exit_Regfile(self, node: RegfileNode) -> None: