lib.fsm is updated for lib_simulation

Author: shtaxxx

sample/tests/lib_simulation/pycoram_userlogic/led.py

@@ -55,7 +55,7 @@ def mkUserlogic():
     fsm.goto(start)
 
     # building always statement
-    fsm.make_always(clk, rst)
+    fsm.make_always(clk, rst, reset=m.make_reset())
 
     return m
 

sample/tests/lib_simulation/pycoram_userlogic/test_led.py

@@ -92,12 +92,11 @@
 
   always @(posedge CLK) begin
     if(RST) begin
-      mem_rdata <= 0;
-      ch_almfull <= 0;
-      ch_rdata <= 0;
-      ch_empty <= 1;
       test_fsm <= test_fsm_init;
       _d1_test_fsm <= test_fsm_init;
+      ch_empty <= 1;
+      ch_rdata <= 0;
+      mem_rdata <= 0;
       _test_fsm_cond_12_0_1 <= 0;
     end else begin
       _d1_test_fsm <= test_fsm;

veriloggen/lib/fsm.py

@@ -211,21 +211,28 @@ def make_if(self):
         return tuple(ret)
 
     #---------------------------------------------------------------------------
-    def make_reset(self):
+    def make_reset(self, reset):
         ret = collections.OrderedDict()
 
+        for v in reset:
+            key = str(v.left)
+            if v is not None and key not in ret:
+                ret[key] = v
+            
         v = self.reset_visitor.visit(self.state)
         key = str(self.state)
         if v is not None and key not in ret:
             ret[key] = v
 
-        for key, dst in self.delayed_state.items():
+        for dst in self.delayed_state.values():
             v = self.reset_visitor.visit(dst)
+            key = str(v.left)
             if v is not None and key not in ret:
                 ret[key] = v
 
-        for key, dst in self.dst_var.items():
+        for dst in self.dst_var.values():
             v = self.reset_visitor.visit(dst)
+            key = str(v.left)
             if v is not None and key not in ret:
                 ret[key] = v
 
@@ -240,8 +247,7 @@ def make_reset(self):
     def make_always(self, clk, rst, reset=(), body=(), case=True):
         self.m.Always(vtypes.Posedge(clk))(
             vtypes.If(rst)(
-                reset,
-                self.make_reset()
+                self.make_reset(reset)
             )(
                 body,
                 self.make_case() if case else self.make_if()

veriloggen/subst_visitor.py

@@ -58,3 +58,6 @@ def visit_Cat(self, node):
 
     def visit_Subst(self, node):
         return self.visit(node.left)
+
+    def visit_SingleStatement(self, node):
+        return []