maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

[mips] Remove the last usage of parseRegister from MipsAsmParser. 

Summary:
Added negative test case so that we can be sure we handle erroneous situations
while parsing the .cpsetup directive.

Reviewers: dsanders

Reviewed By: dsanders

Differential Revision: http://reviews.llvm.org/D3681

llvm-svn: 211160
This commit is contained in:
Matheus Almeida 2014-06-18 13:08:59 +00:00
parent ecf5133a2b
commit 7e81576246
2 changed files with 47 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
llvm/lib/Target/Mips/AsmParser/MipsAsmParser.cpp
View File

@ -183,8 +183,6 @@ class MipsAsmParser : public MCTargetAsmParser {
return STI.getFeatureBits() & Mips::FeatureMips64r6;
}
bool parseRegister(unsigned &RegNum);
bool eatComma(StringRef ErrorStr);
int matchCPURegisterName(StringRef Symbol);
@ -2342,25 +2340,6 @@ bool MipsAsmParser::parseSetFeature(uint64_t Feature) {
return false;
}
bool MipsAsmParser::parseRegister(unsigned &RegNum) {
if (!getLexer().is(AsmToken::Dollar))
return false;
Parser.Lex();
const AsmToken &Reg = Parser.getTok();
if (Reg.is(AsmToken::Identifier)) {
RegNum = matchCPURegisterName(Reg.getIdentifier());
} else if (Reg.is(AsmToken::Integer)) {
RegNum = Reg.getIntVal();
} else {
return false;
}
Parser.Lex();
return true;
}
bool MipsAsmParser::eatComma(StringRef ErrorStr) {
if (getLexer().isNot(AsmToken::Comma)) {
SMLoc Loc = getLexer().getLoc();
@ -2400,23 +2379,48 @@ bool MipsAsmParser::parseDirectiveCPSetup() {
unsigned Save;
bool SaveIsReg = true;
if (!parseRegister(FuncReg))
return reportParseError("expected register containing function address");
FuncReg = getGPR(FuncReg);
SmallVector<std::unique_ptr<MCParsedAsmOperand>, 1> TmpReg;
OperandMatchResultTy ResTy = ParseAnyRegister(TmpReg);
if (ResTy == MatchOperand_NoMatch) {
reportParseError("expected register containing function address");
Parser.eatToEndOfStatement();
return false;
}
MipsOperand &FuncRegOpnd = static_cast<MipsOperand &>(*TmpReg[0]);
if (!FuncRegOpnd.isGPRAsmReg()) {
reportParseError(FuncRegOpnd.getStartLoc(), "invalid register");
Parser.eatToEndOfStatement();
return false;
}
FuncReg = FuncRegOpnd.getGPR32Reg();
TmpReg.clear();
if (!eatComma("expected comma parsing directive"))
return true;
if (!parseRegister(Save)) {
ResTy = ParseAnyRegister(TmpReg);
if (ResTy == MatchOperand_NoMatch) {
const AsmToken &Tok = Parser.getTok();
if (Tok.is(AsmToken::Integer)) {
Save = Tok.getIntVal();
SaveIsReg = false;
Parser.Lex();
} else
return reportParseError("expected save register or stack offset");
} else
Save = getGPR(Save);
} else {
reportParseError("expected save register or stack offset");
Parser.eatToEndOfStatement();
return false;
}
} else {
MipsOperand &SaveOpnd = static_cast<MipsOperand &>(*TmpReg[0]);
if (!SaveOpnd.isGPRAsmReg()) {
reportParseError(SaveOpnd.getStartLoc(), "invalid register");
Parser.eatToEndOfStatement();
return false;
}
Save = SaveOpnd.getGPR32Reg();
}
if (!eatComma("expected comma parsing directive"))
return true;

14
llvm/test/MC/Mips/cpsetup-bad.s Normal file
View File

@ -0,0 +1,14 @@
# RUN: not llvm-mc %s -triple mips64-unknown-unknown 2>%t1
# RUN: FileCheck %s < %t1 -check-prefix=ASM
.text
.option pic2
t1:
.cpsetup $bar, 8, __cerror
# ASM: :[[@LINE-1]]:18: error: expected register containing function address
.cpsetup $33, 8, __cerror
# ASM: :[[@LINE-1]]:18: error: invalid register
.cpsetup $31, foo, __cerror
# ASM: :[[@LINE-1]]:23: error: expected save register or stack offset
.cpsetup $31, $32, __cerror
# ASM: :[[@LINE-1]]:23: error: invalid register