diff options
Diffstat (limited to 'src/base')
-rw-r--r-- | src/base/abc/abc.h | 2 | ||||
-rw-r--r-- | src/base/abc/abcLib.c | 12 | ||||
-rw-r--r-- | src/base/abci/abcCascade.c | 4 | ||||
-rw-r--r-- | src/base/abci/abcNtbdd.c | 18 | ||||
-rw-r--r-- | src/base/cmd/cmd.c | 38 | ||||
-rw-r--r-- | src/base/cmd/cmdAlias.c | 4 | ||||
-rw-r--r-- | src/base/cmd/cmdApi.c | 4 | ||||
-rw-r--r-- | src/base/cmd/cmdFlag.c | 8 | ||||
-rw-r--r-- | src/base/cmd/cmdInt.h | 2 | ||||
-rw-r--r-- | src/base/cmd/cmdUtils.c | 24 | ||||
-rw-r--r-- | src/base/io/io.c | 2 | ||||
-rw-r--r-- | src/base/main/mainInt.h | 6 | ||||
-rw-r--r-- | src/base/ver/ver.h | 2 | ||||
-rw-r--r-- | src/base/ver/verCore.c | 16 |
14 files changed, 71 insertions, 71 deletions
diff --git a/src/base/abc/abc.h b/src/base/abc/abc.h index 06828720..f8e16cd6 100644 --- a/src/base/abc/abc.h +++ b/src/base/abc/abc.h @@ -222,7 +222,7 @@ struct Abc_Lib_t_ void * pManFunc; // functionality manager for the nodes Vec_Ptr_t * vTops; // the array of top-level modules Vec_Ptr_t * vModules; // the array of modules - st_table * tModules; // the table hashing module names into their networks + st__table * tModules; // the table hashing module names into their networks Abc_Lib_t * pLibrary; // the library used to map this design void * pGenlib; // the genlib library used to map this design }; diff --git a/src/base/abc/abcLib.c b/src/base/abc/abcLib.c index b80ebd97..a529ea82 100644 --- a/src/base/abc/abcLib.c +++ b/src/base/abc/abcLib.c @@ -48,7 +48,7 @@ Abc_Lib_t * Abc_LibCreate( char * pName ) p = ABC_ALLOC( Abc_Lib_t, 1 ); memset( p, 0, sizeof(Abc_Lib_t) ); p->pName = Abc_UtilStrsav( pName ); - p->tModules = st_init_table( strcmp, st_strhash ); + p->tModules = st__init_table( strcmp, st__strhash ); p->vTops = Vec_PtrAlloc( 100 ); p->vModules = Vec_PtrAlloc( 100 ); p->pManFunc = Hop_ManStart(); @@ -76,7 +76,7 @@ void Abc_LibFree( Abc_Lib_t * pLib, Abc_Ntk_t * pNtkSave ) if ( pLib->pManFunc ) Hop_ManStop( (Hop_Man_t *)pLib->pManFunc ); if ( pLib->tModules ) - st_free_table( pLib->tModules ); + st__free_table( pLib->tModules ); if ( pLib->vModules ) { Vec_PtrForEachEntry( Abc_Ntk_t *, pLib->vModules, pNtk, i ) @@ -170,9 +170,9 @@ void Abc_LibPrint( Abc_Lib_t * pLib ) ***********************************************************************/ int Abc_LibAddModel( Abc_Lib_t * pLib, Abc_Ntk_t * pNtk ) { - if ( st_is_member( pLib->tModules, (char *)pNtk->pName ) ) + if ( st__is_member( pLib->tModules, (char *)pNtk->pName ) ) return 0; - st_insert( pLib->tModules, (char *)pNtk->pName, (char *)pNtk ); + st__insert( pLib->tModules, (char *)pNtk->pName, (char *)pNtk ); assert( pNtk->Id == 0 ); pNtk->Id = Vec_PtrSize(pLib->vModules); Vec_PtrPush( pLib->vModules, pNtk ); @@ -194,9 +194,9 @@ int Abc_LibAddModel( Abc_Lib_t * pLib, Abc_Ntk_t * pNtk ) Abc_Ntk_t * Abc_LibFindModelByName( Abc_Lib_t * pLib, char * pName ) { Abc_Ntk_t * pNtk; - if ( !st_is_member( pLib->tModules, (char *)pName ) ) + if ( ! st__is_member( pLib->tModules, (char *)pName ) ) return NULL; - st_lookup( pLib->tModules, (char *)pName, (char **)&pNtk ); + st__lookup( pLib->tModules, (char *)pName, (char **)&pNtk ); return pNtk; } diff --git a/src/base/abci/abcCascade.c b/src/base/abci/abcCascade.c index bb6e1d4b..ccae60a5 100644 --- a/src/base/abci/abcCascade.c +++ b/src/base/abci/abcCascade.c @@ -762,7 +762,7 @@ DdNode * Abc_NtkBddToAdd( DdManager * dd, DdNode * bFunc, int nOuts ) DdNode * aFunc, * aTemp, * bTemp; stmm_table * tTable; stmm_generator * gen; - tTable = stmm_init_table( st_ptrcmp, st_ptrhash ); + tTable = stmm_init_table( st__ptrcmp, st__ptrhash ); aFunc = Abc_NtkBddToAdd_rec( dd, Cudd_Regular(bFunc), nOuts, tTable, Cudd_IsComplement(bFunc) ); stmm_foreach_item( tTable, gen, (char **)&bTemp, (char **)&aTemp ) Cudd_RecursiveDeref( dd, aTemp ); @@ -820,7 +820,7 @@ DdNode * Abc_NtkAddToBdd( DdManager * dd, DdNode * aFunc, int nIns, int nOuts ) DdNode * bFunc, * bTemp, * aTemp; stmm_table * tTable; stmm_generator * gen; - tTable = stmm_init_table( st_ptrcmp, st_ptrhash ); + tTable = stmm_init_table( st__ptrcmp, st__ptrhash ); bFunc = Abc_NtkAddToBdd_rec( dd, aFunc, nIns, nOuts, tTable ); stmm_foreach_item( tTable, gen, (char **)&aTemp, (char **)&bTemp ) Cudd_RecursiveDeref( dd, bTemp ); diff --git a/src/base/abci/abcNtbdd.c b/src/base/abci/abcNtbdd.c index 0fc8c36c..3fe42053 100644 --- a/src/base/abci/abcNtbdd.c +++ b/src/base/abci/abcNtbdd.c @@ -30,7 +30,7 @@ ABC_NAMESPACE_IMPL_START static void Abc_NtkBddToMuxesPerform( Abc_Ntk_t * pNtk, Abc_Ntk_t * pNtkNew ); static Abc_Obj_t * Abc_NodeBddToMuxes( Abc_Obj_t * pNodeOld, Abc_Ntk_t * pNtkNew ); -static Abc_Obj_t * Abc_NodeBddToMuxes_rec( DdManager * dd, DdNode * bFunc, Abc_Ntk_t * pNtkNew, st_table * tBdd2Node ); +static Abc_Obj_t * Abc_NodeBddToMuxes_rec( DdManager * dd, DdNode * bFunc, Abc_Ntk_t * pNtkNew, st__table * tBdd2Node ); static DdNode * Abc_NodeGlobalBdds_rec( DdManager * dd, Abc_Obj_t * pNode, int nBddSizeMax, int fDropInternal, ProgressBar * pProgress, int * pCounter, int fVerbose ); //////////////////////////////////////////////////////////////////////// @@ -189,16 +189,16 @@ Abc_Obj_t * Abc_NodeBddToMuxes( Abc_Obj_t * pNodeOld, Abc_Ntk_t * pNtkNew ) DdManager * dd = (DdManager *)pNodeOld->pNtk->pManFunc; DdNode * bFunc = (DdNode *)pNodeOld->pData; Abc_Obj_t * pFaninOld, * pNodeNew; - st_table * tBdd2Node; + st__table * tBdd2Node; int i; // create the table mapping BDD nodes into the ABC nodes - tBdd2Node = st_init_table( st_ptrcmp, st_ptrhash ); + tBdd2Node = st__init_table( st__ptrcmp, st__ptrhash ); // add the constant and the elementary vars Abc_ObjForEachFanin( pNodeOld, pFaninOld, i ) - st_insert( tBdd2Node, (char *)Cudd_bddIthVar(dd, i), (char *)pFaninOld->pCopy ); + st__insert( tBdd2Node, (char *)Cudd_bddIthVar(dd, i), (char *)pFaninOld->pCopy ); // create the new nodes recursively pNodeNew = Abc_NodeBddToMuxes_rec( dd, Cudd_Regular(bFunc), pNtkNew, tBdd2Node ); - st_free_table( tBdd2Node ); + st__free_table( tBdd2Node ); if ( Cudd_IsComplement(bFunc) ) pNodeNew = Abc_NtkCreateNodeInv( pNtkNew, pNodeNew ); return pNodeNew; @@ -215,24 +215,24 @@ Abc_Obj_t * Abc_NodeBddToMuxes( Abc_Obj_t * pNodeOld, Abc_Ntk_t * pNtkNew ) SeeAlso [] ***********************************************************************/ -Abc_Obj_t * Abc_NodeBddToMuxes_rec( DdManager * dd, DdNode * bFunc, Abc_Ntk_t * pNtkNew, st_table * tBdd2Node ) +Abc_Obj_t * Abc_NodeBddToMuxes_rec( DdManager * dd, DdNode * bFunc, Abc_Ntk_t * pNtkNew, st__table * tBdd2Node ) { Abc_Obj_t * pNodeNew, * pNodeNew0, * pNodeNew1, * pNodeNewC; assert( !Cudd_IsComplement(bFunc) ); if ( bFunc == b1 ) return Abc_NtkCreateNodeConst1(pNtkNew); - if ( st_lookup( tBdd2Node, (char *)bFunc, (char **)&pNodeNew ) ) + if ( st__lookup( tBdd2Node, (char *)bFunc, (char **)&pNodeNew ) ) return pNodeNew; // solve for the children nodes pNodeNew0 = Abc_NodeBddToMuxes_rec( dd, Cudd_Regular(cuddE(bFunc)), pNtkNew, tBdd2Node ); if ( Cudd_IsComplement(cuddE(bFunc)) ) pNodeNew0 = Abc_NtkCreateNodeInv( pNtkNew, pNodeNew0 ); pNodeNew1 = Abc_NodeBddToMuxes_rec( dd, cuddT(bFunc), pNtkNew, tBdd2Node ); - if ( !st_lookup( tBdd2Node, (char *)Cudd_bddIthVar(dd, bFunc->index), (char **)&pNodeNewC ) ) + if ( ! st__lookup( tBdd2Node, (char *)Cudd_bddIthVar(dd, bFunc->index), (char **)&pNodeNewC ) ) assert( 0 ); // create the MUX node pNodeNew = Abc_NtkCreateNodeMux( pNtkNew, pNodeNewC, pNodeNew1, pNodeNew0 ); - st_insert( tBdd2Node, (char *)bFunc, (char *)pNodeNew ); + st__insert( tBdd2Node, (char *)bFunc, (char *)pNodeNew ); return pNodeNew; } diff --git a/src/base/cmd/cmd.c b/src/base/cmd/cmd.c index 3180c3e4..bb6ba3dd 100644 --- a/src/base/cmd/cmd.c +++ b/src/base/cmd/cmd.c @@ -75,9 +75,9 @@ extern int Cmd_CommandAbcLoadPlugIn( Abc_Frame_t * pAbc, int argc, char ** argv ******************************************************************************/ void Cmd_Init( Abc_Frame_t * pAbc ) { - pAbc->tCommands = st_init_table(strcmp, st_strhash); - pAbc->tAliases = st_init_table(strcmp, st_strhash); - pAbc->tFlags = st_init_table(strcmp, st_strhash); + pAbc->tCommands = st__init_table(strcmp, st__strhash); + pAbc->tAliases = st__init_table(strcmp, st__strhash); + pAbc->tFlags = st__init_table(strcmp, st__strhash); pAbc->aHistory = Vec_PtrAlloc( 100 ); Cmd_HistoryRead( pAbc ); @@ -120,25 +120,25 @@ void Cmd_Init( Abc_Frame_t * pAbc ) ******************************************************************************/ void Cmd_End( Abc_Frame_t * pAbc ) { - st_generator * gen; + st__generator * gen; char * pKey, * pValue; Cmd_HistoryWrite( pAbc, ABC_INFINITY ); -// st_free_table( pAbc->tCommands, (void (*)()) 0, CmdCommandFree ); -// st_free_table( pAbc->tAliases, (void (*)()) 0, CmdCommandAliasFree ); -// st_free_table( pAbc->tFlags, free, free ); +// st__free_table( pAbc->tCommands, (void (*)()) 0, CmdCommandFree ); +// st__free_table( pAbc->tAliases, (void (*)()) 0, CmdCommandAliasFree ); +// st__free_table( pAbc->tFlags, free, free ); - st_foreach_item( pAbc->tCommands, gen, (const char **)&pKey, (char **)&pValue ) + st__foreach_item( pAbc->tCommands, gen, (const char **)&pKey, (char **)&pValue ) CmdCommandFree( (Abc_Command *)pValue ); - st_free_table( pAbc->tCommands ); + st__free_table( pAbc->tCommands ); - st_foreach_item( pAbc->tAliases, gen, (const char **)&pKey, (char **)&pValue ) + st__foreach_item( pAbc->tAliases, gen, (const char **)&pKey, (char **)&pValue ) CmdCommandAliasFree( (Abc_Alias *)pValue ); - st_free_table( pAbc->tAliases ); + st__free_table( pAbc->tAliases ); - st_foreach_item( pAbc->tFlags, gen, (const char **)&pKey, (char **)&pValue ) + st__foreach_item( pAbc->tFlags, gen, (const char **)&pKey, (char **)&pValue ) ABC_FREE( pKey ), ABC_FREE( pValue ); - st_free_table( pAbc->tFlags ); + st__free_table( pAbc->tFlags ); Vec_PtrFreeFree( pAbc->aHistory ); } @@ -420,14 +420,14 @@ int CmdCommandAlias( Abc_Frame_t * pAbc, int argc, char **argv ) } else if ( argc == 2 ) { - if ( st_lookup( pAbc->tAliases, argv[1], &value ) ) + if ( st__lookup( pAbc->tAliases, argv[1], &value ) ) CmdCommandAliasPrint( pAbc, ( Abc_Alias * ) value ); return 0; } // delete any existing alias key = argv[1]; - if ( st_delete( pAbc->tAliases, &key, &value ) ) + if ( st__delete( pAbc->tAliases, &key, &value ) ) CmdCommandAliasFree( ( Abc_Alias * ) value ); CmdCommandAliasAdd( pAbc, argv[1], argc - 2, argv + 2 ); return 0; @@ -477,7 +477,7 @@ int CmdCommandUnalias( Abc_Frame_t * pAbc, int argc, char **argv ) for ( i = 1; i < argc; i++ ) { key = argv[i]; - if ( st_delete( pAbc->tAliases, &key, &value ) ) + if ( st__delete( pAbc->tAliases, &key, &value ) ) { CmdCommandAliasFree( ( Abc_Alias * ) value ); } @@ -762,7 +762,7 @@ int CmdCommandSetVariable( Abc_Frame_t * pAbc, int argc, char **argv ) else { key = argv[1]; - if ( st_delete( pAbc->tFlags, &key, &value ) ) + if ( st__delete( pAbc->tFlags, &key, &value ) ) { ABC_FREE( key ); ABC_FREE( value ); @@ -770,7 +770,7 @@ int CmdCommandSetVariable( Abc_Frame_t * pAbc, int argc, char **argv ) flag_value = argc == 2 ? Extra_UtilStrsav( "" ) : Extra_UtilStrsav( argv[2] ); // flag_value = argc == 2 ? NULL : Extra_UtilStrsav(argv[2]); - st_insert( pAbc->tFlags, Extra_UtilStrsav(argv[1]), flag_value ); + st__insert( pAbc->tFlags, Extra_UtilStrsav(argv[1]), flag_value ); if ( strcmp( argv[1], "abcout" ) == 0 ) { @@ -861,7 +861,7 @@ int CmdCommandUnsetVariable( Abc_Frame_t * pAbc, int argc, char **argv ) for ( i = 1; i < argc; i++ ) { key = argv[i]; - if ( st_delete( pAbc->tFlags, &key, &value ) ) + if ( st__delete( pAbc->tFlags, &key, &value ) ) { ABC_FREE( key ); ABC_FREE( value ); diff --git a/src/base/cmd/cmdAlias.c b/src/base/cmd/cmdAlias.c index 5afef7c8..d3ac4194 100644 --- a/src/base/cmd/cmdAlias.c +++ b/src/base/cmd/cmdAlias.c @@ -54,7 +54,7 @@ void CmdCommandAliasAdd( Abc_Frame_t * pAbc, char * sName, int argc, char ** arg pAlias->argv = ABC_ALLOC(char *, pAlias->argc); for(i = 0; i < argc; i++) pAlias->argv[i] = Extra_UtilStrsav(argv[i]); - fStatus = st_insert( pAbc->tAliases, pAlias->sName, (char *) pAlias ); + fStatus = st__insert( pAbc->tAliases, pAlias->sName, (char *) pAlias ); assert(!fStatus); } @@ -93,7 +93,7 @@ char * CmdCommandAliasLookup( Abc_Frame_t * pAbc, char * sCommand ) { Abc_Alias * pAlias; char * value; - if (!st_lookup( pAbc->tAliases, sCommand, &value)) + if (! st__lookup( pAbc->tAliases, sCommand, &value)) return sCommand; pAlias = (Abc_Alias *) value; return pAlias->argv[0]; diff --git a/src/base/cmd/cmdApi.c b/src/base/cmd/cmdApi.c index a2322c4c..6aa5b845 100644 --- a/src/base/cmd/cmdApi.c +++ b/src/base/cmd/cmdApi.c @@ -52,7 +52,7 @@ void Cmd_CommandAdd( Abc_Frame_t * pAbc, const char * sGroup, const char * sName int fStatus; key = sName; - if ( st_delete( pAbc->tCommands, &key, &value ) ) + if ( st__delete( pAbc->tCommands, &key, &value ) ) { // delete existing definition for this command fprintf( pAbc->Err, "Cmd warning: redefining '%s'\n", sName ); @@ -65,7 +65,7 @@ void Cmd_CommandAdd( Abc_Frame_t * pAbc, const char * sGroup, const char * sName pCommand->sGroup = Extra_UtilStrsav( sGroup ); pCommand->pFunc = pFunc; pCommand->fChange = fChanges; - fStatus = st_insert( pAbc->tCommands, pCommand->sName, (char *)pCommand ); + fStatus = st__insert( pAbc->tCommands, pCommand->sName, (char *)pCommand ); assert( !fStatus ); // the command should not be in the table } diff --git a/src/base/cmd/cmdFlag.c b/src/base/cmd/cmdFlag.c index f0ed38a1..33427b0e 100644 --- a/src/base/cmd/cmdFlag.c +++ b/src/base/cmd/cmdFlag.c @@ -47,7 +47,7 @@ ABC_NAMESPACE_IMPL_START char * Cmd_FlagReadByName( Abc_Frame_t * pAbc, char * flag ) { char * value; - if ( st_lookup(pAbc->tFlags, flag, &value) ) + if ( st__lookup(pAbc->tFlags, flag, &value) ) return value; return NULL; } @@ -72,9 +72,9 @@ void Cmd_FlagUpdateValue( Abc_Frame_t * pAbc, const char * key, char * value ) else newValue = Extra_UtilStrsav(""); // newValue = NULL; - if ( st_delete(pAbc->tFlags, &key, &oldValue) ) + if ( st__delete(pAbc->tFlags, &key, &oldValue) ) ABC_FREE(oldValue); - st_insert( pAbc->tFlags, key, newValue ); + st__insert( pAbc->tFlags, key, newValue ); } @@ -92,7 +92,7 @@ void Cmd_FlagDeleteByName( Abc_Frame_t * pAbc, const char * key ) char *value; if ( !key ) return; - if ( st_delete( pAbc->tFlags, &key, &value ) ) + if ( st__delete( pAbc->tFlags, &key, &value ) ) { ABC_FREE(key); ABC_FREE(value); diff --git a/src/base/cmd/cmdInt.h b/src/base/cmd/cmdInt.h index 149c26f1..2827e47b 100644 --- a/src/base/cmd/cmdInt.h +++ b/src/base/cmd/cmdInt.h @@ -78,7 +78,7 @@ extern void CmdFreeArgv( int argc, char ** argv ); extern char ** CmdAddToArgv( int argc, char ** argv ); extern void CmdCommandFree( Abc_Command * pCommand ); extern void CmdCommandPrint( Abc_Frame_t * pAbc, int fPrintAll ); -extern void CmdPrintTable( st_table * tTable, int fAliases ); +extern void CmdPrintTable( st__table * tTable, int fAliases ); //////////////////////////////////////////////////////////////////////// /// END OF FILE /// diff --git a/src/base/cmd/cmdUtils.c b/src/base/cmd/cmdUtils.c index 10a97910..e65e2cb7 100644 --- a/src/base/cmd/cmdUtils.c +++ b/src/base/cmd/cmdUtils.c @@ -110,7 +110,7 @@ int CmdCommandDispatch( Abc_Frame_t * pAbc, int * pargc, char *** pargv ) return 0; // get the command - if ( !st_lookup( pAbc->tCommands, argv[0], (char **)&pCommand ) ) + if ( ! st__lookup( pAbc->tCommands, argv[0], (char **)&pCommand ) ) { // the command is not in the table // if there is only one word with an extension, assume this is file to be read if ( argc == 1 && strstr( argv[0], "." ) ) @@ -122,7 +122,7 @@ int CmdCommandDispatch( Abc_Frame_t * pAbc, int * pargc, char *** pargv ) argv = argv2; *pargc = argc; *pargv = argv; - if ( !st_lookup( pAbc->tCommands, argv[0], (char **)&pCommand ) ) + if ( ! st__lookup( pAbc->tCommands, argv[0], (char **)&pCommand ) ) assert( 0 ); } else @@ -157,7 +157,7 @@ int CmdCommandDispatch( Abc_Frame_t * pAbc, int * pargc, char *** pargv ) // usually this is a passive command ... if ( fError == 0 && !pAbc->fAutoexac ) { - if ( st_lookup( pAbc->tFlags, "autoexec", &value ) ) + if ( st__lookup( pAbc->tFlags, "autoexec", &value ) ) { pAbc->fAutoexac = 1; fError = Cmd_CommandExecute( pAbc, value ); @@ -278,7 +278,7 @@ int CmdApplyAlias( Abc_Frame_t * pAbc, int *argcp, char ***argvp, int *loop ) { if ( argc == 0 ) return 0; - if ( stopit != 0 || st_lookup( pAbc->tAliases, argv[0], (char **) &alias ) == 0 ) + if ( stopit != 0 || st__lookup( pAbc->tAliases, argv[0], (char **) &alias ) == 0 ) { return 0; } @@ -546,7 +546,7 @@ void CmdCommandPrint( Abc_Frame_t * pAbc, int fPrintAll ) { const char *key; char *value; - st_generator * gen; + st__generator * gen; Abc_Command ** ppCommands; Abc_Command * pCommands; int nCommands, i; @@ -554,10 +554,10 @@ void CmdCommandPrint( Abc_Frame_t * pAbc, int fPrintAll ) int LenghtMax, nColumns, iCom = 0; // put all commands into one array - nCommands = st_count( pAbc->tCommands ); + nCommands = st__count( pAbc->tCommands ); ppCommands = ABC_ALLOC( Abc_Command *, nCommands ); i = 0; - st_foreach_item( pAbc->tCommands, gen, &key, &value ) + st__foreach_item( pAbc->tCommands, gen, &key, &value ) { pCommands = (Abc_Command *)value; if ( fPrintAll || pCommands->sName[0] != '_' ) @@ -675,18 +675,18 @@ int CmdNamePrintCompare( char ** ppC1, char ** ppC2 ) SeeAlso [] ***********************************************************************/ -void CmdPrintTable( st_table * tTable, int fAliases ) +void CmdPrintTable( st__table * tTable, int fAliases ) { - st_generator * gen; + st__generator * gen; const char ** ppNames; const char * key; char* value; int nNames, i; // collect keys in the array - ppNames = ABC_ALLOC( const char *, st_count(tTable) ); + ppNames = ABC_ALLOC( const char *, st__count(tTable) ); nNames = 0; - st_foreach_item( tTable, gen, &key, &value ) + st__foreach_item( tTable, gen, &key, &value ) ppNames[nNames++] = key; // sort array by name @@ -696,7 +696,7 @@ void CmdPrintTable( st_table * tTable, int fAliases ) // print in this order for ( i = 0; i < nNames; i++ ) { - st_lookup( tTable, ppNames[i], &value ); + st__lookup( tTable, ppNames[i], &value ); if ( fAliases ) CmdCommandAliasPrint( Abc_FrameGetGlobalFrame(), (Abc_Alias *)value ); else diff --git a/src/base/io/io.c b/src/base/io/io.c index 0873c2c0..2263960e 100644 --- a/src/base/io/io.c +++ b/src/base/io/io.c @@ -1209,7 +1209,7 @@ int IoCommandReadVerLib( Abc_Frame_t * pAbc, int argc, char ** argv ) fprintf( pAbc->Err, "Reading library from the verilog file has failed.\n" ); return 1; } - printf( "The library contains %d gates.\n", st_count(pLibrary->tModules) ); + printf( "The library contains %d gates.\n", st__count(pLibrary->tModules) ); // free old library if ( Abc_FrameReadLibVer() ) Abc_LibFree( (Abc_Lib_t *)Abc_FrameReadLibVer(), NULL ); diff --git a/src/base/main/mainInt.h b/src/base/main/mainInt.h index e305c74f..5992d191 100644 --- a/src/base/main/mainInt.h +++ b/src/base/main/mainInt.h @@ -59,9 +59,9 @@ struct Abc_Frame_t_ // general info char * sVersion; // the name of the current version // commands, aliases, etc - st_table * tCommands; // the command table - st_table * tAliases; // the alias table - st_table * tFlags; // the flag table + st__table * tCommands; // the command table + st__table * tAliases; // the alias table + st__table * tFlags; // the flag table Vec_Ptr_t * aHistory; // the command history // the functionality Abc_Ntk_t * pNtkCur; // the current network diff --git a/src/base/ver/ver.h b/src/base/ver/ver.h index 48199a2e..88be8a2e 100644 --- a/src/base/ver/ver.h +++ b/src/base/ver/ver.h @@ -58,7 +58,7 @@ struct Ver_Man_t_ ProgressBar * pProgress; // current design Abc_Lib_t * pDesign; - st_table * tName2Suffix; + st__table * tName2Suffix; // error handling FILE * Output; int fTopLevel; diff --git a/src/base/ver/verCore.c b/src/base/ver/verCore.c index b4a4c9f2..1e103b55 100644 --- a/src/base/ver/verCore.c +++ b/src/base/ver/verCore.c @@ -492,7 +492,7 @@ int Ver_ParseModule( Ver_Man_t * pMan ) break; else if ( pMan->pDesign->pGenlib && (pGate = Mio_LibraryReadGateByName((Mio_Library_t *)pMan->pDesign->pGenlib, pWord, NULL)) ) // current design RetValue = Ver_ParseGate( pMan, pNtk, pGate ); -// else if ( pMan->pDesign->pLibrary && st_lookup(pMan->pDesign->pLibrary->tModules, pWord, (char**)&pNtkTemp) ) // gate library +// else if ( pMan->pDesign->pLibrary && st__lookup(pMan->pDesign->pLibrary->tModules, pWord, (char**)&pNtkTemp) ) // gate library // RetValue = Ver_ParseGate( pMan, pNtkTemp ); else // assume this is the box used in the current design { @@ -561,7 +561,7 @@ int Ver_ParseLookupSuffix( Ver_Man_t * pMan, char * pWord, int * pnMsb, int * pn *pnMsb = *pnLsb = -1; if ( pMan->tName2Suffix == NULL ) return 1; - if ( !st_lookup( pMan->tName2Suffix, (char *)pWord, (char **)&Value ) ) + if ( ! st__lookup( pMan->tName2Suffix, (char *)pWord, (char **)&Value ) ) return 1; *pnMsb = (Value >> 8) & 0xff; *pnLsb = Value & 0xff; @@ -583,13 +583,13 @@ int Ver_ParseInsertsSuffix( Ver_Man_t * pMan, char * pWord, int nMsb, int nLsb ) { unsigned Value; if ( pMan->tName2Suffix == NULL ) - pMan->tName2Suffix = st_init_table( strcmp, st_strhash ); - if ( st_is_member( pMan->tName2Suffix, pWord ) ) + pMan->tName2Suffix = st__init_table( strcmp, st__strhash ); + if ( st__is_member( pMan->tName2Suffix, pWord ) ) return 1; assert( nMsb >= 0 && nMsb < 128 ); assert( nLsb >= 0 && nLsb < 128 ); Value = (nMsb << 8) | nLsb; - st_insert( pMan->tName2Suffix, Extra_UtilStrsav(pWord), (char *)(ABC_PTRUINT_T)Value ); + st__insert( pMan->tName2Suffix, Extra_UtilStrsav(pWord), (char *)(ABC_PTRUINT_T)Value ); return 1; } @@ -606,13 +606,13 @@ int Ver_ParseInsertsSuffix( Ver_Man_t * pMan, char * pWord, int nMsb, int nLsb ) ***********************************************************************/ void Ver_ParseRemoveSuffixTable( Ver_Man_t * pMan ) { - st_generator * gen; + st__generator * gen; char * pKey, * pValue; if ( pMan->tName2Suffix == NULL ) return; - st_foreach_item( pMan->tName2Suffix, gen, (const char **)&pKey, (char **)&pValue ) + st__foreach_item( pMan->tName2Suffix, gen, (const char **)&pKey, (char **)&pValue ) ABC_FREE( pKey ); - st_free_table( pMan->tName2Suffix ); + st__free_table( pMan->tName2Suffix ); pMan->tName2Suffix = NULL; } |