Commit f7939ee6 by Alan Mishchenko

Merging two threads.

parents d0bbb461 9eb8184e
...@@ -2043,6 +2043,11 @@ void Gia_ManTransferTiming( Gia_Man_t * p, Gia_Man_t * pGia ) ...@@ -2043,6 +2043,11 @@ void Gia_ManTransferTiming( Gia_Man_t * p, Gia_Man_t * pGia )
p->vNamesIn = pGia->vNamesIn; pGia->vNamesIn = NULL; p->vNamesIn = pGia->vNamesIn; pGia->vNamesIn = NULL;
p->vNamesOut = pGia->vNamesOut; pGia->vNamesOut = 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 ) if ( pGia->pManTime == NULL || p == pGia )
return; return;
p->pManTime = pGia->pManTime; pGia->pManTime = NULL; p->pManTime = pGia->pManTime; pGia->pManTime = NULL;
......
...@@ -294,11 +294,15 @@ static inline int sat_solver_add_buffer( sat_solver * pSat, int iVarA, int iVarB ...@@ -294,11 +294,15 @@ static inline int sat_solver_add_buffer( sat_solver * pSat, int iVarA, int iVarB
Lits[0] = toLitCond( iVarA, 0 ); Lits[0] = toLitCond( iVarA, 0 );
Lits[1] = toLitCond( iVarB, !fCompl ); Lits[1] = toLitCond( iVarB, !fCompl );
Cid = sat_solver_addclause( pSat, Lits, Lits + 2 ); Cid = sat_solver_addclause( pSat, Lits, Lits + 2 );
if ( Cid == 0 )
return 0;
assert( Cid ); assert( Cid );
Lits[0] = toLitCond( iVarA, 1 ); Lits[0] = toLitCond( iVarA, 1 );
Lits[1] = toLitCond( iVarB, fCompl ); Lits[1] = toLitCond( iVarB, fCompl );
Cid = sat_solver_addclause( pSat, Lits, Lits + 2 ); Cid = sat_solver_addclause( pSat, Lits, Lits + 2 );
if ( Cid == 0 )
return 0;
assert( Cid ); assert( Cid );
return 2; return 2;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment