riscv
/
yosys
mirror of https://github.com/YosysHQ/yosys.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of github.com:cliffordwolf/yosys

This commit is contained in:
Clifford Wolf 2016-10-11 03:58:27 +02:00
parent 5f7c5e685b 5f6a838823
commit 11130d581d
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
backends/smt2/smtbmc.py
View File

@ -249,7 +249,7 @@ def get_constr_expr(db, state, final=False, getvalues=False):
if state not in db: if state not in db:
return ([], [], []) if getvalues else "true" return ([], [], []) if getvalues else "true"
netref_regex = re.compile(r'(^|[( ])\[(-?[0-9]+:|)([^\]]+)\](?=[ )]|$)') netref_regex = re.compile(r'(^|[( ])\[(-?[0-9]+:|)([^\]]*)\](?=[ )]|$)')
def replace_netref(match): def replace_netref(match):
state_sel = match.group(2) state_sel = match.group(2)

2
backends/smt2/smtio.py
View File

@ -541,6 +541,8 @@ class SmtIo:
def net_expr(self, mod, base, path): def net_expr(self, mod, base, path):
if len(path) == 1: if len(path) == 1:
assert mod in self.modinfo assert mod in self.modinfo
if path[0] == "":
return base
if path[0] in self.modinfo[mod].cells: if path[0] in self.modinfo[mod].cells:
return "(|%s_h %s| %s)" % (mod, path[0], base) return "(|%s_h %s| %s)" % (mod, path[0], base)
if path[0] in self.modinfo[mod].wsize: if path[0] in self.modinfo[mod].wsize: