diff options
| author | Alan Mishchenko <alanmi@berkeley.edu> | 2019-03-05 16:08:49 -0800 |
|---|---|---|
| committer | Alan Mishchenko <alanmi@berkeley.edu> | 2019-03-05 16:08:49 -0800 |
| commit | f657d9a7e6aedbb33063d050bc65d8eb3c95098b (patch) | |
| tree | 38c0269b9505d0440ee1bc34f0fc2cc50900da0d /src/aig | |
| parent | 01569b8f5f2394c534c3aba7276caf22493fce82 (diff) | |
| download | abc-f657d9a7e6aedbb33063d050bc65d8eb3c95098b.tar.gz abc-f657d9a7e6aedbb33063d050bc65d8eb3c95098b.tar.bz2 abc-f657d9a7e6aedbb33063d050bc65d8eb3c95098b.zip | |
Fixing several other type conversion warnings.
Diffstat (limited to 'src/aig')
| -rw-r--r-- | src/aig/gia/gia.h | 48 |
1 files changed, 24 insertions, 24 deletions
diff --git a/src/aig/gia/gia.h b/src/aig/gia/gia.h index 698903da..2fce93b8 100644 --- a/src/aig/gia/gia.h +++ b/src/aig/gia/gia.h @@ -676,17 +676,17 @@ static inline int Gia_ManAppendAnd( Gia_Man_t * p, int iLit0, int iLit1 ) assert( p->fGiaSimple || Abc_Lit2Var(iLit0) != Abc_Lit2Var(iLit1) ); if ( iLit0 < iLit1 ) { - pObj->iDiff0 = Gia_ObjId(p, pObj) - Abc_Lit2Var(iLit0); - pObj->fCompl0 = Abc_LitIsCompl(iLit0); - pObj->iDiff1 = Gia_ObjId(p, pObj) - Abc_Lit2Var(iLit1); - pObj->fCompl1 = Abc_LitIsCompl(iLit1); + pObj->iDiff0 = (unsigned)(Gia_ObjId(p, pObj) - Abc_Lit2Var(iLit0)); + pObj->fCompl0 = (unsigned)(Abc_LitIsCompl(iLit0)); + pObj->iDiff1 = (unsigned)(Gia_ObjId(p, pObj) - Abc_Lit2Var(iLit1)); + pObj->fCompl1 = (unsigned)(Abc_LitIsCompl(iLit1)); } else { - pObj->iDiff1 = Gia_ObjId(p, pObj) - Abc_Lit2Var(iLit0); - pObj->fCompl1 = Abc_LitIsCompl(iLit0); - pObj->iDiff0 = Gia_ObjId(p, pObj) - Abc_Lit2Var(iLit1); - pObj->fCompl0 = Abc_LitIsCompl(iLit1); + pObj->iDiff1 = (unsigned)(Gia_ObjId(p, pObj) - Abc_Lit2Var(iLit0)); + pObj->fCompl1 = (unsigned)(Abc_LitIsCompl(iLit0)); + pObj->iDiff0 = (unsigned)(Gia_ObjId(p, pObj) - Abc_Lit2Var(iLit1)); + pObj->fCompl0 = (unsigned)(Abc_LitIsCompl(iLit1)); } if ( p->pFanData ) { @@ -722,17 +722,17 @@ static inline int Gia_ManAppendXorReal( Gia_Man_t * p, int iLit0, int iLit1 ) assert( !Abc_LitIsCompl(iLit1) ); if ( Abc_Lit2Var(iLit0) > Abc_Lit2Var(iLit1) ) { - pObj->iDiff0 = Gia_ObjId(p, pObj) - Abc_Lit2Var(iLit0); - pObj->fCompl0 = Abc_LitIsCompl(iLit0); - pObj->iDiff1 = Gia_ObjId(p, pObj) - Abc_Lit2Var(iLit1); - pObj->fCompl1 = Abc_LitIsCompl(iLit1); + pObj->iDiff0 = (unsigned)(Gia_ObjId(p, pObj) - Abc_Lit2Var(iLit0)); + pObj->fCompl0 = (unsigned)(Abc_LitIsCompl(iLit0)); + pObj->iDiff1 = (unsigned)(Gia_ObjId(p, pObj) - Abc_Lit2Var(iLit1)); + pObj->fCompl1 = (unsigned)(Abc_LitIsCompl(iLit1)); } else { - pObj->iDiff1 = Gia_ObjId(p, pObj) - Abc_Lit2Var(iLit0); - pObj->fCompl1 = Abc_LitIsCompl(iLit0); - pObj->iDiff0 = Gia_ObjId(p, pObj) - Abc_Lit2Var(iLit1); - pObj->fCompl0 = Abc_LitIsCompl(iLit1); + pObj->iDiff1 = (unsigned)(Gia_ObjId(p, pObj) - Abc_Lit2Var(iLit0)); + pObj->fCompl1 = (unsigned)(Abc_LitIsCompl(iLit0)); + pObj->iDiff0 = (unsigned)(Gia_ObjId(p, pObj) - Abc_Lit2Var(iLit1)); + pObj->fCompl0 = (unsigned)(Abc_LitIsCompl(iLit1)); } p->nXors++; return Gia_ObjId( p, pObj ) << 1; @@ -750,18 +750,18 @@ static inline int Gia_ManAppendMuxReal( Gia_Man_t * p, int iLitC, int iLit1, int assert( !Vec_IntSize(&p->vHTable) || !Abc_LitIsCompl(iLit1) ); if ( Abc_Lit2Var(iLit0) < Abc_Lit2Var(iLit1) ) { - pObj->iDiff0 = Gia_ObjId(p, pObj) - Abc_Lit2Var(iLit0); - pObj->fCompl0 = Abc_LitIsCompl(iLit0); - pObj->iDiff1 = Gia_ObjId(p, pObj) - Abc_Lit2Var(iLit1); - pObj->fCompl1 = Abc_LitIsCompl(iLit1); + pObj->iDiff0 = (unsigned)(Gia_ObjId(p, pObj) - Abc_Lit2Var(iLit0)); + pObj->fCompl0 = (unsigned)(Abc_LitIsCompl(iLit0)); + pObj->iDiff1 = (unsigned)(Gia_ObjId(p, pObj) - Abc_Lit2Var(iLit1)); + pObj->fCompl1 = (unsigned)(Abc_LitIsCompl(iLit1)); p->pMuxes[Gia_ObjId(p, pObj)] = iLitC; } else { - pObj->iDiff1 = Gia_ObjId(p, pObj) - Abc_Lit2Var(iLit0); - pObj->fCompl1 = Abc_LitIsCompl(iLit0); - pObj->iDiff0 = Gia_ObjId(p, pObj) - Abc_Lit2Var(iLit1); - pObj->fCompl0 = Abc_LitIsCompl(iLit1); + pObj->iDiff1 = (unsigned)(Gia_ObjId(p, pObj) - Abc_Lit2Var(iLit0)); + pObj->fCompl1 = (unsigned)(Abc_LitIsCompl(iLit0)); + pObj->iDiff0 = (unsigned)(Gia_ObjId(p, pObj) - Abc_Lit2Var(iLit1)); + pObj->fCompl0 = (unsigned)(Abc_LitIsCompl(iLit1)); p->pMuxes[Gia_ObjId(p, pObj)] = Abc_LitNot(iLitC); } p->nMuxes++; |