summaryrefslogtreecommitdiffstats
path: root/llvm/lib/Target/ARM/AsmParser/ARMAsmParser.cpp
diff options
context:
space:
mode:
authorBill Wendling <isanbard@gmail.com>2010-11-06 10:40:24 +0000
committerBill Wendling <isanbard@gmail.com>2010-11-06 10:40:24 +0000
commit6d2eb737aff271f31778092903945db22e098484 (patch)
tree3d7c785ebc780e541fd832fc7987ee6bc575b8e5 /llvm/lib/Target/ARM/AsmParser/ARMAsmParser.cpp
parent8628e2a19c7518e84ee11422a3269fdd85f8a0cf (diff)
downloadbcm5719-llvm-6d2eb737aff271f31778092903945db22e098484.tar.gz
bcm5719-llvm-6d2eb737aff271f31778092903945db22e098484.zip
Use TryParseRegister() instead of MatchRegisterName(). The former returns -1
while the latter doesn't. llvm-svn: 118338
Diffstat (limited to 'llvm/lib/Target/ARM/AsmParser/ARMAsmParser.cpp')
-rw-r--r--llvm/lib/Target/ARM/AsmParser/ARMAsmParser.cpp7
1 files changed, 2 insertions, 5 deletions
diff --git a/llvm/lib/Target/ARM/AsmParser/ARMAsmParser.cpp b/llvm/lib/Target/ARM/AsmParser/ARMAsmParser.cpp
index 818630b981c..3cb93a317a7 100644
--- a/llvm/lib/Target/ARM/AsmParser/ARMAsmParser.cpp
+++ b/llvm/lib/Target/ARM/AsmParser/ARMAsmParser.cpp
@@ -434,13 +434,12 @@ ARMOperand *ARMAsmParser::ParseRegisterList() {
Error(RegLoc, "register expected");
return 0;
}
- int RegNum = MatchRegisterName(RegTok.getString());
+ int RegNum = TryParseRegister();
if (RegNum == -1) {
Error(RegLoc, "register expected");
return 0;
}
- Parser.Lex(); // Eat identifier token.
unsigned RegList = 1 << RegNum;
int HighRegNum = RegNum;
@@ -454,7 +453,7 @@ ARMOperand *ARMAsmParser::ParseRegisterList() {
Error(RegLoc, "register expected");
return 0;
}
- int RegNum = MatchRegisterName(RegTok.getString());
+ int RegNum = TryParseRegister();
if (RegNum == -1) {
Error(RegLoc, "register expected");
return 0;
@@ -466,8 +465,6 @@ ARMOperand *ARMAsmParser::ParseRegisterList() {
Warning(RegLoc, "register not in ascending order in register list");
RegList |= 1 << RegNum;
HighRegNum = RegNum;
-
- Parser.Lex(); // Eat identifier token.
}
const AsmToken &RCurlyTok = Parser.getTok();
if (RCurlyTok.isNot(AsmToken::RCurly)) {
OpenPOWER on IntegriCloud