Commit d3ec4493 by Alan Mishchenko

Windows complier errors.

parent 2ded0512
...@@ -196,9 +196,10 @@ void simpleMinimalGroups(word* x, word* pAux, word* minimal, int* pGroups, int n ...@@ -196,9 +196,10 @@ void simpleMinimalGroups(word* x, word* pAux, word* minimal, int* pGroups, int n
/* variables */ /* variables */
int i, j, o, nn; int i, j, o, nn;
permInfo* pi; permInfo* pi;
int * a, * c, * m;
/* reorder groups and calculate group offsets */ /* reorder groups and calculate group offsets */
int offset[nGroups]; int * offset = ABC_ALLOC( int, nGroups );
o = 0; o = 0;
j = 0; j = 0;
...@@ -224,9 +225,9 @@ void simpleMinimalGroups(word* x, word* pAux, word* minimal, int* pGroups, int n ...@@ -224,9 +225,9 @@ void simpleMinimalGroups(word* x, word* pAux, word* minimal, int* pGroups, int n
/* iterate through all combinations of pGroups using mixed radix enumeration */ /* iterate through all combinations of pGroups using mixed radix enumeration */
nn = ( nGroups << 1 ) + 1; nn = ( nGroups << 1 ) + 1;
int a[nn]; a = ABC_ALLOC( int, nn );
int c[nn]; c = ABC_ALLOC( int, nn );
int m[nn]; m = ABC_ALLOC( int, nn );
/* fill a and m arrays */ /* fill a and m arrays */
m[0] = 2; m[0] = 2;
...@@ -295,6 +296,10 @@ void simpleMinimalGroups(word* x, word* pAux, word* minimal, int* pGroups, int n ...@@ -295,6 +296,10 @@ void simpleMinimalGroups(word* x, word* pAux, word* minimal, int* pGroups, int n
c[j] = 1; c[j] = 1;
a[j]++; a[j]++;
} }
ABC_FREE( offset );
ABC_FREE( a );
ABC_FREE( c );
ABC_FREE( m );
Kit_TruthCopy_64bit( x, minimal, nVars ); Kit_TruthCopy_64bit( x, minimal, nVars );
} }
......
...@@ -1219,8 +1219,9 @@ unsigned Abc_TtCanonicizeHie( Abc_TtMan_t * p, word * pTruthInit, int nVars, cha ...@@ -1219,8 +1219,9 @@ unsigned Abc_TtCanonicizeHie( Abc_TtMan_t * p, word * pTruthInit, int nVars, cha
if ( fExact ) { if ( fExact ) {
extern void simpleMinimalGroups(word* x, word* pAux, word* minimal, int* pGroups, int nGroups, permInfo** pis, int nVars, int fFlipOutput, int fFlipInput); extern void simpleMinimalGroups(word* x, word* pAux, word* minimal, int* pGroups, int nGroups, permInfo** pis, int nVars, int fFlipOutput, int fFlipInput);
word pAuxWord[1024], pAuxWord1[1024]; word pAuxWord[1024], pAuxWord1[1024];
int pGroups[nVars]; int pGroups[16];
int nGroups = 0; int nGroups = 0;
permInfo * pis[17];
// get groups // get groups
pGroups[0] = 0; pGroups[0] = 0;
for (i = 0; i < nVars - 1; i++) { for (i = 0; i < nVars - 1; i++) {
...@@ -1236,7 +1237,6 @@ unsigned Abc_TtCanonicizeHie( Abc_TtMan_t * p, word * pTruthInit, int nVars, cha ...@@ -1236,7 +1237,6 @@ unsigned Abc_TtCanonicizeHie( Abc_TtMan_t * p, word * pTruthInit, int nVars, cha
nGroups++; nGroups++;
// compute permInfo from 0 to nVars (incl.) // compute permInfo from 0 to nVars (incl.)
permInfo * pis[nVars+1];
for (i = 0; i <= nVars; i++) { for (i = 0; i <= nVars; i++) {
pis[i] = setPermInfoPtr(i); pis[i] = setPermInfoPtr(i);
} }
......
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