[mips] Renamed ParseAnyRegisterWithoutDollar to MatchAnyRegisterWithoutDollar

This is for consistency with other functions. The Parse* functions consume
tokens and the Match* functions don't.

No functional change.



git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@205305 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Daniel Sanders 2014-04-01 12:35:23 +00:00
parent 5570517bec
commit 279edf967e

View File

@ -98,7 +98,7 @@ class MipsAsmParser : public MCTargetAsmParser {
SMLoc S); SMLoc S);
MipsAsmParser::OperandMatchResultTy MipsAsmParser::OperandMatchResultTy
ParseAnyRegisterWithoutDollar(SmallVectorImpl<MCParsedAsmOperand *> &Operands, MatchAnyRegisterWithoutDollar(SmallVectorImpl<MCParsedAsmOperand *> &Operands,
SMLoc S); SMLoc S);
MipsAsmParser::OperandMatchResultTy MipsAsmParser::OperandMatchResultTy
@ -275,11 +275,11 @@ public:
private: private:
enum KindTy { enum KindTy {
k_Immediate, k_Immediate, /// An immediate (possibly involving symbol references)
k_Memory, k_Memory, /// Base + Offset Memory Address
k_PhysRegister, k_PhysRegister, /// A physical register from the Mips namespace
k_RegisterIndex, k_RegisterIndex, /// A register index in one or more RegKind.
k_Token k_Token /// A simple token
} Kind; } Kind;
MipsOperand(KindTy K, MipsAsmParser &Parser) MipsOperand(KindTy K, MipsAsmParser &Parser)
@ -477,11 +477,17 @@ public:
llvm_unreachable("Use a custom parser instead"); llvm_unreachable("Use a custom parser instead");
} }
/// Render the operand to an MCInst as a GPR32
/// Asserts if the wrong number of operands are requested, or the operand
/// is not a k_RegisterIndex compatible with RegKind_GPR
void addGPR32AsmRegOperands(MCInst &Inst, unsigned N) const { void addGPR32AsmRegOperands(MCInst &Inst, unsigned N) const {
assert(N == 1 && "Invalid number of operands!"); assert(N == 1 && "Invalid number of operands!");
Inst.addOperand(MCOperand::CreateReg(getGPR32Reg())); Inst.addOperand(MCOperand::CreateReg(getGPR32Reg()));
} }
/// Render the operand to an MCInst as a GPR64
/// Asserts if the wrong number of operands are requested, or the operand
/// is not a k_RegisterIndex compatible with RegKind_GPR
void addGPR64AsmRegOperands(MCInst &Inst, unsigned N) const { void addGPR64AsmRegOperands(MCInst &Inst, unsigned N) const {
assert(N == 1 && "Invalid number of operands!"); assert(N == 1 && "Invalid number of operands!");
Inst.addOperand(MCOperand::CreateReg(getGPR64Reg())); Inst.addOperand(MCOperand::CreateReg(getGPR64Reg()));
@ -1779,7 +1785,7 @@ MipsAsmParser::MatchAnyRegisterNameWithoutDollar(
} }
MipsAsmParser::OperandMatchResultTy MipsAsmParser::OperandMatchResultTy
MipsAsmParser::ParseAnyRegisterWithoutDollar( MipsAsmParser::MatchAnyRegisterWithoutDollar(
SmallVectorImpl<MCParsedAsmOperand *> &Operands, SMLoc S) { SmallVectorImpl<MCParsedAsmOperand *> &Operands, SMLoc S) {
auto Token = Parser.getLexer().peekTok(false); auto Token = Parser.getLexer().peekTok(false);
@ -1821,7 +1827,7 @@ MipsAsmParser::OperandMatchResultTy MipsAsmParser::ParseAnyRegister(
} }
DEBUG(dbgs() << ".. $\n"); DEBUG(dbgs() << ".. $\n");
OperandMatchResultTy ResTy = ParseAnyRegisterWithoutDollar(Operands, S); OperandMatchResultTy ResTy = MatchAnyRegisterWithoutDollar(Operands, S);
if (ResTy == MatchOperand_Success) { if (ResTy == MatchOperand_Success) {
Parser.Lex(); // $ Parser.Lex(); // $
Parser.Lex(); // identifier Parser.Lex(); // identifier