diff options
| author | Alan Mishchenko <alanmi@berkeley.edu> | 2013-04-18 17:39:13 -0700 |
|---|---|---|
| committer | Alan Mishchenko <alanmi@berkeley.edu> | 2013-04-18 17:39:13 -0700 |
| commit | c80fce00fe8d9d2eb2db4bbb59eb2d4ee291e66b (patch) | |
| tree | bfe13cb80791370de3a19e9ed42d16596b1cb7f9 /src | |
| parent | 96b784ecd7cc05f99e12d52f36437c9bd9eb2375 (diff) | |
| download | abc-c80fce00fe8d9d2eb2db4bbb59eb2d4ee291e66b.tar.gz abc-c80fce00fe8d9d2eb2db4bbb59eb2d4ee291e66b.tar.bz2 abc-c80fce00fe8d9d2eb2db4bbb59eb2d4ee291e66b.zip | |
Enabled reading the EXDC network by the default BLIF reader.
Diffstat (limited to 'src')
| -rw-r--r-- | src/base/io/ioReadBlifMv.c | 32 | ||||
| -rw-r--r-- | src/base/io/ioUtil.c | 2 |
2 files changed, 29 insertions, 5 deletions
diff --git a/src/base/io/ioReadBlifMv.c b/src/base/io/ioReadBlifMv.c index ab40065e..5b2a760a 100644 --- a/src/base/io/ioReadBlifMv.c +++ b/src/base/io/ioReadBlifMv.c @@ -143,7 +143,7 @@ Abc_Ntk_t * Io_ReadBlifMv( char * pFileName, int fBlifMv, int fCheck ) { FILE * pFile; Io_MvMan_t * p; - Abc_Ntk_t * pNtk; + Abc_Ntk_t * pNtk, * pExdc; Abc_Lib_t * pDesign = NULL; char * pDesignName; int RetValue, i; @@ -205,6 +205,23 @@ Abc_Ntk_t * Io_ReadBlifMv( char * pFileName, int fBlifMv, int fCheck ) //Abc_LibPrint( pDesign ); + // check if there is an EXDC network + if ( Vec_PtrSize(pDesign->vModules) > 1 ) + { + pNtk = (Abc_Ntk_t *)Vec_PtrEntry(pDesign->vModules, 0); + Vec_PtrForEachEntryStart( Abc_Ntk_t *, pDesign->vModules, pExdc, i, 1 ) + if ( !strcmp(pExdc->pName, "exdc") ) + { + assert( pNtk->pExdc == NULL ); + pNtk->pExdc = pExdc; + Vec_PtrRemove(pDesign->vModules, pExdc); + pExdc->pDesign = NULL; + i--; + } + else + pNtk = pExdc; + } + // detect top-level model RetValue = Abc_LibFindTopLevelModels( pDesign ); pNtk = (Abc_Ntk_t *)Vec_PtrEntry( pDesign->vTops, 0 ); @@ -661,11 +678,12 @@ static void Io_MvReadPreparse( Io_MvMan_t * p ) } else if ( !strncmp(pCur, "exdc", 4) ) { - fprintf( stdout, "Line %d: Skipping EXDC network.\n", Io_MvGetLine(p, pCur) ); -// break; + fprintf( stdout, "Line %d: The design contains EXDC network (warning only).\n", Io_MvGetLine(p, pCur) ); if ( p->pLatest ) Vec_PtrPush( p->vModels, p->pLatest ); - p->pLatest = NULL; + p->pLatest = Io_MvModAlloc(); + p->pLatest->pName = NULL; + p->pLatest->pMan = p; } else if ( !strncmp(pCur, "attrib", 6) ) {} @@ -907,6 +925,12 @@ static int Io_MvParseLineModel( Io_MvMod_t * p, char * pLine ) { Vec_Ptr_t * vTokens = p->pMan->vTokens; char * pToken, * pPivot; + if ( pLine == NULL ) + { + p->pNtk = Abc_NtkAlloc( ABC_NTK_NETLIST, ABC_FUNC_SOP, 1 ); + p->pNtk->pName = Extra_UtilStrsav( "exdc" ); + return 1; + } Io_MvSplitIntoTokens( vTokens, pLine, '\0' ); pToken = (char *)Vec_PtrEntry( vTokens, 0 ); assert( !strcmp(pToken, "model") ); diff --git a/src/base/io/ioUtil.c b/src/base/io/ioUtil.c index ccba5027..bad3f35e 100644 --- a/src/base/io/ioUtil.c +++ b/src/base/io/ioUtil.c @@ -229,9 +229,9 @@ Abc_Ntk_t * Io_Read( char * pFileName, Io_FileType_t FileType, int fCheck ) Vec_Ptr_t * vLtl; // get the netlist pNtk = Io_ReadNetlist( pFileName, FileType, fCheck ); - vLtl = temporaryLtlStore( pNtk ); if ( pNtk == NULL ) return NULL; + vLtl = temporaryLtlStore( pNtk ); if ( !Abc_NtkIsNetlist(pNtk) ) return pNtk; // flatten logic hierarchy |