Skip to content

Commit 5fb4912

Browse files
authored
Merge pull request #180 from MyskYko/ttopt
fix compile warnings
2 parents 1bd7550 + fdd5656 commit 5fb4912

1 file changed

Lines changed: 19 additions & 19 deletions

File tree

src/aig/gia/giaTtopt.cpp

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -123,8 +123,8 @@ class TruthTable {
123123
if(logwidth > lww) {
124124
int nScopeSize = 1 << (logwidth - lww);
125125
for(int i = 0; i < nScopeSize && (fEq || fCompl); i++) {
126-
fEq &= t[nScopeSize * index1 + i] == t[nScopeSize * index2 + i];
127-
fCompl &= t[nScopeSize * index1 + i] == ~t[nScopeSize * index2 + i];
126+
fEq &= (t[nScopeSize * index1 + i] == t[nScopeSize * index2 + i]);
127+
fCompl &= (t[nScopeSize * index1 + i] == ~t[nScopeSize * index2 + i]);
128128
}
129129
} else {
130130
word value = GetValue(index1, lev) ^ GetValue(index2, lev);
@@ -174,18 +174,18 @@ class TruthTable {
174174
fOne &= !(~value);
175175
}
176176
if(fZero || fOne) {
177-
return -2 ^ fOne;
177+
return -2 ^ (int)fOne;
178178
}
179179
for(unsigned j = 0; j < vvIndices[lev].size(); j++) {
180180
int index2 = vvIndices[lev][j];
181181
bool fEq = true;
182182
bool fCompl = true;
183183
for(int i = 0; i < nScopeSize && (fEq || fCompl); i++) {
184-
fEq &= t[nScopeSize * index + i] == t[nScopeSize * index2 + i];
185-
fCompl &= t[nScopeSize * index + i] == ~t[nScopeSize * index2 + i];
184+
fEq &= (t[nScopeSize * index + i] == t[nScopeSize * index2 + i]);
185+
fCompl &= (t[nScopeSize * index + i] == ~t[nScopeSize * index2 + i]);
186186
}
187187
if(fEq || fCompl) {
188-
return (j << 1) ^ fCompl;
188+
return (j << 1) ^ (int)fCompl;
189189
}
190190
}
191191
} else {
@@ -553,7 +553,7 @@ class TruthTableReo : public TruthTable {
553553
}
554554
int *place = Hash_Int2ManLookup(unique, cof0, cof1);
555555
if(*place) {
556-
return (Hash_IntObjData2(unique, *place) << 1) ^ fCompl;
556+
return (Hash_IntObjData2(unique, *place) << 1) ^ (int)fCompl;
557557
}
558558
vvIndices[lev].push_back(index);
559559
Hash_Int2ManInsert(unique, cof0, cof1, vvIndices[lev].size() - 1);
@@ -562,7 +562,7 @@ class TruthTableReo : public TruthTable {
562562
if(cof0 == cof1) {
563563
vvRedundantIndices[lev].push_back(index);
564564
}
565-
return ((vvIndices[lev].size() - 1) << 1) ^ fCompl;
565+
return ((vvIndices[lev].size() - 1) << 1) ^ (int)fCompl;
566566
}
567567

568568
int BDDRebuild(int lev) {
@@ -580,18 +580,18 @@ class TruthTableReo : public TruthTable {
580580
bool cof1c = vvChildren[lev][i+i+1] & 1;
581581
int cof00, cof01, cof10, cof11;
582582
if(cof0index < 0) {
583-
cof00 = -2 ^ cof0c;
584-
cof01 = -2 ^ cof0c;
583+
cof00 = -2 ^ (int)cof0c;
584+
cof01 = -2 ^ (int)cof0c;
585585
} else {
586-
cof00 = vvChildren[lev+1][cof0index+cof0index] ^ cof0c;
587-
cof01 = vvChildren[lev+1][cof0index+cof0index+1] ^ cof0c;
586+
cof00 = vvChildren[lev+1][cof0index+cof0index] ^ (int)cof0c;
587+
cof01 = vvChildren[lev+1][cof0index+cof0index+1] ^ (int)cof0c;
588588
}
589589
if(cof1index < 0) {
590-
cof10 = -2 ^ cof1c;
591-
cof11 = -2 ^ cof1c;
590+
cof10 = -2 ^ (int)cof1c;
591+
cof11 = -2 ^ (int)cof1c;
592592
} else {
593-
cof10 = vvChildren[lev+1][cof1index+cof1index] ^ cof1c;
594-
cof11 = vvChildren[lev+1][cof1index+cof1index+1] ^ cof1c;
593+
cof10 = vvChildren[lev+1][cof1index+cof1index] ^ (int)cof1c;
594+
cof11 = vvChildren[lev+1][cof1index+cof1index+1] ^ (int)cof1c;
595595
}
596596
int newcof0 = BDDRebuildOne(index << 1, cof00, cof10, lev + 1, unique, vChildrenLow);
597597
int newcof1 = BDDRebuildOne((index << 1) ^ 1, cof01, cof11, lev + 1, unique, vChildrenLow);
@@ -900,7 +900,7 @@ class TruthTableCare : public TruthTableRewrite {
900900

901901
void Merge(int index1, int index2, int lev, bool fCompl) {
902902
MergeCare(index1, index2, lev);
903-
vvMergedIndices[lev].push_back(std::make_pair((index1 << 1) ^ fCompl, index2));
903+
vvMergedIndices[lev].push_back(std::make_pair((index1 << 1) ^ (int)fCompl, index2));
904904
}
905905

906906
int BDDBuildOne(int index, int lev) {
@@ -1023,7 +1023,7 @@ class TruthTableLevelTSM : public TruthTableCare {
10231023
fOne &= !(~value & cvalue);
10241024
}
10251025
if(fZero || fOne) {
1026-
return -2 ^ fOne;
1026+
return -2 ^ (int)fOne;
10271027
}
10281028
for(unsigned j = 0; j < vvIndices[lev].size(); j++) {
10291029
int index2 = vvIndices[lev][j];
@@ -1036,7 +1036,7 @@ class TruthTableLevelTSM : public TruthTableCare {
10361036
fCompl &= !(~value & cvalue);
10371037
}
10381038
if(fEq || fCompl) {
1039-
return (index2 << 1) ^ !fEq;
1039+
return (index2 << 1) ^ (int)!fEq;
10401040
}
10411041
}
10421042
} else {

0 commit comments

Comments
 (0)