Merge branch '1.9.3-rc' into develop

Author: shtaxxx

veriloggen/VERSION

@@ -1 +1 @@
-1.9.2
+1.9.3

veriloggen/types/axi.py

@@ -2938,6 +2938,8 @@ def _make_img(filename, size, width, blksize=4096):
     def _make_fsm(self, write_delay=10, read_delay=10, sleep=4, sub_sleep=4):
         write_mode = 100
         read_mode = 200
+        while read_mode <= write_mode + write_delay + 10:
+            read_mode += 100
 
         self.fsm.If(self.waddr.awvalid).goto(write_mode)
         self.fsm.If(self.raddr.arvalid).goto(read_mode)
@@ -3313,6 +3315,8 @@ def __init__(self, m, name, clk, rst, datawidth=32, addrwidth=32, numports=2,
         self._make_fsms(write_delay, read_delay, sleep, sub_sleep)
 
     def _make_fsms(self, write_delay=10, read_delay=10, sleep=4, sub_sleep=4):
+        write_mode = 0
+        read_mode = 0
 
         for i, (fsm, waddr, wdata, wresp, raddr, rdata) in enumerate(
                 zip(self.fsms, self.waddrs, self.wdatas, self.wresps, self.raddrs, self.rdatas)):
@@ -3352,9 +3356,14 @@ def _make_fsms(self, write_delay=10, read_delay=10, sleep=4, sub_sleep=4):
                     sleep_count(0)
                 )
 
-            offset = 1000 * i
-            write_mode = 100 + offset
-            read_mode = 200 + offset
+            offset = 100 * i
+            while offset <= read_mode + read_delay + 10:
+                offset += 100
+
+            write_mode = offset + 100
+            read_mode = offset + 200
+            while read_mode <= write_mode + write_delay + 10:
+                read_mode += 100
 
             fsm.If(waddr.awvalid).goto(write_mode)
             fsm.If(raddr.arvalid).goto(read_mode)