Revise implementation of 'next' property

peakrdl/regblock/hwif/__init__.py

@@ -132,8 +132,13 @@ class Hwif:
         raises an exception if obj is invalid
         """
         if isinstance(obj, FieldNode):
+            next_value = obj.get_property('next')
+            if next_value is not None:
+                # 'next' property replaces the inferred input signal
+                return self.exp.dereferencer.get_value(next_value)
+            # Otherwise, use inferred
             path = get_indexed_path(self.top_node, obj)
-            return "hwif_in." + path + ".value"
+            return "hwif_in." + path + ".next"
         elif isinstance(obj, SignalNode):
             if obj.get_path() in self.out_of_hier_signals:
                 return obj.inst_name

peakrdl/regblock/hwif/generators.py

@@ -30,9 +30,10 @@ class InputStructGenerator_Hier(RDLFlatStructGenerator):
         type_name = self.get_typdef_name(node)
         self.push_struct(type_name, node.inst_name)
 
-        # Provide input to field's value if it is writable by hw
-        if node.is_hw_writable:
-            self.add_member("value", node.width)
+        # Provide input to field's next value if it is writable by hw, and it
+        # was not overridden by the 'next' property
+        if node.is_hw_writable and node.get_property('next') is None:
+            self.add_member("next", node.width)
 
         # Generate implied inputs
         for prop_name in ["we", "wel", "swwe", "swwel", "hwclr", "hwset"]: