6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2025-02-20 14:29:27 +00:00
Code Issues Projects Releases Wiki Activity

Use TryParseRegister() instead of MatchRegisterName(). The former returns -1

Browse Source 
while the latter doesn't.


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@118338 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Bill Wendling 2010-11-06 10:40:24 +00:00
parent 019e378754
commit 1d6a26507b
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -434,13 +434,12 @@ ARMOperand *ARMAsmParser::ParseRegisterList() {
Error(RegLoc, "register expected"); Error(RegLoc, "register expected");
return 0; return 0;
} }
int RegNum = MatchRegisterName(RegTok.getString()); int RegNum = TryParseRegister();
if (RegNum == -1) { if (RegNum == -1) {
Error(RegLoc, "register expected"); Error(RegLoc, "register expected");
return 0; return 0;
} }
Parser.Lex(); // Eat identifier token.
unsigned RegList = 1 << RegNum; unsigned RegList = 1 << RegNum;
int HighRegNum = RegNum; int HighRegNum = RegNum;
@ -454,7 +453,7 @@ ARMOperand *ARMAsmParser::ParseRegisterList() {
Error(RegLoc, "register expected"); Error(RegLoc, "register expected");
return 0; return 0;
} }
int RegNum = MatchRegisterName(RegTok.getString()); int RegNum = TryParseRegister();
if (RegNum == -1) { if (RegNum == -1) {
Error(RegLoc, "register expected"); Error(RegLoc, "register expected");
return 0; return 0;
@ -466,8 +465,6 @@ ARMOperand *ARMAsmParser::ParseRegisterList() {
Warning(RegLoc, "register not in ascending order in register list"); Warning(RegLoc, "register not in ascending order in register list");
RegList |= 1 << RegNum; RegList |= 1 << RegNum;
HighRegNum = RegNum; HighRegNum = RegNum;
Parser.Lex(); // Eat identifier token.
} }
const AsmToken &RCurlyTok = Parser.getTok(); const AsmToken &RCurlyTok = Parser.getTok();
if (RCurlyTok.isNot(AsmToken::RCurly)) { if (RCurlyTok.isNot(AsmToken::RCurly)) {