peakrdl-python 3.1.1__py3-none-any.whl → 3.1.3__py3-none-any.whl

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.1"
+__version__ = "3.1.3"

peakrdl_python/systemrdl_node_hashes.py

@@ -33,7 +33,7 @@ from systemrdl.node import AddrmapNode
 from systemrdl.node import MemNode
 from systemrdl.node import SignalNode
 from systemrdl.rdltypes.user_enum import UserEnumMeta, UserEnum
-from systemrdl.rdltypes import AccessType
+from systemrdl.rdltypes import AccessType, UserStruct
 
 from .systemrdl_node_utility_functions import get_properties_to_include
 from .systemrdl_node_utility_functions import HideNodeCallback
@@ -171,6 +171,10 @@ def __node_hash_components(node: Node,
         if isinstance(item, list):
             for child_udp_value in item:
                 udp_replace_for_hashing(child_udp_value)
+        elif issubclass(type(item), UserStruct):
+            for key, value in item.members.items():
+                value_to_hash.append(key)
+                udp_replace_for_hashing(value)
         elif isinstance(item, Node):
             value_to_hash.append('.'.join(item.get_path_segments()))
         else:

peakrdl_python/templates/addrmap.py.jinja

@@ -145,7 +145,7 @@ class {{node.python_class_name}}({% if asyncoutput %}Async{% endif %}RegFile):
     {{get_table_block(node.instance) | indent}}
     """
 
-    __slots__ : list[str] = [{%- for child_node in node.instance.children(unroll=False) -%}'__{{child_node.inst_name}}'{% if not loop.last %}, {% endif %}{%- endfor %}]
+    __slots__ : list[str] = [{%- for child_node in node.children(unroll=False) -%}'__{{child_node.inst_name}}'{% if not loop.last %}, {% endif %}{%- endfor %}]
 
     def __init__(self,
                  address: int,
@@ -159,7 +159,7 @@ class {{node.python_class_name}}({% if asyncoutput %}Async{% endif %}RegFile):
                          parent=parent)
 
         # instance of objects within the class
-        {% for child_node in node.instance.children(unroll=False) -%}
+        {% for child_node in node.children(unroll=False) -%}
             {{ regfile_or_addr_instance(child_node) | indent }}
         {% endfor %}
 
@@ -214,7 +214,7 @@ class {{node.python_class_name}}({% if asyncoutput %}Async{% endif %}AddressMap)
     {{get_table_block(node.instance) | indent}}
     """
 
-    __slots__ : list[str] = [{%- for child_node in node.instance.children(unroll=False) -%}{%- if isinstance(child_node, systemrdlRegNode) or isinstance(child_node, systemrdlRegfileNode) or isinstance(child_node, systemrdlAddrmapNode) or isinstance(child_node, systemrdlMemNode) -%}'__{{child_node.inst_name}}'{% if not loop.last %}, {% endif %}{% endif %}{%- endfor %}]
+    __slots__ : list[str] = [{%- for child_node in node.children(unroll=False) -%}{%- if isinstance(child_node, systemrdlRegNode) or isinstance(child_node, systemrdlRegfileNode) or isinstance(child_node, systemrdlAddrmapNode) or isinstance(child_node, systemrdlMemNode) -%}'__{{child_node.inst_name}}'{% if not loop.last %}, {% endif %}{% endif %}{%- endfor %}]
 
     def __init__(self, *,
                  address:int {%- if node.instance == top_node -%}={{top_node.absolute_address}}{%- endif -%},
@@ -233,7 +233,7 @@ class {{node.python_class_name}}({% if asyncoutput %}Async{% endif %}AddressMap)
                          inst_name=inst_name,
                          parent=parent)
 
-        {% for child_node in node.instance.children(unroll=False) -%}
+        {% for child_node in node.children(unroll=False) -%}
             {{ regfile_or_addr_instance(child_node) | indent }}
         {% endfor %}
 

peakrdl_python/templates/addrmap_register.py.jinja

@@ -82,7 +82,7 @@ class {{node.python_class_name}}({{node.base_class(asyncoutput)}}):
     {{get_table_block(node.instance) | indent}}
     """
 
-    __slots__ : list[str] = [{%- for child_node in node.instance.children(unroll=False) -%}'__{{child_node.inst_name}}'{% if not loop.last %}, {% endif %}{%- endfor %}]
+    __slots__ : list[str] = [{%- for child_node in node.children(unroll=False) -%}'__{{child_node.inst_name}}'{% if not loop.last %}, {% endif %}{%- endfor %}]
 
     def __init__(self,
                  address: int,
@@ -129,12 +129,12 @@ class {{node.python_class_name}}({{node.base_class(asyncoutput)}}):
 
     {% if node.write_only %}
     {# if the register has no readable components, all the fields must be writen as one #}
-    {% if asyncoutput %}async {% endif %}def write_fields(self, {%- for child_node in node.instance.fields() -%} {{safe_node_name(child_node)}} : {{node.lookup_field_data_python_class(child_node)}}{%- if not loop.last -%},{%- endif -%}{%- endfor -%}) -> None: # type: ignore[override]
+    {% if asyncoutput %}async {% endif %}def write_fields(self, {%- for child_node in node.fields() -%} {{safe_node_name(child_node)}} : {{node.lookup_field_data_python_class(child_node)}}{%- if not loop.last -%},{%- endif -%}{%- endfor -%}) -> None: # type: ignore[override]
         """
         Do a write to the register, updating all fields
         """
         reg_value = 0
-        {%- for child_node in node.instance.fields() %}
+        {%- for child_node in node.fields() %}
         reg_value &= self.{{safe_node_name(child_node)}}.inverse_bitmask
         reg_value |= self.{{safe_node_name(child_node)}}._encode_write_value({{safe_node_name(child_node)}})
         {% endfor %}

{peakrdl_python-3.1.1.dist-info → peakrdl_python-3.1.3.dist-info}/METADATA

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

{peakrdl_python-3.1.1.dist-info → peakrdl_python-3.1.3.dist-info}/RECORD

@@ -1,5 +1,5 @@
 peakrdl_python/.coveragerc,sha256=cqEPbptqQbGePDaOVqk5PtT8jWKF6gj5AFrFnx-0BAE,526
-peakrdl_python/__about__.py,sha256=kixNgC0JZ_lA81c0x1JmC3X1V8ZNGtqhRz7yBcQqfCI,831
+peakrdl_python/__about__.py,sha256=WZTdTVvMa6sjrWPyyPzfN5u0HbP20oj_9YhgQcDgST8,831
 peakrdl_python/__init__.py,sha256=nVSLwpSFOkH3FFXRcF9kNm8WzsA4d41ugmC0Q4Jq9N8,963
 peakrdl_python/__peakrdl__.py,sha256=KH3vfyWPoX_qW2fCmksIxmTp1tg4ODxDgk-EEtyS4Fg,12072
 peakrdl_python/_deploy_package.py,sha256=JJnZGAVbUtR2UMPAXUtow0UZlKb2maQ_ReMWJxfps78,7034
@@ -9,7 +9,7 @@ peakrdl_python/compiler_udp.py,sha256=nGcb1ovYazVSSqBfKtirlkqt8KEpEzWVKFACqTY0L-
 peakrdl_python/exporter.py,sha256=U2lT69Q8dxM3M8Wki1UcarOBu-1z21PsnvPThwrAdVM,61994
 peakrdl_python/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 peakrdl_python/safe_name_utility.py,sha256=eQqUH46ifyu4p2OcNSKsF2eCyk-FxCrIzyI4zdMAdjw,14047
-peakrdl_python/systemrdl_node_hashes.py,sha256=aVG-uVnq2jemV7-7duQ_1VA7TfCmmLmhe03A29QrV6g,23836
+peakrdl_python/systemrdl_node_hashes.py,sha256=vGyir7fA-dyx77oGYQie9v9pv7zYcNkJbQXlRdhJtG8,24038
 peakrdl_python/systemrdl_node_utility_functions.py,sha256=a0eEZDQqqyRbPWFBYbXbZ6PG9yAOvvpR4Wsizm8YZhs,16157
 peakrdl_python/unique_component_iterator.py,sha256=5PsKAglV8gdsOm94V7NPr3L34M05ts027K_qQCcaJqc,21563
 peakrdl_python/lib/__init__.py,sha256=ECgTEXrOyfZPLA8dSPUj_iOXft7eDRwI0L3IjOinKY4,5374
@@ -48,10 +48,10 @@ peakrdl_python/sim_lib/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSu
 peakrdl_python/sim_lib/register.py,sha256=dzSTv6G7mmJ6mb2_j0keNi_fHeEZeBr9yVoaQdlxoHI,7935
 peakrdl_python/sim_lib/simulator.py,sha256=eUA2jQjT3mQi9CdSQPqWGKN6kMJLEMN6bd-68TqINtI,19584
 peakrdl_python/templates/__init__.py,sha256=_jOa1f-I2uCdx4VUUJd-wuEBU924YSYZc4pSJXe8r7Q,819
-peakrdl_python/templates/addrmap.py.jinja,sha256=hv2VI7VdFZ9tHYGmKVqZDbM1iLooBOTTIkesI2Kwqbg,17723
+peakrdl_python/templates/addrmap.py.jinja,sha256=JnWcRmJ9yB7ALhZ_pB-PLE7K3qICTh2n2ao-xjoh4dY,17687
 peakrdl_python/templates/addrmap_field.py.jinja,sha256=TDpgwJTeh8mkeTJhsfupe3b7Ysk1p9vcnhU4LjMVTls,2844
 peakrdl_python/templates/addrmap_memory.py.jinja,sha256=CEu3iQvGFwyqABOxLuF835li4buz-9ktprfKIzp6xoY,6690
-peakrdl_python/templates/addrmap_register.py.jinja,sha256=oPGLhgBN7ySr7cCrlPxNLZ0WzqVG7AP_jcAlgyax-n0,9572
+peakrdl_python/templates/addrmap_register.py.jinja,sha256=vanKTfHXn2Tk1eGtJAU8qDX-Yp3VyhYNDMuSgM0cfg4,9545
 peakrdl_python/templates/addrmap_simulation.py.jinja,sha256=pwBuQFJRwVQQIT8p_f41czU9eOfOWi0LZZtRpVEcLFw,3967
 peakrdl_python/templates/addrmap_simulation_tb.py.jinja,sha256=KscFJHFKv7BGWnqo04abgGi76ybKpqCsWcbNsCFxr1A,6933
 peakrdl_python/templates/addrmap_system_rdl_name_mapping.py.jinja,sha256=4Jo9_UvzKKb1Kdtbs8x2Rc7a37Bop73Kk-4uj4BaMuk,3452
@@ -68,9 +68,9 @@ peakrdl_python/templates/header_tb.py.jinja,sha256=nGMyM_mDTLeQXv6g0rwplr_EaR_me
 peakrdl_python/templates/property_enums.py.jinja,sha256=5qKPoONCaDs4vff9DsE3h2DGJYMYzg7vGQ_a5FVn-iQ,2062
 peakrdl_python/templates/reg_definitions.py.jinja,sha256=mvj6L734h5RM6gxxEmjntNc7Du6FFX-WSi-Eti9wc8c,2013
 peakrdl_python/templates/template_ultilities.py.jinja,sha256=XjWRRXP4ZJcX-D0v16NQM3sNG77w9gJFusG9iT1mem0,1507
-peakrdl_python-3.1.1.dist-info/licenses/LICENSE,sha256=sOw0CAxjvEaaR0JFpz3SBbacPfJ0Nf0YiwdfG2HJJ1c,7645
-peakrdl_python-3.1.1.dist-info/METADATA,sha256=isuTt16NBHBXMGy77auMmQI-Zh_42M4NDC-PAZJLrA0,17541
-peakrdl_python-3.1.1.dist-info/WHEEL,sha256=aeYiig01lYGDzBgS8HxWXOg3uV61G9ijOsup-k9o1sk,91
-peakrdl_python-3.1.1.dist-info/entry_points.txt,sha256=Cga9FurNiqcw8-RQ34y0oobVTx0F5iWv7ngEnWHROKU,65
-peakrdl_python-3.1.1.dist-info/top_level.txt,sha256=M80MHPa4R4_4TxnNqd9FO29LI0FiL5Qjk4rQErB1wec,15
-peakrdl_python-3.1.1.dist-info/RECORD,,
+peakrdl_python-3.1.3.dist-info/licenses/LICENSE,sha256=sOw0CAxjvEaaR0JFpz3SBbacPfJ0Nf0YiwdfG2HJJ1c,7645
+peakrdl_python-3.1.3.dist-info/METADATA,sha256=juN9EpV4l1-3fHbqpN6632vz21ib8YwaPNeJJzjV_vs,17541
+peakrdl_python-3.1.3.dist-info/WHEEL,sha256=YVMoNqKzERt-wjUZwJ33xBGAwnFl-4cqbYkTtWa4itE,91
+peakrdl_python-3.1.3.dist-info/entry_points.txt,sha256=Cga9FurNiqcw8-RQ34y0oobVTx0F5iWv7ngEnWHROKU,65
+peakrdl_python-3.1.3.dist-info/top_level.txt,sha256=M80MHPa4R4_4TxnNqd9FO29LI0FiL5Qjk4rQErB1wec,15
+peakrdl_python-3.1.3.dist-info/RECORD,,

{peakrdl_python-3.1.1.dist-info → peakrdl_python-3.1.3.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (82.0.1)
+Generator: setuptools (84.0.0)
 Root-Is-Purelib: true
 Tag: py3-none-any