diff options
| author | Alan Mishchenko <alanmi@berkeley.edu> | 2016-10-06 22:04:11 -0700 |
|---|---|---|
| committer | Alan Mishchenko <alanmi@berkeley.edu> | 2016-10-06 22:04:11 -0700 |
| commit | eb65c0188829ced86c6e15aaf31a8430d13ffd6d (patch) | |
| tree | faab23588f630883ab19dd19cf0ee00fc02e0937 | |
| parent | 80327537bb9325954a01ead529d914965ee895b1 (diff) | |
| download | abc-eb65c0188829ced86c6e15aaf31a8430d13ffd6d.tar.gz abc-eb65c0188829ced86c6e15aaf31a8430d13ffd6d.tar.bz2 abc-eb65c0188829ced86c6e15aaf31a8430d13ffd6d.zip | |
Change Verilog reader to take a string rather than file name.
| -rw-r--r-- | src/base/wlc/wlc.h | 2 | ||||
| -rw-r--r-- | src/base/wlc/wlcCom.c | 2 | ||||
| -rw-r--r-- | src/base/wlc/wlcReadVer.c | 14 |
3 files changed, 10 insertions, 8 deletions
diff --git a/src/base/wlc/wlc.h b/src/base/wlc/wlc.h index bb5c4bfe..90596093 100644 --- a/src/base/wlc/wlc.h +++ b/src/base/wlc/wlc.h @@ -286,7 +286,7 @@ extern void Wlc_NtkDeleteSim( Vec_Ptr_t * p ); /*=== wlcStdin.c ========================================================*/ extern int Wlc_StdinProcessSmt( Abc_Frame_t * pAbc, char * pCmd ); /*=== wlcReadVer.c ========================================================*/ -extern Wlc_Ntk_t * Wlc_ReadVer( char * pFileName ); +extern Wlc_Ntk_t * Wlc_ReadVer( char * pFileName, char * pStr ); /*=== wlcWriteVer.c ========================================================*/ extern void Wlc_WriteVer( Wlc_Ntk_t * p, char * pFileName, int fAddCos, int fNoFlops ); diff --git a/src/base/wlc/wlcCom.c b/src/base/wlc/wlcCom.c index 2c504127..7856fae8 100644 --- a/src/base/wlc/wlcCom.c +++ b/src/base/wlc/wlcCom.c @@ -161,7 +161,7 @@ int Abc_CommandReadWlc( Abc_Frame_t * pAbc, int argc, char ** argv ) // perform reading if ( !strcmp( Extra_FileNameExtension(pFileName), "v" ) ) - pNtk = Wlc_ReadVer( pFileName ); + pNtk = Wlc_ReadVer( pFileName, NULL ); else if ( !strcmp( Extra_FileNameExtension(pFileName), "smt" ) || !strcmp( Extra_FileNameExtension(pFileName), "smt2" ) ) pNtk = Wlc_ReadSmt( pFileName, fOldParser, fPrintTree ); else diff --git a/src/base/wlc/wlcReadVer.c b/src/base/wlc/wlcReadVer.c index 08dc8e98..fa3efacd 100644 --- a/src/base/wlc/wlcReadVer.c +++ b/src/base/wlc/wlcReadVer.c @@ -75,14 +75,14 @@ static inline int Wlc_PrsStrCmp( char * pStr, char * pWhat ) { return SeeAlso [] ***********************************************************************/ -Wlc_Prs_t * Wlc_PrsStart( char * pFileName ) +Wlc_Prs_t * Wlc_PrsStart( char * pFileName, char * pStr ) { Wlc_Prs_t * p; - if ( !Extra_FileCheck( pFileName ) ) + if ( pFileName && !Extra_FileCheck( pFileName ) ) return NULL; p = ABC_CALLOC( Wlc_Prs_t, 1 ); p->pFileName = pFileName; - p->pBuffer = Extra_FileReadContents( pFileName ); + p->pBuffer = pStr ? Abc_UtilStrsav(pStr) : Extra_FileReadContents( pFileName ); p->nFileSize = strlen(p->pBuffer); assert( p->nFileSize > 0 ); p->vLines = Vec_IntAlloc( p->nFileSize / 50 ); p->vStarts = Vec_IntAlloc( p->nFileSize / 50 ); @@ -1248,12 +1248,14 @@ startword: } return 1; } -Wlc_Ntk_t * Wlc_ReadVer( char * pFileName ) +Wlc_Ntk_t * Wlc_ReadVer( char * pFileName, char * pStr ) { Wlc_Prs_t * p; Wlc_Ntk_t * pNtk = NULL; + // either file name or string is given + assert( (pFileName == NULL) != (pStr == NULL) ); // start the parser - p = Wlc_PrsStart( pFileName ); + p = Wlc_PrsStart( pFileName, pStr ); if ( p == NULL ) return NULL; // detect lines @@ -1286,7 +1288,7 @@ finish: void Io_ReadWordTest( char * pFileName ) { Gia_Man_t * pNew; - Wlc_Ntk_t * pNtk = Wlc_ReadVer( pFileName ); + Wlc_Ntk_t * pNtk = Wlc_ReadVer( pFileName, NULL ); if ( pNtk == NULL ) return; Wlc_WriteVer( pNtk, "test.v", 0, 0 ); |