active_analyzer.py is updated to fix a wrong module name. controlflow_analyzer.py is updated to support various file formats as graphical output.

Author: shtaxxx

pyverilog/controlflow/active_analyzer.py

@@ -64,9 +64,9 @@ def getActiveConditions_fsm(self, fsm_sig, funcdict):
         active_conditions = []
         fsm_sig_width = self.getWidth(fsm_sig)
         for condlist, func in sorted(funcdict.items(), key=lambda x:len(x[0])):
-            node = state_transition.walkCondlist(condlist, fsm_sig, fsm_sig_width)
+            node = transition.walkCondlist(condlist, fsm_sig, fsm_sig_width)
             state_node_list = []
-            if isinstance(node, state_transition.StateNodeList):
+            if isinstance(node, transition.StateNodeList):
                 for n in node.nodelist: state_node_list.append(n)
             elif node:
                 state_node_list.append(node)

pyverilog/controlflow/controlflow_analyzer.py

@@ -305,6 +305,8 @@ def showVersion():
                          default="TOP",help="Top module, Default=TOP")
     optparser.add_option("-s","--search",dest="searchtarget",action="append",
                          default=[],help="Search Target Signal")
+    optparser.add_option("--graphformat",dest="graphformat",
+                         default="png",help="Graph file format, Default=png")
     optparser.add_option("--nograph",action="store_true",dest="nograph",
                          default=False,help="Non graph generation")
     optparser.add_option("--nolabel",action="store_true",dest="nolabel",
@@ -350,7 +352,7 @@ def showVersion():
         print('# DELAY CNT: %d' % fsm.delaycnt)
         fsm.view()
         if not options.nograph:
-            fsm.tograph(filename=util.toFlatname(signame)+'.png', nolabel=options.nolabel)
+            fsm.tograph(filename=util.toFlatname(signame)+'.'+options.graphformat, nolabel=options.nolabel)
         loops = fsm.get_loop()
         print('Loop')
         for loop in loops: