@@ -1579,8 +1579,6 @@ bool FilterChooser::filterProcessor(bool AllowMixed, bool Greedy) {
15791579 }
15801580 }
15811581
1582- unsigned BitIndex;
1583-
15841582 // We maintain BIT_WIDTH copies of the bitAttrs automaton.
15851583 // The automaton consumes the corresponding bit from each
15861584 // instruction.
@@ -1602,14 +1600,14 @@ bool FilterChooser::filterProcessor(bool AllowMixed, bool Greedy) {
16021600
16031601 // FILTERED bit positions provide no entropy and are not worthy of pursuing.
16041602 // 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)
16061604 if (FilterBitValues[BitIndex].isSet ())
16071605 bitAttrs[BitIndex] = ATTR_FILTERED;
16081606
16091607 for (const auto &OpcPair : Opcodes) {
16101608 insn_t insn = insnWithID (OpcPair.EncodingID );
16111609
1612- for (BitIndex = 0 ; BitIndex < BitWidth; ++BitIndex) {
1610+ for (unsigned BitIndex = 0 ; BitIndex < BitWidth; ++BitIndex) {
16131611 switch (bitAttrs[BitIndex]) {
16141612 case ATTR_NONE:
16151613 if (insn[BitIndex] == BitValue::BIT_UNSET)
@@ -1655,7 +1653,7 @@ bool FilterChooser::filterProcessor(bool AllowMixed, bool Greedy) {
16551653 bitAttr_t RA = ATTR_NONE;
16561654 unsigned StartBit = 0 ;
16571655
1658- for (BitIndex = 0 ; BitIndex < BitWidth; ++BitIndex) {
1656+ for (unsigned BitIndex = 0 ; BitIndex < BitWidth; ++BitIndex) {
16591657 bitAttr_t bitAttr = bitAttrs[BitIndex];
16601658
16611659 assert (bitAttr != ATTR_NONE && " Bit without attributes" );
@@ -1736,12 +1734,12 @@ bool FilterChooser::filterProcessor(bool AllowMixed, bool Greedy) {
17361734 case ATTR_FILTERED:
17371735 break ;
17381736 case ATTR_ALL_SET:
1739- reportRegion (RA, StartBit, BitIndex , AllowMixed);
1737+ reportRegion (RA, StartBit, BitWidth , AllowMixed);
17401738 break ;
17411739 case ATTR_ALL_UNSET:
17421740 break ;
17431741 case ATTR_MIXED:
1744- reportRegion (RA, StartBit, BitIndex , AllowMixed);
1742+ reportRegion (RA, StartBit, BitWidth , AllowMixed);
17451743 break ;
17461744 }
17471745
0 commit comments