peakrdl-python 3.1.0rc2__tar.gz → 3.1.1__tar.gz

{peakrdl_python-3.1.0rc2 → peakrdl_python-3.1.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: peakrdl-python
-Version: 3.1.0rc2
+Version: 3.1.1
 Summary: Generate Python Register Access Layer (RAL) from SystemRDL
 Author: Keith Brady
 License:              GNU LESSER GENERAL PUBLIC LICENSE

{peakrdl_python-3.1.0rc2 → peakrdl_python-3.1.1}/src/peakrdl_python/__about__.py

@@ -17,4 +17,4 @@ along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 Variables that describes the peakrdl-python Package
 """
-__version__ = "3.1.0rc2"
+__version__ = "3.1.1"

{peakrdl_python-3.1.0rc2 → peakrdl_python-3.1.1}/src/peakrdl_python/lib/base.py

@@ -26,11 +26,14 @@ from abc import ABC, abstractmethod
 from itertools import product
 from enum import IntEnum, Enum, auto
 import math
+import re
 
 from .callbacks import CallbackSet, CallbackSetLegacy
 
 UDPStruct = dict[str, 'UDPType']
-UDPType = Union[str, int, bool, IntEnum, UDPStruct]
+UDPType = Union[str, int, bool, IntEnum, UDPStruct, list['UDPType']]
+
+array_instance_re = re.compile(r'(?P<root_name>[A-Za-z_0-9]*)\[(?P<index>\d+)\]')
 
 class Base(ABC):
     """
@@ -229,6 +232,18 @@ class Node(Base ,ABC):
         """
         if not isinstance(name, str):
             raise TypeError(f'name must be a string got {type(name)}')
+
+        # check if an array style child pointer
+        array_name_match = array_instance_re.match(name)
+        if array_name_match:
+            root_name = array_name_match.group("root_name")
+            index = int(array_name_match.group("index"))
+            child_array = getattr(self, self.systemrdl_python_child_name_map[root_name])
+            if not isinstance(child_array, NodeArray):
+                raise ValueError('attempting to use array indexing into a non-array '
+                                 f'node: {root_name} of type:{type(child_array)}')
+            return child_array[index]
+
         return getattr(self, self.systemrdl_python_child_name_map[name])
 
     @property

{peakrdl_python-3.1.0rc2 → peakrdl_python-3.1.1}/src/peakrdl_python/lib/sections.py

@@ -25,7 +25,6 @@ from typing import Optional, Union, TYPE_CHECKING,overload, Literal
 from collections.abc import Iterator, Iterable
 from abc import ABC, abstractmethod
 import sys
-from enum import IntEnum
 
 from .base import Node, NodeArray, IterationClassification
 
@@ -48,9 +47,6 @@ if TYPE_CHECKING:
     from .register_and_field import ReadableRegisterArray, WriteableRegisterArray
     from .async_register_and_field import ReadableAsyncRegisterArray, WriteableAsyncRegisterArray
 
-UDPStruct = dict[str, 'UDPType']
-UDPType = Union[str, int, bool, IntEnum, UDPStruct]
-
 class BaseSection(Node, Iterable[Union[Node, NodeArray]], ABC):
     """
     base class of non-async and sync sections (AddressMaps and RegFile)

{peakrdl_python-3.1.0rc2 → peakrdl_python-3.1.1}/src/peakrdl_python.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: peakrdl-python
-Version: 3.1.0rc2
+Version: 3.1.1
 Summary: Generate Python Register Access Layer (RAL) from SystemRDL
 Author: Keith Brady
 License:              GNU LESSER GENERAL PUBLIC LICENSE

{peakrdl_python-3.1.0rc2 → peakrdl_python-3.1.1}/tests/testcases/udp_with_referencing.rdl

@@ -49,6 +49,11 @@ property regfile_child_pointer {
     component = regfile;
 };
 
+property mem_child_pointer {
+    type = reg[];
+    component = mem;
+};
+
 addrmap udp_with_referencing {
 
     reg reg_def {
@@ -74,6 +79,7 @@ addrmap udp_with_referencing {
         memwidth = 32;
 
         reg_def reg_value;
+        mem_child_pointer = '{ reg_value } ;
     };
 
     addrmap addrmap_def {
@@ -83,10 +89,10 @@ addrmap udp_with_referencing {
             addrmap_child_pointer = addrmap_child'{ reg_children:'{ reg_value }, regfile_children:'{ regfile_value } };
         };
         reg_def reg_value;
-        regfile_def regfile_value;
+        regfile_def addrmap_regfile_value;
         external mem_def mem_value;
         inner_addrmap_def addrmap_value;
-        addrmap_child_pointer = addrmap_child'{ reg_children:'{ reg_value }, regfile_children:'{ regfile_value }, addrmap_children:'{ addrmap_value }, mem_children:'{ mem_value } };
+        addrmap_child_pointer = addrmap_child'{ reg_children:'{ reg_value }, regfile_children:'{ addrmap_regfile_value }, addrmap_children:'{ addrmap_value }, mem_children:'{ mem_value } };
     };
 
     addrmap_def main;
@@ -96,4 +102,13 @@ addrmap udp_with_referencing {
     view.reg_value.field_a->field_parent_pointer = main.reg_value;
 
     view.reg_value->register_pointer = main.reg_value;
+
+    reg basic_reg_def {
+        // a register def without any UDPs
+        field { fieldwidth=4; } field_a;
+    };
+
+    basic_reg_def basic_reg_array[3];
+    main.addrmap_value.reg_value -> register_pointer = basic_reg_array[0];
+    main.addrmap_value.regfile_value.reg_value -> register_pointer = basic_reg_array[1];
 };