mirror of
https://github.com/YosysHQ/yosys
synced 2025-04-13 04:28:18 +00:00
Merge pull request #3280 from YosysHQ/micko/fix_readaiw
Fix reading aiw from other solvers
This commit is contained in:
commit
c3a3f68b4d
2
Makefile
2
Makefile
|
@ -142,7 +142,7 @@ bumpversion:
|
||||||
# is just a symlink to your actual ABC working directory, as 'make mrproper'
|
# is just a symlink to your actual ABC working directory, as 'make mrproper'
|
||||||
# will remove the 'abc' directory and you do not want to accidentally
|
# will remove the 'abc' directory and you do not want to accidentally
|
||||||
# delete your work on ABC..
|
# delete your work on ABC..
|
||||||
ABCREV = 00b674d
|
ABCREV = 3da9357
|
||||||
ABCPULL = 1
|
ABCPULL = 1
|
||||||
ABCURL ?= https://github.com/YosysHQ/abc
|
ABCURL ?= https://github.com/YosysHQ/abc
|
||||||
ABCMKARGS = CC="$(CXX)" CXX="$(CXX)" ABC_USE_LIBSTDCXX=1 VERBOSE=$(Q)
|
ABCMKARGS = CC="$(CXX)" CXX="$(CXX)" ABC_USE_LIBSTDCXX=1 VERBOSE=$(Q)
|
||||||
|
|
|
@ -1231,13 +1231,13 @@ struct SimWorker : SimShared
|
||||||
{
|
{
|
||||||
std::string line;
|
std::string line;
|
||||||
std::getline(f, line);
|
std::getline(f, line);
|
||||||
if (line.size()==0 || line[0]=='#') continue;
|
if (line.size()==0 || line[0]=='#' || line[0]=='c' || line[0]=='f' || line[0]=='u') continue;
|
||||||
if (line[0]=='.') break;
|
if (line[0]=='.') break;
|
||||||
if (state==0 && line.size()!=1) {
|
if (state==0 && line.size()!=1) {
|
||||||
// old format detected, latch data
|
// old format detected, latch data
|
||||||
state = 2;
|
state = 2;
|
||||||
}
|
}
|
||||||
if (state==1 && line[0]!='b' && line[0]!='c') {
|
if (state==1 && line[0]!='b' && line[0]!='j') {
|
||||||
// was old format but with 1 bit latch
|
// was old format but with 1 bit latch
|
||||||
top->setState(latches, status);
|
top->setState(latches, status);
|
||||||
state = 3;
|
state = 3;
|
||||||
|
|
Loading…
Reference in a new issue