@@ -1579,8 +1579,6 @@ bool FilterChooser::filterProcessor(bool AllowMixed, bool Greedy) {
1579
1579
}
1580
1580
}
1581
1581
1582
- unsigned BitIndex;
1583
-
1584
1582
// We maintain BIT_WIDTH copies of the bitAttrs automaton.
1585
1583
// The automaton consumes the corresponding bit from each
1586
1584
// instruction.
@@ -1602,14 +1600,14 @@ bool FilterChooser::filterProcessor(bool AllowMixed, bool Greedy) {
1602
1600
1603
1601
// FILTERED bit positions provide no entropy and are not worthy of pursuing.
1604
1602
// Filter::recurse() set either BIT_TRUE or BIT_FALSE for each position.
1605
- for (BitIndex = 0 ; BitIndex < BitWidth; ++BitIndex)
1603
+ for (unsigned BitIndex = 0 ; BitIndex < BitWidth; ++BitIndex)
1606
1604
if (FilterBitValues[BitIndex].isSet ())
1607
1605
bitAttrs[BitIndex] = ATTR_FILTERED;
1608
1606
1609
1607
for (const auto &OpcPair : Opcodes) {
1610
1608
insn_t insn = insnWithID (OpcPair.EncodingID );
1611
1609
1612
- for (BitIndex = 0 ; BitIndex < BitWidth; ++BitIndex) {
1610
+ for (unsigned BitIndex = 0 ; BitIndex < BitWidth; ++BitIndex) {
1613
1611
switch (bitAttrs[BitIndex]) {
1614
1612
case ATTR_NONE:
1615
1613
if (insn[BitIndex] == BitValue::BIT_UNSET)
@@ -1655,7 +1653,7 @@ bool FilterChooser::filterProcessor(bool AllowMixed, bool Greedy) {
1655
1653
bitAttr_t RA = ATTR_NONE;
1656
1654
unsigned StartBit = 0 ;
1657
1655
1658
- for (BitIndex = 0 ; BitIndex < BitWidth; ++BitIndex) {
1656
+ for (unsigned BitIndex = 0 ; BitIndex < BitWidth; ++BitIndex) {
1659
1657
bitAttr_t bitAttr = bitAttrs[BitIndex];
1660
1658
1661
1659
assert (bitAttr != ATTR_NONE && " Bit without attributes" );
@@ -1736,12 +1734,12 @@ bool FilterChooser::filterProcessor(bool AllowMixed, bool Greedy) {
1736
1734
case ATTR_FILTERED:
1737
1735
break ;
1738
1736
case ATTR_ALL_SET:
1739
- reportRegion (RA, StartBit, BitIndex , AllowMixed);
1737
+ reportRegion (RA, StartBit, BitWidth , AllowMixed);
1740
1738
break ;
1741
1739
case ATTR_ALL_UNSET:
1742
1740
break ;
1743
1741
case ATTR_MIXED:
1744
- reportRegion (RA, StartBit, BitIndex , AllowMixed);
1742
+ reportRegion (RA, StartBit, BitWidth , AllowMixed);
1745
1743
break ;
1746
1744
}
1747
1745
0 commit comments