From 570228780990568f27288961f8ffe17de8f31e3d Mon Sep 17 00:00:00 2001 From: "Duncan P. N. Exon Smith" Date: Sat, 27 Feb 2016 19:09:00 +0000 Subject: CodeGen: Update DFAPacketizer API to take MachineInstr&, NFC In all but one case, change the DFAPacketizer API to take MachineInstr& instead of MachineInstr*. In DFAPacketizer::endPacket(), take MachineBasicBlock::iterator. Besides cleaning up the API, this is in search of PR26753. llvm-svn: 262142 --- llvm/lib/CodeGen/DFAPacketizer.cpp | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) (limited to 'llvm/lib/CodeGen') diff --git a/llvm/lib/CodeGen/DFAPacketizer.cpp b/llvm/lib/CodeGen/DFAPacketizer.cpp index c8a3d381242..a4ed61b98ce 100644 --- a/llvm/lib/CodeGen/DFAPacketizer.cpp +++ b/llvm/lib/CodeGen/DFAPacketizer.cpp @@ -135,16 +135,16 @@ void DFAPacketizer::reserveResources(const llvm::MCInstrDesc *MID) { // Check if the resources occupied by a machine instruction are available // in the current state. -bool DFAPacketizer::canReserveResources(llvm::MachineInstr *MI) { - const llvm::MCInstrDesc &MID = MI->getDesc(); +bool DFAPacketizer::canReserveResources(llvm::MachineInstr &MI) { + const llvm::MCInstrDesc &MID = MI.getDesc(); return canReserveResources(&MID); } // Reserve the resources occupied by a machine instruction and change the // current state to reflect that change. -void DFAPacketizer::reserveResources(llvm::MachineInstr *MI) { - const llvm::MCInstrDesc &MID = MI->getDesc(); +void DFAPacketizer::reserveResources(llvm::MachineInstr &MI) { + const llvm::MCInstrDesc &MID = MI.getDesc(); reserveResources(&MID); } @@ -195,10 +195,11 @@ VLIWPacketizerList::~VLIWPacketizerList() { // End the current packet, bundle packet instructions and reset DFA state. -void VLIWPacketizerList::endPacket(MachineBasicBlock *MBB, MachineInstr *MI) { +void VLIWPacketizerList::endPacket(MachineBasicBlock *MBB, + MachineBasicBlock::iterator MI) { if (CurrentPacketMIs.size() > 1) { - MachineInstr *MIFirst = CurrentPacketMIs.front(); - finalizeBundle(*MBB, MIFirst->getIterator(), MI->getIterator()); + MachineInstr &MIFirst = *CurrentPacketMIs.front(); + finalizeBundle(*MBB, MIFirst.getIterator(), MI.getInstrIterator()); } CurrentPacketMIs.clear(); ResourceTracker->clearResources(); @@ -222,7 +223,7 @@ void VLIWPacketizerList::PacketizeMIs(MachineBasicBlock *MBB, // The main packetizer loop. for (; BeginItr != EndItr; ++BeginItr) { - MachineInstr *MI = BeginItr; + MachineInstr &MI = *BeginItr; initPacketizerState(); // End the current packet if needed. @@ -235,7 +236,7 @@ void VLIWPacketizerList::PacketizeMIs(MachineBasicBlock *MBB, if (ignorePseudoInstruction(MI, MBB)) continue; - SUnit *SUI = MIToSUnit[MI]; + SUnit *SUI = MIToSUnit[&MI]; assert(SUI && "Missing SUnit Info!"); // Ask DFA if machine resource is available for MI. -- cgit v1.2.3