luke
/
abc
mirror of https://github.com/YosysHQ/abc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merging two threads.

This commit is contained in:
Alan Mishchenko 2015-05-25 18:23:51 -07:00
parent d0bbb46191 9eb8184e74
commit f7939ee6b1
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/aig/gia/giaIf.c
View File

@ -2043,6 +2043,11 @@ void Gia_ManTransferTiming( Gia_Man_t * p, Gia_Man_t * pGia )
p->vNamesIn = pGia->vNamesIn; pGia->vNamesIn = NULL;
p->vNamesOut = pGia->vNamesOut; pGia->vNamesOut = NULL;
}
if ( pGia->vConfigs || pGia->pCellStr )
{
p->vConfigs = pGia->vConfigs; pGia->vConfigs = NULL;
p->pCellStr = pGia->pCellStr; pGia->pCellStr = NULL;
}
if ( pGia->pManTime == NULL || p == pGia )
return;
p->pManTime = pGia->pManTime; pGia->pManTime = NULL;

4
src/sat/bsat/satSolver.h
View File

@ -294,11 +294,15 @@ static inline int sat_solver_add_buffer( sat_solver * pSat, int iVarA, int iVarB
Lits[0] = toLitCond( iVarA, 0 );
Lits[1] = toLitCond( iVarB, !fCompl );
Cid = sat_solver_addclause( pSat, Lits, Lits + 2 );
if ( Cid == 0 )
return 0;
assert( Cid );
Lits[0] = toLitCond( iVarA, 1 );
Lits[1] = toLitCond( iVarB, fCompl );
Cid = sat_solver_addclause( pSat, Lits, Lits + 2 );
if ( Cid == 0 )
return 0;
assert( Cid );
return 2;
}