From 1a66b635780c22de07bc2ce12e2ff832d6698668 Mon Sep 17 00:00:00 2001 From: Juergen Ributzka Date: Mon, 10 Feb 2014 23:30:26 +0000 Subject: [Stackmaps] Cleanup code. No functional change intended. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@201115 91177308-0d34-0410-b5e6-96231b3b80d8 --- include/llvm/CodeGen/StackMaps.h | 2 +- lib/CodeGen/StackMaps.cpp | 41 ++++++++++++++++------------------------ 2 files changed, 17 insertions(+), 26 deletions(-) diff --git a/include/llvm/CodeGen/StackMaps.h b/include/llvm/CodeGen/StackMaps.h index bd4c3db3d3..9497578cf3 100644 --- a/include/llvm/CodeGen/StackMaps.h +++ b/include/llvm/CodeGen/StackMaps.h @@ -180,7 +180,7 @@ private: LocationVec &Locs, LiveOutVec &LiveOuts) const; /// \brief Create a live-out register record for the given register @p Reg. - LiveOutReg createLiveOutReg(unsigned Reg, const MCRegisterInfo &MCRI, + LiveOutReg createLiveOutReg(unsigned Reg, const TargetRegisterInfo *TRI) const; /// \brief Parse the register live-out mask and return a vector of live-out diff --git a/lib/CodeGen/StackMaps.cpp b/lib/CodeGen/StackMaps.cpp index 1ec2587777..5d077932df 100644 --- a/lib/CodeGen/StackMaps.cpp +++ b/lib/CodeGen/StackMaps.cpp @@ -125,22 +125,19 @@ StackMaps::parseOperand(MachineInstr::const_mop_iterator MOI, } /// Go up the super-register chain until we hit a valid dwarf register number. -static unsigned short getDwarfRegNum(unsigned Reg, const MCRegisterInfo &MCRI, - const TargetRegisterInfo *TRI) { - int RegNo = MCRI.getDwarfRegNum(Reg, false); - for (MCSuperRegIterator SR(Reg, TRI); - SR.isValid() && RegNo < 0; ++SR) +static unsigned getDwarfRegNum(unsigned Reg, const TargetRegisterInfo *TRI) { + int RegNo = TRI->getDwarfRegNum(Reg, false); + for (MCSuperRegIterator SR(Reg, TRI); SR.isValid() && RegNo < 0; ++SR) RegNo = TRI->getDwarfRegNum(*SR, false); assert(RegNo >= 0 && "Invalid Dwarf register number."); - return (unsigned short) RegNo; + return (unsigned) RegNo; } /// Create a live-out register record for the given register Reg. StackMaps::LiveOutReg -StackMaps::createLiveOutReg(unsigned Reg, const MCRegisterInfo &MCRI, - const TargetRegisterInfo *TRI) const { - unsigned RegNo = getDwarfRegNum(Reg, MCRI, TRI); +StackMaps::createLiveOutReg(unsigned Reg, const TargetRegisterInfo *TRI) const { + unsigned RegNo = getDwarfRegNum(Reg, TRI); unsigned Size = TRI->getMinimalPhysRegClass(Reg)->getSize(); return LiveOutReg(Reg, RegNo, Size); } @@ -151,14 +148,12 @@ StackMaps::LiveOutVec StackMaps::parseRegisterLiveOutMask(const uint32_t *Mask) const { assert(Mask && "No register mask specified"); const TargetRegisterInfo *TRI = AP.TM.getRegisterInfo(); - MCContext &OutContext = AP.OutStreamer.getContext(); - const MCRegisterInfo &MCRI = *OutContext.getRegisterInfo(); LiveOutVec LiveOuts; // Create a LiveOutReg for each bit that is set in the register mask. for (unsigned Reg = 0, NumRegs = TRI->getNumRegs(); Reg != NumRegs; ++Reg) if ((Mask[Reg / 32] >> Reg % 32) & 1) - LiveOuts.push_back(createLiveOutReg(Reg, MCRI, TRI)); + LiveOuts.push_back(createLiveOutReg(Reg, TRI)); // We don't need to keep track of a register if its super-register is already // in the list. Merge entries that refer to the same dwarf register and use @@ -320,7 +315,6 @@ void StackMaps::serializeToStackMapSection() { // Serialize data. const char *WSMP = "Stack Maps: "; (void)WSMP; - const MCRegisterInfo &MCRI = *OutContext.getRegisterInfo(); DEBUG(dbgs() << "********** Stack Map Output **********\n"); @@ -387,19 +381,16 @@ void StackMaps::serializeToStackMapSection() { unsigned RegNo = 0; int Offset = Loc.Offset; if(Loc.Reg) { - RegNo = MCRI.getDwarfRegNum(Loc.Reg, false); - for (MCSuperRegIterator SR(Loc.Reg, TRI); - SR.isValid() && (int)RegNo < 0; ++SR) { - RegNo = TRI->getDwarfRegNum(*SR, false); - } + RegNo = getDwarfRegNum(Loc.Reg, TRI); + // If this is a register location, put the subregister byte offset in // the location offset. if (Loc.LocType == Location::Register) { assert(!Loc.Offset && "Register location should have zero offset"); - unsigned LLVMRegNo = MCRI.getLLVMRegNum(RegNo, false); - unsigned SubRegIdx = MCRI.getSubRegIndex(LLVMRegNo, Loc.Reg); + unsigned LLVMRegNo = TRI->getLLVMRegNum(RegNo, false); + unsigned SubRegIdx = TRI->getSubRegIndex(LLVMRegNo, Loc.Reg); if (SubRegIdx) - Offset = MCRI.getSubRegIdxOffset(SubRegIdx); + Offset = TRI->getSubRegIdxOffset(SubRegIdx); } } else { @@ -414,15 +405,15 @@ void StackMaps::serializeToStackMapSection() { dbgs() << ""; break; case Location::Register: - dbgs() << "Register " << MCRI.getName(Loc.Reg); + dbgs() << "Register " << TRI->getName(Loc.Reg); break; case Location::Direct: - dbgs() << "Direct " << MCRI.getName(Loc.Reg); + dbgs() << "Direct " << TRI->getName(Loc.Reg); if (Loc.Offset) dbgs() << " + " << Loc.Offset; break; case Location::Indirect: - dbgs() << "Indirect " << MCRI.getName(Loc.Reg) + dbgs() << "Indirect " << TRI->getName(Loc.Reg) << " + " << Loc.Offset; break; case Location::Constant: @@ -453,7 +444,7 @@ void StackMaps::serializeToStackMapSection() { for (LiveOutVec::const_iterator LI = LiveOuts.begin(), LE = LiveOuts.end(); LI != LE; ++LI, ++operIdx) { DEBUG(dbgs() << WSMP << " LO " << operIdx << ": " - << MCRI.getName(LI->Reg) + << TRI->getName(LI->Reg) << " [encoding: .short " << LI->RegNo << ", .byte 0, .byte " << LI->Size << "]\n"); -- cgit v1.2.3