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

replace SrcOpNum with SrcOpName, eliminating a numering dependency

Browse Source 
on the incoming operand list.  This also makes the code simpler.


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@118225 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Chris Lattner 2010-11-04 01:42:59 +00:00
parent ea8e20696e
commit 567820c1e0
1 changed files with 23 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
utils/TableGen/AsmMatcherEmitter.cpp
View File

@ -250,10 +250,10 @@ struct MatchableInfo {
/// The unique class instance this operand should match. /// The unique class instance this operand should match.
ClassInfo *Class; ClassInfo *Class;
/// The original operand this corresponds to. /// The operand name this is, if anything.
int SrcOpNum; StringRef SrcOpName;
explicit AsmOperand(StringRef T) : Token(T), Class(0), SrcOpNum(-1) {} explicit AsmOperand(StringRef T) : Token(T), Class(0) {}
}; };
/// ResOperand - This represents a single operand in the result instruction /// ResOperand - This represents a single operand in the result instruction
@ -1141,7 +1141,7 @@ BuildInstructionOperandReference(MatchableInfo *II,
for (unsigned i = 0, e = Operands.size(); i != e; ++i) { for (unsigned i = 0, e = Operands.size(); i != e; ++i) {
if (Operands[i].MIOperandNo == unsigned(OITied)) { if (Operands[i].MIOperandNo == unsigned(OITied)) {
OI = &Operands[i]; OI = &Operands[i];
Idx = i; OperandName = OI->Name;
break; break;
} }
} }
@ -1150,40 +1150,37 @@ BuildInstructionOperandReference(MatchableInfo *II,
} }
Op.Class = getOperandClass(Token, *OI); Op.Class = getOperandClass(Token, *OI);
Op.SrcOpNum = Idx; Op.SrcOpName = OperandName;
} }
void MatchableInfo::BuildResultOperands() { void MatchableInfo::BuildResultOperands() {
/// OperandMap - This is a mapping from the MCInst operands (specified by the
/// II.OperandList operands) to the AsmOperands that they are filled in from.
SmallVector<int, 16> OperandMap(TheOperandList.size(), -1);
// Order the (class) operands by the order to convert them into an MCInst.
for (unsigned i = 0, e = AsmOperands.size(); i != e; ++i) {
MatchableInfo::AsmOperand &Op = AsmOperands[i];
if (Op.SrcOpNum != -1)
OperandMap[Op.SrcOpNum] = i;
}
for (unsigned i = 0, e = TheOperandList.size(); i != e; ++i) { for (unsigned i = 0, e = TheOperandList.size(); i != e; ++i) {
const CGIOperandList::OperandInfo &OpInfo = TheOperandList[i]; const CGIOperandList::OperandInfo &OpInfo = TheOperandList[i];
// If this is a tied operand, just copy from the previously handled operand.
int TiedOp = OpInfo.getTiedRegister();
if (TiedOp != -1) {
ResOperands.push_back(ResOperand::getTiedOp(TiedOp, &OpInfo));
continue;
}
// Find out what operand from the asmparser that this MCInst operand comes // Find out what operand from the asmparser that this MCInst operand comes
// from. // from.
int SrcOperand = OperandMap[i]; int SrcOperand = -1;
if (SrcOperand != -1) { for (unsigned op = 0, e = AsmOperands.size(); op != e; ++op)
if (OpInfo.Name == AsmOperands[op].SrcOpName) {
SrcOperand = op;
break;
}
if (!OpInfo.Name.empty() && SrcOperand != -1) {
ResOperands.push_back(ResOperand::getRenderedOp(SrcOperand, &OpInfo)); ResOperands.push_back(ResOperand::getRenderedOp(SrcOperand, &OpInfo));
continue; continue;
} }
// Otherwise, this must be a tied operand.
int TiedOp = OpInfo.getTiedRegister();
if (TiedOp == -1)
throw TGError(TheDef->getLoc(), "Instruction '" + throw TGError(TheDef->getLoc(), "Instruction '" +
TheDef->getName() + "' has operand '" + OpInfo.Name + TheDef->getName() + "' has operand '" + OpInfo.Name +
"' that doesn't appear in asm string!"); "' that doesn't appear in asm string!");
ResOperands.push_back(ResOperand::getTiedOp(TiedOp, &OpInfo));
} }
} }