Remove dangerous usage of non-public parts of the systemrdl-compiler API

Author: amykyta3

pyproject.toml

@@ -7,7 +7,7 @@ name = "peakrdl-uvm"
 dynamic = ["version"]
 requires-python = ">=3.7"
 dependencies = [
-    "systemrdl-compiler ~= 1.27",
+    "systemrdl-compiler ~= 1.30",
     "jinja2 >= 2.9",
 ]
 

src/peakrdl_uvm/exporter.py

@@ -117,7 +117,7 @@ def export(self, node: Node, path: str, **kwargs):
         if isinstance(node, AddrmapNode) and node.get_property('bridge'):
             node.env.msg.warning(
                 "UVM RAL generator does not have proper support for bridge addmaps yet. The 'bridge' property will be ignored.",
-                node.inst.property_src_ref.get('bridge', node.inst.inst_src_ref)
+                node.property_src_ref.get('bridge', node.inst_src_ref)
             )
 
         # First, traverse the model and collect some information
@@ -238,7 +238,7 @@ def _class_needs_definition(self, node: Node) -> bool:
             obj = self.namespace_db[type_name]
 
             # Sanity-check for collisions
-            if (obj is None) or (obj is not node.inst.original_def):
+            if (obj is None) or (obj is not node.original_def):
                 raise RuntimeError("Namespace collision! Type-name generation is not robust enough to create unique names!")
 
             # This object likely represents the existing class definition
@@ -247,7 +247,7 @@ def _class_needs_definition(self, node: Node) -> bool:
 
         # Need to emit a new definition
         # First, register it in the namespace
-        self.namespace_db[type_name] = node.inst.original_def
+        self.namespace_db[type_name] = node.original_def
         return True
 
 

src/peakrdl_uvm/templates/uvm_vreg.sv

@@ -65,6 +65,6 @@ this.{{get_inst_name(node)}} = {{get_class_name(node)}}::type_id::create("{{get_
 {%- else %}
 this.{{get_inst_name(node)}} = new("{{get_inst_name(node)}}");
 {%- endif %}
-this.{{get_inst_name(node)}}.configure(this, this.m_mem, {{node.inst.n_elements}});
+this.{{get_inst_name(node)}}.configure(this, this.m_mem, {{node.n_elements}});
 this.{{get_inst_name(node)}}.build();
 {%- endmacro %}

test/generate_testcase_data.py

@@ -84,7 +84,7 @@
             {%- if isinstance(node, RegNode) %}
                 {%- if node.is_virtual %}
         `ASSERT_EQ_STR({{node.parent.get_path() + "." + node.inst_name}}.get_full_name(), "{{node.parent.get_path() + "." + node.inst_name}}");
-        `ASSERT_EQ_INT({{node.parent.get_path() + "." + node.inst_name}}.get_size(), {{node.inst.n_elements}});
+        `ASSERT_EQ_INT({{node.parent.get_path() + "." + node.inst_name}}.get_size(), {{node.n_elements}});
                 {%- else %}
         `ASSERT_EQ_STR({{node.get_path()}}.get_full_name(), "{{node.get_path()}}");
         `ASSERT_EQ_INT({{node.get_path()}}.get_address(), {{"'h%x" % node.absolute_address}});