diff options
Diffstat (limited to 'src/base')
-rw-r--r-- | src/base/abci/abc.c | 30 | ||||
-rw-r--r-- | src/base/abci/abcRec2.c | 2 | ||||
-rw-r--r-- | src/base/abci/abcTim.c | 6 | ||||
-rw-r--r-- | src/base/cmd/cmdPlugin.c | 4 |
4 files changed, 21 insertions, 21 deletions
diff --git a/src/base/abci/abc.c b/src/base/abci/abc.c index c65ee1bc..651b70ec 100644 --- a/src/base/abci/abc.c +++ b/src/base/abci/abc.c @@ -12840,7 +12840,7 @@ int Abc_CommandRecStart2( Abc_Frame_t * pAbc, int argc, char ** argv ) return 1; } fclose( pFile ); - pGia = Gia_ReadAiger( FileName, 1, 0 ); + pGia = Gia_AigerRead( FileName, 1, 0 ); if ( pGia == NULL ) { Abc_Print( -1, "Reading AIGER has failed.\n" ); @@ -13059,7 +13059,7 @@ int Abc_CommandRecDump2( Abc_Frame_t * pAbc, int argc, char ** argv ) { // get the input file name FileName = pArgvNew[0]; - Gia_WriteAiger( pGia, FileName, 0, 0 ); + Gia_AigerWrite( pGia, FileName, 0, 0 ); } return 0; @@ -13188,7 +13188,7 @@ int Abc_CommandRecMerge2( Abc_Frame_t * pAbc, int argc, char ** argv ) return 1; } fclose( pFile ); - pGia = Gia_ReadAiger( FileName, 0, 0 ); + pGia = Gia_AigerRead( FileName, 0, 0 ); if ( pGia == NULL ) { Abc_Print( -1, "Reading AIGER has failed.\n" ); @@ -13299,7 +13299,7 @@ int Abc_CommandRecStart3( Abc_Frame_t * pAbc, int argc, char ** argv ) return 1; } fclose( pFile ); - pGia = Gia_ReadAiger( FileName, 1, 0 ); + pGia = Gia_AigerRead( FileName, 1, 0 ); if ( pGia == NULL ) { Abc_Print( -1, "Reading AIGER has failed.\n" ); @@ -13531,7 +13531,7 @@ int Abc_CommandRecDump3( Abc_Frame_t * pAbc, int argc, char ** argv ) Abc_Print( 0, "No structure in the library.\n" ); return 1; } - Gia_WriteAiger( pGia, FileName, 0, 0 ); + Gia_AigerWrite( pGia, FileName, 0, 0 ); } return 0; @@ -13605,7 +13605,7 @@ int Abc_CommandRecMerge3( Abc_Frame_t * pAbc, int argc, char ** argv ) return 1; } fclose( pFile ); - pGia = Gia_ReadAiger( FileName, 1, 0 ); + pGia = Gia_AigerRead( FileName, 1, 0 ); if ( pGia == NULL ) { Abc_Print( -1, "Reading AIGER has failed.\n" ); @@ -23444,7 +23444,7 @@ int Abc_CommandAbc9Read( Abc_Frame_t * pAbc, int argc, char ** argv ) } fclose( pFile ); - pAig = Gia_ReadAiger( FileName, fSkipStrash, 0 ); + pAig = Gia_AigerRead( FileName, fSkipStrash, 0 ); Abc_CommandUpdate9( pAbc, pAig ); return 0; @@ -23830,11 +23830,11 @@ int Abc_CommandAbc9Write( Abc_Frame_t * pAbc, int argc, char ** argv ) if ( fUnique ) { Gia_Man_t * pGia = Gia_ManIsoCanonicize( pAbc->pGia, fVerbose ); - Gia_WriteAigerSimple( pGia, pFileName ); + Gia_AigerWriteSimple( pGia, pFileName ); Gia_ManStop( pGia ); } else - Gia_WriteAiger( pAbc->pGia, pFileName, 0, 0 ); + Gia_AigerWrite( pAbc->pGia, pFileName, 0, 0 ); return 0; usage: @@ -25942,7 +25942,7 @@ int Abc_CommandAbc9Miter( Abc_Frame_t * pAbc, int argc, char ** argv ) return 1; } fclose( pFile ); - pSecond = Gia_ReadAiger( FileName, 0, 0 ); + pSecond = Gia_AigerRead( FileName, 0, 0 ); if ( pSecond == NULL ) { Abc_Print( -1, "Reading AIGER has failed.\n" ); @@ -26024,7 +26024,7 @@ int Abc_CommandAbc9Append( Abc_Frame_t * pAbc, int argc, char ** argv ) return 1; } fclose( pFile ); - pSecond = Gia_ReadAiger( FileName, 0, 0 ); + pSecond = Gia_AigerRead( FileName, 0, 0 ); if ( pSecond == NULL ) { Abc_Print( -1, "Reading AIGER has failed.\n" ); @@ -26689,7 +26689,7 @@ int Abc_CommandAbc9Srm( Abc_Frame_t * pAbc, int argc, char ** argv ) pTemp = Gia_ManSeqStructSweep( pAux = pTemp, 1, 1, 0 ); Gia_ManStop( pAux ); } - Gia_WriteAiger( pTemp, pFileNameIn ? pFileNameIn : pFileName, 0, 0 ); + Gia_AigerWrite( pTemp, pFileNameIn ? pFileNameIn : pFileName, 0, 0 ); Abc_Print( 1, "Speculatively reduced model was written into file \"%s\".\n", pFileName ); Gia_ManPrintStatsShort( pTemp ); Gia_ManStop( pTemp ); @@ -26702,7 +26702,7 @@ int Abc_CommandAbc9Srm( Abc_Frame_t * pAbc, int argc, char ** argv ) pTemp = Gia_ManSeqStructSweep( pAux = pTemp, 1, 1, 0 ); Gia_ManStop( pAux ); - Gia_WriteAiger( pTemp, pFileName2, 0, 0 ); + Gia_AigerWrite( pTemp, pFileName2, 0, 0 ); Abc_Print( 1, "Reduced original network was written into file \"%s\".\n", pFileName2 ); Gia_ManPrintStatsShort( pTemp ); Gia_ManStop( pTemp ); @@ -26803,7 +26803,7 @@ int Abc_CommandAbc9Srm2( Abc_Frame_t * pAbc, int argc, char ** argv ) pTemp = Gia_ManSeqStructSweep( pAux = pTemp, 1, 1, 0 ); Gia_ManStop( pAux ); - Gia_WriteAiger( pTemp, pFileName, 0, 0 ); + Gia_AigerWrite( pTemp, pFileName, 0, 0 ); Abc_Print( 1, "Speculatively reduced model was written into file \"%s\".\n", pFileName ); Gia_ManPrintStatsShort( pTemp ); Gia_ManStop( pTemp ); @@ -27122,7 +27122,7 @@ int Abc_CommandAbc9Cec( Abc_Frame_t * pAbc, int argc, char ** argv ) return 1; } fclose( pFile ); - pSecond = Gia_ReadAiger( FileName, 0, 0 ); + pSecond = Gia_AigerRead( FileName, 0, 0 ); if ( pSecond == NULL ) { Abc_Print( -1, "Reading AIGER has failed.\n" ); diff --git a/src/base/abci/abcRec2.c b/src/base/abci/abcRec2.c index b359f312..385ec520 100644 --- a/src/base/abci/abcRec2.c +++ b/src/base/abci/abcRec2.c @@ -581,7 +581,7 @@ void Abc_NtkRecFilter2(int nLimit) // remove dangling nodes and POs driven by constants newPGia = Abc_NtkDupWithoutDangling2(pGia); sprintf( fileName, "RecLib%d_Filtered%d.aig", p->nVars, nLimit); - Gia_WriteAiger( newPGia, fileName, 0, 0 ); + Gia_AigerWrite( newPGia, fileName, 0, 0 ); Abc_Print(1, "Library %s was written.", fileName); //Gia_ManHashStop(newPGia); Gia_ManStop(newPGia); diff --git a/src/base/abci/abcTim.c b/src/base/abci/abcTim.c index 1544e1e2..41406ce4 100644 --- a/src/base/abci/abcTim.c +++ b/src/base/abci/abcTim.c @@ -223,7 +223,7 @@ void Abc_NtkTestPinGia( Abc_Ntk_t * pNtk, int fWhiteBoxOnly, int fVerbose ) Gia_Man_t * pGia; char * pFileName = "testpin.aig"; pGia = Abc_NtkTestPinDeriveGia( pNtk, fWhiteBoxOnly, fVerbose ); - Gia_WriteAiger( pGia, pFileName, 0, 0 ); + Gia_AigerWrite( pGia, pFileName, 0, 0 ); Gia_ManStop( pGia ); printf( "AIG with pins derived from mapped network \"%s\" was written into file \"%s\".\n", Abc_NtkName(pNtk), pFileName ); @@ -426,13 +426,13 @@ void Abc_NtkTestTimByWritingFile( Gia_Man_t * pGia, char * pFileName ) Gia_ManReverseClasses( pGia, 0 ); } // write file - Gia_WriteAiger( pGia, pFileName, 0, 0 ); + Gia_AigerWrite( pGia, pFileName, 0, 0 ); // unnormalize choices if ( Gia_ManWithChoices(pGia) ) Gia_ManReverseClasses( pGia, 1 ); // read file - pGia2 = Gia_ReadAiger( pFileName, 1, 1 ); + pGia2 = Gia_AigerRead( pFileName, 1, 1 ); // normalize choices if ( Gia_ManWithChoices(pGia2) ) diff --git a/src/base/cmd/cmdPlugin.c b/src/base/cmd/cmdPlugin.c index b89238fc..2aa95e85 100644 --- a/src/base/cmd/cmdPlugin.c +++ b/src/base/cmd/cmdPlugin.c @@ -391,7 +391,7 @@ Gia_Man_t * Abc_ManReadAig( char * pFileName, char * pToken ) fclose( pFile ); } // derive AIG - pGia = Gia_ReadAigerFromMemory( pStr, nBinaryPart, 0, 0 ); + pGia = Gia_AigerReadFromMemory( pStr, nBinaryPart, 0, 0 ); } Vec_StrFree( vStr ); return pGia; @@ -513,7 +513,7 @@ int Cmd_CommandAbcPlugIn( Abc_Frame_t * pAbc, int argc, char ** argv ) } // create input file - Gia_WriteAiger( pAbc->pGia, pFileIn, 0, 0 ); + Gia_AigerWrite( pAbc->pGia, pFileIn, 0, 0 ); // create command line vCommand = Vec_StrAlloc( 100 ); |