summaryrefslogtreecommitdiffstats
path: root/src/map
diff options
context:
space:
mode:
Diffstat (limited to 'src/map')
-rw-r--r--src/map/mapper/mapper.h2
-rw-r--r--src/map/mapper/mapperInt.h2
-rw-r--r--src/map/mapper/mapperSuper.c4
-rw-r--r--src/map/mapper/mapperTree.c16
-rw-r--r--src/map/mapper/mapperUtils.c8
-rw-r--r--src/map/mio/mio.h2
-rw-r--r--src/map/mio/mioApi.c4
-rw-r--r--src/map/mio/mioInt.h2
-rw-r--r--src/map/mio/mioRead.c32
-rw-r--r--src/map/mio/mioUtils.c2
-rw-r--r--src/map/super/superAnd.c4
-rw-r--r--src/map/super/superGate.c2
12 files changed, 40 insertions, 40 deletions
diff --git a/src/map/mapper/mapper.h b/src/map/mapper/mapper.h
index 67c582e0..24a07e17 100644
--- a/src/map/mapper/mapper.h
+++ b/src/map/mapper/mapper.h
@@ -178,7 +178,7 @@ extern Map_Super_t * Map_SuperTableLookupC( Map_SuperLib_t * pLib, unsigned uT
/*=== mapperTime.c =============================================================*/
/*=== mapperUtil.c =============================================================*/
extern int Map_ManCheckConsistency( Map_Man_t * p );
-extern st_table * Map_CreateTableGate2Super( Map_Man_t * p );
+extern st__table * Map_CreateTableGate2Super( Map_Man_t * p );
extern void Map_ManCleanData( Map_Man_t * p );
extern void Map_MappingSetupTruthTables( unsigned uTruths[][2] );
extern void Map_MappingSetupTruthTablesLarge( unsigned uTruths[][32] );
diff --git a/src/map/mapper/mapperInt.h b/src/map/mapper/mapperInt.h
index 1740d4e9..442ca5eb 100644
--- a/src/map/mapper/mapperInt.h
+++ b/src/map/mapper/mapperInt.h
@@ -405,7 +405,7 @@ extern float Map_MappingGetArea( Map_Man_t * pMan, Map_NodeVec_t * v
/*=== mapperShow.c =============================================================*/
extern void Map_MappingShow( Map_Man_t * pMan, char * pFileName );
/*=== mapperTree.c ===============================================================*/
-extern int Map_LibraryDeriveGateInfo( Map_SuperLib_t * pLib, st_table * tExcludeGate );
+extern int Map_LibraryDeriveGateInfo( Map_SuperLib_t * pLib, st__table * tExcludeGate );
extern int Map_LibraryReadFileTreeStr( Map_SuperLib_t * pLib, Vec_Str_t * vStr, char * pFileName );
extern int Map_LibraryReadTree( Map_SuperLib_t * pLib, char * pFileName, char * pExcludeFile );
extern void Map_LibraryPrintTree( Map_SuperLib_t * pLib );
diff --git a/src/map/mapper/mapperSuper.c b/src/map/mapper/mapperSuper.c
index a8682a1b..9382575a 100644
--- a/src/map/mapper/mapperSuper.c
+++ b/src/map/mapper/mapperSuper.c
@@ -425,12 +425,12 @@ void Map_LibraryPrintSupergate( Map_Super_t * pGate )
void Map_LibraryPrintClasses( Map_SuperLib_t * p )
{
/*
- st_generator * gen;
+ st__generator * gen;
Map_Super_t * pSuper, * pSuper2;
unsigned Key, uTruth;
int Counter = 0;
// copy all the supergates into one array
- st_foreach_item( p->tSuplib, gen, (char **)&Key, (char **)&pSuper )
+ st__foreach_item( p->tSuplib, gen, (char **)&Key, (char **)&pSuper )
{
for ( pSuper2 = pSuper; pSuper2; pSuper2 = pSuper2->pNext )
{
diff --git a/src/map/mapper/mapperTree.c b/src/map/mapper/mapperTree.c
index 62d11c53..9bf74ff2 100644
--- a/src/map/mapper/mapperTree.c
+++ b/src/map/mapper/mapperTree.c
@@ -265,7 +265,7 @@ int Map_LibraryReadTree2( Map_SuperLib_t * pLib, char * pFileName, char * pExclu
FILE * pFile;
int Status, num;
Abc_Frame_t * pAbc;
- st_table * tExcludeGate = 0;
+ st__table * tExcludeGate = 0;
// read the beginning of the file
assert( pLib->pGenlib == NULL );
@@ -281,10 +281,10 @@ int Map_LibraryReadTree2( Map_SuperLib_t * pLib, char * pFileName, char * pExclu
{
pAbc = Abc_FrameGetGlobalFrame();
- tExcludeGate = st_init_table(strcmp, st_strhash);
+ tExcludeGate = st__init_table(strcmp, st__strhash);
if ( (num = Mio_LibraryReadExclude( pExcludeFile, tExcludeGate )) == -1 )
{
- st_free_table( tExcludeGate );
+ st__free_table( tExcludeGate );
tExcludeGate = 0;
return 0;
}
@@ -525,7 +525,7 @@ int Map_LibraryReadTree( Map_SuperLib_t * pLib, char * pFileName, char * pExclud
Vec_Str_t * vStr;
int Status, num;
Abc_Frame_t * pAbc;
- st_table * tExcludeGate = 0;
+ st__table * tExcludeGate = 0;
// read the beginning of the file
assert( pLib->pGenlib == NULL );
@@ -542,10 +542,10 @@ int Map_LibraryReadTree( Map_SuperLib_t * pLib, char * pFileName, char * pExclud
{
pAbc = Abc_FrameGetGlobalFrame();
- tExcludeGate = st_init_table(strcmp, st_strhash);
+ tExcludeGate = st__init_table(strcmp, st__strhash);
if ( (num = Mio_LibraryReadExclude( pExcludeFile, tExcludeGate )) == -1 )
{
- st_free_table( tExcludeGate );
+ st__free_table( tExcludeGate );
tExcludeGate = 0;
Vec_StrFree( vStr );
return 0;
@@ -580,7 +580,7 @@ int Map_LibraryReadTree( Map_SuperLib_t * pLib, char * pFileName, char * pExclud
SeeAlso []
***********************************************************************/
-int Map_LibraryDeriveGateInfo( Map_SuperLib_t * pLib, st_table * tExcludeGate )
+int Map_LibraryDeriveGateInfo( Map_SuperLib_t * pLib, st__table * tExcludeGate )
{
Map_Super_t * pGate, * pFanin;
Mio_Pin_t * pPin;
@@ -595,7 +595,7 @@ int Map_LibraryDeriveGateInfo( Map_SuperLib_t * pLib, st_table * tExcludeGate )
if ( tExcludeGate )
{
- if ( st_is_member( tExcludeGate, Mio_GateReadName( pGate->pRoot ) ) )
+ if ( st__is_member( tExcludeGate, Mio_GateReadName( pGate->pRoot ) ) )
pGate->fExclude = 1;
for ( k = 0; k < (int)pGate->nFanins; k++ )
{
diff --git a/src/map/mapper/mapperUtils.c b/src/map/mapper/mapperUtils.c
index e49c4dd4..fbee6f74 100644
--- a/src/map/mapper/mapperUtils.c
+++ b/src/map/mapper/mapperUtils.c
@@ -787,12 +787,12 @@ int Map_MappingCountDoubles( Map_Man_t * pMan, Map_NodeVec_t * vNodes )
SeeAlso []
***********************************************************************/
-st_table * Map_CreateTableGate2Super( Map_Man_t * pMan )
+ st__table * Map_CreateTableGate2Super( Map_Man_t * pMan )
{
Map_Super_t * pSuper;
- st_table * tTable;
+ st__table * tTable;
int i, nInputs, v;
- tTable = st_init_table(strcmp, st_strhash);
+ tTable = st__init_table(strcmp, st__strhash);
for ( i = 0; i < pMan->pSuperLib->nSupersAll; i++ )
{
pSuper = pMan->pSuperLib->ppSupers[i];
@@ -806,7 +806,7 @@ st_table * Map_CreateTableGate2Super( Map_Man_t * pMan )
if ( v != nInputs )
continue;
// printf( "%s\n", Mio_GateReadName(pSuper->pRoot) );
- if ( st_insert( tTable, (char *)pSuper->pRoot, (char *)pSuper ) )
+ if ( st__insert( tTable, (char *)pSuper->pRoot, (char *)pSuper ) )
{
assert( 0 );
}
diff --git a/src/map/mio/mio.h b/src/map/mio/mio.h
index 3b9990a1..72803cd7 100644
--- a/src/map/mio/mio.h
+++ b/src/map/mio/mio.h
@@ -131,7 +131,7 @@ extern Mio_Pin_t * Mio_PinReadNext ( Mio_Pin_t * pPin );
/*=== mioRead.c =============================================================*/
extern char * Mio_ReadFile( char * FileName, int fAddEnd );
extern Mio_Library_t * Mio_LibraryRead( char * FileName, char * pBuffer, char * ExcludeFile, int fVerbose );
-extern int Mio_LibraryReadExclude( char * ExcludeFile, st_table * tExcludeGate );
+extern int Mio_LibraryReadExclude( char * ExcludeFile, st__table * tExcludeGate );
/*=== mioFunc.c =============================================================*/
extern int Mio_LibraryParseFormulas( Mio_Library_t * pLib );
/*=== mioParse.c =============================================================*/
diff --git a/src/map/mio/mioApi.c b/src/map/mio/mioApi.c
index 31d803ab..0ae12e89 100644
--- a/src/map/mio/mioApi.c
+++ b/src/map/mio/mioApi.c
@@ -99,7 +99,7 @@ int Mio_LibraryReadGateNameMax( Mio_Library_t * pLib )
Mio_Gate_t * Mio_LibraryReadGateByName( Mio_Library_t * pLib, char * pName, char * pOutName )
{
Mio_Gate_t * pGate;
- if ( !st_lookup( pLib->tName2Gate, pName, (char **)&pGate ) )
+ if ( ! st__lookup( pLib->tName2Gate, pName, (char **)&pGate ) )
return NULL;
if ( pOutName == NULL )
return pGate;
@@ -124,7 +124,7 @@ Mio_Gate_t * Mio_LibraryReadGateByName( Mio_Library_t * pLib, char * pName, char
char * Mio_LibraryReadSopByName( Mio_Library_t * pLib, char * pName )
{
Mio_Gate_t * pGate;
- if ( st_lookup( pLib->tName2Gate, pName, (char **)&pGate ) )
+ if ( st__lookup( pLib->tName2Gate, pName, (char **)&pGate ) )
return pGate->pSop;
return NULL;
}
diff --git a/src/map/mio/mioInt.h b/src/map/mio/mioInt.h
index 6f82309e..6ede6d1d 100644
--- a/src/map/mio/mioInt.h
+++ b/src/map/mio/mioInt.h
@@ -71,7 +71,7 @@ struct Mio_LibraryStruct_t_
Mio_Gate_t * pGateInv; // the inverter
Mio_Gate_t * pGateNand2; // the NAND2 gate
Mio_Gate_t * pGateAnd2; // the AND2 gate
- st_table * tName2Gate; // the mapping of gate names into their pointer
+ st__table * tName2Gate; // the mapping of gate names into their pointer
Mem_Flex_t * pMmFlex; // the memory manaqer for SOPs
Vec_Str_t * vCube; // temporary cube
};
diff --git a/src/map/mio/mioRead.c b/src/map/mio/mioRead.c
index 19c68899..05148776 100644
--- a/src/map/mio/mioRead.c
+++ b/src/map/mio/mioRead.c
@@ -31,9 +31,9 @@ ABC_NAMESPACE_IMPL_START
/// FUNCTION DEFINITIONS ///
////////////////////////////////////////////////////////////////////////
-static Mio_Library_t * Mio_LibraryReadOne( char * FileName, int fExtendedFormat, st_table * tExcludeGate, int fVerbose );
-static Mio_Library_t * Mio_LibraryReadBuffer( char * pBuffer, int fExtendedFormat, st_table * tExcludeGate, int fVerbose );
-static int Mio_LibraryReadInternal( Mio_Library_t * pLib, char * pBuffer, int fExtendedFormat, st_table * tExcludeGate, int fVerbose );
+static Mio_Library_t * Mio_LibraryReadOne( char * FileName, int fExtendedFormat, st__table * tExcludeGate, int fVerbose );
+static Mio_Library_t * Mio_LibraryReadBuffer( char * pBuffer, int fExtendedFormat, st__table * tExcludeGate, int fVerbose );
+static int Mio_LibraryReadInternal( Mio_Library_t * pLib, char * pBuffer, int fExtendedFormat, st__table * tExcludeGate, int fVerbose );
static Mio_Gate_t * Mio_LibraryReadGate( char ** ppToken, int fExtendedFormat );
static Mio_Pin_t * Mio_LibraryReadPin( char ** ppToken, int fExtendedFormat );
static char * chomp( char *s );
@@ -56,14 +56,14 @@ Mio_Library_t * Mio_LibraryRead( char * FileName, char * pBuffer, char * Exclude
Mio_Library_t * pLib;
int num;
- st_table * tExcludeGate = 0;
+ st__table * tExcludeGate = 0;
if ( ExcludeFile )
{
- tExcludeGate = st_init_table(strcmp, st_strhash);
+ tExcludeGate = st__init_table(strcmp, st__strhash);
if ( (num = Mio_LibraryReadExclude( ExcludeFile, tExcludeGate )) == -1 )
{
- st_free_table( tExcludeGate );
+ st__free_table( tExcludeGate );
tExcludeGate = 0;
return 0;
}
@@ -92,7 +92,7 @@ Mio_Library_t * Mio_LibraryRead( char * FileName, char * pBuffer, char * Exclude
printf ( "Warning: Read extended genlib format but ignoring extensions\n" );
}
if ( tExcludeGate )
- st_free_table( tExcludeGate );
+ st__free_table( tExcludeGate );
return pLib;
}
@@ -149,14 +149,14 @@ char * Mio_ReadFile( char * FileName, int fAddEnd )
SeeAlso []
***********************************************************************/
-Mio_Library_t * Mio_LibraryReadBuffer( char * pBuffer, int fExtendedFormat, st_table * tExcludeGate, int fVerbose )
+Mio_Library_t * Mio_LibraryReadBuffer( char * pBuffer, int fExtendedFormat, st__table * tExcludeGate, int fVerbose )
{
Mio_Library_t * pLib;
// allocate the genlib structure
pLib = ABC_ALLOC( Mio_Library_t, 1 );
memset( pLib, 0, sizeof(Mio_Library_t) );
- pLib->tName2Gate = st_init_table(strcmp, st_strhash);
+ pLib->tName2Gate = st__init_table(strcmp, st__strhash);
pLib->pMmFlex = Mem_FlexStart();
pLib->vCube = Vec_StrAlloc( 100 );
@@ -194,7 +194,7 @@ Mio_Library_t * Mio_LibraryReadBuffer( char * pBuffer, int fExtendedFormat, st_t
SeeAlso []
***********************************************************************/
-Mio_Library_t * Mio_LibraryReadOne( char * FileName, int fExtendedFormat, st_table * tExcludeGate, int fVerbose )
+Mio_Library_t * Mio_LibraryReadOne( char * FileName, int fExtendedFormat, st__table * tExcludeGate, int fVerbose )
{
Mio_Library_t * pLib;
char * pBuffer;
@@ -223,7 +223,7 @@ Mio_Library_t * Mio_LibraryReadOne( char * FileName, int fExtendedFormat, st_tab
SeeAlso []
***********************************************************************/
-int Mio_LibraryReadInternal( Mio_Library_t * pLib, char * pBuffer, int fExtendedFormat, st_table * tExcludeGate, int fVerbose )
+int Mio_LibraryReadInternal( Mio_Library_t * pLib, char * pBuffer, int fExtendedFormat, st__table * tExcludeGate, int fVerbose )
{
Mio_Gate_t * pGate, ** ppGate;
char * pToken;
@@ -272,7 +272,7 @@ int Mio_LibraryReadInternal( Mio_Library_t * pLib, char * pBuffer, int fExtended
// printf ("Processing: '%s'\n", pGate->pName);
- if ( tExcludeGate && st_is_member( tExcludeGate, pGate->pName ) )
+ if ( tExcludeGate && st__is_member( tExcludeGate, pGate->pName ) )
{
//printf ("Excluding: '%s'\n", pGate->pName);
Mio_GateDelete( pGate );
@@ -286,8 +286,8 @@ int Mio_LibraryReadInternal( Mio_Library_t * pLib, char * pBuffer, int fExtended
nGates++;
// remember this gate by name
- if ( !st_is_member( pLib->tName2Gate, pGate->pName ) )
- st_insert( pLib->tName2Gate, pGate->pName, (char *)pGate );
+ if ( ! st__is_member( pLib->tName2Gate, pGate->pName ) )
+ st__insert( pLib->tName2Gate, pGate->pName, (char *)pGate );
else
{
Mio_Gate_t * pBase = Mio_LibraryReadGateByName( pLib, pGate->pName, NULL );
@@ -654,7 +654,7 @@ void Mio_LibraryDetectSpecialGates( Mio_Library_t * pLib )
SeeAlso []
***********************************************************************/
-int Mio_LibraryReadExclude( char * ExcludeFile, st_table * tExcludeGate )
+int Mio_LibraryReadExclude( char * ExcludeFile, st__table * tExcludeGate )
{
int nDel = 0;
FILE *pEx;
@@ -675,7 +675,7 @@ int Mio_LibraryReadExclude( char * ExcludeFile, st_table * tExcludeGate )
while (1 == fscanf( pEx, "%127s", buffer ))
{
//printf ("Read: '%s'\n", buffer );
- st_insert( tExcludeGate, Mio_UtilStrsav( buffer ), (char *)0 );
+ st__insert( tExcludeGate, Mio_UtilStrsav( buffer ), (char *)0 );
nDel++;
}
diff --git a/src/map/mio/mioUtils.c b/src/map/mio/mioUtils.c
index a11fed68..d481bf81 100644
--- a/src/map/mio/mioUtils.c
+++ b/src/map/mio/mioUtils.c
@@ -57,7 +57,7 @@ void Mio_LibraryDelete( Mio_Library_t * pLib )
Mem_FlexStop( pLib->pMmFlex, 0 );
Vec_StrFree( pLib->vCube );
if ( pLib->tName2Gate )
- st_free_table( pLib->tName2Gate );
+ st__free_table( pLib->tName2Gate );
// if ( pLib->dd )
// Cudd_Quit( pLib->dd );
ABC_FREE( pLib->ppGates0 );
diff --git a/src/map/super/superAnd.c b/src/map/super/superAnd.c
index 9f3996b9..774c4fc5 100644
--- a/src/map/super/superAnd.c
+++ b/src/map/super/superAnd.c
@@ -169,7 +169,7 @@ Super2_Man_t * Super2_ManStart()
pMan = ABC_ALLOC( Super2_Man_t, 1 );
memset( pMan, 0, sizeof(Super2_Man_t) );
pMan->pMem = Extra_MmFixedStart( sizeof(Super2_Gate_t) );
- pMan->tTable = stmm_init_table( st_ptrcmp, st_ptrhash );
+ pMan->tTable = stmm_init_table( st__ptrcmp, st__ptrhash );
return pMan;
}
@@ -344,7 +344,7 @@ Super2_Lib_t * Super2_LibCompute( Super2_Man_t * pMan, Super2_Lib_t * pLib )
// reset the hash table
stmm_free_table( pMan->tTable );
- pMan->tTable = stmm_init_table( st_ptrcmp, st_ptrhash );
+ pMan->tTable = stmm_init_table( st__ptrcmp, st__ptrhash );
// set the starting things into the hash table
Super2_LibForEachGate( pLibNew, pGate1 )
{
diff --git a/src/map/super/superGate.c b/src/map/super/superGate.c
index 8c22920e..c9bf7ce8 100644
--- a/src/map/super/superGate.c
+++ b/src/map/super/superGate.c
@@ -938,7 +938,7 @@ Super_Man_t * Super_ManStart()
Super_Man_t * pMan;
pMan = ABC_CALLOC( Super_Man_t, 1 );
pMan->pMem = Extra_MmFixedStart( sizeof(Super_Gate_t) );
- pMan->tTable = stmm_init_table( st_ptrcmp, st_ptrhash );
+ pMan->tTable = stmm_init_table( st__ptrcmp, st__ptrhash );
return pMan;
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-12 22:03:23 +0000