From 70872139d5aa60340e3488d8cbf51134f6e5568e Mon Sep 17 00:00:00 2001 From: Clement Courbet Date: Fri, 18 Jan 2019 09:40:19 +0000 Subject: [PATCH] Revert r351529 "[llvm-objdump][NFC] Improve readability." Breaks labels-branch.s git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@351534 91177308-0d34-0410-b5e6-96231b3b80d8 --- tools/llvm-objdump/llvm-objdump.cpp | 65 +++++++++++++---------------- 1 file changed, 28 insertions(+), 37 deletions(-) diff --git a/tools/llvm-objdump/llvm-objdump.cpp b/tools/llvm-objdump/llvm-objdump.cpp index 7dc63d78522..7d0e7e94068 100644 --- a/tools/llvm-objdump/llvm-objdump.cpp +++ b/tools/llvm-objdump/llvm-objdump.cpp @@ -278,23 +278,9 @@ cl::alias DisassembleZeroesShort("z", static StringRef ToolName; -namespace { -struct SectionSymbol { - SectionSymbol(uint64_t Address, StringRef Name, uint8_t Type) - : Address(Address), Name(Name), Type(Type) {} - - bool operator<(const SectionSymbol &Other) const { - return std::tie(Address, Name, Type) < - std::tie(Other.Address, Other.Name, Other.Type); - } - - uint64_t Address; - StringRef Name; - uint8_t Type; -}; - -typedef std::vector SectionSymbolsTy; +typedef std::vector> SectionSymbolsTy; +namespace { typedef std::function FilterPredicate; class SectionFilterIterator { @@ -1469,8 +1455,8 @@ static void disassembleObject(const ObjectFile *Obj, bool InlineRelocs) { std::vector TextMappingSymsAddr; if (isArmElf(Obj)) { for (const auto &Symb : Symbols) { - uint64_t Address = Symb.Address; - StringRef Name = Symb.Name; + uint64_t Address = std::get<0>(Symb); + StringRef Name = std::get<1>(Symb); if (Name.startswith("$d")) DataMappingSymsAddr.push_back(Address - SectionAddr); if (Name.startswith("$x")) @@ -1519,11 +1505,11 @@ static void disassembleObject(const ObjectFile *Obj, bool InlineRelocs) { error(Section.getName(SectionName)); // If the section has no symbol at the start, just insert a dummy one. - if (Symbols.empty() || Symbols[0].Address != 0) { + if (Symbols.empty() || std::get<0>(Symbols[0]) != 0) { Symbols.insert( Symbols.begin(), - SectionSymbol(SectionAddr, SectionName, - Section.isText() ? ELF::STT_FUNC : ELF::STT_OBJECT)); + std::make_tuple(SectionAddr, SectionName, + Section.isText() ? ELF::STT_FUNC : ELF::STT_OBJECT)); } SmallString<40> Comments; @@ -1542,12 +1528,12 @@ static void disassembleObject(const ObjectFile *Obj, bool InlineRelocs) { std::vector::const_iterator RelEnd = Rels.end(); // Disassemble symbol by symbol. for (unsigned SI = 0, SE = Symbols.size(); SI != SE; ++SI) { - uint64_t Start = Symbols[SI].Address - SectionAddr; + uint64_t Start = std::get<0>(Symbols[SI]) - SectionAddr; // The end is either the section end or the beginning of the next // symbol. uint64_t End = (SI == SE - 1) ? SectSize - : Symbols[SI + 1].Address - SectionAddr; + : std::get<0>(Symbols[SI + 1]) - SectionAddr; // Don't try to disassemble beyond the end of section contents. if (End > SectSize) End = SectSize; @@ -1563,7 +1549,8 @@ static void disassembleObject(const ObjectFile *Obj, bool InlineRelocs) { } /// Skip if user requested specific symbols and this is not in the list - if (!DisasmFuncsSet.empty() && !DisasmFuncsSet.count(Symbols[SI].Name)) + if (!DisasmFuncsSet.empty() && + !DisasmFuncsSet.count(std::get<1>(Symbols[SI]))) continue; if (!PrintedSection) { @@ -1579,12 +1566,12 @@ static void disassembleObject(const ObjectFile *Obj, bool InlineRelocs) { End = StopAddress - SectionAddr; if (Obj->isELF() && Obj->getArch() == Triple::amdgcn) { - if (Symbols[SI].Type == ELF::STT_AMDGPU_HSA_KERNEL) { + if (std::get<2>(Symbols[SI]) == ELF::STT_AMDGPU_HSA_KERNEL) { // skip amd_kernel_code_t at the begining of kernel symbol (256 bytes) Start += 256; } if (SI == SE - 1 || - Symbols[SI + 1].Type == ELF::STT_AMDGPU_HSA_KERNEL) { + std::get<2>(Symbols[SI + 1]) == ELF::STT_AMDGPU_HSA_KERNEL) { // cut trailing zeroes at the end of kernel // cut up to 256 bytes const uint64_t EndAlign = 256; @@ -1599,7 +1586,7 @@ static void disassembleObject(const ObjectFile *Obj, bool InlineRelocs) { if (!NoLeadingAddr) outs() << format("%016" PRIx64 " ", SectionAddr + Start); - StringRef SymbolName = Symbols[SI].Name; + StringRef SymbolName = std::get<1>(Symbols[SI]); if (Demangle) outs() << demangle(SymbolName) << ":\n"; else @@ -1637,7 +1624,7 @@ static void disassembleObject(const ObjectFile *Obj, bool InlineRelocs) { // same section. We rely on the markers introduced to // understand what we need to dump. If the data marker is within a // function, it is denoted as a word/short etc - if (isArmElf(Obj) && Symbols[SI].Type != ELF::STT_OBJECT && + if (isArmElf(Obj) && std::get<2>(Symbols[SI]) != ELF::STT_OBJECT && !DisassembleAll) { uint64_t Stride = 0; @@ -1701,7 +1688,7 @@ static void disassembleObject(const ObjectFile *Obj, bool InlineRelocs) { // disassembling text (applicable all architectures), // we are in a situation where we must print the data and not // disassemble it. - if (Obj->isELF() && Symbols[SI].Type == ELF::STT_OBJECT && + if (Obj->isELF() && std::get<2>(Symbols[SI]) == ELF::STT_OBJECT && !DisassembleAll && Section.isText()) { // print out data up to 8 bytes at a time in hex and ascii uint8_t AsciiData[9] = {'\0'}; @@ -1798,21 +1785,25 @@ static void disassembleObject(const ObjectFile *Obj, bool InlineRelocs) { // the target, find the nearest preceding absolute symbol. auto TargetSym = std::upper_bound( TargetSectionSymbols->begin(), TargetSectionSymbols->end(), - Target, [](uint64_t LHS, const SectionSymbol &RHS) { - return LHS < RHS.Address; + Target, [](uint64_t LHS, + const std::tuple &RHS) { + return LHS < std::get<0>(RHS); }); if (TargetSym == TargetSectionSymbols->begin()) { TargetSectionSymbols = &AbsoluteSymbols; TargetSym = std::upper_bound( - AbsoluteSymbols.begin(), AbsoluteSymbols.end(), Target, - [](uint64_t LHS, const SectionSymbol &RHS) { - return LHS < RHS.Address; - }); + AbsoluteSymbols.begin(), AbsoluteSymbols.end(), + Target, [](uint64_t LHS, + const std::tuple &RHS) { + return LHS < std::get<0>(RHS); + }); } if (TargetSym != TargetSectionSymbols->begin()) { --TargetSym; - outs() << " <" << TargetSym->Name; - uint64_t Disp = Target - TargetSym->Address; + uint64_t TargetAddress = std::get<0>(*TargetSym); + StringRef TargetName = std::get<1>(*TargetSym); + outs() << " <" << TargetName; + uint64_t Disp = Target - TargetAddress; if (Disp) outs() << "+0x" << Twine::utohexstr(Disp); outs() << '>'; -- 2.50.1