From: Colin LeMahieu Date: Wed, 3 Dec 2014 17:31:43 +0000 (+0000) Subject: [Hexagon] [NFC] Renaming *packetStart to *packetBegin X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e6c2d47e82e6fba3bb0ba4209b22a5e4950093e0;p=llvm [Hexagon] [NFC] Renaming *packetStart to *packetBegin git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@223243 91177308-0d34-0410-b5e6-96231b3b80d8 --- diff --git a/lib/Target/Hexagon/HexagonAsmPrinter.cpp b/lib/Target/Hexagon/HexagonAsmPrinter.cpp index 92402822ab4..75c2db0b8ee 100644 --- a/lib/Target/Hexagon/HexagonAsmPrinter.cpp +++ b/lib/Target/Hexagon/HexagonAsmPrinter.cpp @@ -196,7 +196,7 @@ void HexagonAsmPrinter::EmitInstruction(const MachineInstr *MI) { assert((Size+IgnoreCount) == MI->getBundleSize() && "Corrupt Bundle!"); for (unsigned Index = 0; Index < Size; Index++) { HexagonMCInst MCI; - MCI.setPacketStart(Index == 0); + MCI.setPacketBegin(Index == 0); MCI.setPacketEnd(Index == (Size-1)); HexagonLowerToMC(BundleMIs[Index], MCI, *this); @@ -206,7 +206,7 @@ void HexagonAsmPrinter::EmitInstruction(const MachineInstr *MI) { else { HexagonMCInst MCI; if (MI->getOpcode() == Hexagon::ENDLOOP0) { - MCI.setPacketStart(true); + MCI.setPacketBegin(true); MCI.setPacketEnd(true); } HexagonLowerToMC(MI, MCI, *this); diff --git a/lib/Target/Hexagon/MCTargetDesc/HexagonInstPrinter.cpp b/lib/Target/Hexagon/MCTargetDesc/HexagonInstPrinter.cpp index 2c9bd6b38f2..5c6f0363f78 100644 --- a/lib/Target/Hexagon/MCTargetDesc/HexagonInstPrinter.cpp +++ b/lib/Target/Hexagon/MCTargetDesc/HexagonInstPrinter.cpp @@ -91,14 +91,14 @@ void HexagonInstPrinter::printInst(const HexagonMCInst *MI, raw_ostream &O, // Ending a harware loop is different from ending an regular packet. assert(MI->isPacketEnd() && "Loop-end must also end the packet"); - if (MI->isPacketStart()) { + if (MI->isPacketBegin()) { // There must be a packet to end a loop. // FIXME: when shuffling is always run, this shouldn't be needed. HexagonMCInst Nop; StringRef NoAnnot; Nop.setOpcode (Hexagon::A2_nop); - Nop.setPacketStart (MI->isPacketStart()); + Nop.setPacketBegin (MI->isPacketBegin()); printInst (&Nop, O, NoAnnot); } @@ -110,7 +110,7 @@ void HexagonInstPrinter::printInst(const HexagonMCInst *MI, raw_ostream &O, } else { // Prefix the insn opening the packet. - if (MI->isPacketStart()) + if (MI->isPacketBegin()) O << PacketPadding << startPacket << '\n'; printInstruction(MI, O); diff --git a/lib/Target/Hexagon/MCTargetDesc/HexagonMCInst.h b/lib/Target/Hexagon/MCTargetDesc/HexagonMCInst.h index 90fbbf3f60a..1e1e644070e 100644 --- a/lib/Target/Hexagon/MCTargetDesc/HexagonMCInst.h +++ b/lib/Target/Hexagon/MCTargetDesc/HexagonMCInst.h @@ -27,19 +27,19 @@ namespace llvm { const MCInstrDesc *MCID; // Packet start and end markers - unsigned packetStart: 1, packetEnd: 1; + unsigned packetBegin: 1, packetEnd: 1; public: explicit HexagonMCInst(): - MCInst(), MCID(nullptr), packetStart(0), packetEnd(0) {}; + MCInst(), MCID(nullptr), packetBegin(0), packetEnd(0) {}; HexagonMCInst(const MCInstrDesc& mcid): - MCInst(), MCID(&mcid), packetStart(0), packetEnd(0) {}; + MCInst(), MCID(&mcid), packetBegin(0), packetEnd(0) {}; - bool isPacketStart() const { return (packetStart); }; + bool isPacketBegin() const { return (packetBegin); }; bool isPacketEnd() const { return (packetEnd); }; - void setPacketStart(bool Y) { packetStart = Y; }; + void setPacketBegin(bool Y) { packetBegin = Y; }; void setPacketEnd(bool Y) { packetEnd = Y; }; - void resetPacket() { setPacketStart(false); setPacketEnd(false); }; + void resetPacket() { setPacketBegin(false); setPacketEnd(false); }; // Return the slots used by the insn. unsigned getUnits(const HexagonTargetMachine* TM) const;