diff options
| author | Clifford Wolf <clifford@clifford.at> | 2016-10-11 03:58:27 +0200 |
|---|---|---|
| committer | Clifford Wolf <clifford@clifford.at> | 2016-10-11 03:58:27 +0200 |
| commit | 11130d581dddaa78e5b5563416fe5d3d2b649cdd (patch) | |
| tree | 1aad9850960753f7d3aa28e7a0c1cf7a61c6fc8f /backends/smt2 | |
| parent | 5f7c5e685bb2ea23ced2676e3bbb644769f2d955 (diff) | |
| parent | 5f6a838823d0468cd055ca4aeaa96d5a7b79eca1 (diff) | |
| download | yosys-11130d581dddaa78e5b5563416fe5d3d2b649cdd.tar.gz yosys-11130d581dddaa78e5b5563416fe5d3d2b649cdd.tar.bz2 yosys-11130d581dddaa78e5b5563416fe5d3d2b649cdd.zip | |
Merge branch 'master' of github.com:cliffordwolf/yosys
Diffstat (limited to 'backends/smt2')
| -rw-r--r-- | backends/smt2/smtbmc.py | 2 | ||||
| -rw-r--r-- | backends/smt2/smtio.py | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/backends/smt2/smtbmc.py b/backends/smt2/smtbmc.py index eac693632..0cfb386a1 100644 --- a/backends/smt2/smtbmc.py +++ b/backends/smt2/smtbmc.py @@ -249,7 +249,7 @@ def get_constr_expr(db, state, final=False, getvalues=False): if state not in db: return ([], [], []) if getvalues else "true" - netref_regex = re.compile(r'(^|[( ])\[(-?[0-9]+:|)([^\]]+)\](?=[ )]|$)') + netref_regex = re.compile(r'(^|[( ])\[(-?[0-9]+:|)([^\]]*)\](?=[ )]|$)') def replace_netref(match): state_sel = match.group(2) diff --git a/backends/smt2/smtio.py b/backends/smt2/smtio.py index a0c981d3c..865eed1f1 100644 --- a/backends/smt2/smtio.py +++ b/backends/smt2/smtio.py @@ -541,6 +541,8 @@ class SmtIo: def net_expr(self, mod, base, path): if len(path) == 1: assert mod in self.modinfo + if path[0] == "": + return base if path[0] in self.modinfo[mod].cells: return "(|%s_h %s| %s)" % (mod, path[0], base) if path[0] in self.modinfo[mod].wsize: |