diff options
| author | Alan Mishchenko <alanmi@berkeley.edu> | 2013-11-01 13:48:17 -0400 |
|---|---|---|
| committer | Alan Mishchenko <alanmi@berkeley.edu> | 2013-11-01 13:48:17 -0400 |
| commit | 74893bf3d4d26570f4e5dbc6ed9562d808e05f2c (patch) | |
| tree | a8c1b60c3a6942e73fd5c27c9e352e6f7dc69c43 | |
| parent | a564e2ab8184f330e87da811cedfd3faf2ee4041 (diff) | |
| download | abc-74893bf3d4d26570f4e5dbc6ed9562d808e05f2c.tar.gz abc-74893bf3d4d26570f4e5dbc6ed9562d808e05f2c.tar.bz2 abc-74893bf3d4d26570f4e5dbc6ed9562d808e05f2c.zip | |
Sweeper internal verification.
| -rw-r--r-- | src/aig/gia/gia.h | 2 | ||||
| -rw-r--r-- | src/aig/gia/giaDup.c | 8 | ||||
| -rw-r--r-- | src/proof/ssc/sscCore.c | 2 |
3 files changed, 7 insertions, 5 deletions
diff --git a/src/aig/gia/gia.h b/src/aig/gia/gia.h index 7849f363..23e32dc1 100644 --- a/src/aig/gia/gia.h +++ b/src/aig/gia/gia.h @@ -1008,7 +1008,7 @@ extern Gia_Man_t * Gia_ManDupDfsCiMap( Gia_Man_t * p, int * pCi2Lit, Vec extern Gia_Man_t * Gia_ManDupDfsClasses( Gia_Man_t * p ); extern Gia_Man_t * Gia_ManDupTopAnd( Gia_Man_t * p, int fVerbose ); extern Gia_Man_t * Gia_ManMiter( Gia_Man_t * pAig0, Gia_Man_t * pAig1, int nInsDup, int fDualOut, int fSeq, int fImplic, int fVerbose ); -extern Gia_Man_t * Gia_ManDupAndOr( Gia_Man_t * p, int fUseOr, int fCompl ); +extern Gia_Man_t * Gia_ManDupAndOr( Gia_Man_t * p, int nOuts, int fUseOr, int fCompl ); extern Gia_Man_t * Gia_ManDupZeroUndc( Gia_Man_t * p, char * pInit, int fVerbose ); extern Gia_Man_t * Gia_ManMiter2( Gia_Man_t * p, char * pInit, int fVerbose ); extern Gia_Man_t * Gia_ManTransformMiter( Gia_Man_t * p ); diff --git a/src/aig/gia/giaDup.c b/src/aig/gia/giaDup.c index 657aa2bb..fca614bb 100644 --- a/src/aig/gia/giaDup.c +++ b/src/aig/gia/giaDup.c @@ -2027,7 +2027,7 @@ Gia_Man_t * Gia_ManMiter( Gia_Man_t * p0, Gia_Man_t * p1, int nInsDup, int fDual SeeAlso [] ***********************************************************************/ -Gia_Man_t * Gia_ManDupAndOr( Gia_Man_t * p, int fUseOr, int fCompl ) +Gia_Man_t * Gia_ManDupAndOr( Gia_Man_t * p, int nOuts, int fUseOr, int fCompl ) { Gia_Man_t * pNew, * pTemp; Gia_Obj_t * pObj; @@ -2054,8 +2054,10 @@ Gia_Man_t * Gia_ManDupAndOr( Gia_Man_t * p, int fUseOr, int fCompl ) iResult = Gia_ManHashAnd( pNew, iResult, Gia_ObjFanin0Copy(pObj) ); } iResult = Abc_LitNotCond( iResult, (int)(fCompl > 0) ); - Gia_ManForEachPo( p, pObj, i ) - pObj->Value = Gia_ManAppendCo( pNew, iResult ); +// Gia_ManForEachPo( p, pObj, i ) +// pObj->Value = Gia_ManAppendCo( pNew, iResult ); + for ( i = 0; i < nOuts; i++ ) + Gia_ManAppendCo( pNew, iResult ); Gia_ManHashStop( pNew ); Gia_ManSetRegNum( pNew, Gia_ManRegNum(p) ); pNew = Gia_ManCleanup( pTemp = pNew ); diff --git a/src/proof/ssc/sscCore.c b/src/proof/ssc/sscCore.c index 0fb16103..caad8d48 100644 --- a/src/proof/ssc/sscCore.c +++ b/src/proof/ssc/sscCore.c @@ -225,7 +225,7 @@ int Ssc_PerformVerification( Gia_Man_t * p0, Gia_Man_t * p1, Gia_Man_t * pC ) int Status; Cec_ParCec_t ParsCec, * pPars = &ParsCec; // derive the OR of constraint outputs - Gia_Man_t * pCond = Gia_ManDupAndOr( pC, 1, 0 ); + Gia_Man_t * pCond = Gia_ManDupAndOr( pC, Gia_ManPoNum(p0), 1, 0 ); // derive F = F & !OR(c0, c1, c2, ...) Gia_Man_t * p0c = Gia_ManMiter( p0, pCond, 0, 0, 0, 1, 0 ); // derive F = F & !OR(c0, c1, c2, ...) |