From 43904299b05bdf579415749041f77c4490fe5f5b Mon Sep 17 00:00:00 2001 From: Jim Grosbach Date: Mon, 25 Jul 2011 20:14:50 +0000 Subject: [PATCH] Make assembly parser method names more consistent. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@135950 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Target/ARM/ARMInstrFormats.td | 6 ++-- lib/Target/ARM/ARMInstrInfo.td | 8 ++--- lib/Target/ARM/AsmParser/ARMAsmParser.cpp | 42 +++++++++++------------ 3 files changed, 28 insertions(+), 28 deletions(-) diff --git a/lib/Target/ARM/ARMInstrFormats.td b/lib/Target/ARM/ARMInstrFormats.td index 278bd5bda79..37e363e74d2 100644 --- a/lib/Target/ARM/ARMInstrFormats.td +++ b/lib/Target/ARM/ARMInstrFormats.td @@ -144,19 +144,19 @@ def CCOutOperand : AsmOperandClass { def MemBarrierOptOperand : AsmOperandClass { let Name = "MemBarrierOpt"; let SuperClasses = []; - let ParserMethod = "tryParseMemBarrierOptOperand"; + let ParserMethod = "parseMemBarrierOptOperand"; } def ProcIFlagsOperand : AsmOperandClass { let Name = "ProcIFlags"; let SuperClasses = []; - let ParserMethod = "tryParseProcIFlagsOperand"; + let ParserMethod = "parseProcIFlagsOperand"; } def MSRMaskOperand : AsmOperandClass { let Name = "MSRMask"; let SuperClasses = []; - let ParserMethod = "tryParseMSRMaskOperand"; + let ParserMethod = "parseMSRMaskOperand"; } // ARM imod and iflag operands, used only by the CPS instruction. diff --git a/lib/Target/ARM/ARMInstrInfo.td b/lib/Target/ARM/ARMInstrInfo.td index 75f7a477a7b..b94435bd03f 100644 --- a/lib/Target/ARM/ARMInstrInfo.td +++ b/lib/Target/ARM/ARMInstrInfo.td @@ -570,7 +570,7 @@ def ldst_so_reg : Operand, // def MemMode2AsmOperand : AsmOperandClass { let Name = "MemMode2"; - let ParserMethod = "tryParseMemMode2Operand"; + let ParserMethod = "parseMemMode2Operand"; } def addrmode2 : Operand, ComplexPattern { @@ -593,7 +593,7 @@ def am2offset : Operand, // def MemMode3AsmOperand : AsmOperandClass { let Name = "MemMode3"; - let ParserMethod = "tryParseMemMode3Operand"; + let ParserMethod = "parseMemMode3Operand"; } def addrmode3 : Operand, ComplexPattern { @@ -689,7 +689,7 @@ def nohash_imm : Operand { def CoprocNumAsmOperand : AsmOperandClass { let Name = "CoprocNum"; - let ParserMethod = "tryParseCoprocNumOperand"; + let ParserMethod = "parseCoprocNumOperand"; } def p_imm : Operand { let PrintMethod = "printPImmediate"; @@ -698,7 +698,7 @@ def p_imm : Operand { def CoprocRegAsmOperand : AsmOperandClass { let Name = "CoprocReg"; - let ParserMethod = "tryParseCoprocRegOperand"; + let ParserMethod = "parseCoprocRegOperand"; } def c_imm : Operand { let PrintMethod = "printCImmediate"; diff --git a/lib/Target/ARM/AsmParser/ARMAsmParser.cpp b/lib/Target/ARM/AsmParser/ARMAsmParser.cpp index 1715a47d140..eaaca5c22d3 100644 --- a/lib/Target/ARM/AsmParser/ARMAsmParser.cpp +++ b/lib/Target/ARM/AsmParser/ARMAsmParser.cpp @@ -104,19 +104,19 @@ class ARMAsmParser : public TargetAsmParser { /// } - OperandMatchResultTy tryParseCoprocNumOperand( + OperandMatchResultTy parseCoprocNumOperand( SmallVectorImpl&); - OperandMatchResultTy tryParseCoprocRegOperand( + OperandMatchResultTy parseCoprocRegOperand( SmallVectorImpl&); - OperandMatchResultTy tryParseMemBarrierOptOperand( + OperandMatchResultTy parseMemBarrierOptOperand( SmallVectorImpl&); - OperandMatchResultTy tryParseProcIFlagsOperand( + OperandMatchResultTy parseProcIFlagsOperand( SmallVectorImpl&); - OperandMatchResultTy tryParseMSRMaskOperand( + OperandMatchResultTy parseMSRMaskOperand( SmallVectorImpl&); - OperandMatchResultTy tryParseMemMode2Operand( + OperandMatchResultTy parseMemMode2Operand( SmallVectorImpl&); - OperandMatchResultTy tryParseMemMode3Operand( + OperandMatchResultTy parseMemMode3Operand( SmallVectorImpl&); OperandMatchResultTy parsePKHImm(SmallVectorImpl &O, StringRef Op, int Low, int High); @@ -1360,11 +1360,11 @@ static int MatchCoprocessorOperandName(StringRef Name, char CoprocOp) { return -1; } -/// tryParseCoprocNumOperand - Try to parse an coprocessor number operand. The +/// parseCoprocNumOperand - Try to parse an coprocessor number operand. The /// token must be an Identifier when called, and if it is a coprocessor /// number, the token is eaten and the operand is added to the operand list. ARMAsmParser::OperandMatchResultTy ARMAsmParser:: -tryParseCoprocNumOperand(SmallVectorImpl &Operands) { +parseCoprocNumOperand(SmallVectorImpl &Operands) { SMLoc S = Parser.getTok().getLoc(); const AsmToken &Tok = Parser.getTok(); assert(Tok.is(AsmToken::Identifier) && "Token is not an Identifier"); @@ -1378,11 +1378,11 @@ tryParseCoprocNumOperand(SmallVectorImpl &Operands) { return MatchOperand_Success; } -/// tryParseCoprocRegOperand - Try to parse an coprocessor register operand. The +/// parseCoprocRegOperand - Try to parse an coprocessor register operand. The /// token must be an Identifier when called, and if it is a coprocessor /// number, the token is eaten and the operand is added to the operand list. ARMAsmParser::OperandMatchResultTy ARMAsmParser:: -tryParseCoprocRegOperand(SmallVectorImpl &Operands) { +parseCoprocRegOperand(SmallVectorImpl &Operands) { SMLoc S = Parser.getTok().getLoc(); const AsmToken &Tok = Parser.getTok(); assert(Tok.is(AsmToken::Identifier) && "Token is not an Identifier"); @@ -1480,9 +1480,9 @@ ParseRegisterList(SmallVectorImpl &Operands) { return false; } -/// tryParseMemBarrierOptOperand - Try to parse DSB/DMB data barrier options. +/// parseMemBarrierOptOperand - Try to parse DSB/DMB data barrier options. ARMAsmParser::OperandMatchResultTy ARMAsmParser:: -tryParseMemBarrierOptOperand(SmallVectorImpl &Operands) { +parseMemBarrierOptOperand(SmallVectorImpl &Operands) { SMLoc S = Parser.getTok().getLoc(); const AsmToken &Tok = Parser.getTok(); assert(Tok.is(AsmToken::Identifier) && "Token is not an Identifier"); @@ -1511,9 +1511,9 @@ tryParseMemBarrierOptOperand(SmallVectorImpl &Operands) { return MatchOperand_Success; } -/// tryParseProcIFlagsOperand - Try to parse iflags from CPS instruction. +/// parseProcIFlagsOperand - Try to parse iflags from CPS instruction. ARMAsmParser::OperandMatchResultTy ARMAsmParser:: -tryParseProcIFlagsOperand(SmallVectorImpl &Operands) { +parseProcIFlagsOperand(SmallVectorImpl &Operands) { SMLoc S = Parser.getTok().getLoc(); const AsmToken &Tok = Parser.getTok(); assert(Tok.is(AsmToken::Identifier) && "Token is not an Identifier"); @@ -1540,9 +1540,9 @@ tryParseProcIFlagsOperand(SmallVectorImpl &Operands) { return MatchOperand_Success; } -/// tryParseMSRMaskOperand - Try to parse mask flags from MSR instruction. +/// parseMSRMaskOperand - Try to parse mask flags from MSR instruction. ARMAsmParser::OperandMatchResultTy ARMAsmParser:: -tryParseMSRMaskOperand(SmallVectorImpl &Operands) { +parseMSRMaskOperand(SmallVectorImpl &Operands) { SMLoc S = Parser.getTok().getLoc(); const AsmToken &Tok = Parser.getTok(); assert(Tok.is(AsmToken::Identifier) && "Token is not an Identifier"); @@ -1606,9 +1606,9 @@ tryParseMSRMaskOperand(SmallVectorImpl &Operands) { return MatchOperand_Success; } -/// tryParseMemMode2Operand - Try to parse memory addressing mode 2 operand. +/// parseMemMode2Operand - Try to parse memory addressing mode 2 operand. ARMAsmParser::OperandMatchResultTy ARMAsmParser:: -tryParseMemMode2Operand(SmallVectorImpl &Operands) { +parseMemMode2Operand(SmallVectorImpl &Operands) { assert(Parser.getTok().is(AsmToken::LBrac) && "Token is not a \"[\""); if (ParseMemory(Operands, ARMII::AddrMode2)) @@ -1617,9 +1617,9 @@ tryParseMemMode2Operand(SmallVectorImpl &Operands) { return MatchOperand_Success; } -/// tryParseMemMode3Operand - Try to parse memory addressing mode 3 operand. +/// parseMemMode3Operand - Try to parse memory addressing mode 3 operand. ARMAsmParser::OperandMatchResultTy ARMAsmParser:: -tryParseMemMode3Operand(SmallVectorImpl &Operands) { +parseMemMode3Operand(SmallVectorImpl &Operands) { assert(Parser.getTok().is(AsmToken::LBrac) && "Token is not a \"[\""); if (ParseMemory(Operands, ARMII::AddrMode3))