diff options
| author | Alan Mishchenko <alanmi@berkeley.edu> | 2015-05-25 18:23:51 -0700 |
|---|---|---|
| committer | Alan Mishchenko <alanmi@berkeley.edu> | 2015-05-25 18:23:51 -0700 |
| commit | f7939ee6b12d69587c546e532e91da485e63ba1b (patch) | |
| tree | cdae2b3859791859167637be31e882116f001c95 /src | |
| parent | d0bbb46191e1f87244bd792b340b5e2785dd0d99 (diff) | |
| parent | 9eb8184e7478b357c62d41546c1c065549b7dd7d (diff) | |
| download | abc-f7939ee6b12d69587c546e532e91da485e63ba1b.tar.gz abc-f7939ee6b12d69587c546e532e91da485e63ba1b.tar.bz2 abc-f7939ee6b12d69587c546e532e91da485e63ba1b.zip | |
Merging two threads.
Diffstat (limited to 'src')
| -rw-r--r-- | src/aig/gia/giaIf.c | 5 | ||||
| -rw-r--r-- | src/sat/bsat/satSolver.h | 4 |
2 files changed, 9 insertions, 0 deletions
diff --git a/src/aig/gia/giaIf.c b/src/aig/gia/giaIf.c index 487460bd..45d2b49f 100644 --- a/src/aig/gia/giaIf.c +++ b/src/aig/gia/giaIf.c @@ -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; diff --git a/src/sat/bsat/satSolver.h b/src/sat/bsat/satSolver.h index ebc555d9..d328e6d5 100644 --- a/src/sat/bsat/satSolver.h +++ b/src/sat/bsat/satSolver.h @@ -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; } |