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

ARM IAS: fix after r198172

Browse Source 
The DPR and SPR register lists are also register lists.  Furthermore, the
registers need not be checked individually since the register type can be
checked via the list kind.  Use that to simplify the logic and fix the incorrect
assertion.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@198174 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Saleem Abdulrasool 2013-12-29 18:53:16 +00:00
parent dd2836776f
commit ee6d3cd701
1 changed files with 11 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
lib/Target/ARM/AsmParser/ARMAsmParser.cpp
View File

@ -5112,13 +5112,13 @@ bool ARMAsmParser::ParseInstruction(ParseInstructionInfo &Info, StringRef Name,
SMLoc NameLoc,
SmallVectorImpl<MCParsedAsmOperand*> &Operands) {
// FIXME: Can this be done via tablegen in some fashion?
bool HasPrecisionRestrictions;
bool RequireVFPRegisterList;
bool AcceptDoublePrecisionOnly;
bool AcceptSinglePrecisionOnly;
HasPrecisionRestrictions = Name.startswith("fldm") || Name.startswith("fstm");
RequireVFPRegisterList = Name.startswith("fldm") || Name.startswith("fstm");
AcceptDoublePrecisionOnly =
HasPrecisionRestrictions && (Name.back() == 'd' || Name.back() == 'x');
AcceptSinglePrecisionOnly = HasPrecisionRestrictions && Name.back() == 's';
RequireVFPRegisterList && (Name.back() == 'd' || Name.back() == 'x');
AcceptSinglePrecisionOnly = RequireVFPRegisterList && Name.back() == 's';
// Apply mnemonic aliases before doing anything else, as the destination
// mnemonic may include suffices and we want to handle them normally.
@ -5288,24 +5288,14 @@ bool ARMAsmParser::ParseInstruction(ParseInstructionInfo &Info, StringRef Name,
Parser.Lex(); // Consume the EndOfStatement
if (HasPrecisionRestrictions) {
if (RequireVFPRegisterList) {
ARMOperand *Op = static_cast<ARMOperand*>(Operands.back());
assert(Op->isRegList());
const SmallVectorImpl<unsigned> &RegList = Op->getRegList();
for (SmallVectorImpl<unsigned>::const_iterator RLI = RegList.begin(),
RLE = RegList.end();
RLI != RLE; ++RLI) {
if (AcceptSinglePrecisionOnly &&
!ARMMCRegisterClasses[ARM::SPRRegClassID].contains(*RLI))
return Error(Op->getStartLoc(),
"VFP/Neon single precision register expected");
else if (AcceptDoublePrecisionOnly &&
!ARMMCRegisterClasses[ARM::DPRRegClassID].contains(*RLI))
return Error(Op->getStartLoc(),
"VFP/Neon double precision register expected");
else
llvm_unreachable("must have single or double precision restrictions");
}
if (AcceptSinglePrecisionOnly && !Op->isSPRRegList())
return Error(Op->getStartLoc(),
"VFP/Neon single precision register expected");
if (AcceptDoublePrecisionOnly && !Op->isDPRRegList())
return Error(Op->getStartLoc(),
"VFP/Neon double precision register expected");
}
// Some instructions, mostly Thumb, have forms for the same mnemonic that