6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2024-08-09 10:29:21 +00:00
Code Issues Projects Releases Wiki Activity

MSVC doesn't like member variables with the same name as the class.

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@78462 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Benjamin Kramer 2009-08-08 10:06:30 +00:00
parent a3741fa28b
commit fa1165abb8
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
utils/TableGen/AsmMatcherEmitter.cpp
View File

@ -307,7 +307,7 @@ struct InstructionInfo {
ClassInfo *Class; ClassInfo *Class;
/// The original operand this corresponds to, if any. /// The original operand this corresponds to, if any.
const CodeGenInstruction::OperandInfo *Operand; const CodeGenInstruction::OperandInfo *OperandInfo;
}; };
/// InstrName - The target name for this instruction. /// InstrName - The target name for this instruction.
@ -384,7 +384,7 @@ void InstructionInfo::dump() {
continue; continue;
} }
const CodeGenInstruction::OperandInfo &OI = *Op.Operand; const CodeGenInstruction::OperandInfo &OI = *Op.OperandInfo;
errs() << OI.Name << " " << OI.Rec->getName() errs() << OI.Name << " " << OI.Rec->getName()
<< " (" << OI.MIOperandNo << ", " << OI.MINumOperands << ")\n"; << " (" << OI.MIOperandNo << ", " << OI.MINumOperands << ")\n";
} }
@ -501,7 +501,7 @@ void AsmMatcherInfo::BuildInfo(CodeGenTarget &Target) {
if (Token[0] != '$') { if (Token[0] != '$') {
InstructionInfo::Operand Op; InstructionInfo::Operand Op;
Op.Class = getTokenClass(Token); Op.Class = getTokenClass(Token);
Op.Operand = 0; Op.OperandInfo = 0;
II->Operands.push_back(Op); II->Operands.push_back(Op);
continue; continue;
} }
@ -525,7 +525,7 @@ void AsmMatcherInfo::BuildInfo(CodeGenTarget &Target) {
const CodeGenInstruction::OperandInfo &OI = CGI.OperandList[Idx]; const CodeGenInstruction::OperandInfo &OI = CGI.OperandList[Idx];
InstructionInfo::Operand Op; InstructionInfo::Operand Op;
Op.Class = getOperandClass(Token, OI); Op.Class = getOperandClass(Token, OI);
Op.Operand = &OI; Op.OperandInfo = &OI;
II->Operands.push_back(Op); II->Operands.push_back(Op);
} }
@ -574,8 +574,8 @@ static void ConstructConversionFunctions(CodeGenTarget &Target,
SmallVector<std::pair<unsigned, unsigned>, 4> MIOperandList; SmallVector<std::pair<unsigned, unsigned>, 4> MIOperandList;
for (unsigned i = 0, e = II.Operands.size(); i != e; ++i) { for (unsigned i = 0, e = II.Operands.size(); i != e; ++i) {
InstructionInfo::Operand &Op = II.Operands[i]; InstructionInfo::Operand &Op = II.Operands[i];
if (Op.Operand) if (Op.OperandInfo)
MIOperandList.push_back(std::make_pair(Op.Operand->MIOperandNo, i)); MIOperandList.push_back(std::make_pair(Op.OperandInfo->MIOperandNo, i));
} }
std::sort(MIOperandList.begin(), MIOperandList.end()); std::sort(MIOperandList.begin(), MIOperandList.end());
@ -592,7 +592,7 @@ static void ConstructConversionFunctions(CodeGenTarget &Target,
unsigned CurIndex = 0; unsigned CurIndex = 0;
for (unsigned i = 0, e = MIOperandList.size(); i != e; ++i) { for (unsigned i = 0, e = MIOperandList.size(); i != e; ++i) {
InstructionInfo::Operand &Op = II.Operands[MIOperandList[i].second]; InstructionInfo::Operand &Op = II.Operands[MIOperandList[i].second];
assert(CurIndex <= Op.Operand->MIOperandNo && assert(CurIndex <= Op.OperandInfo->MIOperandNo &&
"Duplicate match for instruction operand!"); "Duplicate match for instruction operand!");
Signature += "_"; Signature += "_";
@ -601,14 +601,14 @@ static void ConstructConversionFunctions(CodeGenTarget &Target,
// .td file encodes "implicit" operands as explicit ones. // .td file encodes "implicit" operands as explicit ones.
// //
// FIXME: This should be removed from the MCInst structure. // FIXME: This should be removed from the MCInst structure.
for (; CurIndex != Op.Operand->MIOperandNo; ++CurIndex) for (; CurIndex != Op.OperandInfo->MIOperandNo; ++CurIndex)
Signature += "Imp"; Signature += "Imp";
Signature += Op.Class->Name; Signature += Op.Class->Name;
Signature += utostr(Op.Operand->MINumOperands); Signature += utostr(Op.OperandInfo->MINumOperands);
Signature += "_" + utostr(MIOperandList[i].second); Signature += "_" + utostr(MIOperandList[i].second);
CurIndex += Op.Operand->MINumOperands; CurIndex += Op.OperandInfo->MINumOperands;
} }
// Add any trailing implicit operands. // Add any trailing implicit operands.
@ -633,13 +633,13 @@ static void ConstructConversionFunctions(CodeGenTarget &Target,
InstructionInfo::Operand &Op = II.Operands[MIOperandList[i].second]; InstructionInfo::Operand &Op = II.Operands[MIOperandList[i].second];
// Add the implicit operands. // Add the implicit operands.
for (; CurIndex != Op.Operand->MIOperandNo; ++CurIndex) for (; CurIndex != Op.OperandInfo->MIOperandNo; ++CurIndex)
CvtOS << " Inst.addOperand(MCOperand::CreateReg(0));\n"; CvtOS << " Inst.addOperand(MCOperand::CreateReg(0));\n";
CvtOS << " Operands[" << MIOperandList[i].second CvtOS << " Operands[" << MIOperandList[i].second
<< "]." << Op.Class->RenderMethod << "]." << Op.Class->RenderMethod
<< "(Inst, " << Op.Operand->MINumOperands << ");\n"; << "(Inst, " << Op.OperandInfo->MINumOperands << ");\n";
CurIndex += Op.Operand->MINumOperands; CurIndex += Op.OperandInfo->MINumOperands;
} }
// And add trailing implicit operands. // And add trailing implicit operands.