summaryrefslogtreecommitdiffstats
path: root/llvm/lib/Target/ARM/AsmParser/ARMAsmParser.cpp
diff options
context:
space:
mode:
authorJim Grosbach <grosbach@apple.com>2012-04-05 03:17:53 +0000
committerJim Grosbach <grosbach@apple.com>2012-04-05 03:17:53 +0000
commit3d00eecc53b3b06eead0c5372ac38b0706650a18 (patch)
tree64307f50e0d1d7bfc27ed2662e57047352fef017 /llvm/lib/Target/ARM/AsmParser/ARMAsmParser.cpp
parentf2390e830378a2d3f3cefe3c07e1ae3c51613268 (diff)
downloadbcm5719-llvm-3d00eecc53b3b06eead0c5372ac38b0706650a18.tar.gz
bcm5719-llvm-3d00eecc53b3b06eead0c5372ac38b0706650a18.zip
ARM assembly parsing for 'msr' plain 'cpsr' operand.
Plain 'cpsr' is an alias for 'cpsr_fc'. rdar://11153753 llvm-svn: 154080
Diffstat (limited to 'llvm/lib/Target/ARM/AsmParser/ARMAsmParser.cpp')
-rw-r--r--llvm/lib/Target/ARM/AsmParser/ARMAsmParser.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/llvm/lib/Target/ARM/AsmParser/ARMAsmParser.cpp b/llvm/lib/Target/ARM/AsmParser/ARMAsmParser.cpp
index 0729da1a8ea..a558a61592f 100644
--- a/llvm/lib/Target/ARM/AsmParser/ARMAsmParser.cpp
+++ b/llvm/lib/Target/ARM/AsmParser/ARMAsmParser.cpp
@@ -3328,7 +3328,8 @@ parseMSRMaskOperand(SmallVectorImpl<MCParsedAsmOperand*> &Operands) {
FlagsVal = 8; // No flag
}
} else if (SpecReg == "cpsr" || SpecReg == "spsr") {
- if (Flags == "all") // cpsr_all is an alias for cpsr_fc
+ // cpsr_all is an alias for cpsr_fc, as is plain cpsr.
+ if (Flags == "all" || Flags == "")
Flags = "fc";
for (int i = 0, e = Flags.size(); i != e; ++i) {
unsigned Flag = StringSwitch<unsigned>(Flags.substr(i, 1))
OpenPOWER on IntegriCloud