maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

[llvm-objdump] Change some nonnull pointers to references. NFC

This commit is contained in:
Fangrui Song 2022-07-07 12:14:59 -07:00
parent 58b9666dc1
commit d3712b0852
7 changed files with 172 additions and 175 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
llvm/tools/llvm-objdump/COFFDump.cpp
View File

@ -800,11 +800,11 @@ void objdump::printCOFFFileHeader(const COFFObjectFile &Obj) {
printExportTable(&Obj); printExportTable(&Obj);
} }
void objdump::printCOFFSymbolTable(const object::COFFImportFile *i) { void objdump::printCOFFSymbolTable(const object::COFFImportFile &i) {
unsigned Index = 0; unsigned Index = 0;
bool IsCode = i->getCOFFImportHeader()->getType() == COFF::IMPORT_CODE; bool IsCode = i.getCOFFImportHeader()->getType() == COFF::IMPORT_CODE;
for (const object::BasicSymbolRef &Sym : i->symbols()) { for (const object::BasicSymbolRef &Sym : i.symbols()) {
std::string Name; std::string Name;
raw_string_ostream NS(Name); raw_string_ostream NS(Name);
@ -823,15 +823,15 @@ void objdump::printCOFFSymbolTable(const object::COFFImportFile *i) {
} }
} }
void objdump::printCOFFSymbolTable(const COFFObjectFile *coff) { void objdump::printCOFFSymbolTable(const COFFObjectFile &coff) {
for (unsigned SI = 0, SE = coff->getNumberOfSymbols(); SI != SE; ++SI) { for (unsigned SI = 0, SE = coff.getNumberOfSymbols(); SI != SE; ++SI) {
Expected<COFFSymbolRef> Symbol = coff->getSymbol(SI); Expected<COFFSymbolRef> Symbol = coff.getSymbol(SI);
if (!Symbol) if (!Symbol)
reportError(Symbol.takeError(), coff->getFileName()); reportError(Symbol.takeError(), coff.getFileName());
Expected<StringRef> NameOrErr = coff->getSymbolName(*Symbol); Expected<StringRef> NameOrErr = coff.getSymbolName(*Symbol);
if (!NameOrErr) if (!NameOrErr)
reportError(NameOrErr.takeError(), coff->getFileName()); reportError(NameOrErr.takeError(), coff.getFileName());
StringRef Name = *NameOrErr; StringRef Name = *NameOrErr;
outs() << "[" << format("%2d", SI) << "]" outs() << "[" << format("%2d", SI) << "]"
@ -861,8 +861,8 @@ void objdump::printCOFFSymbolTable(const COFFObjectFile *coff) {
if (Symbol->isSectionDefinition()) { if (Symbol->isSectionDefinition()) {
const coff_aux_section_definition *asd; const coff_aux_section_definition *asd;
if (Error E = if (Error E =
coff->getAuxSymbol<coff_aux_section_definition>(SI + 1, asd)) coff.getAuxSymbol<coff_aux_section_definition>(SI + 1, asd))
reportError(std::move(E), coff->getFileName()); reportError(std::move(E), coff.getFileName());
int32_t AuxNumber = asd->getNumber(Symbol->isBigObj()); int32_t AuxNumber = asd->getNumber(Symbol->isBigObj());
@ -877,19 +877,19 @@ void objdump::printCOFFSymbolTable(const COFFObjectFile *coff) {
, unsigned(asd->Selection)); , unsigned(asd->Selection));
} else if (Symbol->isFileRecord()) { } else if (Symbol->isFileRecord()) {
const char *FileName; const char *FileName;
if (Error E = coff->getAuxSymbol<char>(SI + 1, FileName)) if (Error E = coff.getAuxSymbol<char>(SI + 1, FileName))
reportError(std::move(E), coff->getFileName()); reportError(std::move(E), coff.getFileName());
StringRef Name(FileName, Symbol->getNumberOfAuxSymbols() * StringRef Name(FileName, Symbol->getNumberOfAuxSymbols() *
coff->getSymbolTableEntrySize()); coff.getSymbolTableEntrySize());
outs() << "AUX " << Name.rtrim(StringRef("\0", 1)) << '\n'; outs() << "AUX " << Name.rtrim(StringRef("\0", 1)) << '\n';
SI = SI + Symbol->getNumberOfAuxSymbols(); SI = SI + Symbol->getNumberOfAuxSymbols();
break; break;
} else if (Symbol->isWeakExternal()) { } else if (Symbol->isWeakExternal()) {
const coff_aux_weak_external *awe; const coff_aux_weak_external *awe;
if (Error E = coff->getAuxSymbol<coff_aux_weak_external>(SI + 1, awe)) if (Error E = coff.getAuxSymbol<coff_aux_weak_external>(SI + 1, awe))
reportError(std::move(E), coff->getFileName()); reportError(std::move(E), coff.getFileName());
outs() << "AUX " << format("indx %d srch %d\n", outs() << "AUX " << format("indx %d srch %d\n",
static_cast<uint32_t>(awe->TagIndex), static_cast<uint32_t>(awe->TagIndex),

4
llvm/tools/llvm-objdump/COFFDump.h
View File

@ -28,8 +28,8 @@ Error getCOFFRelocationValueString(const object::COFFObjectFile *Obj,
void printCOFFUnwindInfo(const object::COFFObjectFile *O); void printCOFFUnwindInfo(const object::COFFObjectFile *O);
void printCOFFFileHeader(const object::COFFObjectFile &Obj); void printCOFFFileHeader(const object::COFFObjectFile &Obj);
void printCOFFSymbolTable(const object::COFFImportFile *I); void printCOFFSymbolTable(const object::COFFImportFile &I);
void printCOFFSymbolTable(const object::COFFObjectFile *O); void printCOFFSymbolTable(const object::COFFObjectFile &O);
} // namespace objdump } // namespace objdump
} // namespace llvm } // namespace llvm

4
llvm/tools/llvm-objdump/MachODump.cpp
View File

@ -1979,7 +1979,7 @@ static void ProcessMachO(StringRef Name, MachOObjectFile *MachOOF,
if (Relocations) if (Relocations)
PrintRelocations(MachOOF, Verbose); PrintRelocations(MachOOF, Verbose);
if (SectionHeaders) if (SectionHeaders)
printSectionHeaders(MachOOF); printSectionHeaders(*MachOOF);
if (SectionContents) if (SectionContents)
printSectionContents(MachOOF); printSectionContents(MachOOF);
if (!FilterSections.empty()) if (!FilterSections.empty())
@ -1993,7 +1993,7 @@ static void ProcessMachO(StringRef Name, MachOObjectFile *MachOOF,
if (DylibId) if (DylibId)
PrintDylibs(MachOOF, true); PrintDylibs(MachOOF, true);
if (SymbolTable) if (SymbolTable)
printSymbolTable(MachOOF, ArchiveName, ArchitectureName); printSymbolTable(*MachOOF, ArchiveName, ArchitectureName);
if (UnwindInfo) if (UnwindInfo)
printMachOUnwindInfo(MachOOF); printMachOUnwindInfo(MachOOF);
if (PrivateHeaders) { if (PrivateHeaders) {

23
llvm/tools/llvm-objdump/XCOFFDump.cpp
View File

@ -19,11 +19,11 @@
using namespace llvm; using namespace llvm;
using namespace llvm::object; using namespace llvm::object;
Error objdump::getXCOFFRelocationValueString(const XCOFFObjectFile *Obj, Error objdump::getXCOFFRelocationValueString(const XCOFFObjectFile &Obj,
const RelocationRef &Rel, const RelocationRef &Rel,
SmallVectorImpl<char> &Result) { SmallVectorImpl<char> &Result) {
symbol_iterator SymI = Rel.getSymbol(); symbol_iterator SymI = Rel.getSymbol();
if (SymI == Obj->symbol_end()) if (SymI == Obj.symbol_end())
return make_error<GenericBinaryError>( return make_error<GenericBinaryError>(
"invalid symbol reference in relocation entry", "invalid symbol reference in relocation entry",
object_error::parse_failed); object_error::parse_failed);
@ -44,9 +44,9 @@ Error objdump::getXCOFFRelocationValueString(const XCOFFObjectFile *Obj,
} }
Optional<XCOFF::StorageMappingClass> Optional<XCOFF::StorageMappingClass>
objdump::getXCOFFSymbolCsectSMC(const XCOFFObjectFile *Obj, objdump::getXCOFFSymbolCsectSMC(const XCOFFObjectFile &Obj,
const SymbolRef &Sym) { const SymbolRef &Sym) {
const XCOFFSymbolRef SymRef = Obj->toSymbolRef(Sym.getRawDataRefImpl()); const XCOFFSymbolRef SymRef = Obj.toSymbolRef(Sym.getRawDataRefImpl());
if (!SymRef.isCsectSymbol()) if (!SymRef.isCsectSymbol())
return None; return None;
@ -59,10 +59,9 @@ objdump::getXCOFFSymbolCsectSMC(const XCOFFObjectFile *Obj,
} }
Optional<object::SymbolRef> Optional<object::SymbolRef>
objdump::getXCOFFSymbolContainingSymbolRef(const XCOFFObjectFile *Obj, objdump::getXCOFFSymbolContainingSymbolRef(const XCOFFObjectFile &Obj,
const SymbolRef &Sym) { const SymbolRef &Sym) {
const XCOFFSymbolRef SymRef = Obj.toSymbolRef(Sym.getRawDataRefImpl());
const XCOFFSymbolRef SymRef = Obj->toSymbolRef(Sym.getRawDataRefImpl());
if (!SymRef.isCsectSymbol()) if (!SymRef.isCsectSymbol())
return None; return None;
@ -72,14 +71,12 @@ objdump::getXCOFFSymbolContainingSymbolRef(const XCOFFObjectFile *Obj,
uint32_t Idx = uint32_t Idx =
static_cast<uint32_t>(CsectAuxEntOrErr.get().getSectionOrLength()); static_cast<uint32_t>(CsectAuxEntOrErr.get().getSectionOrLength());
DataRefImpl DRI; DataRefImpl DRI;
DRI.p = Obj->getSymbolByIndex(Idx); DRI.p = Obj.getSymbolByIndex(Idx);
return SymbolRef(DRI, Obj); return SymbolRef(DRI, &Obj);
} }
bool objdump::isLabel(const XCOFFObjectFile *Obj, const SymbolRef &Sym) { bool objdump::isLabel(const XCOFFObjectFile &Obj, const SymbolRef &Sym) {
const XCOFFSymbolRef SymRef = Obj.toSymbolRef(Sym.getRawDataRefImpl());
const XCOFFSymbolRef SymRef = Obj->toSymbolRef(Sym.getRawDataRefImpl());
if (!SymRef.isCsectSymbol()) if (!SymRef.isCsectSymbol())
return false; return false;

8
llvm/tools/llvm-objdump/XCOFFDump.h
View File

@ -17,19 +17,19 @@ struct SymbolInfoTy;
namespace objdump { namespace objdump {
Optional<XCOFF::StorageMappingClass> Optional<XCOFF::StorageMappingClass>
getXCOFFSymbolCsectSMC(const object::XCOFFObjectFile *Obj, getXCOFFSymbolCsectSMC(const object::XCOFFObjectFile &Obj,
const object::SymbolRef &Sym); const object::SymbolRef &Sym);
Optional<object::SymbolRef> Optional<object::SymbolRef>
getXCOFFSymbolContainingSymbolRef(const object::XCOFFObjectFile *Obj, getXCOFFSymbolContainingSymbolRef(const object::XCOFFObjectFile &Obj,
const object::SymbolRef &Sym); const object::SymbolRef &Sym);
bool isLabel(const object::XCOFFObjectFile *Obj, const object::SymbolRef &Sym); bool isLabel(const object::XCOFFObjectFile &Obj, const object::SymbolRef &Sym);
std::string getXCOFFSymbolDescription(const SymbolInfoTy &SymbolInfo, std::string getXCOFFSymbolDescription(const SymbolInfoTy &SymbolInfo,
StringRef SymbolName); StringRef SymbolName);
Error getXCOFFRelocationValueString(const object::XCOFFObjectFile *Obj, Error getXCOFFRelocationValueString(const object::XCOFFObjectFile &Obj,
const object::RelocationRef &RelRef, const object::RelocationRef &RelRef,
llvm::SmallVectorImpl<char> &Result); llvm::SmallVectorImpl<char> &Result);
} // namespace objdump } // namespace objdump

268
llvm/tools/llvm-objdump/llvm-objdump.cpp
View File

@ -391,7 +391,7 @@ static Error getRelocationValueString(const RelocationRef &Rel,
if (auto *MachO = dyn_cast<MachOObjectFile>(Obj)) if (auto *MachO = dyn_cast<MachOObjectFile>(Obj))
return getMachORelocationValueString(MachO, Rel, Result); return getMachORelocationValueString(MachO, Rel, Result);
if (auto *XCOFF = dyn_cast<XCOFFObjectFile>(Obj)) if (auto *XCOFF = dyn_cast<XCOFFObjectFile>(Obj))
return getXCOFFRelocationValueString(XCOFF, Rel, Result); return getXCOFFRelocationValueString(*XCOFF, Rel, Result);
llvm_unreachable("unknown object file format"); llvm_unreachable("unknown object file format");
} }
@ -435,22 +435,22 @@ unsigned getInstStartColumn(const MCSubtargetInfo &STI) {
return !ShowRawInsn ? 16 : STI.getTargetTriple().isX86() ? 40 : 24; return !ShowRawInsn ? 16 : STI.getTargetTriple().isX86() ? 40 : 24;
} }
static bool isAArch64Elf(const ObjectFile *Obj) { static bool isAArch64Elf(const ObjectFile &Obj) {
const auto *Elf = dyn_cast<ELFObjectFileBase>(Obj); const auto *Elf = dyn_cast<ELFObjectFileBase>(&Obj);
return Elf && Elf->getEMachine() == ELF::EM_AARCH64; return Elf && Elf->getEMachine() == ELF::EM_AARCH64;
} }
static bool isArmElf(const ObjectFile *Obj) { static bool isArmElf(const ObjectFile &Obj) {
const auto *Elf = dyn_cast<ELFObjectFileBase>(Obj); const auto *Elf = dyn_cast<ELFObjectFileBase>(&Obj);
return Elf && Elf->getEMachine() == ELF::EM_ARM; return Elf && Elf->getEMachine() == ELF::EM_ARM;
} }
static bool isCSKYElf(const ObjectFile *Obj) { static bool isCSKYElf(const ObjectFile &Obj) {
const auto *Elf = dyn_cast<ELFObjectFileBase>(Obj); const auto *Elf = dyn_cast<ELFObjectFileBase>(&Obj);
return Elf && Elf->getEMachine() == ELF::EM_CSKY; return Elf && Elf->getEMachine() == ELF::EM_CSKY;
} }
static bool hasMappingSymbols(const ObjectFile *Obj) { static bool hasMappingSymbols(const ObjectFile &Obj) {
return isArmElf(Obj) || isAArch64Elf(Obj) || isCSKYElf(Obj) ; return isArmElf(Obj) || isAArch64Elf(Obj) || isCSKYElf(Obj) ;
} }
@ -679,50 +679,51 @@ PrettyPrinter &selectPrettyPrinter(Triple const &Triple) {
} }
} }
static uint8_t getElfSymbolType(const ObjectFile *Obj, const SymbolRef &Sym) { static uint8_t getElfSymbolType(const ObjectFile &Obj, const SymbolRef &Sym) {
assert(Obj->isELF()); assert(Obj.isELF());
if (auto *Elf32LEObj = dyn_cast<ELF32LEObjectFile>(Obj)) if (auto *Elf32LEObj = dyn_cast<ELF32LEObjectFile>(&Obj))
return unwrapOrError(Elf32LEObj->getSymbol(Sym.getRawDataRefImpl()), return unwrapOrError(Elf32LEObj->getSymbol(Sym.getRawDataRefImpl()),
Obj->getFileName()) Obj.getFileName())
->getType(); ->getType();
if (auto *Elf64LEObj = dyn_cast<ELF64LEObjectFile>(Obj)) if (auto *Elf64LEObj = dyn_cast<ELF64LEObjectFile>(&Obj))
return unwrapOrError(Elf64LEObj->getSymbol(Sym.getRawDataRefImpl()), return unwrapOrError(Elf64LEObj->getSymbol(Sym.getRawDataRefImpl()),
Obj->getFileName()) Obj.getFileName())
->getType(); ->getType();
if (auto *Elf32BEObj = dyn_cast<ELF32BEObjectFile>(Obj)) if (auto *Elf32BEObj = dyn_cast<ELF32BEObjectFile>(&Obj))
return unwrapOrError(Elf32BEObj->getSymbol(Sym.getRawDataRefImpl()), return unwrapOrError(Elf32BEObj->getSymbol(Sym.getRawDataRefImpl()),
Obj->getFileName()) Obj.getFileName())
->getType(); ->getType();
if (auto *Elf64BEObj = cast<ELF64BEObjectFile>(Obj)) if (auto *Elf64BEObj = cast<ELF64BEObjectFile>(&Obj))
return unwrapOrError(Elf64BEObj->getSymbol(Sym.getRawDataRefImpl()), return unwrapOrError(Elf64BEObj->getSymbol(Sym.getRawDataRefImpl()),
Obj->getFileName()) Obj.getFileName())
->getType(); ->getType();
llvm_unreachable("Unsupported binary format"); llvm_unreachable("Unsupported binary format");
} }
template <class ELFT> static void template <class ELFT>
addDynamicElfSymbols(const ELFObjectFile<ELFT> *Obj, static void
addDynamicElfSymbols(const ELFObjectFile<ELFT> &Obj,
std::map<SectionRef, SectionSymbolsTy> &AllSymbols) { std::map<SectionRef, SectionSymbolsTy> &AllSymbols) {
for (auto Symbol : Obj->getDynamicSymbolIterators()) { for (auto Symbol : Obj.getDynamicSymbolIterators()) {
uint8_t SymbolType = Symbol.getELFType(); uint8_t SymbolType = Symbol.getELFType();
if (SymbolType == ELF::STT_SECTION) if (SymbolType == ELF::STT_SECTION)
continue; continue;
uint64_t Address = unwrapOrError(Symbol.getAddress(), Obj->getFileName()); uint64_t Address = unwrapOrError(Symbol.getAddress(), Obj.getFileName());
// ELFSymbolRef::getAddress() returns size instead of value for common // ELFSymbolRef::getAddress() returns size instead of value for common
// symbols which is not desirable for disassembly output. Overriding. // symbols which is not desirable for disassembly output. Overriding.
if (SymbolType == ELF::STT_COMMON) if (SymbolType == ELF::STT_COMMON)
Address = unwrapOrError(Obj->getSymbol(Symbol.getRawDataRefImpl()), Address = unwrapOrError(Obj.getSymbol(Symbol.getRawDataRefImpl()),
Obj->getFileName()) Obj.getFileName())
->st_value; ->st_value;
StringRef Name = unwrapOrError(Symbol.getName(), Obj->getFileName()); StringRef Name = unwrapOrError(Symbol.getName(), Obj.getFileName());
if (Name.empty()) if (Name.empty())
continue; continue;
section_iterator SecI = section_iterator SecI =
unwrapOrError(Symbol.getSection(), Obj->getFileName()); unwrapOrError(Symbol.getSection(), Obj.getFileName());
if (SecI == Obj->section_end()) if (SecI == Obj.section_end())
continue; continue;
AllSymbols[*SecI].emplace_back(Address, Name, SymbolType); AllSymbols[*SecI].emplace_back(Address, Name, SymbolType);
@ -730,24 +731,23 @@ addDynamicElfSymbols(const ELFObjectFile<ELFT> *Obj,
} }
static void static void
addDynamicElfSymbols(const ObjectFile *Obj, addDynamicElfSymbols(const ELFObjectFileBase &Obj,
std::map<SectionRef, SectionSymbolsTy> &AllSymbols) { std::map<SectionRef, SectionSymbolsTy> &AllSymbols) {
assert(Obj->isELF()); if (auto *Elf32LEObj = dyn_cast<ELF32LEObjectFile>(&Obj))
if (auto *Elf32LEObj = dyn_cast<ELF32LEObjectFile>(Obj)) addDynamicElfSymbols(*Elf32LEObj, AllSymbols);
addDynamicElfSymbols(Elf32LEObj, AllSymbols); else if (auto *Elf64LEObj = dyn_cast<ELF64LEObjectFile>(&Obj))
else if (auto *Elf64LEObj = dyn_cast<ELF64LEObjectFile>(Obj)) addDynamicElfSymbols(*Elf64LEObj, AllSymbols);
addDynamicElfSymbols(Elf64LEObj, AllSymbols); else if (auto *Elf32BEObj = dyn_cast<ELF32BEObjectFile>(&Obj))
else if (auto *Elf32BEObj = dyn_cast<ELF32BEObjectFile>(Obj)) addDynamicElfSymbols(*Elf32BEObj, AllSymbols);
addDynamicElfSymbols(Elf32BEObj, AllSymbols); else if (auto *Elf64BEObj = cast<ELF64BEObjectFile>(&Obj))
else if (auto *Elf64BEObj = cast<ELF64BEObjectFile>(Obj)) addDynamicElfSymbols(*Elf64BEObj, AllSymbols);
addDynamicElfSymbols(Elf64BEObj, AllSymbols);
else else
llvm_unreachable("Unsupported binary format"); llvm_unreachable("Unsupported binary format");
} }
static Optional<SectionRef> getWasmCodeSection(const WasmObjectFile *Obj) { static Optional<SectionRef> getWasmCodeSection(const WasmObjectFile &Obj) {
for (auto SecI : Obj->sections()) { for (auto SecI : Obj.sections()) {
const WasmSection &Section = Obj->getWasmSection(SecI); const WasmSection &Section = Obj.getWasmSection(SecI);
if (Section.Type == wasm::WASM_SEC_CODE) if (Section.Type == wasm::WASM_SEC_CODE)
return SecI; return SecI;
} }
@ -755,7 +755,7 @@ static Optional<SectionRef> getWasmCodeSection(const WasmObjectFile *Obj) {
} }
static void static void
addMissingWasmCodeSymbols(const WasmObjectFile *Obj, addMissingWasmCodeSymbols(const WasmObjectFile &Obj,
std::map<SectionRef, SectionSymbolsTy> &AllSymbols) { std::map<SectionRef, SectionSymbolsTy> &AllSymbols) {
Optional<SectionRef> Section = getWasmCodeSection(Obj); Optional<SectionRef> Section = getWasmCodeSection(Obj);
if (!Section) if (!Section)
@ -766,7 +766,7 @@ addMissingWasmCodeSymbols(const WasmObjectFile *Obj,
for (const auto &Sym : Symbols) for (const auto &Sym : Symbols)
SymbolAddresses.insert(Sym.Addr); SymbolAddresses.insert(Sym.Addr);
for (const wasm::WasmFunction &Function : Obj->functions()) { for (const wasm::WasmFunction &Function : Obj.functions()) {
uint64_t Address = Function.CodeSectionOffset; uint64_t Address = Function.CodeSectionOffset;
// Only add fallback symbols for functions not already present in the symbol // Only add fallback symbols for functions not already present in the symbol
// table. // table.
@ -782,11 +782,11 @@ addMissingWasmCodeSymbols(const WasmObjectFile *Obj,
} }
} }
static void addPltEntries(const ObjectFile *Obj, static void addPltEntries(const ObjectFile &Obj,
std::map<SectionRef, SectionSymbolsTy> &AllSymbols, std::map<SectionRef, SectionSymbolsTy> &AllSymbols,
StringSaver &Saver) { StringSaver &Saver) {
Optional<SectionRef> Plt = None; Optional<SectionRef> Plt = None;
for (const SectionRef &Section : Obj->sections()) { for (const SectionRef &Section : Obj.sections()) {
Expected<StringRef> SecNameOrErr = Section.getName(); Expected<StringRef> SecNameOrErr = Section.getName();
if (!SecNameOrErr) { if (!SecNameOrErr) {
consumeError(SecNameOrErr.takeError()); consumeError(SecNameOrErr.takeError());
@ -797,7 +797,7 @@ static void addPltEntries(const ObjectFile *Obj,
} }
if (!Plt) if (!Plt)
return; return;
if (auto *ElfObj = dyn_cast<ELFObjectFileBase>(Obj)) { if (auto *ElfObj = dyn_cast<ELFObjectFileBase>(&Obj)) {
for (auto PltEntry : ElfObj->getPltAddresses()) { for (auto PltEntry : ElfObj->getPltAddresses()) {
if (PltEntry.first) { if (PltEntry.first) {
SymbolRef Symbol(*PltEntry.first, ElfObj); SymbolRef Symbol(*PltEntry.first, ElfObj);
@ -815,7 +815,7 @@ static void addPltEntries(const ObjectFile *Obj,
} }
reportWarning("PLT entry at 0x" + Twine::utohexstr(PltEntry.second) + reportWarning("PLT entry at 0x" + Twine::utohexstr(PltEntry.second) +
" references an invalid symbol", " references an invalid symbol",
Obj->getFileName()); Obj.getFileName());
} }
} }
} }
@ -892,12 +892,12 @@ static char getMappingSymbolKind(ArrayRef<MappingSymbolPair> MappingSymbols,
} }
static uint64_t dumpARMELFData(uint64_t SectionAddr, uint64_t Index, static uint64_t dumpARMELFData(uint64_t SectionAddr, uint64_t Index,
uint64_t End, const ObjectFile *Obj, uint64_t End, const ObjectFile &Obj,
ArrayRef<uint8_t> Bytes, ArrayRef<uint8_t> Bytes,
ArrayRef<MappingSymbolPair> MappingSymbols, ArrayRef<MappingSymbolPair> MappingSymbols,
raw_ostream &OS) { raw_ostream &OS) {
support::endianness Endian = support::endianness Endian =
Obj->isLittleEndian() ? support::little : support::big; Obj.isLittleEndian() ? support::little : support::big;
OS << format("%8" PRIx64 ":\t", SectionAddr + Index); OS << format("%8" PRIx64 ":\t", SectionAddr + Index);
if (Index + 4 <= End) { if (Index + 4 <= End) {
dumpBytes(Bytes.slice(Index, 4), OS); dumpBytes(Bytes.slice(Index, 4), OS);
@ -952,34 +952,34 @@ static void dumpELFData(uint64_t SectionAddr, uint64_t Index, uint64_t End,
} }
} }
SymbolInfoTy objdump::createSymbolInfo(const ObjectFile *Obj, SymbolInfoTy objdump::createSymbolInfo(const ObjectFile &Obj,
const SymbolRef &Symbol) { const SymbolRef &Symbol) {
const StringRef FileName = Obj->getFileName(); const StringRef FileName = Obj.getFileName();
const uint64_t Addr = unwrapOrError(Symbol.getAddress(), FileName); const uint64_t Addr = unwrapOrError(Symbol.getAddress(), FileName);
const StringRef Name = unwrapOrError(Symbol.getName(), FileName); const StringRef Name = unwrapOrError(Symbol.getName(), FileName);
if (Obj->isXCOFF() && SymbolDescription) { if (Obj.isXCOFF() && SymbolDescription) {
const auto *XCOFFObj = cast<XCOFFObjectFile>(Obj); const auto &XCOFFObj = cast<XCOFFObjectFile>(Obj);
DataRefImpl SymbolDRI = Symbol.getRawDataRefImpl(); DataRefImpl SymbolDRI = Symbol.getRawDataRefImpl();
const uint32_t SymbolIndex = XCOFFObj->getSymbolIndex(SymbolDRI.p); const uint32_t SymbolIndex = XCOFFObj.getSymbolIndex(SymbolDRI.p);
Optional<XCOFF::StorageMappingClass> Smc = Optional<XCOFF::StorageMappingClass> Smc =
getXCOFFSymbolCsectSMC(XCOFFObj, Symbol); getXCOFFSymbolCsectSMC(XCOFFObj, Symbol);
return SymbolInfoTy(Addr, Name, Smc, SymbolIndex, return SymbolInfoTy(Addr, Name, Smc, SymbolIndex,
isLabel(XCOFFObj, Symbol)); isLabel(XCOFFObj, Symbol));
} else if (Obj->isXCOFF()) { } else if (Obj.isXCOFF()) {
const SymbolRef::Type SymType = unwrapOrError(Symbol.getType(), FileName); const SymbolRef::Type SymType = unwrapOrError(Symbol.getType(), FileName);
return SymbolInfoTy(Addr, Name, SymType, true); return SymbolInfoTy(Addr, Name, SymType, true);
} else } else
return SymbolInfoTy(Addr, Name, return SymbolInfoTy(Addr, Name,
Obj->isELF() ? getElfSymbolType(Obj, Symbol) Obj.isELF() ? getElfSymbolType(Obj, Symbol)
: (uint8_t)ELF::STT_NOTYPE); : (uint8_t)ELF::STT_NOTYPE);
} }
static SymbolInfoTy createDummySymbolInfo(const ObjectFile *Obj, static SymbolInfoTy createDummySymbolInfo(const ObjectFile &Obj,
const uint64_t Addr, StringRef &Name, const uint64_t Addr, StringRef &Name,
uint8_t Type) { uint8_t Type) {
if (Obj->isXCOFF() && SymbolDescription) if (Obj.isXCOFF() && SymbolDescription)
return SymbolInfoTy(Addr, Name, None, None, false); return SymbolInfoTy(Addr, Name, None, None, false);
else else
return SymbolInfoTy(Addr, Name, Type); return SymbolInfoTy(Addr, Name, Type);
@ -1131,14 +1131,14 @@ static void emitPostInstructionInfo(formatted_raw_ostream &FOS,
FOS.flush(); FOS.flush();
} }
static void disassembleObject(const Target *TheTarget, const ObjectFile *Obj, static void disassembleObject(const Target *TheTarget, const ObjectFile &Obj,
MCContext &Ctx, MCDisassembler *PrimaryDisAsm, MCContext &Ctx, MCDisassembler *PrimaryDisAsm,
MCDisassembler *SecondaryDisAsm, MCDisassembler *SecondaryDisAsm,
const MCInstrAnalysis *MIA, MCInstPrinter *IP, const MCInstrAnalysis *MIA, MCInstPrinter *IP,
const MCSubtargetInfo *PrimarySTI, const MCSubtargetInfo *PrimarySTI,
const MCSubtargetInfo *SecondarySTI, const MCSubtargetInfo *SecondarySTI,
PrettyPrinter &PIP, PrettyPrinter &PIP, SourcePrinter &SP,
SourcePrinter &SP, bool InlineRelocs) { bool InlineRelocs) {
const MCSubtargetInfo *STI = PrimarySTI; const MCSubtargetInfo *STI = PrimarySTI;
MCDisassembler *DisAsm = PrimaryDisAsm; MCDisassembler *DisAsm = PrimaryDisAsm;
bool PrimaryIsThumb = false; bool PrimaryIsThumb = false;
@ -1147,25 +1147,25 @@ static void disassembleObject(const Target *TheTarget, const ObjectFile *Obj,
std::map<SectionRef, std::vector<RelocationRef>> RelocMap; std::map<SectionRef, std::vector<RelocationRef>> RelocMap;
if (InlineRelocs) if (InlineRelocs)
RelocMap = getRelocsMap(*Obj); RelocMap = getRelocsMap(Obj);
bool Is64Bits = Obj->getBytesInAddress() > 4; bool Is64Bits = Obj.getBytesInAddress() > 4;
// Create a mapping from virtual address to symbol name. This is used to // Create a mapping from virtual address to symbol name. This is used to
// pretty print the symbols while disassembling. // pretty print the symbols while disassembling.
std::map<SectionRef, SectionSymbolsTy> AllSymbols; std::map<SectionRef, SectionSymbolsTy> AllSymbols;
SectionSymbolsTy AbsoluteSymbols; SectionSymbolsTy AbsoluteSymbols;
const StringRef FileName = Obj->getFileName(); const StringRef FileName = Obj.getFileName();
const MachOObjectFile *MachO = dyn_cast<const MachOObjectFile>(Obj); const MachOObjectFile *MachO = dyn_cast<const MachOObjectFile>(&Obj);
for (const SymbolRef &Symbol : Obj->symbols()) { for (const SymbolRef &Symbol : Obj.symbols()) {
Expected<StringRef> NameOrErr = Symbol.getName(); Expected<StringRef> NameOrErr = Symbol.getName();
if (!NameOrErr) { if (!NameOrErr) {
reportWarning(toString(NameOrErr.takeError()), FileName); reportWarning(toString(NameOrErr.takeError()), FileName);
continue; continue;
} }
if (NameOrErr->empty() && !(Obj->isXCOFF() && SymbolDescription)) if (NameOrErr->empty() && !(Obj.isXCOFF() && SymbolDescription))
continue; continue;
if (Obj->isELF() && getElfSymbolType(Obj, Symbol) == ELF::STT_SECTION) if (Obj.isELF() && getElfSymbolType(Obj, Symbol) == ELF::STT_SECTION)
continue; continue;
if (MachO) { if (MachO) {
@ -1186,16 +1186,16 @@ static void disassembleObject(const Target *TheTarget, const ObjectFile *Obj,
} }
section_iterator SecI = unwrapOrError(Symbol.getSection(), FileName); section_iterator SecI = unwrapOrError(Symbol.getSection(), FileName);
if (SecI != Obj->section_end()) if (SecI != Obj.section_end())
AllSymbols[*SecI].push_back(createSymbolInfo(Obj, Symbol)); AllSymbols[*SecI].push_back(createSymbolInfo(Obj, Symbol));
else else
AbsoluteSymbols.push_back(createSymbolInfo(Obj, Symbol)); AbsoluteSymbols.push_back(createSymbolInfo(Obj, Symbol));
} }
if (AllSymbols.empty() && Obj->isELF()) if (AllSymbols.empty() && Obj.isELF())
addDynamicElfSymbols(Obj, AllSymbols); addDynamicElfSymbols(cast<ELFObjectFileBase>(Obj), AllSymbols);
if (Obj->isWasm()) if (Obj.isWasm())
addMissingWasmCodeSymbols(cast<WasmObjectFile>(Obj), AllSymbols); addMissingWasmCodeSymbols(cast<WasmObjectFile>(Obj), AllSymbols);
BumpPtrAllocator A; BumpPtrAllocator A;
@ -1207,7 +1207,7 @@ static void disassembleObject(const Target *TheTarget, const ObjectFile *Obj,
// before same-addressed non-empty sections so that symbol lookups prefer the // before same-addressed non-empty sections so that symbol lookups prefer the
// non-empty section. // non-empty section.
std::vector<std::pair<uint64_t, SectionRef>> SectionAddresses; std::vector<std::pair<uint64_t, SectionRef>> SectionAddresses;
for (SectionRef Sec : Obj->sections()) for (SectionRef Sec : Obj.sections())
SectionAddresses.emplace_back(Sec.getAddress(), Sec); SectionAddresses.emplace_back(Sec.getAddress(), Sec);
llvm::stable_sort(SectionAddresses, [](const auto &LHS, const auto &RHS) { llvm::stable_sort(SectionAddresses, [](const auto &LHS, const auto &RHS) {
if (LHS.first != RHS.first) if (LHS.first != RHS.first)
@ -1217,17 +1217,17 @@ static void disassembleObject(const Target *TheTarget, const ObjectFile *Obj,
// Linked executables (.exe and .dll files) typically don't include a real // Linked executables (.exe and .dll files) typically don't include a real
// symbol table but they might contain an export table. // symbol table but they might contain an export table.
if (const auto *COFFObj = dyn_cast<COFFObjectFile>(Obj)) { if (const auto *COFFObj = dyn_cast<COFFObjectFile>(&Obj)) {
for (const auto &ExportEntry : COFFObj->export_directories()) { for (const auto &ExportEntry : COFFObj->export_directories()) {
StringRef Name; StringRef Name;
if (Error E = ExportEntry.getSymbolName(Name)) if (Error E = ExportEntry.getSymbolName(Name))
reportError(std::move(E), Obj->getFileName()); reportError(std::move(E), Obj.getFileName());
if (Name.empty()) if (Name.empty())
continue; continue;
uint32_t RVA; uint32_t RVA;
if (Error E = ExportEntry.getExportRVA(RVA)) if (Error E = ExportEntry.getExportRVA(RVA))
reportError(std::move(E), Obj->getFileName()); reportError(std::move(E), Obj.getFileName());
uint64_t VA = COFFObj->getImageBase() + RVA; uint64_t VA = COFFObj->getImageBase() + RVA;
auto Sec = partition_point( auto Sec = partition_point(
@ -1254,14 +1254,14 @@ static void disassembleObject(const Target *TheTarget, const ObjectFile *Obj,
LiveVariablePrinter LVP(*Ctx.getRegisterInfo(), *STI); LiveVariablePrinter LVP(*Ctx.getRegisterInfo(), *STI);
if (DbgVariables != DVDisabled) { if (DbgVariables != DVDisabled) {
DICtx = DWARFContext::create(*Obj); DICtx = DWARFContext::create(Obj);
for (const std::unique_ptr<DWARFUnit> &CU : DICtx->compile_units()) for (const std::unique_ptr<DWARFUnit> &CU : DICtx->compile_units())
LVP.addCompileUnit(CU->getUnitDIE(false)); LVP.addCompileUnit(CU->getUnitDIE(false));
} }
LLVM_DEBUG(LVP.dump()); LLVM_DEBUG(LVP.dump());
for (const SectionRef &Section : ToolSectionFilter(*Obj)) { for (const SectionRef &Section : ToolSectionFilter(Obj)) {
if (FilterSections.empty() && !DisassembleAll && if (FilterSections.empty() && !DisassembleAll &&
(!Section.isText() || Section.isVirtual())) (!Section.isText() || Section.isVirtual()))
continue; continue;
@ -1273,12 +1273,12 @@ static void disassembleObject(const Target *TheTarget, const ObjectFile *Obj,
std::unordered_map<uint64_t, BBAddrMap> AddrToBBAddrMap; std::unordered_map<uint64_t, BBAddrMap> AddrToBBAddrMap;
if (SymbolizeOperands) { if (SymbolizeOperands) {
if (auto *Elf = dyn_cast<ELFObjectFileBase>(Obj)) { if (auto *Elf = dyn_cast<ELFObjectFileBase>(&Obj)) {
// Read the BB-address-map corresponding to this section, if present. // Read the BB-address-map corresponding to this section, if present.
auto SectionBBAddrMapsOrErr = Elf->readBBAddrMap(Section.getIndex()); auto SectionBBAddrMapsOrErr = Elf->readBBAddrMap(Section.getIndex());
if (!SectionBBAddrMapsOrErr) if (!SectionBBAddrMapsOrErr)
reportWarning(toString(SectionBBAddrMapsOrErr.takeError()), reportWarning(toString(SectionBBAddrMapsOrErr.takeError()),
Obj->getFileName()); Obj.getFileName());
for (auto &FunctionBBAddrMap : *SectionBBAddrMapsOrErr) for (auto &FunctionBBAddrMap : *SectionBBAddrMapsOrErr)
AddrToBBAddrMap.emplace(FunctionBBAddrMap.Addr, AddrToBBAddrMap.emplace(FunctionBBAddrMap.Addr,
std::move(FunctionBBAddrMap)); std::move(FunctionBBAddrMap));
@ -1306,17 +1306,17 @@ static void disassembleObject(const Target *TheTarget, const ObjectFile *Obj,
llvm::sort(MappingSymbols); llvm::sort(MappingSymbols);
ArrayRef<uint8_t> Bytes = arrayRefFromStringRef( ArrayRef<uint8_t> Bytes = arrayRefFromStringRef(
unwrapOrError(Section.getContents(), Obj->getFileName())); unwrapOrError(Section.getContents(), Obj.getFileName()));
std::vector<std::unique_ptr<std::string>> SynthesizedLabelNames; std::vector<std::unique_ptr<std::string>> SynthesizedLabelNames;
if (Obj->isELF() && Obj->getArch() == Triple::amdgcn) { if (Obj.isELF() && Obj.getArch() == Triple::amdgcn) {
// AMDGPU disassembler uses symbolizer for printing labels // AMDGPU disassembler uses symbolizer for printing labels
addSymbolizer(Ctx, TheTarget, TripleName, DisAsm, SectionAddr, Bytes, addSymbolizer(Ctx, TheTarget, TripleName, DisAsm, SectionAddr, Bytes,
Symbols, SynthesizedLabelNames); Symbols, SynthesizedLabelNames);
} }
StringRef SegmentName = getSegmentName(MachO, Section); StringRef SegmentName = getSegmentName(MachO, Section);
StringRef SectionName = unwrapOrError(Section.getName(), Obj->getFileName()); StringRef SectionName = unwrapOrError(Section.getName(), Obj.getFileName());
// If the section has no symbol at the start, just insert a dummy one. // If the section has no symbol at the start, just insert a dummy one.
if (Symbols.empty() || Symbols[0].Addr != 0) { if (Symbols.empty() || Symbols[0].Addr != 0) {
Symbols.insert(Symbols.begin(), Symbols.insert(Symbols.begin(),
@ -1335,7 +1335,7 @@ static void disassembleObject(const Target *TheTarget, const ObjectFile *Obj,
// In executable and shared objects, r_offset holds a virtual address. // In executable and shared objects, r_offset holds a virtual address.
// Subtract SectionAddr from the r_offset field of a relocation to get // Subtract SectionAddr from the r_offset field of a relocation to get
// the section offset. // the section offset.
uint64_t RelAdjustment = Obj->isRelocatableObject() ? 0 : SectionAddr; uint64_t RelAdjustment = Obj.isRelocatableObject() ? 0 : SectionAddr;
uint64_t Size; uint64_t Size;
uint64_t Index; uint64_t Index;
bool PrintedSection = false; bool PrintedSection = false;
@ -1381,7 +1381,7 @@ static void disassembleObject(const Target *TheTarget, const ObjectFile *Obj,
if (LeadingAddr) if (LeadingAddr)
outs() << format(Is64Bits ? "%016" PRIx64 " " : "%08" PRIx64 " ", outs() << format(Is64Bits ? "%016" PRIx64 " " : "%08" PRIx64 " ",
SectionAddr + Start + VMAAdjustment); SectionAddr + Start + VMAAdjustment);
if (Obj->isXCOFF() && SymbolDescription) { if (Obj.isXCOFF() && SymbolDescription) {
outs() << getXCOFFSymbolDescription(Symbols[SI], SymbolName) << ":\n"; outs() << getXCOFFSymbolDescription(Symbols[SI], SymbolName) << ":\n";
} else } else
outs() << '<' << SymbolName << ">:\n"; outs() << '<' << SymbolName << ">:\n";
@ -1433,7 +1433,7 @@ static void disassembleObject(const Target *TheTarget, const ObjectFile *Obj,
// If there is a data/common symbol inside an ELF text section and we are // If there is a data/common symbol inside an ELF text section and we are
// only disassembling text (applicable all architectures), we are in a // only disassembling text (applicable all architectures), we are in a
// situation where we must print the data and not disassemble it. // situation where we must print the data and not disassemble it.
if (Obj->isELF() && !DisassembleAll && Section.isText()) { if (Obj.isELF() && !DisassembleAll && Section.isText()) {
uint8_t SymTy = Symbols[SI].Type; uint8_t SymTy = Symbols[SI].Type;
if (SymTy == ELF::STT_OBJECT || SymTy == ELF::STT_COMMON) { if (SymTy == ELF::STT_OBJECT || SymTy == ELF::STT_COMMON) {
dumpELFData(SectionAddr, Index, End, Bytes); dumpELFData(SectionAddr, Index, End, Bytes);
@ -1525,7 +1525,7 @@ static void disassembleObject(const Target *TheTarget, const ObjectFile *Obj,
PIP.printInst( PIP.printInst(
*IP, Disassembled ? &Inst : nullptr, Bytes.slice(Index, Size), *IP, Disassembled ? &Inst : nullptr, Bytes.slice(Index, Size),
{SectionAddr + Index + VMAAdjustment, Section.getIndex()}, FOS, {SectionAddr + Index + VMAAdjustment, Section.getIndex()}, FOS,
"", *STI, &SP, Obj->getFileName(), &Rels, LVP); "", *STI, &SP, Obj.getFileName(), &Rels, LVP);
IP->setCommentStream(llvm::nulls()); IP->setCommentStream(llvm::nulls());
@ -1563,7 +1563,7 @@ static void disassembleObject(const Target *TheTarget, const ObjectFile *Obj,
// //
// N.B. We don't walk the relocations in the relocatable case yet. // N.B. We don't walk the relocations in the relocatable case yet.
std::vector<const SectionSymbolsTy *> TargetSectionSymbols; std::vector<const SectionSymbolsTy *> TargetSectionSymbols;
if (!Obj->isRelocatableObject()) { if (!Obj.isRelocatableObject()) {
auto It = llvm::partition_point( auto It = llvm::partition_point(
SectionAddresses, SectionAddresses,
[=](const std::pair<uint64_t, SectionRef> &O) { [=](const std::pair<uint64_t, SectionRef> &O) {
@ -1644,7 +1644,7 @@ static void disassembleObject(const Target *TheTarget, const ObjectFile *Obj,
Comments.clear(); Comments.clear();
// Hexagon does this in pretty printer // Hexagon does this in pretty printer
if (Obj->getArch() != Triple::hexagon) { if (Obj.getArch() != Triple::hexagon) {
// Print relocation for instruction and data. // Print relocation for instruction and data.
while (RelCur != RelEnd) { while (RelCur != RelEnd) {
uint64_t Offset = RelCur->getOffset() - RelAdjustment; uint64_t Offset = RelCur->getOffset() - RelAdjustment;
@ -1663,15 +1663,15 @@ static void disassembleObject(const Target *TheTarget, const ObjectFile *Obj,
break; break;
// When --adjust-vma is used, update the address printed. // When --adjust-vma is used, update the address printed.
if (RelCur->getSymbol() != Obj->symbol_end()) { if (RelCur->getSymbol() != Obj.symbol_end()) {
Expected<section_iterator> SymSI = Expected<section_iterator> SymSI =
RelCur->getSymbol()->getSection(); RelCur->getSymbol()->getSection();
if (SymSI && *SymSI != Obj->section_end() && if (SymSI && *SymSI != Obj.section_end() &&
shouldAdjustVA(**SymSI)) shouldAdjustVA(**SymSI))
Offset += AdjustVMA; Offset += AdjustVMA;
} }
printRelocation(FOS, Obj->getFileName(), *RelCur, printRelocation(FOS, Obj.getFileName(), *RelCur,
SectionAddr + Offset, Is64Bits); SectionAddr + Offset, Is64Bits);
LVP.printAfterOtherLine(FOS, true); LVP.printAfterOtherLine(FOS, true);
++RelCur; ++RelCur;
@ -1743,7 +1743,7 @@ static void disassembleObject(const ObjectFile *Obj, bool InlineRelocs) {
// appropriate. // appropriate.
std::unique_ptr<MCDisassembler> SecondaryDisAsm; std::unique_ptr<MCDisassembler> SecondaryDisAsm;
std::unique_ptr<const MCSubtargetInfo> SecondarySTI; std::unique_ptr<const MCSubtargetInfo> SecondarySTI;
if (isArmElf(Obj) && !STI->checkFeatures("+mclass")) { if (isArmElf(*Obj) && !STI->checkFeatures("+mclass")) {
if (STI->checkFeatures("+thumb-mode")) if (STI->checkFeatures("+thumb-mode"))
Features.AddFeature("-thumb-mode"); Features.AddFeature("-thumb-mode");
else else
@ -1775,9 +1775,9 @@ static void disassembleObject(const ObjectFile *Obj, bool InlineRelocs) {
reportError(Obj->getFileName(), reportError(Obj->getFileName(),
"Unrecognized disassembler option: " + Opt); "Unrecognized disassembler option: " + Opt);
disassembleObject(TheTarget, Obj, Ctx, DisAsm.get(), SecondaryDisAsm.get(), disassembleObject(TheTarget, *Obj, Ctx, DisAsm.get(), SecondaryDisAsm.get(),
MIA.get(), IP.get(), STI.get(), SecondarySTI.get(), PIP, MIA.get(), IP.get(), STI.get(), SecondarySTI.get(), PIP, SP,
SP, InlineRelocs); InlineRelocs);
} }
void objdump::printRelocations(const ObjectFile *Obj) { void objdump::printRelocations(const ObjectFile *Obj) {
@ -1871,28 +1871,28 @@ void objdump::printDynamicRelocations(const ObjectFile *Obj) {
// Returns true if we need to show LMA column when dumping section headers. We // Returns true if we need to show LMA column when dumping section headers. We
// show it only when the platform is ELF and either we have at least one section // show it only when the platform is ELF and either we have at least one section
// whose VMA and LMA are different and/or when --show-lma flag is used. // whose VMA and LMA are different and/or when --show-lma flag is used.
static bool shouldDisplayLMA(const ObjectFile *Obj) { static bool shouldDisplayLMA(const ObjectFile &Obj) {
if (!Obj->isELF()) if (!Obj.isELF())
return false; return false;
for (const SectionRef &S : ToolSectionFilter(*Obj)) for (const SectionRef &S : ToolSectionFilter(Obj))
if (S.getAddress() != getELFSectionLMA(S)) if (S.getAddress() != getELFSectionLMA(S))
return true; return true;
return ShowLMA; return ShowLMA;
} }
static size_t getMaxSectionNameWidth(const ObjectFile *Obj) { static size_t getMaxSectionNameWidth(const ObjectFile &Obj) {
// Default column width for names is 13 even if no names are that long. // Default column width for names is 13 even if no names are that long.
size_t MaxWidth = 13; size_t MaxWidth = 13;
for (const SectionRef &Section : ToolSectionFilter(*Obj)) { for (const SectionRef &Section : ToolSectionFilter(Obj)) {
StringRef Name = unwrapOrError(Section.getName(), Obj->getFileName()); StringRef Name = unwrapOrError(Section.getName(), Obj.getFileName());
MaxWidth = std::max(MaxWidth, Name.size()); MaxWidth = std::max(MaxWidth, Name.size());
} }
return MaxWidth; return MaxWidth;
} }
void objdump::printSectionHeaders(const ObjectFile *Obj) { void objdump::printSectionHeaders(const ObjectFile &Obj) {
size_t NameWidth = getMaxSectionNameWidth(Obj); size_t NameWidth = getMaxSectionNameWidth(Obj);
size_t AddressWidth = 2 * Obj->getBytesInAddress(); size_t AddressWidth = 2 * Obj.getBytesInAddress();
bool HasLMAColumn = shouldDisplayLMA(Obj); bool HasLMAColumn = shouldDisplayLMA(Obj);
outs() << "\nSections:\n"; outs() << "\nSections:\n";
if (HasLMAColumn) if (HasLMAColumn)
@ -1904,8 +1904,8 @@ void objdump::printSectionHeaders(const ObjectFile *Obj) {
<< left_justify("VMA", AddressWidth) << " Type\n"; << left_justify("VMA", AddressWidth) << " Type\n";
uint64_t Idx; uint64_t Idx;
for (const SectionRef &Section : ToolSectionFilter(*Obj, &Idx)) { for (const SectionRef &Section : ToolSectionFilter(Obj, &Idx)) {
StringRef Name = unwrapOrError(Section.getName(), Obj->getFileName()); StringRef Name = unwrapOrError(Section.getName(), Obj.getFileName());
uint64_t VMA = Section.getAddress(); uint64_t VMA = Section.getAddress();
if (shouldAdjustVA(Section)) if (shouldAdjustVA(Section))
VMA += AdjustVMA; VMA += AdjustVMA;
@ -1983,33 +1983,33 @@ void objdump::printSectionContents(const ObjectFile *Obj) {
} }
} }
void objdump::printSymbolTable(const ObjectFile *O, StringRef ArchiveName, void objdump::printSymbolTable(const ObjectFile &O, StringRef ArchiveName,
StringRef ArchitectureName, bool DumpDynamic) { StringRef ArchitectureName, bool DumpDynamic) {
if (O->isCOFF() && !DumpDynamic) { if (O.isCOFF() && !DumpDynamic) {
outs() << "\nSYMBOL TABLE:\n"; outs() << "\nSYMBOL TABLE:\n";
printCOFFSymbolTable(cast<const COFFObjectFile>(O)); printCOFFSymbolTable(cast<const COFFObjectFile>(O));
return; return;
} }
const StringRef FileName = O->getFileName(); const StringRef FileName = O.getFileName();
if (!DumpDynamic) { if (!DumpDynamic) {
outs() << "\nSYMBOL TABLE:\n"; outs() << "\nSYMBOL TABLE:\n";
for (auto I = O->symbol_begin(); I != O->symbol_end(); ++I) for (auto I = O.symbol_begin(); I != O.symbol_end(); ++I)
printSymbol(O, *I, {}, FileName, ArchiveName, ArchitectureName, printSymbol(O, *I, {}, FileName, ArchiveName, ArchitectureName,
DumpDynamic); DumpDynamic);
return; return;
} }
outs() << "\nDYNAMIC SYMBOL TABLE:\n"; outs() << "\nDYNAMIC SYMBOL TABLE:\n";
if (!O->isELF()) { if (!O.isELF()) {
reportWarning( reportWarning(
"this operation is not currently supported for this file format", "this operation is not currently supported for this file format",
FileName); FileName);
return; return;
} }
const ELFObjectFileBase *ELF = cast<const ELFObjectFileBase>(O); const ELFObjectFileBase *ELF = cast<const ELFObjectFileBase>(&O);
auto Symbols = ELF->getDynamicSymbolIterators(); auto Symbols = ELF->getDynamicSymbolIterators();
Expected<std::vector<VersionEntry>> SymbolVersionsOrErr = Expected<std::vector<VersionEntry>> SymbolVersionsOrErr =
ELF->readDynsymVersions(); ELF->readDynsymVersions();
@ -2023,11 +2023,11 @@ void objdump::printSymbolTable(const ObjectFile *O, StringRef ArchiveName,
ArchitectureName, DumpDynamic); ArchitectureName, DumpDynamic);
} }
void objdump::printSymbol(const ObjectFile *O, const SymbolRef &Symbol, void objdump::printSymbol(const ObjectFile &O, const SymbolRef &Symbol,
ArrayRef<VersionEntry> SymbolVersions, ArrayRef<VersionEntry> SymbolVersions,
StringRef FileName, StringRef ArchiveName, StringRef FileName, StringRef ArchiveName,
StringRef ArchitectureName, bool DumpDynamic) { StringRef ArchitectureName, bool DumpDynamic) {
const MachOObjectFile *MachO = dyn_cast<const MachOObjectFile>(O); const MachOObjectFile *MachO = dyn_cast<const MachOObjectFile>(&O);
uint64_t Address = unwrapOrError(Symbol.getAddress(), FileName, ArchiveName, uint64_t Address = unwrapOrError(Symbol.getAddress(), FileName, ArchiveName,
ArchitectureName); ArchitectureName);
if ((Address < StartAddress) || (Address > StopAddress)) if ((Address < StartAddress) || (Address > StopAddress))
@ -2050,12 +2050,12 @@ void objdump::printSymbol(const ObjectFile *O, const SymbolRef &Symbol,
IsSTAB = true; IsSTAB = true;
} }
section_iterator Section = IsSTAB section_iterator Section = IsSTAB
? O->section_end() ? O.section_end()
: unwrapOrError(Symbol.getSection(), FileName, : unwrapOrError(Symbol.getSection(), FileName,
ArchiveName, ArchitectureName); ArchiveName, ArchitectureName);
StringRef Name; StringRef Name;
if (Type == SymbolRef::ST_Debug && Section != O->section_end()) { if (Type == SymbolRef::ST_Debug && Section != O.section_end()) {
if (Expected<StringRef> NameOrErr = Section->getName()) if (Expected<StringRef> NameOrErr = Section->getName())
Name = *NameOrErr; Name = *NameOrErr;
else else
@ -2073,10 +2073,10 @@ void objdump::printSymbol(const ObjectFile *O, const SymbolRef &Symbol,
bool Hidden = Flags & SymbolRef::SF_Hidden; bool Hidden = Flags & SymbolRef::SF_Hidden;
char GlobLoc = ' '; char GlobLoc = ' ';
if ((Section != O->section_end() || Absolute) && !Weak) if ((Section != O.section_end() || Absolute) && !Weak)
GlobLoc = Global ? 'g' : 'l'; GlobLoc = Global ? 'g' : 'l';
char IFunc = ' '; char IFunc = ' ';
if (O->isELF()) { if (O.isELF()) {
if (ELFSymbolRef(Symbol).getELFType() == ELF::STT_GNU_IFUNC) if (ELFSymbolRef(Symbol).getELFType() == ELF::STT_GNU_IFUNC)
IFunc = 'i'; IFunc = 'i';
if (ELFSymbolRef(Symbol).getBinding() == ELF::STB_GNU_UNIQUE) if (ELFSymbolRef(Symbol).getBinding() == ELF::STB_GNU_UNIQUE)
@ -2097,7 +2097,7 @@ void objdump::printSymbol(const ObjectFile *O, const SymbolRef &Symbol,
else if (Type == SymbolRef::ST_Data) else if (Type == SymbolRef::ST_Data)
FileFunc = 'O'; FileFunc = 'O';
const char *Fmt = O->getBytesInAddress() > 4 ? "%016" PRIx64 : "%08" PRIx64; const char *Fmt = O.getBytesInAddress() > 4 ? "%016" PRIx64 : "%08" PRIx64;
outs() << format(Fmt, Address) << " " outs() << format(Fmt, Address) << " "
<< GlobLoc // Local -> 'l', Global -> 'g', Neither -> ' ' << GlobLoc // Local -> 'l', Global -> 'g', Neither -> ' '
@ -2112,9 +2112,9 @@ void objdump::printSymbol(const ObjectFile *O, const SymbolRef &Symbol,
outs() << "*ABS*"; outs() << "*ABS*";
} else if (Common) { } else if (Common) {
outs() << "*COM*"; outs() << "*COM*";
} else if (Section == O->section_end()) { } else if (Section == O.section_end()) {
if (O->isXCOFF()) { if (O.isXCOFF()) {
XCOFFSymbolRef XCOFFSym = dyn_cast<const XCOFFObjectFile>(O)->toSymbolRef( XCOFFSymbolRef XCOFFSym = cast<const XCOFFObjectFile>(O).toSymbolRef(
Symbol.getRawDataRefImpl()); Symbol.getRawDataRefImpl());
if (XCOFF::N_DEBUG == XCOFFSym.getSectionNumber()) if (XCOFF::N_DEBUG == XCOFFSym.getSectionNumber())
outs() << "*DEBUG*"; outs() << "*DEBUG*";
@ -2128,9 +2128,9 @@ void objdump::printSymbol(const ObjectFile *O, const SymbolRef &Symbol,
outs() << SegmentName << ","; outs() << SegmentName << ",";
StringRef SectionName = unwrapOrError(Section->getName(), FileName); StringRef SectionName = unwrapOrError(Section->getName(), FileName);
outs() << SectionName; outs() << SectionName;
if (O->isXCOFF()) { if (O.isXCOFF()) {
Optional<SymbolRef> SymRef = getXCOFFSymbolContainingSymbolRef( Optional<SymbolRef> SymRef =
dyn_cast<const XCOFFObjectFile>(O), Symbol); getXCOFFSymbolContainingSymbolRef(cast<XCOFFObjectFile>(O), Symbol);
if (SymRef) { if (SymRef) {
Expected<StringRef> NameOrErr = SymRef->getName(); Expected<StringRef> NameOrErr = SymRef->getName();
@ -2156,14 +2156,14 @@ void objdump::printSymbol(const ObjectFile *O, const SymbolRef &Symbol,
if (Common) if (Common)
outs() << '\t' << format(Fmt, static_cast<uint64_t>(Symbol.getAlignment())); outs() << '\t' << format(Fmt, static_cast<uint64_t>(Symbol.getAlignment()));
else if (O->isXCOFF()) else if (O.isXCOFF())
outs() << '\t' outs() << '\t'
<< format(Fmt, dyn_cast<const XCOFFObjectFile>(O)->getSymbolSize( << format(Fmt, cast<XCOFFObjectFile>(O).getSymbolSize(
Symbol.getRawDataRefImpl())); Symbol.getRawDataRefImpl()));
else if (O->isELF()) else if (O.isELF())
outs() << '\t' << format(Fmt, ELFSymbolRef(Symbol).getSize()); outs() << '\t' << format(Fmt, ELFSymbolRef(Symbol).getSize());
if (O->isELF()) { if (O.isELF()) {
if (!SymbolVersions.empty()) { if (!SymbolVersions.empty()) {
const VersionEntry &Ver = const VersionEntry &Ver =
SymbolVersions[Symbol.getRawDataRefImpl().d.b - 1]; SymbolVersions[Symbol.getRawDataRefImpl().d.b - 1];
@ -2198,7 +2198,7 @@ void objdump::printSymbol(const ObjectFile *O, const SymbolRef &Symbol,
if (Demangle) if (Demangle)
SymName = demangle(SymName); SymName = demangle(SymName);
if (O->isXCOFF() && SymbolDescription) if (O.isXCOFF() && SymbolDescription)
SymName = getXCOFFSymbolDescription(createSymbolInfo(O, Symbol), SymName); SymName = getXCOFFSymbolDescription(createSymbolInfo(O, Symbol), SymName);
outs() << ' ' << SymName << '\n'; outs() << ' ' << SymName << '\n';
@ -2442,11 +2442,11 @@ static void dumpObject(ObjectFile *O, const Archive *A = nullptr,
if (PrivateHeaders || FirstPrivateHeader) if (PrivateHeaders || FirstPrivateHeader)
printPrivateFileHeaders(O, FirstPrivateHeader); printPrivateFileHeaders(O, FirstPrivateHeader);
if (SectionHeaders) if (SectionHeaders)
printSectionHeaders(O); printSectionHeaders(*O);
if (SymbolTable) if (SymbolTable)
printSymbolTable(O, ArchiveName); printSymbolTable(*O, ArchiveName);
if (DynamicSymbolTable) if (DynamicSymbolTable)
printSymbolTable(O, ArchiveName, /*ArchitectureName=*/"", printSymbolTable(*O, ArchiveName, /*ArchitectureName=*/"",
/*DumpDynamic=*/true); /*DumpDynamic=*/true);
if (DwarfDumpType != DIDT_Null) { if (DwarfDumpType != DIDT_Null) {
std::unique_ptr<DIContext> DICtx = DWARFContext::create(*O); std::unique_ptr<DIContext> DICtx = DWARFContext::create(*O);
@ -2501,7 +2501,7 @@ static void dumpObject(const COFFImportFile *I, const Archive *A,
if (ArchiveHeaders && !MachOOpt && C) if (ArchiveHeaders && !MachOOpt && C)
printArchiveChild(ArchiveName, *C); printArchiveChild(ArchiveName, *C);
if (SymbolTable) if (SymbolTable)
printCOFFSymbolTable(I); printCOFFSymbolTable(*I);
} }
/// Dump each object file in \a a; /// Dump each object file in \a a;

8
llvm/tools/llvm-objdump/llvm-objdump.h
View File

@ -124,12 +124,12 @@ SectionFilter ToolSectionFilter(llvm::object::ObjectFile const &O,
bool isRelocAddressLess(object::RelocationRef A, object::RelocationRef B); bool isRelocAddressLess(object::RelocationRef A, object::RelocationRef B);
void printRelocations(const object::ObjectFile *O); void printRelocations(const object::ObjectFile *O);
void printDynamicRelocations(const object::ObjectFile *O); void printDynamicRelocations(const object::ObjectFile *O);
void printSectionHeaders(const object::ObjectFile *O); void printSectionHeaders(const object::ObjectFile &O);
void printSectionContents(const object::ObjectFile *O); void printSectionContents(const object::ObjectFile *O);
void printSymbolTable(const object::ObjectFile *O, StringRef ArchiveName, void printSymbolTable(const object::ObjectFile &O, StringRef ArchiveName,
StringRef ArchitectureName = StringRef(), StringRef ArchitectureName = StringRef(),
bool DumpDynamic = false); bool DumpDynamic = false);
void printSymbol(const object::ObjectFile *O, const object::SymbolRef &Symbol, void printSymbol(const object::ObjectFile &O, const object::SymbolRef &Symbol,
ArrayRef<object::VersionEntry> SymbolVersions, ArrayRef<object::VersionEntry> SymbolVersions,
StringRef FileName, StringRef ArchiveName, StringRef FileName, StringRef ArchiveName,
StringRef ArchitectureName, bool DumpDynamic); StringRef ArchitectureName, bool DumpDynamic);
@ -148,7 +148,7 @@ T unwrapOrError(Expected<T> EO, Ts &&... Args) {
std::string getFileNameForError(const object::Archive::Child &C, std::string getFileNameForError(const object::Archive::Child &C,
unsigned Index); unsigned Index);
SymbolInfoTy createSymbolInfo(const object::ObjectFile *Obj, SymbolInfoTy createSymbolInfo(const object::ObjectFile &Obj,
const object::SymbolRef &Symbol); const object::SymbolRef &Symbol);
} // namespace objdump } // namespace objdump