Commit 32b09a1e by Alan Mishchenko

Improvements to the truth table computations.

parent 3dfa92f2
...@@ -642,7 +642,7 @@ static inline void Abc_TtPrintDigit( int Digit ) ...@@ -642,7 +642,7 @@ static inline void Abc_TtPrintDigit( int Digit )
static inline void Abc_TtPrintHex( word * pTruth, int nVars ) static inline void Abc_TtPrintHex( word * pTruth, int nVars )
{ {
word * pThis, * pLimit = pTruth + Abc_TtWordNum(nVars); word * pThis, * pLimit = pTruth + Abc_TtWordNum(nVars);
int k, nDigits = 1 << (nVars-2); int k;
assert( nVars >= 2 ); assert( nVars >= 2 );
for ( pThis = pTruth; pThis < pLimit; pThis++ ) for ( pThis = pTruth; pThis < pLimit; pThis++ )
for ( k = 0; k < 16; k++ ) for ( k = 0; k < 16; k++ )
...@@ -652,7 +652,7 @@ static inline void Abc_TtPrintHex( word * pTruth, int nVars ) ...@@ -652,7 +652,7 @@ static inline void Abc_TtPrintHex( word * pTruth, int nVars )
static inline void Abc_TtPrintHexRev( word * pTruth, int nVars ) static inline void Abc_TtPrintHexRev( word * pTruth, int nVars )
{ {
word * pThis; word * pThis;
int k, nDigits = 1 << (nVars-2); int k;
assert( nVars >= 2 ); assert( nVars >= 2 );
for ( pThis = pTruth + Abc_TtWordNum(nVars) - 1; pThis >= pTruth; pThis-- ) for ( pThis = pTruth + Abc_TtWordNum(nVars) - 1; pThis >= pTruth; pThis-- )
for ( k = 15; k >= 0; k-- ) for ( k = 15; k >= 0; k-- )
...@@ -662,7 +662,7 @@ static inline void Abc_TtPrintHexRev( word * pTruth, int nVars ) ...@@ -662,7 +662,7 @@ static inline void Abc_TtPrintHexRev( word * pTruth, int nVars )
static inline void Abc_TtPrintHexSpecial( word * pTruth, int nVars ) static inline void Abc_TtPrintHexSpecial( word * pTruth, int nVars )
{ {
word * pThis; word * pThis;
int k, nDigits = 1 << (nVars-2); int k;
assert( nVars >= 2 ); assert( nVars >= 2 );
for ( pThis = pTruth + Abc_TtWordNum(nVars) - 1; pThis >= pTruth; pThis-- ) for ( pThis = pTruth + Abc_TtWordNum(nVars) - 1; pThis >= pTruth; pThis-- )
for ( k = 0; k < 16; k++ ) for ( k = 0; k < 16; k++ )
...@@ -685,7 +685,7 @@ static inline void Abc_TtPrintHexSpecial( word * pTruth, int nVars ) ...@@ -685,7 +685,7 @@ static inline void Abc_TtPrintHexSpecial( word * pTruth, int nVars )
static inline void Abc_TtPrintBinary( word * pTruth, int nVars ) static inline void Abc_TtPrintBinary( word * pTruth, int nVars )
{ {
word * pThis, * pLimit = pTruth + Abc_TtWordNum(nVars); word * pThis, * pLimit = pTruth + Abc_TtWordNum(nVars);
int k, nDigits = 1 << (nVars-2); int k;
assert( nVars >= 2 ); assert( nVars >= 2 );
for ( pThis = pTruth; pThis < pLimit; pThis++ ) for ( pThis = pTruth; pThis < pLimit; pThis++ )
for ( k = 0; k < 64; k++ ) for ( k = 0; k < 64; k++ )
......
...@@ -74,7 +74,7 @@ void Abc_TtConfactorTest7( word * pTruth, int nVars, int N ) ...@@ -74,7 +74,7 @@ void Abc_TtConfactorTest7( word * pTruth, int nVars, int N )
{ {
word Cof[4][1024]; word Cof[4][1024];
int i, nWords = Abc_TtWordNum( nVars ); int i, nWords = Abc_TtWordNum( nVars );
int Counter = 0; // int Counter = 0;
for ( i = 0; i < nVars-1; i++ ) for ( i = 0; i < nVars-1; i++ )
{ {
Abc_TtCopy( Cof[0], pTruth, nWords, 0 ); Abc_TtCopy( Cof[0], pTruth, nWords, 0 );
...@@ -221,7 +221,7 @@ void Abc_TtConfactorTest4( word * pTruth, int nVars, int N ) ...@@ -221,7 +221,7 @@ void Abc_TtConfactorTest4( word * pTruth, int nVars, int N )
{ {
word Cof[4][1024]; word Cof[4][1024];
int i, j, nWords = Abc_TtWordNum( nVars ); int i, j, nWords = Abc_TtWordNum( nVars );
int Counter = 0, Sum = 0; int Sum = 0;
for ( i = 0; i < nVars-1; i++ ) for ( i = 0; i < nVars-1; i++ )
for ( j = i+1; j < nVars; j++ ) for ( j = i+1; j < nVars; j++ )
{ {
...@@ -508,7 +508,7 @@ void Abc_TtConfactorTest10( word * pTruth, int nVars, int N ) ...@@ -508,7 +508,7 @@ void Abc_TtConfactorTest10( word * pTruth, int nVars, int N )
void Abc_TtConfactorTest( word * pTruth, int nVars, int N ) void Abc_TtConfactorTest( word * pTruth, int nVars, int N )
{ {
char pCanonPerm[32]; char pCanonPerm[32];
static word pCopy1[1024]; // static word pCopy1[1024];
static word pCopy2[1024]; static word pCopy2[1024];
int nWords = Abc_TtWordNum( nVars ); int nWords = Abc_TtWordNum( nVars );
......
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