6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2025-01-13 09:33:50 +00:00
Code Issues Projects Releases Wiki Activity

MC/X86/AsmParser: Give an explicit error message when we reject an instruction

Browse Source 
because it could have an ambiguous suffix.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@110890 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Daniel Dunbar 2010-08-12 00:55:42 +00:00
parent f1e29d4c21
commit 09062b1672
2 changed files with 36 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
lib/Target/X86/AsmParser/X86AsmParser.cpp
View File

@ -21,6 +21,7 @@
#include "llvm/MC/MCParser/MCAsmParser.h"
#include "llvm/MC/MCParser/MCParsedAsmOperand.h"
#include "llvm/Support/SourceMgr.h"
#include "llvm/Support/raw_ostream.h"
#include "llvm/Target/TargetRegistry.h"
#include "llvm/Target/TargetAsmParser.h"
using namespace llvm;
@ -921,8 +922,36 @@ X86ATTAsmParser::MatchInstruction(SMLoc IDLoc,
// Otherwise, the match failed.
// FIXME: We should give nicer diagnostics about the exact failure.
Error(IDLoc, "unrecognized instruction");
// If we had multiple suffix matches, then identify this as an ambiguous
// match.
if (MatchB + MatchW + MatchL + MatchQ != 4) {
char MatchChars[4];
unsigned NumMatches = 0;
if (!MatchB)
MatchChars[NumMatches++] = 'b';
if (!MatchW)
MatchChars[NumMatches++] = 'w';
if (!MatchL)
MatchChars[NumMatches++] = 'l';
if (!MatchQ)
MatchChars[NumMatches++] = 'q';
SmallString<126> Msg;
raw_svector_ostream OS(Msg);
OS << "ambiguous instructions require an explicit suffix (could be ";
for (unsigned i = 0; i != NumMatches; ++i) {
if (i != 0)
OS << ", ";
if (i + 1 == NumMatches)
OS << "or ";
OS << "'" << Base << MatchChars[i] << "'";
}
OS << ")";
Error(IDLoc, OS.str());
} else {
// FIXME: We should give nicer diagnostics about the exact failure.
Error(IDLoc, "unrecognized instruction");
}
return true;
}

5
test/MC/AsmParser/X86/x86_instruction_errors.s Normal file
View File

@ -0,0 +1,5 @@
// RUN: not llvm-mc -triple x86_64-unknown-unknown %s 2> %t.err
// RUN: FileCheck < %t.err %s
// CHECK: error: ambiguous instructions require an explicit suffix (could be 'cmpb', 'cmpw', 'cmpl', or 'cmpq')
cmp $0, 0(%eax)