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

Compiler warnings.

This commit is contained in:
Alan Mishchenko 2017-02-18 14:26:31 -08:00
parent 429f52ce15
commit 316238d484
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/aig/gia/giaUtil.c
View File

@ -2063,7 +2063,7 @@ void Gia_AigerWriteLut( Gia_Man_t * p, char * pFileName )
***********************************************************************/ ***********************************************************************/
void Gia_ManDetectMuxes( Gia_Man_t * p ) void Gia_ManDetectMuxes( Gia_Man_t * p )
{ {
Gia_Obj_t * pObj, * pNodeT, * pNodeE; int i; Gia_Obj_t * pObj = NULL, * pNodeT, * pNodeE; int i;
Gia_ManForEachObj( p, pObj, i ); Gia_ManForEachObj( p, pObj, i );
if ( Gia_ObjIsAnd(pObj) && Gia_ObjRecognizeMux(pObj, &pNodeT, &pNodeE) ) if ( Gia_ObjIsAnd(pObj) && Gia_ObjRecognizeMux(pObj, &pNodeT, &pNodeE) )
pObj->fMark0 = 1; pObj->fMark0 = 1;

4
src/sat/satoko/satoko.h
View File

@ -84,8 +84,8 @@ extern void satoko_default_opts(satoko_opts_t *);
extern void satoko_configure(satoko_t *, satoko_opts_t *); extern void satoko_configure(satoko_t *, satoko_opts_t *);
extern int satoko_parse_dimacs(char *, satoko_t **); extern int satoko_parse_dimacs(char *, satoko_t **);
extern int satoko_add_variable(satoko_t *, char); extern int satoko_add_variable(satoko_t *, char);
extern int satoko_add_clause(satoko_t *, unsigned *, unsigned); extern int satoko_add_clause(satoko_t *, int *, int);
extern void satoko_assump_push(satoko_t *s, unsigned); extern void satoko_assump_push(satoko_t *s, int);
extern void satoko_assump_pop(satoko_t *s); extern void satoko_assump_pop(satoko_t *s);
extern int satoko_simplify(satoko_t *); extern int satoko_simplify(satoko_t *);
extern int satoko_solve(satoko_t *); extern int satoko_solve(satoko_t *);

10
src/sat/satoko/solver_api.c
View File

@ -234,7 +234,7 @@ int satoko_add_variable(solver_t *s, char sign)
return var; return var;
} }
int satoko_add_clause(solver_t *s, unsigned *lits, unsigned size) int satoko_add_clause(solver_t *s, int *lits, int size)
{ {
unsigned i, j; unsigned i, j;
unsigned prev_lit; unsigned prev_lit;
@ -249,10 +249,10 @@ int satoko_add_clause(solver_t *s, unsigned *lits, unsigned size)
vec_uint_clear(s->temp_lits); vec_uint_clear(s->temp_lits);
j = 0; j = 0;
prev_lit = UNDEF; prev_lit = UNDEF;
for (i = 0; i < size; i++) { for (i = 0; i < (unsigned)size; i++) {
if (lits[i] == lit_neg(prev_lit) || lit_value(s, lits[i]) == LIT_TRUE) if ((unsigned)lits[i] == lit_neg(prev_lit) || lit_value(s, lits[i]) == LIT_TRUE)
return SATOKO_OK; return SATOKO_OK;
else if (lits[i] != prev_lit && var_value(s, lit2var(lits[i])) == VAR_UNASSING) { else if ((unsigned)lits[i] != prev_lit && var_value(s, lit2var(lits[i])) == VAR_UNASSING) {
prev_lit = lits[i]; prev_lit = lits[i];
vec_uint_push_back(s->temp_lits, lits[i]); vec_uint_push_back(s->temp_lits, lits[i]);
} }
@ -270,7 +270,7 @@ int satoko_add_clause(solver_t *s, unsigned *lits, unsigned size)
return SATOKO_OK; return SATOKO_OK;
} }
void satoko_assump_push(solver_t *s, unsigned lit) void satoko_assump_push(solver_t *s, int lit)
{ {
vec_uint_push_back(s->assumptions, lit); vec_uint_push_back(s->assumptions, lit);
} }