Windows complier errors.

This commit is contained in:
Alan Mishchenko 2016-08-06 00:24:07 -07:00
parent 2ded05127a
commit d3ec4493b2
2 changed files with 11 additions and 6 deletions

View File

@ -196,9 +196,10 @@ void simpleMinimalGroups(word* x, word* pAux, word* minimal, int* pGroups, int n
/* variables */
int i, j, o, nn;
permInfo* pi;
int * a, * c, * m;
/* reorder groups and calculate group offsets */
int offset[nGroups];
int * offset = ABC_ALLOC( int, nGroups );
o = 0;
j = 0;
@ -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 */
nn = ( nGroups << 1 ) + 1;
int a[nn];
int c[nn];
int m[nn];
a = ABC_ALLOC( int, nn );
c = ABC_ALLOC( int, nn );
m = ABC_ALLOC( int, nn );
/* fill a and m arrays */
m[0] = 2;
@ -295,6 +296,10 @@ void simpleMinimalGroups(word* x, word* pAux, word* minimal, int* pGroups, int n
c[j] = 1;
a[j]++;
}
ABC_FREE( offset );
ABC_FREE( a );
ABC_FREE( c );
ABC_FREE( m );
Kit_TruthCopy_64bit( x, minimal, nVars );
}

View File

@ -1219,8 +1219,9 @@ unsigned Abc_TtCanonicizeHie( Abc_TtMan_t * p, word * pTruthInit, int nVars, cha
if ( fExact ) {
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];
int pGroups[nVars];
int pGroups[16];
int nGroups = 0;
permInfo * pis[17];
// get groups
pGroups[0] = 0;
for (i = 0; i < nVars - 1; i++) {
@ -1236,7 +1237,6 @@ unsigned Abc_TtCanonicizeHie( Abc_TtMan_t * p, word * pTruthInit, int nVars, cha
nGroups++;
// compute permInfo from 0 to nVars (incl.)
permInfo * pis[nVars+1];
for (i = 0; i <= nVars; i++) {
pis[i] = setPermInfoPtr(i);
}