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

[llvm-objdump] Move llvm:: to llvm::objdump:: and qualifying definitions with objdump:: 

Or adding `static`.

Qualifying definitions with `objdump::` comforms to the coding standards
https://llvm.org/docs/CodingStandards.html#use-namespace-qualifiers-to-implement-previously-declared-functions
This commit is contained in:
Fangrui Song 2020-05-30 18:00:14 -07:00
parent a23d1e9aff
commit 439d27d79f
3 changed files with 28 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -27,6 +27,7 @@
#include "llvm/Support/raw_ostream.h" #include "llvm/Support/raw_ostream.h"
using namespace llvm; using namespace llvm;
using namespace llvm::objdump;
using namespace llvm::object; using namespace llvm::object;
using namespace llvm::Win64EH; using namespace llvm::Win64EH;

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

@ -388,7 +388,8 @@ static FilterResult checkSectionFilter(object::SectionRef S) {
namespace llvm { namespace llvm {
SectionFilter ToolSectionFilter(object::ObjectFile const &O, uint64_t *Idx) { SectionFilter objdump::ToolSectionFilter(object::ObjectFile const &O,
uint64_t *Idx) {
// Start at UINT64_MAX so that the first index returned after an increment is // Start at UINT64_MAX so that the first index returned after an increment is
// zero (after the unsigned wrap). // zero (after the unsigned wrap).
if (Idx) if (Idx)
@ -403,8 +404,8 @@ SectionFilter ToolSectionFilter(object::ObjectFile const &O, uint64_t *Idx) {
O); O);
} }
std::string getFileNameForError(const object::Archive::Child &C, std::string objdump::getFileNameForError(const object::Archive::Child &C,
unsigned Index) { unsigned Index) {
Expected<StringRef> NameOrErr = C.getName(); Expected<StringRef> NameOrErr = C.getName();
if (NameOrErr) if (NameOrErr)
return std::string(NameOrErr.get()); return std::string(NameOrErr.get());
@ -414,7 +415,7 @@ std::string getFileNameForError(const object::Archive::Child &C,
return "<file index: " + std::to_string(Index) + ">"; return "<file index: " + std::to_string(Index) + ">";
} }
void reportWarning(Twine Message, StringRef File) { void objdump::reportWarning(Twine Message, StringRef File) {
// Output order between errs() and outs() matters especially for archive // Output order between errs() and outs() matters especially for archive
// files where the output is per member object. // files where the output is per member object.
outs().flush(); outs().flush();
@ -422,15 +423,16 @@ void reportWarning(Twine Message, StringRef File) {
<< "'" << File << "': " << Message << "\n"; << "'" << File << "': " << Message << "\n";
} }
LLVM_ATTRIBUTE_NORETURN void reportError(StringRef File, Twine Message) { LLVM_ATTRIBUTE_NORETURN void objdump::reportError(StringRef File,
Twine Message) {
outs().flush(); outs().flush();
WithColor::error(errs(), ToolName) << "'" << File << "': " << Message << "\n"; WithColor::error(errs(), ToolName) << "'" << File << "': " << Message << "\n";
exit(1); exit(1);
} }
LLVM_ATTRIBUTE_NORETURN void reportError(Error E, StringRef FileName, LLVM_ATTRIBUTE_NORETURN void objdump::reportError(Error E, StringRef FileName,
StringRef ArchiveName, StringRef ArchiveName,
StringRef ArchitectureName) { StringRef ArchitectureName) {
assert(E); assert(E);
outs().flush(); outs().flush();
WithColor::error(errs(), ToolName); WithColor::error(errs(), ToolName);
@ -495,7 +497,7 @@ static const Target *getTarget(const ObjectFile *Obj) {
return TheTarget; return TheTarget;
} }
bool isRelocAddressLess(RelocationRef A, RelocationRef B) { bool objdump::isRelocAddressLess(RelocationRef A, RelocationRef B) {
return A.getOffset() < B.getOffset(); return A.getOffset() < B.getOffset();
} }
@ -1149,7 +1151,8 @@ static void dumpELFData(uint64_t SectionAddr, uint64_t Index, uint64_t End,
} }
} }
SymbolInfoTy createSymbolInfo(const ObjectFile *Obj, const SymbolRef &Symbol) { SymbolInfoTy objdump::createSymbolInfo(const ObjectFile *Obj,
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);
@ -1169,8 +1172,9 @@ SymbolInfoTy createSymbolInfo(const ObjectFile *Obj, const SymbolRef &Symbol) {
: (uint8_t)ELF::STT_NOTYPE); : (uint8_t)ELF::STT_NOTYPE);
} }
SymbolInfoTy createDummySymbolInfo(const ObjectFile *Obj, const uint64_t Addr, static SymbolInfoTy createDummySymbolInfo(const ObjectFile *Obj,
StringRef &Name, uint8_t Type) { const uint64_t Addr, StringRef &Name,
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
@ -1713,7 +1717,7 @@ static void disassembleObject(const ObjectFile *Obj, bool InlineRelocs) {
SP, InlineRelocs); SP, InlineRelocs);
} }
void printRelocations(const ObjectFile *Obj) { void objdump::printRelocations(const ObjectFile *Obj) {
StringRef Fmt = Obj->getBytesInAddress() > 4 ? "%016" PRIx64 : StringRef Fmt = Obj->getBytesInAddress() > 4 ? "%016" PRIx64 :
"%08" PRIx64; "%08" PRIx64;
// Regular objdump doesn't print relocations in non-relocatable object // Regular objdump doesn't print relocations in non-relocatable object
@ -1767,7 +1771,7 @@ void printRelocations(const ObjectFile *Obj) {
} }
} }
void printDynamicRelocations(const ObjectFile *Obj) { void objdump::printDynamicRelocations(const ObjectFile *Obj) {
// For the moment, this option is for ELF only // For the moment, this option is for ELF only
if (!Obj->isELF()) if (!Obj->isELF())
return; return;
@ -1819,7 +1823,7 @@ static size_t getMaxSectionNameWidth(const ObjectFile *Obj) {
return MaxWidth; return MaxWidth;
} }
void 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);
@ -1864,7 +1868,7 @@ void printSectionHeaders(const ObjectFile *Obj) {
outs() << "\n"; outs() << "\n";
} }
void printSectionContents(const ObjectFile *Obj) { void objdump::printSectionContents(const ObjectFile *Obj) {
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());
uint64_t BaseAddr = Section.getAddress(); uint64_t BaseAddr = Section.getAddress();
@ -1908,8 +1912,8 @@ void printSectionContents(const ObjectFile *Obj) {
} }
} }
void 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() << "SYMBOL TABLE:\n"; outs() << "SYMBOL TABLE:\n";
printCOFFSymbolTable(cast<const COFFObjectFile>(O)); printCOFFSymbolTable(cast<const COFFObjectFile>(O));
@ -1939,9 +1943,9 @@ void printSymbolTable(const ObjectFile *O, StringRef ArchiveName,
printSymbol(O, *I, FileName, ArchiveName, ArchitectureName, DumpDynamic); printSymbol(O, *I, FileName, ArchiveName, ArchitectureName, DumpDynamic);
} }
void printSymbol(const ObjectFile *O, const SymbolRef &Symbol, void objdump::printSymbol(const ObjectFile *O, const SymbolRef &Symbol,
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);
@ -2089,7 +2093,7 @@ static void printUnwindInfo(const ObjectFile *O) {
/// Dump the raw contents of the __clangast section so the output can be piped /// Dump the raw contents of the __clangast section so the output can be piped
/// into llvm-bcanalyzer. /// into llvm-bcanalyzer.
void printRawClangAST(const ObjectFile *Obj) { static void printRawClangAST(const ObjectFile *Obj) {
if (outs().is_displayed()) { if (outs().is_displayed()) {
WithColor::error(errs(), ToolName) WithColor::error(errs(), ToolName)
<< "The -raw-clang-ast option will dump the raw binary contents of " << "The -raw-clang-ast option will dump the raw binary contents of "

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

@ -51,8 +51,6 @@ extern cl::opt<bool> UnwindInfo;
extern StringSet<> FoundSectionSet; extern StringSet<> FoundSectionSet;
} // namespace objdump
typedef std::function<bool(llvm::object::SectionRef const &)> FilterPredicate; typedef std::function<bool(llvm::object::SectionRef const &)> FilterPredicate;
/// A filtered iterator for SectionRefs that skips sections based on some given /// A filtered iterator for SectionRefs that skips sections based on some given
@ -118,7 +116,6 @@ SectionFilter ToolSectionFilter(llvm::object::ObjectFile const &O,
uint64_t *Idx = nullptr); uint64_t *Idx = nullptr);
bool isRelocAddressLess(object::RelocationRef A, object::RelocationRef B); bool isRelocAddressLess(object::RelocationRef A, object::RelocationRef B);
void printRawClangAST(const object::ObjectFile *O);
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);
@ -147,6 +144,7 @@ std::string getFileNameForError(const object::Archive::Child &C,
SymbolInfoTy createSymbolInfo(const object::ObjectFile *Obj, SymbolInfoTy createSymbolInfo(const object::ObjectFile *Obj,
const object::SymbolRef &Symbol); const object::SymbolRef &Symbol);
} // namespace objdump
} // end namespace llvm } // end namespace llvm
#endif #endif