6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2025-05-27 08:38:48 +00:00
Code Issues Projects Releases Wiki Activity

Declare some for loop indices inside the for loop statement.

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@162085 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Craig Topper 2012-08-17 05:42:16 +00:00
parent c056483fc6
commit 8cd9eaef01
1 changed files with 13 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
utils/TableGen/FixedLenDecoderEmitter.cpp
View File

@ -150,9 +150,7 @@ static bit_value_t bitFromBits(const BitsInit &bits, unsigned index) {
} }
// Prints the bit value for each position. // Prints the bit value for each position.
static void dumpBits(raw_ostream &o, const BitsInit &bits) { static void dumpBits(raw_ostream &o, const BitsInit &bits) {
unsigned index; for (unsigned index = bits.getNumBits(); index > 0; --index) {
for (index = bits.getNumBits(); index > 0; index--) {
switch (bitFromBits(bits, index - 1)) { switch (bitFromBits(bits, index - 1)) {
case BIT_TRUE: case BIT_TRUE:
o << "1"; o << "1";
@ -557,11 +555,9 @@ void Filter::recurse() {
// Starts by inheriting our parent filter chooser's filter bit values. // Starts by inheriting our parent filter chooser's filter bit values.
std::vector<bit_value_t> BitValueArray(Owner->FilterBitValues); std::vector<bit_value_t> BitValueArray(Owner->FilterBitValues);
unsigned bitIndex;
if (VariableInstructions.size()) { if (VariableInstructions.size()) {
// Conservatively marks each segment position as BIT_UNSET. // Conservatively marks each segment position as BIT_UNSET.
for (bitIndex = 0; bitIndex < NumBits; bitIndex++) for (unsigned bitIndex = 0; bitIndex < NumBits; ++bitIndex)
BitValueArray[StartBit + bitIndex] = BIT_UNSET; BitValueArray[StartBit + bitIndex] = BIT_UNSET;
// Delegates to an inferior filter chooser for further processing on this // Delegates to an inferior filter chooser for further processing on this
@ -590,7 +586,7 @@ void Filter::recurse() {
mapIterator++) { mapIterator++) {
// Marks all the segment positions with either BIT_TRUE or BIT_FALSE. // Marks all the segment positions with either BIT_TRUE or BIT_FALSE.
for (bitIndex = 0; bitIndex < NumBits; bitIndex++) { for (unsigned bitIndex = 0; bitIndex < NumBits; ++bitIndex) {
if (mapIterator->first & (1ULL << bitIndex)) if (mapIterator->first & (1ULL << bitIndex))
BitValueArray[StartBit + bitIndex] = BIT_TRUE; BitValueArray[StartBit + bitIndex] = BIT_TRUE;
else else
@ -946,9 +942,7 @@ bool FilterChooser::fieldFromInsn(uint64_t &Field, insn_t &Insn,
/// filter array as a series of chars. /// filter array as a series of chars.
void FilterChooser::dumpFilterArray(raw_ostream &o, void FilterChooser::dumpFilterArray(raw_ostream &o,
const std::vector<bit_value_t> &filter) const { const std::vector<bit_value_t> &filter) const {
unsigned bitIndex; for (unsigned bitIndex = BitWidth; bitIndex > 0; bitIndex--) {
for (bitIndex = BitWidth; bitIndex > 0; bitIndex--) {
switch (filter[bitIndex - 1]) { switch (filter[bitIndex - 1]) {
case BIT_UNFILTERED: case BIT_UNFILTERED:
o << "."; o << ".";
@ -1233,7 +1227,7 @@ void FilterChooser::emitPredicateTableEntry(DecoderTableInfo &TableInfo,
TableInfo.Table.push_back(MCD::OPC_CheckPredicate); TableInfo.Table.push_back(MCD::OPC_CheckPredicate);
// Predicate index // Predicate index
for (int i = 0, e = PBytes.size(); i != e; ++i) for (unsigned i = 0, e = PBytes.size(); i != e; ++i)
TableInfo.Table.push_back(PBytes[i]); TableInfo.Table.push_back(PBytes[i]);
// Push location for NumToSkip backpatching. // Push location for NumToSkip backpatching.
TableInfo.FixupStack.back().push_back(TableInfo.Table.size()); TableInfo.FixupStack.back().push_back(TableInfo.Table.size());
@ -1289,7 +1283,7 @@ void FilterChooser::emitSoftFailTableEntry(DecoderTableInfo &TableInfo,
if (NeedPositiveMask) { if (NeedPositiveMask) {
encodeULEB128(PositiveMask.getZExtValue(), S); encodeULEB128(PositiveMask.getZExtValue(), S);
S.flush(); S.flush();
for (int i = 0, e = MaskBytes.size(); i != e; ++i) for (unsigned i = 0, e = MaskBytes.size(); i != e; ++i)
TableInfo.Table.push_back(MaskBytes[i]); TableInfo.Table.push_back(MaskBytes[i]);
} else } else
TableInfo.Table.push_back(0); TableInfo.Table.push_back(0);
@ -1298,7 +1292,7 @@ void FilterChooser::emitSoftFailTableEntry(DecoderTableInfo &TableInfo,
S.resync(); S.resync();
encodeULEB128(NegativeMask.getZExtValue(), S); encodeULEB128(NegativeMask.getZExtValue(), S);
S.flush(); S.flush();
for (int i = 0, e = MaskBytes.size(); i != e; ++i) for (unsigned i = 0, e = MaskBytes.size(); i != e; ++i)
TableInfo.Table.push_back(MaskBytes[i]); TableInfo.Table.push_back(MaskBytes[i]);
} else } else
TableInfo.Table.push_back(0); TableInfo.Table.push_back(0);
@ -1317,14 +1311,13 @@ void FilterChooser::emitSingletonTableEntry(DecoderTableInfo &TableInfo,
getIslands(StartBits, EndBits, FieldVals, Insn); getIslands(StartBits, EndBits, FieldVals, Insn);
unsigned Size = StartBits.size(); unsigned Size = StartBits.size();
unsigned I, NumBits;
// Emit the predicate table entry if one is needed. // Emit the predicate table entry if one is needed.
emitPredicateTableEntry(TableInfo, Opc); emitPredicateTableEntry(TableInfo, Opc);
// Check any additional encoding fields needed. // Check any additional encoding fields needed.
for (I = Size; I != 0; --I) { for (unsigned I = Size; I != 0; --I) {
NumBits = EndBits[I-1] - StartBits[I-1] + 1; unsigned NumBits = EndBits[I-1] - StartBits[I-1] + 1;
TableInfo.Table.push_back(MCD::OPC_CheckField); TableInfo.Table.push_back(MCD::OPC_CheckField);
TableInfo.Table.push_back(StartBits[I-1]); TableInfo.Table.push_back(StartBits[I-1]);
TableInfo.Table.push_back(NumBits); TableInfo.Table.push_back(NumBits);
@ -1359,7 +1352,7 @@ void FilterChooser::emitSingletonTableEntry(DecoderTableInfo &TableInfo,
S.flush(); S.flush();
// Decoder index // Decoder index
for (int i = 0, e = Bytes.size(); i != e; ++i) for (unsigned i = 0, e = Bytes.size(); i != e; ++i)
TableInfo.Table.push_back(Bytes[i]); TableInfo.Table.push_back(Bytes[i]);
} }
@ -1439,7 +1432,7 @@ bool FilterChooser::filterProcessor(bool AllowMixed, bool Greedy) {
} }
} }
unsigned BitIndex, InsnIndex; unsigned BitIndex;
// We maintain BIT_WIDTH copies of the bitAttrs automaton. // We maintain BIT_WIDTH copies of the bitAttrs automaton.
// The automaton consumes the corresponding bit from each // The automaton consumes the corresponding bit from each
@ -1469,7 +1462,7 @@ bool FilterChooser::filterProcessor(bool AllowMixed, bool Greedy) {
else else
bitAttrs.push_back(ATTR_NONE); bitAttrs.push_back(ATTR_NONE);
for (InsnIndex = 0; InsnIndex < numInstructions; ++InsnIndex) { for (unsigned InsnIndex = 0; InsnIndex < numInstructions; ++InsnIndex) {
insn_t insn; insn_t insn;
insnWithID(insn, Opcodes[InsnIndex]); insnWithID(insn, Opcodes[InsnIndex]);
@ -1520,7 +1513,7 @@ bool FilterChooser::filterProcessor(bool AllowMixed, bool Greedy) {
bitAttr_t RA = ATTR_NONE; bitAttr_t RA = ATTR_NONE;
unsigned StartBit = 0; unsigned StartBit = 0;
for (BitIndex = 0; BitIndex < BitWidth; BitIndex++) { for (BitIndex = 0; BitIndex < BitWidth; ++BitIndex) {
bitAttr_t bitAttr = bitAttrs[BitIndex]; bitAttr_t bitAttr = bitAttrs[BitIndex];
assert(bitAttr != ATTR_NONE && "Bit without attributes"); assert(bitAttr != ATTR_NONE && "Bit without attributes");