diff options
Diffstat (limited to 'src/base')
| -rw-r--r-- | src/base/abci/abc.c | 22 | ||||
| -rw-r--r-- | src/base/abci/abcDar.c | 7 |
2 files changed, 24 insertions, 5 deletions
diff --git a/src/base/abci/abc.c b/src/base/abci/abc.c index 81092912..3573c442 100644 --- a/src/base/abci/abc.c +++ b/src/base/abci/abc.c @@ -26557,6 +26557,7 @@ int Abc_CommandAbc9Strash( Abc_Frame_t * pAbc, int argc, char ** argv ) } else if ( fCollapse && pAbc->pGia->pAigExtra ) { + assert( !Gia_ManBufNum(pAbc->pGia) ); if ( Gia_ManIsSeqWithBoxes(pAbc->pGia) || Gia_ManRegBoxNum(pAbc->pGia) ) { Gia_Man_t * pUnshuffled = Gia_ManDupUnshuffleInputs( pAbc->pGia ); @@ -31744,6 +31745,11 @@ int Abc_CommandAbc9If( Abc_Frame_t * pAbc, int argc, char ** argv ) Abc_Print( -1, "Empty GIA network.\n" ); return 1; } + if ( Gia_ManBufNum(pAbc->pGia) ) + { + Abc_Print( -1, "This command does not work with barrier buffers.\n" ); + return 1; + } if ( Gia_ManHasMapping(pAbc->pGia) ) { Abc_Print( -1, "Current AIG has mapping. Run \"&st\".\n" ); @@ -32377,7 +32383,11 @@ int Abc_CommandAbc9Jf( Abc_Frame_t * pAbc, int argc, char ** argv ) Abc_Print( -1, "Empty GIA network.\n" ); return 1; } - + if ( Gia_ManBufNum(pAbc->pGia) ) + { + Abc_Print( -1, "Abc_CommandAbc9Jf(): This command does not work with barrier buffers.\n" ); + return 1; + } if ( (pPars->fFuncDsd || pPars->fGenCnf) && pPars->nLutSize > 6 ) { Abc_Print( -1, "Abc_CommandAbc9Jf(): DSD computation works for LUT6 or less.\n" ); @@ -33641,6 +33651,11 @@ int Abc_CommandAbc9Dch( Abc_Frame_t * pAbc, int argc, char ** argv ) Abc_Print( -1, "Abc_CommandAbc9Dch(): There is no AIG.\n" ); return 1; } + if ( Gia_ManBufNum(pAbc->pGia) ) + { + Abc_Print( -1, "Abc_CommandAbc9Dch(): This command does not work with barrier buffers.\n" ); + return 1; + } pTemp = Gia_ManPerformDch( pAbc->pGia, pPars ); Abc_FrameUpdateGia( pAbc, pTemp ); return 0; @@ -36950,6 +36965,11 @@ int Abc_CommandAbc9Mfs( Abc_Frame_t * pAbc, int argc, char ** argv ) Abc_Print( -1, "Abc_CommandAbc9Mfs(): There is no AIG.\n" ); return 0; } + if ( Gia_ManBufNum(pAbc->pGia) ) + { + Abc_Print( -1, "Abc_CommandAbc9Mfs(): This command does not work with barrier buffers.\n" ); + return 1; + } if ( !Gia_ManHasMapping(pAbc->pGia) ) { Abc_Print( -1, "Abc_CommandAbc9Mfs(): The current AIG has no mapping.\n" ); diff --git a/src/base/abci/abcDar.c b/src/base/abci/abcDar.c index 613f151f..f450fc47 100644 --- a/src/base/abci/abcDar.c +++ b/src/base/abci/abcDar.c @@ -911,10 +911,9 @@ Abc_Ntk_t * Abc_NtkFromCellMappedGia( Gia_Man_t * p ) Gia_ManForEachCo( p, pObj, i ) if ( Gia_ObjFaninId0p(p, pObj) == 0 ) fNeedConst[Gia_ObjFaninC0(pObj)] = 1; - if ( Gia_ManBufNum(p) ) - Gia_ManForEachBuf( p, pObj, i ) - if ( Gia_ObjFaninId0p(p, pObj) == 0 ) - fNeedConst[Gia_ObjFaninC0(pObj)] = 1; + Gia_ManForEachBuf( p, pObj, i ) + if ( Gia_ObjFaninId0p(p, pObj) == 0 ) + fNeedConst[Gia_ObjFaninC0(pObj)] = 1; if ( fNeedConst[0] ) Abc_NtkFromCellWrite( vCopyLits, 0, 0, Abc_ObjId(Abc_NtkCreateNodeConst0(pNtkNew)) ); if ( fNeedConst[1] ) |