Commit e3cd1048 by Alan Mishchenko

Updated NPN classification code (compiler warnings).

parent 900fd5cc
...@@ -317,7 +317,7 @@ void Abc_TruthNpnPerform( Abc_TtStore_t * p, int NpnType, int fVerbose ) ...@@ -317,7 +317,7 @@ void Abc_TruthNpnPerform( Abc_TtStore_t * p, int NpnType, int fVerbose )
} }
else if ( NpnType == 8 ) else if ( NpnType == 8 )
{ {
typedef unsigned(*TtCanonicizeFunc)(Abc_TtHieMan_t * p, word * pTruth, int nVars, char * pCanonPerm, int flag); // typedef unsigned(*TtCanonicizeFunc)(Abc_TtHieMan_t * p, word * pTruth, int nVars, char * pCanonPerm, int flag);
unsigned Abc_TtCanonicizeWrap(TtCanonicizeFunc func, Abc_TtHieMan_t * p, word * pTruth, int nVars, char * pCanonPerm, int flag); unsigned Abc_TtCanonicizeWrap(TtCanonicizeFunc func, Abc_TtHieMan_t * p, word * pTruth, int nVars, char * pCanonPerm, int flag);
unsigned Abc_TtCanonicizeAda(Abc_TtHieMan_t * p, word * pTruth, int nVars, char * pCanonPerm, int iThres); unsigned Abc_TtCanonicizeAda(Abc_TtHieMan_t * p, word * pTruth, int nVars, char * pCanonPerm, int iThres);
...@@ -335,7 +335,7 @@ void Abc_TruthNpnPerform( Abc_TtStore_t * p, int NpnType, int fVerbose ) ...@@ -335,7 +335,7 @@ void Abc_TruthNpnPerform( Abc_TtStore_t * p, int NpnType, int fVerbose )
} }
else if ( NpnType == 9 || NpnType == 10 || NpnType == 11 ) else if ( NpnType == 9 || NpnType == 10 || NpnType == 11 )
{ {
typedef unsigned(*TtCanonicizeFunc)(Abc_TtHieMan_t * p, word * pTruth, int nVars, char * pCanonPerm, int flag); // typedef unsigned(*TtCanonicizeFunc)(Abc_TtHieMan_t * p, word * pTruth, int nVars, char * pCanonPerm, int flag);
unsigned Abc_TtCanonicizeWrap(TtCanonicizeFunc func, Abc_TtHieMan_t * p, word * pTruth, int nVars, char * pCanonPerm, int flag); unsigned Abc_TtCanonicizeWrap(TtCanonicizeFunc func, Abc_TtHieMan_t * p, word * pTruth, int nVars, char * pCanonPerm, int flag);
unsigned Abc_TtCanonicizeAda(Abc_TtHieMan_t * p, word * pTruth, int nVars, char * pCanonPerm, int iThres); unsigned Abc_TtCanonicizeAda(Abc_TtHieMan_t * p, word * pTruth, int nVars, char * pCanonPerm, int iThres);
unsigned Abc_TtCanonicizeCA(Abc_TtHieMan_t * p, word * pTruth, int nVars, char * pCanonPerm, int iThres); unsigned Abc_TtCanonicizeCA(Abc_TtHieMan_t * p, word * pTruth, int nVars, char * pCanonPerm, int iThres);
......
...@@ -1274,6 +1274,7 @@ void Abc_TtHieManStop(Abc_TtHieMan_t * p) ...@@ -1274,6 +1274,7 @@ void Abc_TtHieManStop(Abc_TtHieMan_t * p)
Vec_MemFreeP(&p->vTtMem[i]); Vec_MemFreeP(&p->vTtMem[i]);
Vec_IntFree(p->vRepres[i]); Vec_IntFree(p->vRepres[i]);
} }
Vec_IntFree( p->vPhase );
ABC_FREE(p); ABC_FREE(p);
} }
...@@ -1520,7 +1521,7 @@ static int Abc_NextPermSwapC(char * pData, signed char * pDir, int size) ...@@ -1520,7 +1521,7 @@ static int Abc_NextPermSwapC(char * pData, signed char * pDir, int size)
return j < k ? j : k; return j < k ? j : k;
} }
typedef unsigned(*TtCanonicizeFunc)(Abc_TtHieMan_t * p, word * pTruth, int nVars, char * pCanonPerm, int flag); //typedef unsigned(*TtCanonicizeFunc)(Abc_TtHieMan_t * p, word * pTruth, int nVars, char * pCanonPerm, int flag);
unsigned Abc_TtCanonicizeWrap(TtCanonicizeFunc func, Abc_TtHieMan_t * p, word * pTruth, int nVars, char * pCanonPerm, int flag) unsigned Abc_TtCanonicizeWrap(TtCanonicizeFunc func, Abc_TtHieMan_t * p, word * pTruth, int nVars, char * pCanonPerm, int flag)
{ {
int nWords = Abc_TtWordNum(nVars); int nWords = Abc_TtWordNum(nVars);
......
...@@ -774,7 +774,7 @@ void Dtt_MakeFormulaFI2( unsigned tFun, Dtt_FunImpl_t* pFun, Vec_Vec_t* vLibImpl ...@@ -774,7 +774,7 @@ void Dtt_MakeFormulaFI2( unsigned tFun, Dtt_FunImpl_t* pFun, Vec_Vec_t* vLibImpl
{ {
int j; int j;
Dtt_FunImpl_t* pImpl2; Dtt_FunImpl_t* pImpl2;
char sFI2[100]; sprintf( sFI2, "" ); char sFI2[100] = {0}; //sprintf( sFI2, "" );
if ( pFun->FI2 == 0 ) // PI if ( pFun->FI2 == 0 ) // PI
{ {
...@@ -799,7 +799,7 @@ void Dtt_MakeFormula( unsigned tFun, Dtt_FunImpl_t* pFun, Vec_Vec_t* vLibImpl, i ...@@ -799,7 +799,7 @@ void Dtt_MakeFormula( unsigned tFun, Dtt_FunImpl_t* pFun, Vec_Vec_t* vLibImpl, i
{ {
int j; int j;
Dtt_FunImpl_t* pImpl1; Dtt_FunImpl_t* pImpl1;
char sFI1[100], sCopy[100]; sprintf( sFI1, "" ); char sFI1[100], sCopy[100] = {0}; //sprintf( sFI1, "" );
if ( pFun->FI1 == 0 ) // PI if ( pFun->FI1 == 0 ) // PI
{ {
...@@ -986,7 +986,7 @@ void Dtt_DumpLibrary( Dtt_Man_t * p ) ...@@ -986,7 +986,7 @@ void Dtt_DumpLibrary( Dtt_Man_t * p )
if ( i<2 ) continue; // skip const 0 and buffer if ( i<2 ) continue; // skip const 0 and buffer
Vec_VecForEachEntryLevel( Dtt_FunImpl_t*, vLibImpl, pFun, j, i ) Vec_VecForEachEntryLevel( Dtt_FunImpl_t*, vLibImpl, pFun, j, i )
{ {
sprintf( str, "" ); str[0] = 0; //sprintf( str, "" );
Dtt_MakeFormula( (unsigned)Entry, pFun, vLibImpl, (4<<16)+(3<<12)+(2<<8)+(1<<4), str, 1, pFile ); Dtt_MakeFormula( (unsigned)Entry, pFun, vLibImpl, (4<<16)+(3<<12)+(2<<8)+(1<<4), str, 1, pFile );
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment