diff options
| author | Alan Mishchenko <alanmi@berkeley.edu> | 2015-03-08 20:17:59 -0700 |
|---|---|---|
| committer | Alan Mishchenko <alanmi@berkeley.edu> | 2015-03-08 20:17:59 -0700 |
| commit | 56f783157abf00a7d3d9744a75fa1503ea698262 (patch) | |
| tree | fd0544c9c64987323926179447ce9e5c5fe94a44 /src/base | |
| parent | 9e4f8e9fdf45067659f112acc40c5656a38c2a14 (diff) | |
| download | abc-56f783157abf00a7d3d9744a75fa1503ea698262.tar.gz abc-56f783157abf00a7d3d9744a75fa1503ea698262.tar.bz2 abc-56f783157abf00a7d3d9744a75fa1503ea698262.zip | |
Support for representing programmable cell configuration data.
Diffstat (limited to 'src/base')
| -rw-r--r-- | src/base/abci/abc.c | 10 | ||||
| -rw-r--r-- | src/base/wlc/wlcStdin.c | 2 |
2 files changed, 5 insertions, 7 deletions
diff --git a/src/base/abci/abc.c b/src/base/abci/abc.c index f1c19bd8..e28e5e7d 100644 --- a/src/base/abci/abc.c +++ b/src/base/abci/abc.c @@ -26745,12 +26745,10 @@ int Abc_CommandAbc9Strash( Abc_Frame_t * pAbc, int argc, char ** argv ) Abc_Print( -1, "Abc_CommandAbc9Strash(): There is no AIG.\n" ); return 1; } - if ( Gia_ManHasMapping(pAbc->pGia) ) - { - pTemp = (Gia_Man_t *)Dsm_ManDeriveGia( pAbc->pGia, fAddMuxes ); -// if ( !Abc_FrameReadFlag("silentmode") ) -// printf( "Performed delay-oriented unmapping.\n" ); - } + if ( Gia_ManHasMapping(pAbc->pGia) && pAbc->pGia->vConfigs ) + pTemp = (Gia_Man_t *)If_ManDeriveGiaFromCells( pAbc->pGia ); + else if ( Gia_ManHasMapping(pAbc->pGia) ) + pTemp = (Gia_Man_t *)Dsm_ManDeriveGia( pAbc->pGia, fAddMuxes ); // delay-oriented unmapping else if ( fAddMuxes ) { if ( pAbc->pGia->pMuxes ) diff --git a/src/base/wlc/wlcStdin.c b/src/base/wlc/wlcStdin.c index 353cbb3e..d0249d1e 100644 --- a/src/base/wlc/wlcStdin.c +++ b/src/base/wlc/wlcStdin.c @@ -110,7 +110,7 @@ Vec_Str_t * Wlc_ConvertToRadix( unsigned * pBits, int Start, int nBits, int Radi void Wlc_NtkReport( Wlc_Ntk_t * p, Abc_Cex_t * pCex, char * pName, int Radix ) { Vec_Str_t * vNum; - int i, NameId, Name, Start, nBits = -1; + int i, NameId, Name, Start = -1, nBits = -1; assert( pCex->nRegs == 0 ); // get the name ID NameId = Abc_NamStrFind( p->pManName, pName ); |