mirror of
https://github.com/RPCS3/llvm-mirror.git
synced 2024-10-18 18:42:46 +02:00
Revert r351529 "[llvm-objdump][NFC] Improve readability."
msan errors in ELF/strip-all.s. llvm-svn: 351556
This commit is contained in:
Clement Courbet
parent
97d150850a
commit
6d903be6b8
@ -279,18 +279,7 @@ cl::alias DisassembleZeroesShort("z",
|
||||
|
||||
static StringRef ToolName;
|
||||
|
||||
namespace {
|
||||
struct SectionSymbol : public std::tuple<uint64_t, StringRef, uint8_t> {
|
||||
SectionSymbol(uint64_t Address, StringRef Name, uint8_t Type)
|
||||
: std::tuple<uint64_t, StringRef, uint8_t>(Address, Name, Type) {}
|
||||
|
||||
uint64_t Address() const { return std::get<0>(*this); }
|
||||
StringRef Name() const { return std::get<1>(*this); }
|
||||
uint8_t Type() const { return std::get<2>(*this); }
|
||||
};
|
||||
|
||||
typedef std::vector<SectionSymbol> SectionSymbolsTy;
|
||||
} // namespace
|
||||
typedef std::vector<std::tuple<uint64_t, StringRef, uint8_t>> SectionSymbolsTy;
|
||||
|
||||
SectionFilter llvm::ToolSectionFilter(llvm::object::ObjectFile const &O) {
|
||||
return SectionFilter(
|
||||
@ -1046,8 +1035,8 @@ static void disassembleObject(const ObjectFile *Obj, bool InlineRelocs) {
|
||||
std::vector<uint64_t> 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"))
|
||||
@ -1096,11 +1085,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;
|
||||
@ -1119,11 +1108,12 @@ static void disassembleObject(const ObjectFile *Obj, bool InlineRelocs) {
|
||||
std::vector<RelocationRef>::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;
|
||||
uint64_t End = (SI == SE - 1)
|
||||
? SectSize
|
||||
: std::get<0>(Symbols[SI + 1]) - SectionAddr;
|
||||
// Don't try to disassemble beyond the end of section contents.
|
||||
if (End > SectSize)
|
||||
End = SectSize;
|
||||
@ -1139,7 +1129,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) {
|
||||
@ -1155,12 +1146,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;
|
||||
@ -1175,7 +1166,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
|
||||
@ -1213,7 +1204,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;
|
||||
|
||||
@ -1277,7 +1268,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'};
|
||||
@ -1374,21 +1365,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<uint64_t, StringRef, uint8_t> &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<uint64_t, StringRef, uint8_t> &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() << '>';
|
||||
|
||||
Loading…
Reference in New Issue
Block a user