From 4b9ad7ad1b09c80558f2a8a20272c3c4a373c11b Mon Sep 17 00:00:00 2001
From: Dennis <dennis@dennispotter.eu>
Date: Sat, 15 May 2021 17:57:50 +0200
Subject: [PATCH] Fix SW write wire and improve I/O packed dimension

---
 srdl2sv/components/field.py              | 4 ++--
 srdl2sv/components/templates/fields.yaml | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/srdl2sv/components/field.py b/srdl2sv/components/field.py
index 6bea769..c574e29 100644
--- a/srdl2sv/components/field.py
+++ b/srdl2sv/components/field.py
@@ -93,7 +93,7 @@ class Field(Component):
         if self.sw_access in (AccessType.rw, AccessType.w):
             access_rtl['sw_write'].append(
                 Field.templ_dict['sw_access_field'].format(
-                    path = self.path_underscored,
+                    path_wo_field = self.path_wo_field,
                     genvars = self.genvars_str))
 
             # If field spans multiple bytes, every byte shall have a seperate enable!
@@ -287,7 +287,7 @@ class Field(Component):
         if self.hw_access in (AccessType.rw, AccessType.r):
             self.ports['output'].append(
                 Port("{}_r".format(self.path_underscored),
-                     "[{}-1:0]".format(self.obj.width) if self.obj.width > 0 else "",
+                     "[{}:0]".format(self.obj.width-1) if self.obj.width > 1 else "",
                      self.dimensions
                 ))
 
diff --git a/srdl2sv/components/templates/fields.yaml b/srdl2sv/components/templates/fields.yaml
index 4a31f69..feda75a 100644
--- a/srdl2sv/components/templates/fields.yaml
+++ b/srdl2sv/components/templates/fields.yaml
@@ -10,7 +10,7 @@ rst_field_assign: |-
     end
     else
 sw_access_field: |-
-    if ({path}_sw_wr{genvars})
+    if ({path_wo_field}_sw_wr{genvars})
     begin
 sw_access_byte: |-
     if (byte_enable[{i}])