luke
/
abc
mirror of https://github.com/YosysHQ/abc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Updated NPN classification code (compiler warnings).

This commit is contained in:
Alan Mishchenko 2019-03-12 23:25:20 +01:00
parent 900fd5cc73
commit e3cd104810
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/base/abci/abcNpn.c
View File

@ -317,7 +317,7 @@ void Abc_TruthNpnPerform( Abc_TtStore_t * p, int NpnType, int fVerbose )
}
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_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 )
}
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_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);

3
src/opt/dau/dauCanon.c
View File

@ -1274,6 +1274,7 @@ void Abc_TtHieManStop(Abc_TtHieMan_t * p)
Vec_MemFreeP(&p->vTtMem[i]);
Vec_IntFree(p->vRepres[i]);
}
Vec_IntFree( p->vPhase );
ABC_FREE(p);
}
@ -1520,7 +1521,7 @@ static int Abc_NextPermSwapC(char * pData, signed char * pDir, int size)
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)
{
int nWords = Abc_TtWordNum(nVars);

6
src/opt/dau/dauNpn2.c
View File

@ -774,7 +774,7 @@ void Dtt_MakeFormulaFI2( unsigned tFun, Dtt_FunImpl_t* pFun, Vec_Vec_t* vLibImpl
{
int j;
Dtt_FunImpl_t* pImpl2;
char sFI2[100]; sprintf( sFI2, "" );
char sFI2[100] = {0}; //sprintf( sFI2, "" );
if ( pFun->FI2 == 0 ) // PI
{
@ -799,7 +799,7 @@ void Dtt_MakeFormula( unsigned tFun, Dtt_FunImpl_t* pFun, Vec_Vec_t* vLibImpl, i
{
int j;
Dtt_FunImpl_t* pImpl1;
char sFI1[100], sCopy[100]; sprintf( sFI1, "" );
char sFI1[100], sCopy[100] = {0}; //sprintf( sFI1, "" );
if ( pFun->FI1 == 0 ) // PI
{
@ -986,7 +986,7 @@ void Dtt_DumpLibrary( Dtt_Man_t * p )
if ( i<2 ) continue; // skip const 0 and buffer
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 );
}
}