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

Fixing windows compilation problem.

This commit is contained in:
Alan Mishchenko 2017-01-24 20:49:47 -08:00
parent 88e887d1a0
commit c3dfec7467
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/sat/xsat/xsatBQueue.h
View File

@ -125,8 +125,9 @@ static inline void xSAT_BQueuePush( xSAT_BQueue_t * p, unsigned Value )
***********************************************************************/ ***********************************************************************/
static inline int xSAT_BQueuePop( xSAT_BQueue_t * p ) static inline int xSAT_BQueuePop( xSAT_BQueue_t * p )
{ {
int RetValue;
assert( p->nSize >= 1 ); assert( p->nSize >= 1 );
int RetValue = p->pData[p->iFirst]; RetValue = p->pData[p->iFirst];
p->nSum -= RetValue; p->nSum -= RetValue;
p->iFirst = ( p->iFirst + 1 ) % p->nCap; p->iFirst = ( p->iFirst + 1 ) % p->nCap;
p->nSize--; p->nSize--;

2
src/sat/xsat/xsatSolver.c
View File

@ -334,7 +334,7 @@ int xSAT_SolverEnqueue( xSAT_Solver_t * s, int Lit, unsigned Reason )
{ {
int Var = xSAT_Lit2Var( Lit ); int Var = xSAT_Lit2Var( Lit );
Vec_StrWriteEntry( s->vAssigns, Var, xSAT_LitSign( Lit ) ); Vec_StrWriteEntry( s->vAssigns, Var, (char)xSAT_LitSign( Lit ) );
Vec_IntWriteEntry( s->vLevels, Var, xSAT_SolverDecisionLevel( s ) ); Vec_IntWriteEntry( s->vLevels, Var, xSAT_SolverDecisionLevel( s ) );
Vec_IntWriteEntry( s->vReasons, Var, ( int ) Reason ); Vec_IntWriteEntry( s->vReasons, Var, ( int ) Reason );
Vec_IntPush( s->vTrail, Lit ); Vec_IntPush( s->vTrail, Lit );

2
src/sat/xsat/xsatSolver.h
View File

@ -143,7 +143,7 @@ struct xSAT_Solver_t_
int nAssignSimplify; /* Number of top-level assignments since last int nAssignSimplify; /* Number of top-level assignments since last
* execution of 'simplify()'. */ * execution of 'simplify()'. */
int64_t nPropSimplify; /* Remaining number of propagations that must be iword nPropSimplify; /* Remaining number of propagations that must be
* made before next execution of 'simplify()'. */ * made before next execution of 'simplify()'. */
/* Temporary data used by Search method */ /* Temporary data used by Search method */