Compiler warnings.

This commit is contained in:
Alan Mishchenko 2012-08-09 18:45:53 -07:00
parent 1451614c5c
commit 20518f59d1
3 changed files with 14 additions and 17 deletions

View File

@ -154,7 +154,7 @@ Abc_TtStore_t * Abc_TruthStoreAlloc( int nVars, int nFuncs )
p->pFuncs[i] = p->pFuncs[i-1] + p->nWords;
return p;
}
void Abc_TruthStoreFree( Abc_TtStore_t * p )
void Abc_TtStoreFree( Abc_TtStore_t * p )
{
free( p->pFuncs[0] );
free( p->pFuncs );
@ -338,7 +338,7 @@ void Abc_TruthStoreWrite( char * pFileName, Abc_TtStore_t * p )
SeeAlso []
***********************************************************************/
Abc_TtStore_t * Abc_TruthStoreLoad( char * pFileName )
Abc_TtStore_t * Abc_TtStoreLoad( char * pFileName )
{
Abc_TtStore_t * p;
char * pFileInput = pFileName;
@ -368,14 +368,14 @@ Abc_TtStore_t * Abc_TruthStoreLoad( char * pFileName )
SeeAlso []
***********************************************************************/
void Abc_TruthStoreTest( char * pFileName )
void Abc_TtStoreTest( char * pFileName )
{
Abc_TtStore_t * p;
char * pFileInput = pFileName;
char * pFileOutput = "out.txt";
// read info from file
p = Abc_TruthStoreLoad( pFileInput );
p = Abc_TtStoreLoad( pFileInput );
if ( p == NULL )
return;
@ -383,7 +383,7 @@ void Abc_TruthStoreTest( char * pFileName )
Abc_TruthStoreWrite( pFileOutput, p );
// delete data-structure
Abc_TruthStoreFree( p );
Abc_TtStoreFree( p );
printf( "Input file \"%s\" was copied into output file \"%s\".\n", pFileInput, pFileOutput );
}
@ -511,7 +511,7 @@ void Abc_TruthDecTest( char * pFileName, int DecType, int fVerbose )
Abc_TruthDecPerform( p, DecType, fVerbose );
// delete data-structure
Abc_TruthStoreFree( p );
Abc_TtStoreFree( p );
// printf( "Finished decomposing truth tables from file \"%s\".\n", pFileName );
}
@ -532,7 +532,7 @@ int Abc_DecTest( char * pFileName, int DecType, int fVerbose )
if ( fVerbose )
printf( "Using truth tables from file \"%s\"...\n", pFileName );
if ( DecType == 0 )
Abc_TruthStoreTest( pFileName );
Abc_TtStoreTest( pFileName );
else if ( DecType >= 1 && DecType <= 3 )
Abc_TruthDecTest( pFileName, DecType, fVerbose );
else

View File

@ -47,9 +47,9 @@ struct Abc_TtStore_t_
word ** pFuncs;
};
extern Abc_TtStore_t * Abc_TruthStoreLoad( char * pFileName );
extern void Abc_TruthStoreFree( Abc_TtStore_t * p );
extern void Abc_TruthStoreTest( char * pFileName );
extern Abc_TtStore_t * Abc_TtStoreLoad( char * pFileName );
extern void Abc_TtStoreFree( Abc_TtStore_t * p );
extern void Abc_TtStoreTest( char * pFileName );
////////////////////////////////////////////////////////////////////////
/// FUNCTION DEFINITIONS ///
@ -183,7 +183,7 @@ void Abc_TruthNpnTest( char * pFileName, int NpnType, int fVerbose )
Abc_TtStore_t * p;
// read info from file
p = Abc_TruthStoreLoad( pFileName );
p = Abc_TtStoreLoad( pFileName );
if ( p == NULL )
return;
@ -191,7 +191,7 @@ void Abc_TruthNpnTest( char * pFileName, int NpnType, int fVerbose )
Abc_TruthNpnPerform( p, NpnType, fVerbose );
// delete data-structure
Abc_TruthStoreFree( p );
Abc_TtStoreFree( p );
// printf( "Finished computing canonical forms for functions from file \"%s\".\n", pFileName );
}
@ -212,7 +212,7 @@ int Abc_NpnTest( char * pFileName, int NpnType, int fVerbose )
if ( fVerbose )
printf( "Using truth tables from file \"%s\"...\n", pFileName );
if ( NpnType == 0 )
Abc_TruthStoreTest( pFileName );
Abc_TtStoreTest( pFileName );
else if ( NpnType >= 1 && NpnType <= 3 )
Abc_TruthNpnTest( pFileName, NpnType, fVerbose );
else

View File

@ -40,9 +40,6 @@ typedef unsigned __int64 word;
ABC_NAMESPACE_HEADER_START
//typedef unsigned __int64 ABC_UINT64_T;
//typedef ABC_UINT64_T word;
#define bool int
#define false 0
@ -107,7 +104,7 @@ static inline void TimePrint( char* Message )
extern inline int memCompare(word* x, word* y, int nVars);
extern inline int Kit_TruthWordNum_64bit( int nVars );
extern Abc_TtStore_t * setTtStore(char * pFileInput);
extern void Abc_TruthStoreFree( Abc_TtStore_t * p );
extern inline void Abc_TruthStoreFree( Abc_TtStore_t * p );
extern inline void Kit_TruthChangePhase_64bit( word * pInOut, int nVars, int iVar );
extern inline void Kit_TruthNot_64bit(word * pIn, int nVars );
extern inline void Kit_TruthCopy_64bit( word * pOut, word * pIn, int nVars );