From c7b2124d49fdecf5792c7c42a40fecc7fcb00336 Mon Sep 17 00:00:00 2001 From: Colin LeMahieu Date: Mon, 15 Feb 2016 18:47:55 +0000 Subject: [PATCH] [NFC] Fixing naming convention, lowercase start of function name. llvm-svn: 260903 --- .../Target/Hexagon/AsmParser/HexagonAsmParser.cpp | 38 +++++++++++----------- llvm/lib/Target/Hexagon/HexagonAsmPrinter.cpp | 14 ++++---- llvm/lib/Target/Hexagon/HexagonMCInstLower.cpp | 8 ++--- .../Target/Hexagon/MCTargetDesc/HexagonMCExpr.cpp | 2 +- .../Target/Hexagon/MCTargetDesc/HexagonMCExpr.h | 2 +- .../Hexagon/MCTargetDesc/HexagonMCInstrInfo.cpp | 2 +- 6 files changed, 33 insertions(+), 33 deletions(-) diff --git a/llvm/lib/Target/Hexagon/AsmParser/HexagonAsmParser.cpp b/llvm/lib/Target/Hexagon/AsmParser/HexagonAsmParser.cpp index 5ab3efe..9738e55 100644 --- a/llvm/lib/Target/Hexagon/AsmParser/HexagonAsmParser.cpp +++ b/llvm/lib/Target/Hexagon/AsmParser/HexagonAsmParser.cpp @@ -768,7 +768,7 @@ void HexagonAsmParser::canonicalizeImmediates(MCInst &MCI) { if (WarnSignedMismatch) Warning (MCI.getLoc(), "Signed/Unsigned mismatch"); } - NewInst.addOperand(MCOperand::createExpr(HexagonMCExpr::Create( + NewInst.addOperand(MCOperand::createExpr(HexagonMCExpr::create( MCConstantExpr::create(Value, getContext()), getContext()))); } else @@ -919,7 +919,7 @@ bool HexagonAsmParser::ParseDirectiveSubsection(SMLoc L) { // end of the section. Only legacy hexagon-gcc created assembly code // used negative subsections. if ((Res < 0) && (Res > -8193)) - Subsection = HexagonMCExpr::Create( + Subsection = HexagonMCExpr::create( MCConstantExpr::create(8192 + Res, getContext()), getContext()); getStreamer().SubSection(Subsection); @@ -1339,7 +1339,7 @@ bool HexagonAsmParser::parseExpressionOrOperand(OperandVector &Operands) { SMLoc Loc = Parser.getLexer().getLoc(); MCExpr const *Expr = nullptr; bool Error = parseExpression(Expr); - Expr = HexagonMCExpr::Create(Expr, getContext()); + Expr = HexagonMCExpr::create(Expr, getContext()); if (!Error) Operands.push_back(HexagonOperand::CreateImm(Expr, Loc, Loc)); return Error; @@ -1441,7 +1441,7 @@ bool HexagonAsmParser::parseInstruction(OperandVector &Operands) { MCConstantExpr::create(0xffff, Context), Context); } - Expr = HexagonMCExpr::Create(Expr, Context); + Expr = HexagonMCExpr::create(Expr, Context); HexagonMCInstrInfo::setMustNotExtend(*Expr, MustNotExtend); std::unique_ptr Operand = HexagonOperand::CreateImm(Expr, ExprLoc, ExprLoc); @@ -1563,7 +1563,7 @@ int HexagonAsmParser::processInstruction(MCInst &Inst, case Hexagon::C2_cmpgei: { MCOperand &MO = Inst.getOperand(2); - MO.setExpr(HexagonMCExpr::Create(MCBinaryExpr::createSub( + MO.setExpr(HexagonMCExpr::create(MCBinaryExpr::createSub( MO.getExpr(), MCConstantExpr::create(1, Context), Context), Context)); Inst.setOpcode(Hexagon::C2_cmpgti); break; @@ -1585,7 +1585,7 @@ int HexagonAsmParser::processInstruction(MCInst &Inst, TmpInst.addOperand(Rt); Inst = TmpInst; } else { - MO.setExpr(HexagonMCExpr::Create(MCBinaryExpr::createSub( + MO.setExpr(HexagonMCExpr::create(MCBinaryExpr::createSub( MO.getExpr(), MCConstantExpr::create(1, Context), Context), Context)); Inst.setOpcode(Hexagon::C2_cmpgtui); } @@ -1782,7 +1782,7 @@ int HexagonAsmParser::processInstruction(MCInst &Inst, int64_t Value; int sVal = (MO.getExpr()->evaluateAsAbsolute(Value) && Value < 0) ? -1 : 0; MCOperand imm(MCOperand::createExpr( - HexagonMCExpr::Create(MCConstantExpr::create(sVal, Context), Context))); + HexagonMCExpr::create(MCConstantExpr::create(sVal, Context), Context))); Inst = makeCombineInst(Hexagon::A2_combineii, Rdd, imm, MO); break; } @@ -1797,14 +1797,14 @@ int HexagonAsmParser::processInstruction(MCInst &Inst, signed int s8 = (u64 >> 32) & 0xFFFFFFFF; if (s8 < -128 || s8 > 127) OutOfRange(IDLoc, s8, -128); - MCOperand imm(MCOperand::createExpr(HexagonMCExpr::Create( + MCOperand imm(MCOperand::createExpr(HexagonMCExpr::create( MCConstantExpr::create(s8, Context), Context))); // upper 32 - MCOperand imm2(MCOperand::createExpr(HexagonMCExpr::Create( + MCOperand imm2(MCOperand::createExpr(HexagonMCExpr::create( MCConstantExpr::create(u64 & 0xFFFFFFFF, Context), Context))); // lower 32 Inst = makeCombineInst(Hexagon::A4_combineii, Rdd, imm, imm2); } else { - MCOperand imm(MCOperand::createExpr(HexagonMCExpr::Create( + MCOperand imm(MCOperand::createExpr(HexagonMCExpr::create( MCConstantExpr::create(0, Context), Context))); // upper 32 Inst = makeCombineInst(Hexagon::A4_combineii, Rdd, imm, MO); } @@ -1853,7 +1853,7 @@ int HexagonAsmParser::processInstruction(MCInst &Inst, MCOperand &Rs = Inst.getOperand(2); MCOperand &Imm4 = Inst.getOperand(3); MCOperand &Imm6 = Inst.getOperand(4); - Imm6.setExpr(HexagonMCExpr::Create(MCBinaryExpr::createSub( + Imm6.setExpr(HexagonMCExpr::create(MCBinaryExpr::createSub( Imm6.getExpr(), MCConstantExpr::create(1, Context), Context), Context)); TmpInst.setOpcode(Hexagon::S2_tableidxh); TmpInst.addOperand(Rx); @@ -1872,7 +1872,7 @@ int HexagonAsmParser::processInstruction(MCInst &Inst, MCOperand &Rs = Inst.getOperand(2); MCOperand &Imm4 = Inst.getOperand(3); MCOperand &Imm6 = Inst.getOperand(4); - Imm6.setExpr(HexagonMCExpr::Create(MCBinaryExpr::createSub( + Imm6.setExpr(HexagonMCExpr::create(MCBinaryExpr::createSub( Imm6.getExpr(), MCConstantExpr::create(2, Context), Context), Context)); TmpInst.setOpcode(Hexagon::S2_tableidxw); TmpInst.addOperand(Rx); @@ -1891,7 +1891,7 @@ int HexagonAsmParser::processInstruction(MCInst &Inst, MCOperand &Rs = Inst.getOperand(2); MCOperand &Imm4 = Inst.getOperand(3); MCOperand &Imm6 = Inst.getOperand(4); - Imm6.setExpr(HexagonMCExpr::Create(MCBinaryExpr::createSub( + Imm6.setExpr(HexagonMCExpr::create(MCBinaryExpr::createSub( Imm6.getExpr(), MCConstantExpr::create(3, Context), Context), Context)); TmpInst.setOpcode(Hexagon::S2_tableidxd); TmpInst.addOperand(Rx); @@ -1918,7 +1918,7 @@ int HexagonAsmParser::processInstruction(MCInst &Inst, (void)Absolute; if (!MustExtend) { if (Value < 0 && Value > -256) { - Imm.setExpr(HexagonMCExpr::Create( + Imm.setExpr(HexagonMCExpr::create( MCConstantExpr::create(Value * -1, Context), Context)); TmpInst.setOpcode(Hexagon::M2_mpysin); } else if (Value < 256 && Value >= 0) @@ -1952,7 +1952,7 @@ int HexagonAsmParser::processInstruction(MCInst &Inst, TmpInst.addOperand(Rd); TmpInst.addOperand(Rs); } else { - Imm.setExpr(HexagonMCExpr::Create( + Imm.setExpr(HexagonMCExpr::create( MCBinaryExpr::createSub(Imm.getExpr(), MCConstantExpr::create(1, Context), Context), Context)); @@ -1990,7 +1990,7 @@ int HexagonAsmParser::processInstruction(MCInst &Inst, TmpInst.addOperand(MCOperand::createReg(MatchRegisterName(Reg2))); Inst = TmpInst; } else { - Imm.setExpr(HexagonMCExpr::Create( + Imm.setExpr(HexagonMCExpr::create( MCBinaryExpr::createSub(Imm.getExpr(), MCConstantExpr::create(1, Context), Context), Context)); @@ -2112,7 +2112,7 @@ int HexagonAsmParser::processInstruction(MCInst &Inst, if (Value == 0) Inst.setOpcode(Hexagon::S2_vsathub); else { - Imm.setExpr(HexagonMCExpr::Create( + Imm.setExpr(HexagonMCExpr::create( MCBinaryExpr::createSub(Imm.getExpr(), MCConstantExpr::create(1, Context), Context), Context)); @@ -2144,7 +2144,7 @@ int HexagonAsmParser::processInstruction(MCInst &Inst, TmpInst.addOperand(MCOperand::createReg(MatchRegisterName(Reg2))); Inst = TmpInst; } else { - Imm.setExpr(HexagonMCExpr::Create( + Imm.setExpr(HexagonMCExpr::create( MCBinaryExpr::createSub(Imm.getExpr(), MCConstantExpr::create(1, Context), Context), Context)); @@ -2160,7 +2160,7 @@ int HexagonAsmParser::processInstruction(MCInst &Inst, TmpInst.setOpcode(Hexagon::A2_subri); TmpInst.addOperand(Rd); TmpInst.addOperand(MCOperand::createExpr( - HexagonMCExpr::Create(MCConstantExpr::create(-1, Context), Context))); + HexagonMCExpr::create(MCConstantExpr::create(-1, Context), Context))); TmpInst.addOperand(Rs); Inst = TmpInst; break; diff --git a/llvm/lib/Target/Hexagon/HexagonAsmPrinter.cpp b/llvm/lib/Target/Hexagon/HexagonAsmPrinter.cpp index dc6d09d..208f02f 100644 --- a/llvm/lib/Target/Hexagon/HexagonAsmPrinter.cpp +++ b/llvm/lib/Target/Hexagon/HexagonAsmPrinter.cpp @@ -297,7 +297,7 @@ void HexagonAsmPrinter::HexagonProcessInstruction(MCInst &Inst, MCOperand &Reg = MappedInst.getOperand(0); TmpInst.setOpcode(Hexagon::L2_loadrigp); TmpInst.addOperand(Reg); - TmpInst.addOperand(MCOperand::createExpr(HexagonMCExpr::Create( + TmpInst.addOperand(MCOperand::createExpr(HexagonMCExpr::create( MCSymbolRefExpr::create(Sym, OutContext), OutContext))); MappedInst = TmpInst; } @@ -383,7 +383,7 @@ void HexagonAsmPrinter::HexagonProcessInstruction(MCInst &Inst, const MCExpr *One = MCConstantExpr::create(1, OutContext); const MCExpr *Sub = MCBinaryExpr::createSub(Expr, One, OutContext); TmpInst.addOperand( - MCOperand::createExpr(HexagonMCExpr::Create(Sub, OutContext))); + MCOperand::createExpr(HexagonMCExpr::create(Sub, OutContext))); MappedInst = TmpInst; return; } @@ -418,7 +418,7 @@ void HexagonAsmPrinter::HexagonProcessInstruction(MCInst &Inst, const MCExpr *One = MCConstantExpr::create(1, OutContext); const MCExpr *Sub = MCBinaryExpr::createSub(Expr, One, OutContext); TmpInst.addOperand( - MCOperand::createExpr(HexagonMCExpr::Create(Sub, OutContext))); + MCOperand::createExpr(HexagonMCExpr::create(Sub, OutContext))); MappedInst = TmpInst; return; } @@ -444,7 +444,7 @@ void HexagonAsmPrinter::HexagonProcessInstruction(MCInst &Inst, const MCExpr *One = MCConstantExpr::create(1, OutContext); const MCExpr *Sub = MCBinaryExpr::createSub(Expr, One, OutContext); TmpInst.addOperand( - MCOperand::createExpr(HexagonMCExpr::Create(Sub, OutContext))); + MCOperand::createExpr(HexagonMCExpr::create(Sub, OutContext))); MappedInst = TmpInst; return; } @@ -476,10 +476,10 @@ void HexagonAsmPrinter::HexagonProcessInstruction(MCInst &Inst, bool Success = MO.getExpr()->evaluateAsAbsolute(Imm); if (Success && Imm < 0) { const MCExpr *MOne = MCConstantExpr::create(-1, OutContext); - TmpInst.addOperand(MCOperand::createExpr(HexagonMCExpr::Create(MOne, OutContext))); + TmpInst.addOperand(MCOperand::createExpr(HexagonMCExpr::create(MOne, OutContext))); } else { const MCExpr *Zero = MCConstantExpr::create(0, OutContext); - TmpInst.addOperand(MCOperand::createExpr(HexagonMCExpr::Create(Zero, OutContext))); + TmpInst.addOperand(MCOperand::createExpr(HexagonMCExpr::create(Zero, OutContext))); } TmpInst.addOperand(MO); MappedInst = TmpInst; @@ -533,7 +533,7 @@ void HexagonAsmPrinter::HexagonProcessInstruction(MCInst &Inst, (void)Success; if (Value < 0 && Value > -256) { MappedInst.setOpcode(Hexagon::M2_mpysin); - Imm.setExpr(HexagonMCExpr::Create( + Imm.setExpr(HexagonMCExpr::create( MCUnaryExpr::createMinus(Expr, OutContext), OutContext)); } else MappedInst.setOpcode(Hexagon::M2_mpysip); diff --git a/llvm/lib/Target/Hexagon/HexagonMCInstLower.cpp b/llvm/lib/Target/Hexagon/HexagonMCInstLower.cpp index 918064a..2b77294 100644 --- a/llvm/lib/Target/Hexagon/HexagonMCInstLower.cpp +++ b/llvm/lib/Target/Hexagon/HexagonMCInstLower.cpp @@ -66,7 +66,7 @@ static MCOperand GetSymbolRef(const MachineOperand &MO, const MCSymbol *Symbol, ME = MCBinaryExpr::createAdd(ME, MCConstantExpr::create(MO.getOffset(), MC), MC); - return MCOperand::createExpr(HexagonMCExpr::Create(ME, MC)); + return MCOperand::createExpr(HexagonMCExpr::create(ME, MC)); } // Create an MCInst from a MachineInstr @@ -106,17 +106,17 @@ void llvm::HexagonLowerToMC(const MCInstrInfo &MCII, const MachineInstr *MI, // FP immediates are used only when setting GPRs, so they may be dealt // with like regular immediates from this point on. MCO = MCOperand::createExpr( - HexagonMCExpr::Create(MCConstantExpr::create(*Val.bitcastToAPInt().getRawData(), + HexagonMCExpr::create(MCConstantExpr::create(*Val.bitcastToAPInt().getRawData(), AP.OutContext), AP.OutContext)); break; } case MachineOperand::MO_Immediate: MCO = MCOperand::createExpr( - HexagonMCExpr::Create(MCConstantExpr::create(MO.getImm(), AP.OutContext), AP.OutContext)); + HexagonMCExpr::create(MCConstantExpr::create(MO.getImm(), AP.OutContext), AP.OutContext)); break; case MachineOperand::MO_MachineBasicBlock: MCO = MCOperand::createExpr - (HexagonMCExpr::Create(MCSymbolRefExpr::create(MO.getMBB()->getSymbol(), + (HexagonMCExpr::create(MCSymbolRefExpr::create(MO.getMBB()->getSymbol(), AP.OutContext), AP.OutContext)); break; case MachineOperand::MO_GlobalAddress: diff --git a/llvm/lib/Target/Hexagon/MCTargetDesc/HexagonMCExpr.cpp b/llvm/lib/Target/Hexagon/MCTargetDesc/HexagonMCExpr.cpp index 48e7dc5..d3ee314 100644 --- a/llvm/lib/Target/Hexagon/MCTargetDesc/HexagonMCExpr.cpp +++ b/llvm/lib/Target/Hexagon/MCTargetDesc/HexagonMCExpr.cpp @@ -18,7 +18,7 @@ using namespace llvm; #define DEBUG_TYPE "hexagon-mcexpr" -HexagonMCExpr *HexagonMCExpr::Create(MCExpr const *Expr, MCContext &Ctx) { +HexagonMCExpr *HexagonMCExpr::create(MCExpr const *Expr, MCContext &Ctx) { return new (Ctx) HexagonMCExpr(Expr); } diff --git a/llvm/lib/Target/Hexagon/MCTargetDesc/HexagonMCExpr.h b/llvm/lib/Target/Hexagon/MCTargetDesc/HexagonMCExpr.h index 2f37674..e16d926 100644 --- a/llvm/lib/Target/Hexagon/MCTargetDesc/HexagonMCExpr.h +++ b/llvm/lib/Target/Hexagon/MCTargetDesc/HexagonMCExpr.h @@ -16,7 +16,7 @@ namespace llvm { class MCInst; class HexagonMCExpr : public MCTargetExpr { public: - static HexagonMCExpr *Create(MCExpr const *Expr, MCContext &Ctx); + static HexagonMCExpr *create(MCExpr const *Expr, MCContext &Ctx); void printImpl(raw_ostream &OS, const MCAsmInfo *MAI) const override; bool evaluateAsRelocatableImpl(MCValue &Res, const MCAsmLayout *Layout, const MCFixup *Fixup) const override; diff --git a/llvm/lib/Target/Hexagon/MCTargetDesc/HexagonMCInstrInfo.cpp b/llvm/lib/Target/Hexagon/MCTargetDesc/HexagonMCInstrInfo.cpp index d5821e6..eed635f 100644 --- a/llvm/lib/Target/Hexagon/MCTargetDesc/HexagonMCInstrInfo.cpp +++ b/llvm/lib/Target/Hexagon/MCTargetDesc/HexagonMCInstrInfo.cpp @@ -99,7 +99,7 @@ void HexagonMCInstrInfo::clampExtended(MCInstrInfo const &MCII, int64_t Value; if (exOp.getExpr()->evaluateAsAbsolute(Value)) { unsigned Shift = HexagonMCInstrInfo::getExtentAlignment(MCII, MCI); - exOp.setExpr(HexagonMCExpr::Create( + exOp.setExpr(HexagonMCExpr::create( MCConstantExpr::create((Value & 0x3f) << Shift, Context), Context)); } } -- 2.7.4