prop reference infrastructure, and other things

peakrdl/regblock/hwif/base.py

@@ -1,6 +1,6 @@
 from typing import TYPE_CHECKING, Union
 from systemrdl.node import Node, SignalNode, FieldNode
-from systemrdl.rdltypes import AccessType
+from systemrdl.rdltypes import AccessType, PropertyReference
 
 if TYPE_CHECKING:
     from ..exporter import RegblockExporter
@@ -13,7 +13,7 @@ class HwifBase:
     - Signal inputs (except those that are promoted to the top)
     """
 
-    def __init__(self, exporter:'RegblockExporter', top_node:'Node', package_name:str):
+    def __init__(self, exporter: 'RegblockExporter', top_node: Node, package_name: str):
         self.exporter = exporter
         self.top_node = top_node
         self.package_name = package_name
@@ -41,9 +41,10 @@ class HwifBase:
         Returns True if the object infers an input wire in the hwif
         """
         if isinstance(obj, FieldNode):
-            return obj.get_property("hw") in {AccessType.rw, AccessType.w}
+            return obj.is_hw_writable
         elif isinstance(obj, SignalNode):
-            raise NotImplementedError # TODO:
+            # Signals are implicitly always inputs
+            return True
         else:
             raise RuntimeError
 
@@ -52,29 +53,35 @@ class HwifBase:
         """
         Returns True if the object infers an output wire in the hwif
         """
-        return obj.get_property("hw") in {AccessType.rw, AccessType.r}
+        # TODO: Extend this for signals and prop references?
+        return obj.is_hw_readable
 
 
-    def get_input_identifier(self, obj) -> str:
+    def get_input_identifier(self, obj: Union[FieldNode, SignalNode, PropertyReference]) -> str:
         """
         Returns the identifier string that best represents the input object.
 
         if obj is:
             Field: the fields input value port
             Signal: signal input value
-            TODO: finish this
+            Prop reference:
+                could be an implied hwclr/hwset/swwe/swwel/we/wel input
+                Raise a runtime error if an illegal prop ref is requested, or if
+                the prop ref is not actually implied, but explicitly ref a component
 
+        TODO: finish this
         raises an exception if obj is invalid
         """
         raise NotImplementedError()
 
 
-    def get_output_identifier(self, obj) -> str:
+    def get_output_identifier(self, obj: FieldNode) -> str:
         """
         Returns the identifier string that best represents the output object.
 
         if obj is:
             Field: the fields output value port
+            Property ref: this is also part of the struct
             TODO: finish this
 
         raises an exception if obj is invalid