Fix bug in custom field with internals

abs-tudelft · Sep 5, 2019 · fd6e1a0 · fd6e1a0
1 parent ceb290c
commit fd6e1a0
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/vhdmmio/core/behavior/custom.py b/vhdmmio/core/behavior/custom.py
@@ -100,19 +100,19 @@ def __init__(self, resources, field_descriptor,
                 internal = resources.internals.drive(
                     field_descriptor, name, internal_shape)
                 internal_interfaces.append((
-                    internal, internal.drive_name + internal_suffix))
+                    internal, True, internal_suffix))
             elif kind == 'strobe':
                 assert vhdl_type is None
                 internal = resources.internals.strobe(
                     field_descriptor, name, internal_shape)
                 internal_interfaces.append((
-                    internal, internal.drive_name + internal_suffix))
+                    internal, True, internal_suffix))
             elif kind == 'monitor':
                 assert vhdl_type is None
                 internal = resources.internals.use(
                     field_descriptor, name, internal_shape)
                 internal_interfaces.append((
-                    internal, internal.use_name + internal_suffix))
+                    internal, False, internal_suffix))
             elif kind == 'state':
                 assert vhdl_type is None
                 state.append((name, shape))
@@ -203,8 +203,8 @@ def external_interfaces(self):
 
     @property
     def internal_interfaces(self):
-        """A tuple consisting of `(Internal, identifier)` tuples, representing
-        the internal interfaces for this behavior."""
+        """A tuple consisting of `(Internal, direction, suffix)` tuples,
+        representing the internal interfaces for this behavior."""
         return self._internal_interfaces
 
     @property

diff --git a/vhdmmio/vhdl/behavior/custom.py b/vhdmmio/vhdl/behavior/custom.py
@@ -28,7 +28,11 @@ def __getattr__(self, attr):
             setattr(identifiers, name, self.add_interface(mode, name, count, typ)['$i$'])
 
         # Register the internal interfaces.
-        for internal, identifier in self.behavior.internal_interfaces:
+        for internal, direction, suffix in self.behavior.internal_interfaces:
+            if direction:
+                identifier = internal.drive_name + suffix
+            else:
+                identifier = internal.use_name + suffix
             setattr(identifiers, internal.name, identifier)
 
         # Construct the state record, if the behavior is stateful.