maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

fix computation of ambiguous instructions to not ignore the mnemonic. 

FWIW, X86 has 254 ambiguous instructions.

llvm-svn: 117979
This commit is contained in:
Chris Lattner 2010-11-01 23:57:23 +00:00
parent 2ba03aa618
commit e3c48deff5
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
llvm/utils/TableGen/AsmMatcherEmitter.cpp
View File

@ -411,6 +411,10 @@ struct MatchableInfo {
/// ambiguously match the same set of operands as \arg RHS (without being a /// ambiguously match the same set of operands as \arg RHS (without being a
/// strictly superior match). /// strictly superior match).
bool CouldMatchAmiguouslyWith(const MatchableInfo &RHS) { bool CouldMatchAmiguouslyWith(const MatchableInfo &RHS) {
// The primary comparator is the instruction mnemonic.
if (Tokens[0] != RHS.Tokens[0])
return false;
// The number of operands is unambiguous. // The number of operands is unambiguous.
if (Operands.size() != RHS.Operands.size()) if (Operands.size() != RHS.Operands.size())
return false; return false;
@ -849,8 +853,8 @@ BuildRegisterClasses(SmallPtrSet<Record*, 16> &SingletonRegisters) {
} }
void AsmMatcherInfo::BuildOperandClasses() { void AsmMatcherInfo::BuildOperandClasses() {
std::vector<Record*> AsmOperands; std::vector<Record*> AsmOperands =
AsmOperands = Records.getAllDerivedDefinitions("AsmOperandClass"); Records.getAllDerivedDefinitions("AsmOperandClass");
// Pre-populate AsmOperandClasses map. // Pre-populate AsmOperandClasses map.
for (std::vector<Record*>::iterator it = AsmOperands.begin(), for (std::vector<Record*>::iterator it = AsmOperands.begin(),
@ -1127,7 +1131,7 @@ static void EmitConvertToMCInst(CodeGenTarget &Target,
} }
} }
std::sort(MIOperandList.begin(), MIOperandList.end()); array_pod_sort(MIOperandList.begin(), MIOperandList.end());
// Compute the total number of operands. // Compute the total number of operands.
unsigned NumMIOperands = 0; unsigned NumMIOperands = 0;