1 files changed, 7 insertions, 16 deletions
diff --git a/backends/smt2/smtbmc.py b/backends/smt2/smtbmc.py
index 057776f6d..3d96b07a0 100644
--- a/backends/smt2/smtbmc.py
+++ b/backends/smt2/smtbmc.py
@@ -95,37 +95,28 @@ smt = smtio(opts=so)
 print("%s Solver: %s" % (smt.timestamp(), so.solver))
 smt.setup("QF_AUFBV")
 
-debug_nets = dict()
-debug_nets_re = re.compile(r"^; yosys-smt2-(input|output|register|wire) (\S+) (\d+)")
-current_module = None
-
 with open(args[0], "r") as f:
     for line in f:
-        match = debug_nets_re.match(line)
-        if match:
-            debug_nets[current_module].add(match.group(2))
-        if line.startswith("; yosys-smt2-module"):
-            current_module = line.split()[2]
-            debug_nets[current_module] = set()
         smt.write(line)
-    if topmod is None:
-        topmod = current_module
+        smt.getinfo(line)
 
-assert topmod is not None
-assert topmod in debug_nets
+if topmod is None:
+    topmod = smt.topmod
 
+assert topmod is not None
+assert topmod in smt.modinfo
 
 def write_vcd_model(steps):
     print("%s Writing model to VCD file." % smt.timestamp())
 
     vcd = mkvcd(open(vcdfile, "w"))
-    for netname in sorted(debug_nets[topmod]):
+    for netname in sorted(smt.modinfo[topmod].wsize.keys()):
         width = len(smt.get_net_bin(topmod, netname, "s0"))
         vcd.add_net(netname, width)
 
     for i in range(steps):
         vcd.set_time(i)
-        for netname in debug_nets[topmod]:
+        for netname in smt.modinfo[topmod].wsize.keys():
             vcd.set_net(netname, smt.get_net_bin(topmod, netname, "s%d" % i))
 
     vcd.set_time(steps)