From: Fangrui Song Date: Mon, 15 Apr 2019 15:31:42 +0000 (+0000) Subject: [llvm-objdump] Wrap things in namespace llvm X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0ea2470160129a7ef32887e0a9f189f0432248cf;p=llvm [llvm-objdump] Wrap things in namespace llvm git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@358417 91177308-0d34-0410-b5e6-96231b3b80d8 --- diff --git a/tools/llvm-objdump/COFFDump.cpp b/tools/llvm-objdump/COFFDump.cpp index e390b99232f..5489bcf9801 100644 --- a/tools/llvm-objdump/COFFDump.cpp +++ b/tools/llvm-objdump/COFFDump.cpp @@ -24,10 +24,10 @@ #include "llvm/Support/WithColor.h" #include "llvm/Support/raw_ostream.h" -using namespace llvm; -using namespace object; +using namespace llvm::object; using namespace llvm::Win64EH; +namespace llvm { // Returns the name of the unwind code. static StringRef getUnwindCodeTypeName(uint8_t Code) { switch(Code) { @@ -218,7 +218,7 @@ static Error resolveSymbolName(const std::vector &Rels, return Error::success(); } -static void printCOFFSymbolAddress(llvm::raw_ostream &Out, +static void printCOFFSymbolAddress(raw_ostream &Out, const std::vector &Rels, uint64_t Offset, uint32_t Disp) { StringRef Sym; @@ -468,7 +468,7 @@ static bool getPDataSection(const COFFObjectFile *Obj, return false; } -Error llvm::getCOFFRelocationValueString(const COFFObjectFile *Obj, +Error getCOFFRelocationValueString(const COFFObjectFile *Obj, const RelocationRef &Rel, SmallVectorImpl &Result) { symbol_iterator SymI = Rel.getSymbol(); @@ -589,7 +589,7 @@ static void printRuntimeFunctionRels(const COFFObjectFile *Obj, printWin64EHUnwindInfo(UI); } -void llvm::printCOFFUnwindInfo(const COFFObjectFile *Obj) { +void printCOFFUnwindInfo(const COFFObjectFile *Obj) { if (Obj->getMachine() != COFF::IMAGE_FILE_MACHINE_AMD64) { WithColor::error(errs(), "llvm-objdump") << "unsupported image machine type " @@ -618,7 +618,7 @@ void llvm::printCOFFUnwindInfo(const COFFObjectFile *Obj) { } } -void llvm::printCOFFFileHeader(const object::ObjectFile *Obj) { +void printCOFFFileHeader(const object::ObjectFile *Obj) { const COFFObjectFile *file = dyn_cast(Obj); printTLSDirectory(file); printLoadConfiguration(file); @@ -626,7 +626,7 @@ void llvm::printCOFFFileHeader(const object::ObjectFile *Obj) { printExportTable(file); } -void llvm::printCOFFSymbolTable(const object::COFFImportFile *i) { +void printCOFFSymbolTable(const object::COFFImportFile *i) { unsigned Index = 0; bool IsCode = i->getCOFFImportHeader()->getType() == COFF::IMPORT_CODE; @@ -649,7 +649,7 @@ void llvm::printCOFFSymbolTable(const object::COFFImportFile *i) { } } -void llvm::printCOFFSymbolTable(const COFFObjectFile *coff) { +void printCOFFSymbolTable(const COFFObjectFile *coff) { for (unsigned SI = 0, SE = coff->getNumberOfSymbols(); SI != SE; ++SI) { Expected Symbol = coff->getSymbol(SI); StringRef Name; @@ -720,3 +720,4 @@ void llvm::printCOFFSymbolTable(const COFFObjectFile *coff) { } } } +} // namespace llvm diff --git a/tools/llvm-objdump/ELFDump.cpp b/tools/llvm-objdump/ELFDump.cpp index 286828de11c..62a81a9b213 100644 --- a/tools/llvm-objdump/ELFDump.cpp +++ b/tools/llvm-objdump/ELFDump.cpp @@ -18,11 +18,11 @@ #include "llvm/Support/MathExtras.h" #include "llvm/Support/raw_ostream.h" -using namespace llvm; using namespace llvm::object; +namespace llvm { template -Expected getDynamicStrTab(const ELFFile *Elf) { +static Expected getDynamicStrTab(const ELFFile *Elf) { auto DynamicEntriesOrError = Elf->dynamicEntries(); if (!DynamicEntriesOrError) return DynamicEntriesOrError.takeError(); @@ -113,9 +113,9 @@ static Error getRelocationValueString(const ELFObjectFile *Obj, return Error::success(); } -Error llvm::getELFRelocationValueString(const ELFObjectFileBase *Obj, - const RelocationRef &Rel, - SmallVectorImpl &Result) { +Error getELFRelocationValueString(const ELFObjectFileBase *Obj, + const RelocationRef &Rel, + SmallVectorImpl &Result) { if (auto *ELF32LE = dyn_cast(Obj)) return getRelocationValueString(ELF32LE, Rel, Result); if (auto *ELF64LE = dyn_cast(Obj)) @@ -144,7 +144,7 @@ static uint64_t getSectionLMA(const ELFFile *Obj, return Sec.getAddress(); } -uint64_t llvm::getELFSectionLMA(const object::ELFSectionRef &Sec) { +uint64_t getELFSectionLMA(const object::ELFSectionRef &Sec) { if (const auto *ELFObj = dyn_cast(Sec.getObject())) return getSectionLMA(ELFObj->getELFFile(), Sec); else if (const auto *ELFObj = dyn_cast(Sec.getObject())) @@ -328,7 +328,7 @@ void printSymbolVersionInfo(const ELFFile *Elf, StringRef FileName) { } } -void llvm::printELFFileHeader(const object::ObjectFile *Obj) { +void printELFFileHeader(const object::ObjectFile *Obj) { if (const auto *ELFObj = dyn_cast(Obj)) printProgramHeaders(ELFObj->getELFFile()); else if (const auto *ELFObj = dyn_cast(Obj)) @@ -339,7 +339,7 @@ void llvm::printELFFileHeader(const object::ObjectFile *Obj) { printProgramHeaders(ELFObj->getELFFile()); } -void llvm::printELFDynamicSection(const object::ObjectFile *Obj) { +void printELFDynamicSection(const object::ObjectFile *Obj) { if (const auto *ELFObj = dyn_cast(Obj)) printDynamicSection(ELFObj->getELFFile(), Obj->getFileName()); else if (const auto *ELFObj = dyn_cast(Obj)) @@ -350,7 +350,7 @@ void llvm::printELFDynamicSection(const object::ObjectFile *Obj) { printDynamicSection(ELFObj->getELFFile(), Obj->getFileName()); } -void llvm::printELFSymbolVersionInfo(const object::ObjectFile *Obj) { +void printELFSymbolVersionInfo(const object::ObjectFile *Obj) { if (const auto *ELFObj = dyn_cast(Obj)) printSymbolVersionInfo(ELFObj->getELFFile(), Obj->getFileName()); else if (const auto *ELFObj = dyn_cast(Obj)) @@ -360,3 +360,4 @@ void llvm::printELFSymbolVersionInfo(const object::ObjectFile *Obj) { else if (const auto *ELFObj = dyn_cast(Obj)) printSymbolVersionInfo(ELFObj->getELFFile(), Obj->getFileName()); } +} // namespace llvm diff --git a/tools/llvm-objdump/MachODump.cpp b/tools/llvm-objdump/MachODump.cpp index 6577b3ab7fd..e5e039cd054 100644 --- a/tools/llvm-objdump/MachODump.cpp +++ b/tools/llvm-objdump/MachODump.cpp @@ -55,8 +55,7 @@ extern "C" { } #endif -using namespace llvm; -using namespace object; +using namespace llvm::object; namespace llvm { @@ -166,7 +165,6 @@ static cl::opt NoSymbolicOperands( static cl::list ArchFlags("arch", cl::desc("architecture(s) from a Mach-O file to dump"), cl::ZeroOrMore); -} // namespace llvm bool ArchAll = false; @@ -176,7 +174,7 @@ static const Target *GetTarget(const MachOObjectFile *MachOObj, const char **McpuDefault, const Target **ThumbTarget) { // Figure out the target triple. - llvm::Triple TT(TripleName); + Triple TT(TripleName); if (TripleName.empty()) { TT = MachOObj->getArchTriple(McpuDefault); TripleName = TT.str(); @@ -185,7 +183,7 @@ static const Target *GetTarget(const MachOObjectFile *MachOObj, if (TT.getArch() == Triple::arm) { // We've inferred a 32-bit ARM target from the object file. All MachO CPUs // that support ARM are also capable of Thumb mode. - llvm::Triple ThumbTriple = TT; + Triple ThumbTriple = TT; std::string ThumbName = (Twine("thumb") + TT.getArchName().substr(3)).str(); ThumbTriple.setArchName(ThumbName); ThumbTripleName = ThumbTriple.str(); @@ -445,9 +443,9 @@ static void printRelocationTargetName(const MachOObjectFile *O, Fmt << S; } -Error llvm::getMachORelocationValueString(const MachOObjectFile *Obj, - const RelocationRef &RelRef, - SmallVectorImpl &Result) { +Error getMachORelocationValueString(const MachOObjectFile *Obj, + const RelocationRef &RelRef, + SmallVectorImpl &Result) { DataRefImpl Rel = RelRef.getRawDataRefImpl(); MachO::any_relocation_info RE = Obj->getRelocation(Rel); @@ -788,9 +786,8 @@ static void PrintRType(const uint64_t cputype, const unsigned r_type) { static void PrintRLength(const uint64_t cputype, const unsigned r_type, const unsigned r_length, const bool previous_arm_half){ if (cputype == MachO::CPU_TYPE_ARM && - (r_type == llvm::MachO::ARM_RELOC_HALF || - r_type == llvm::MachO::ARM_RELOC_HALF_SECTDIFF || - previous_arm_half == true)) { + (r_type == MachO::ARM_RELOC_HALF || + r_type == MachO::ARM_RELOC_HALF_SECTDIFF || previous_arm_half == true)) { if ((r_length & 0x1) == 0) outs() << "lo/"; else @@ -851,9 +848,8 @@ static void PrintRelocationEntries(const MachOObjectFile *O, if (verbose) { // scattered: address if ((cputype == MachO::CPU_TYPE_I386 && - r_type == llvm::MachO::GENERIC_RELOC_PAIR) || - (cputype == MachO::CPU_TYPE_ARM && - r_type == llvm::MachO::ARM_RELOC_PAIR)) + r_type == MachO::GENERIC_RELOC_PAIR) || + (cputype == MachO::CPU_TYPE_ARM && r_type == MachO::ARM_RELOC_PAIR)) outs() << " "; else outs() << format("%08x ", (unsigned int)r_address); @@ -875,29 +871,27 @@ static void PrintRelocationEntries(const MachOObjectFile *O, outs() << format("True 0x%08x", (unsigned int)r_value); if (previous_sectdiff == false) { if ((cputype == MachO::CPU_TYPE_ARM && - r_type == llvm::MachO::ARM_RELOC_PAIR)) + r_type == MachO::ARM_RELOC_PAIR)) outs() << format(" half = 0x%04x ", (unsigned int)r_address); - } - else if (cputype == MachO::CPU_TYPE_ARM && - sectdiff_r_type == llvm::MachO::ARM_RELOC_HALF_SECTDIFF) + } else if (cputype == MachO::CPU_TYPE_ARM && + sectdiff_r_type == MachO::ARM_RELOC_HALF_SECTDIFF) outs() << format(" other_half = 0x%04x ", (unsigned int)r_address); if ((cputype == MachO::CPU_TYPE_I386 && - (r_type == llvm::MachO::GENERIC_RELOC_SECTDIFF || - r_type == llvm::MachO::GENERIC_RELOC_LOCAL_SECTDIFF)) || + (r_type == MachO::GENERIC_RELOC_SECTDIFF || + r_type == MachO::GENERIC_RELOC_LOCAL_SECTDIFF)) || (cputype == MachO::CPU_TYPE_ARM && - (sectdiff_r_type == llvm::MachO::ARM_RELOC_SECTDIFF || - sectdiff_r_type == llvm::MachO::ARM_RELOC_LOCAL_SECTDIFF || - sectdiff_r_type == llvm::MachO::ARM_RELOC_HALF_SECTDIFF))) { - previous_sectdiff = true; - sectdiff_r_type = r_type; - } - else { + (sectdiff_r_type == MachO::ARM_RELOC_SECTDIFF || + sectdiff_r_type == MachO::ARM_RELOC_LOCAL_SECTDIFF || + sectdiff_r_type == MachO::ARM_RELOC_HALF_SECTDIFF))) { + previous_sectdiff = true; + sectdiff_r_type = r_type; + } else { previous_sectdiff = false; sectdiff_r_type = 0; } if (cputype == MachO::CPU_TYPE_ARM && - (r_type == llvm::MachO::ARM_RELOC_HALF || - r_type == llvm::MachO::ARM_RELOC_HALF_SECTDIFF)) + (r_type == MachO::ARM_RELOC_HALF || + r_type == MachO::ARM_RELOC_HALF_SECTDIFF)) previous_arm_half = true; else previous_arm_half = false; @@ -913,8 +907,7 @@ static void PrintRelocationEntries(const MachOObjectFile *O, else { if (verbose) { // plain: address - if (cputype == MachO::CPU_TYPE_ARM && - r_type == llvm::MachO::ARM_RELOC_PAIR) + if (cputype == MachO::CPU_TYPE_ARM && r_type == MachO::ARM_RELOC_PAIR) outs() << " "; else outs() << format("%08x ", (unsigned int)r_address); @@ -956,21 +949,20 @@ static void PrintRelocationEntries(const MachOObjectFile *O, outs() << "False "; // plain: symbolnum/value - if (cputype == MachO::CPU_TYPE_ARM && - r_type == llvm::MachO::ARM_RELOC_PAIR) + if (cputype == MachO::CPU_TYPE_ARM && r_type == MachO::ARM_RELOC_PAIR) outs() << format("other_half = 0x%04x\n", (unsigned int)r_address); else if (cputype == MachO::CPU_TYPE_ARM64 && - r_type == llvm::MachO::ARM64_RELOC_ADDEND) + r_type == MachO::ARM64_RELOC_ADDEND) outs() << format("addend = 0x%06x\n", (unsigned int)r_symbolnum); else { outs() << format("%d ", r_symbolnum); - if (r_symbolnum == llvm::MachO::R_ABS) + if (r_symbolnum == MachO::R_ABS) outs() << "R_ABS\n"; else { // in this case, r_symbolnum is actually a 1-based section number uint32_t nsects = O->section_end()->getRawDataRefImpl().d.a; if (r_symbolnum > 0 && r_symbolnum <= nsects) { - llvm::object::DataRefImpl DRI; + object::DataRefImpl DRI; DRI.d.a = r_symbolnum-1; StringRef SegName = O->getSectionFinalSegmentName(DRI); StringRef SectName; @@ -986,8 +978,8 @@ static void PrintRelocationEntries(const MachOObjectFile *O, } } if (cputype == MachO::CPU_TYPE_ARM && - (r_type == llvm::MachO::ARM_RELOC_HALF || - r_type == llvm::MachO::ARM_RELOC_HALF_SECTDIFF)) + (r_type == MachO::ARM_RELOC_HALF || + r_type == MachO::ARM_RELOC_HALF_SECTDIFF)) previous_arm_half = true; else previous_arm_half = false; @@ -2224,7 +2216,7 @@ static bool ValidateArchFlags() { // -arch flags selecting just those slices as specified by them and also parses // archive files. Then for each individual Mach-O file ProcessMachO() is // called to process the file based on the command line options. -void llvm::parseInputMachO(StringRef Filename) { +void parseInputMachO(StringRef Filename) { if (!ValidateArchFlags()) return; @@ -2280,7 +2272,7 @@ void llvm::parseInputMachO(StringRef Filename) { llvm_unreachable("Input object can't be invalid at this point"); } -void llvm::parseInputMachO(MachOUniversalBinary *UB) { +void parseInputMachO(MachOUniversalBinary *UB) { if (!ValidateArchFlags()) return; @@ -8005,7 +7997,7 @@ static void printMachOUnwindInfoSection(const MachOObjectFile *Obj, } } -void llvm::printMachOUnwindInfo(const MachOObjectFile *Obj) { +void printMachOUnwindInfo(const MachOObjectFile *Obj) { std::map Symbols; for (const SymbolRef &SymRef : Obj->symbols()) { // Discard any undefined or absolute symbols. They're not going to take part @@ -9997,12 +9989,12 @@ static void PrintMachHeader(const MachOObjectFile *Obj, bool verbose) { } } -void llvm::printMachOFileHeader(const object::ObjectFile *Obj) { +void printMachOFileHeader(const object::ObjectFile *Obj) { const MachOObjectFile *file = dyn_cast(Obj); PrintMachHeader(file, !NonVerbose); } -void llvm::printMachOLoadCommands(const object::ObjectFile *Obj) { +void printMachOLoadCommands(const object::ObjectFile *Obj) { const MachOObjectFile *file = dyn_cast(Obj); uint32_t filetype = 0; uint32_t cputype = 0; @@ -10024,7 +10016,7 @@ void llvm::printMachOLoadCommands(const object::ObjectFile *Obj) { // export trie dumping //===----------------------------------------------------------------------===// -void llvm::printMachOExportsTrie(const object::MachOObjectFile *Obj) { +void printMachOExportsTrie(const object::MachOObjectFile *Obj) { uint64_t BaseSegmentAddress = 0; for (const auto &Command : Obj->load_commands()) { if (Command.C.cmd == MachO::LC_SEGMENT) { @@ -10042,7 +10034,7 @@ void llvm::printMachOExportsTrie(const object::MachOObjectFile *Obj) { } } Error Err = Error::success(); - for (const llvm::object::ExportEntry &Entry : Obj->exports(Err)) { + for (const object::ExportEntry &Entry : Obj->exports(Err)) { uint64_t Flags = Entry.flags(); bool ReExport = (Flags & MachO::EXPORT_SYMBOL_FLAGS_REEXPORT); bool WeakDef = (Flags & MachO::EXPORT_SYMBOL_FLAGS_WEAK_DEFINITION); @@ -10103,10 +10095,10 @@ void llvm::printMachOExportsTrie(const object::MachOObjectFile *Obj) { // rebase table dumping //===----------------------------------------------------------------------===// -void llvm::printMachORebaseTable(object::MachOObjectFile *Obj) { +void printMachORebaseTable(object::MachOObjectFile *Obj) { outs() << "segment section address type\n"; Error Err = Error::success(); - for (const llvm::object::MachORebaseEntry &Entry : Obj->rebaseTable(Err)) { + for (const object::MachORebaseEntry &Entry : Obj->rebaseTable(Err)) { StringRef SegmentName = Entry.segmentName(); StringRef SectionName = Entry.sectionName(); uint64_t Address = Entry.address(); @@ -10145,12 +10137,12 @@ static StringRef ordinalName(const object::MachOObjectFile *Obj, int Ordinal) { // bind table dumping //===----------------------------------------------------------------------===// -void llvm::printMachOBindTable(object::MachOObjectFile *Obj) { +void printMachOBindTable(object::MachOObjectFile *Obj) { // Build table of sections so names can used in final output. outs() << "segment section address type " "addend dylib symbol\n"; Error Err = Error::success(); - for (const llvm::object::MachOBindEntry &Entry : Obj->bindTable(Err)) { + for (const object::MachOBindEntry &Entry : Obj->bindTable(Err)) { StringRef SegmentName = Entry.segmentName(); StringRef SectionName = Entry.sectionName(); uint64_t Address = Entry.address(); @@ -10176,11 +10168,11 @@ void llvm::printMachOBindTable(object::MachOObjectFile *Obj) { // lazy bind table dumping //===----------------------------------------------------------------------===// -void llvm::printMachOLazyBindTable(object::MachOObjectFile *Obj) { +void printMachOLazyBindTable(object::MachOObjectFile *Obj) { outs() << "segment section address " "dylib symbol\n"; Error Err = Error::success(); - for (const llvm::object::MachOBindEntry &Entry : Obj->lazyBindTable(Err)) { + for (const object::MachOBindEntry &Entry : Obj->lazyBindTable(Err)) { StringRef SegmentName = Entry.segmentName(); StringRef SectionName = Entry.sectionName(); uint64_t Address = Entry.address(); @@ -10201,11 +10193,11 @@ void llvm::printMachOLazyBindTable(object::MachOObjectFile *Obj) { // weak bind table dumping //===----------------------------------------------------------------------===// -void llvm::printMachOWeakBindTable(object::MachOObjectFile *Obj) { +void printMachOWeakBindTable(object::MachOObjectFile *Obj) { outs() << "segment section address " "type addend symbol\n"; Error Err = Error::success(); - for (const llvm::object::MachOBindEntry &Entry : Obj->weakBindTable(Err)) { + for (const object::MachOBindEntry &Entry : Obj->weakBindTable(Err)) { // Strong symbols don't have a location to update. if (Entry.flags() & MachO::BIND_SYMBOL_FLAGS_NON_WEAK_DEFINITION) { outs() << " strong " @@ -10238,7 +10230,7 @@ static const char *get_dyld_bind_info_symbolname(uint64_t ReferenceValue, if (info->bindtable == nullptr) { info->bindtable = llvm::make_unique(); Error Err = Error::success(); - for (const llvm::object::MachOBindEntry &Entry : info->O->bindTable(Err)) { + for (const object::MachOBindEntry &Entry : info->O->bindTable(Err)) { uint64_t Address = Entry.address(); StringRef name = Entry.symbolName(); if (!name.empty()) @@ -10251,7 +10243,7 @@ static const char *get_dyld_bind_info_symbolname(uint64_t ReferenceValue, return !name.empty() ? name.data() : nullptr; } -void llvm::printLazyBindTable(ObjectFile *o) { +void printLazyBindTable(ObjectFile *o) { outs() << "Lazy bind table:\n"; if (MachOObjectFile *MachO = dyn_cast(o)) printMachOLazyBindTable(MachO); @@ -10261,7 +10253,7 @@ void llvm::printLazyBindTable(ObjectFile *o) { "for Mach-O executable files.\n"; } -void llvm::printWeakBindTable(ObjectFile *o) { +void printWeakBindTable(ObjectFile *o) { outs() << "Weak bind table:\n"; if (MachOObjectFile *MachO = dyn_cast(o)) printMachOWeakBindTable(MachO); @@ -10271,7 +10263,7 @@ void llvm::printWeakBindTable(ObjectFile *o) { "for Mach-O executable files.\n"; } -void llvm::printExportsTrie(const ObjectFile *o) { +void printExportsTrie(const ObjectFile *o) { outs() << "Exports trie:\n"; if (const MachOObjectFile *MachO = dyn_cast(o)) printMachOExportsTrie(MachO); @@ -10281,7 +10273,7 @@ void llvm::printExportsTrie(const ObjectFile *o) { "for Mach-O executable files.\n"; } -void llvm::printRebaseTable(ObjectFile *o) { +void printRebaseTable(ObjectFile *o) { outs() << "Rebase table:\n"; if (MachOObjectFile *MachO = dyn_cast(o)) printMachORebaseTable(MachO); @@ -10291,7 +10283,7 @@ void llvm::printRebaseTable(ObjectFile *o) { "for Mach-O executable files.\n"; } -void llvm::printBindTable(ObjectFile *o) { +void printBindTable(ObjectFile *o) { outs() << "Bind table:\n"; if (MachOObjectFile *MachO = dyn_cast(o)) printMachOBindTable(MachO); @@ -10300,3 +10292,4 @@ void llvm::printBindTable(ObjectFile *o) { << "This operation is only currently supported " "for Mach-O executable files.\n"; } +} // namespace llvm diff --git a/tools/llvm-objdump/WasmDump.cpp b/tools/llvm-objdump/WasmDump.cpp index bc76f2442c1..da27a4acbb5 100644 --- a/tools/llvm-objdump/WasmDump.cpp +++ b/tools/llvm-objdump/WasmDump.cpp @@ -14,10 +14,10 @@ #include "llvm-objdump.h" #include "llvm/Object/Wasm.h" -using namespace llvm; -using namespace object; +using namespace llvm::object; -void llvm::printWasmFileHeader(const object::ObjectFile *Obj) { +namespace llvm { +void printWasmFileHeader(const object::ObjectFile *Obj) { const auto *File = dyn_cast(Obj); outs() << "Program Header:\n"; @@ -26,7 +26,7 @@ void llvm::printWasmFileHeader(const object::ObjectFile *Obj) { outs() << "\n"; } -Error llvm::getWasmRelocationValueString(const WasmObjectFile *Obj, +Error getWasmRelocationValueString(const WasmObjectFile *Obj, const RelocationRef &RelRef, SmallVectorImpl &Result) { const wasm::WasmRelocation &Rel = Obj->getWasmRelocation(RelRef); @@ -49,3 +49,4 @@ Error llvm::getWasmRelocationValueString(const WasmObjectFile *Obj, Result.append(FmtBuf.begin(), FmtBuf.end()); return Error::success(); } +} // namespace llvm diff --git a/tools/llvm-objdump/llvm-objdump.cpp b/tools/llvm-objdump/llvm-objdump.cpp index f81238e5e18..afd137f6845 100644 --- a/tools/llvm-objdump/llvm-objdump.cpp +++ b/tools/llvm-objdump/llvm-objdump.cpp @@ -67,8 +67,7 @@ #include #include -using namespace llvm; -using namespace object; +using namespace llvm::object; namespace llvm { @@ -298,19 +297,18 @@ static cl::alias UnwindInfoShort("u", cl::desc("Alias for --unwind-info"), static cl::opt Wide("wide", cl::desc("Ignored for compatibility with GNU objdump")); static cl::alias WideShort("w", cl::Grouping, cl::aliasopt(Wide)); -} // namespace llvm static StringSet<> DisasmFuncsSet; static StringRef ToolName; typedef std::vector> SectionSymbolsTy; -SectionFilter llvm::ToolSectionFilter(llvm::object::ObjectFile const &O) { +SectionFilter ToolSectionFilter(object::ObjectFile const &O) { return SectionFilter( - [](llvm::object::SectionRef const &S) { + [](object::SectionRef const &S) { if (FilterSections.empty()) return true; - llvm::StringRef String; + StringRef String; std::error_code error = S.getName(String); if (error) return false; @@ -319,7 +317,7 @@ SectionFilter llvm::ToolSectionFilter(llvm::object::ObjectFile const &O) { O); } -void llvm::error(std::error_code EC) { +void error(std::error_code EC) { if (!EC) return; WithColor::error(errs(), ToolName) @@ -328,32 +326,31 @@ void llvm::error(std::error_code EC) { exit(1); } -void llvm::error(Error E) { +void error(Error E) { if (!E) return; WithColor::error(errs(), ToolName) << toString(std::move(E)); exit(1); } -LLVM_ATTRIBUTE_NORETURN void llvm::error(Twine Message) { +LLVM_ATTRIBUTE_NORETURN void error(Twine Message) { WithColor::error(errs(), ToolName) << Message << ".\n"; errs().flush(); exit(1); } -void llvm::warn(StringRef Message) { +void warn(StringRef Message) { WithColor::warning(errs(), ToolName) << Message << ".\n"; errs().flush(); } -LLVM_ATTRIBUTE_NORETURN void llvm::report_error(StringRef File, - Twine Message) { +LLVM_ATTRIBUTE_NORETURN void report_error(StringRef File, Twine Message) { WithColor::error(errs(), ToolName) << "'" << File << "': " << Message << ".\n"; exit(1); } -LLVM_ATTRIBUTE_NORETURN void llvm::report_error(Error E, StringRef File) { +LLVM_ATTRIBUTE_NORETURN void report_error(Error E, StringRef File) { assert(E); std::string Buf; raw_string_ostream OS(Buf); @@ -363,9 +360,9 @@ LLVM_ATTRIBUTE_NORETURN void llvm::report_error(Error E, StringRef File) { exit(1); } -LLVM_ATTRIBUTE_NORETURN void llvm::report_error(Error E, StringRef ArchiveName, - StringRef FileName, - StringRef ArchitectureName) { +LLVM_ATTRIBUTE_NORETURN void report_error(Error E, StringRef ArchiveName, + StringRef FileName, + StringRef ArchitectureName) { assert(E); WithColor::error(errs(), ToolName); if (ArchiveName != "") @@ -382,24 +379,23 @@ LLVM_ATTRIBUTE_NORETURN void llvm::report_error(Error E, StringRef ArchiveName, exit(1); } -LLVM_ATTRIBUTE_NORETURN void llvm::report_error(Error E, StringRef ArchiveName, - const object::Archive::Child &C, - StringRef ArchitectureName) { +LLVM_ATTRIBUTE_NORETURN void report_error(Error E, StringRef ArchiveName, + const object::Archive::Child &C, + StringRef ArchitectureName) { Expected NameOrErr = C.getName(); // TODO: if we have a error getting the name then it would be nice to print // the index of which archive member this is and or its offset in the // archive instead of "???" as the name. if (!NameOrErr) { consumeError(NameOrErr.takeError()); - llvm::report_error(std::move(E), ArchiveName, "???", ArchitectureName); + report_error(std::move(E), ArchiveName, "???", ArchitectureName); } else - llvm::report_error(std::move(E), ArchiveName, NameOrErr.get(), - ArchitectureName); + report_error(std::move(E), ArchiveName, NameOrErr.get(), ArchitectureName); } static const Target *getTarget(const ObjectFile *Obj = nullptr) { // Figure out the target triple. - llvm::Triple TheTriple("unknown-unknown-unknown"); + Triple TheTriple("unknown-unknown-unknown"); if (TripleName.empty()) { if (Obj) TheTriple = Obj->makeTriple(); @@ -430,7 +426,7 @@ static const Target *getTarget(const ObjectFile *Obj = nullptr) { return TheTarget; } -bool llvm::isRelocAddressLess(RelocationRef A, RelocationRef B) { +bool isRelocAddressLess(RelocationRef A, RelocationRef B) { return A.getOffset() < B.getOffset(); } @@ -893,7 +889,7 @@ static size_t countSkippableZeroBytes(ArrayRef Buf) { // Returns a map from sections to their relocations. static std::map> -getRelocsMap(llvm::object::ObjectFile const &Obj) { +getRelocsMap(object::ObjectFile const &Obj) { std::map> Ret; for (const SectionRef &Section : ToolSectionFilter(Obj)) { section_iterator RelSec = Section.getRelocatedSection(); @@ -1453,7 +1449,7 @@ static void disassembleObject(const ObjectFile *Obj, bool InlineRelocs) { STI.get(), PIP, SP, InlineRelocs); } -void llvm::printRelocations(const ObjectFile *Obj) { +void printRelocations(const ObjectFile *Obj) { StringRef Fmt = Obj->getBytesInAddress() > 4 ? "%016" PRIx64 : "%08" PRIx64; // Regular objdump doesn't print relocations in non-relocatable object @@ -1482,7 +1478,7 @@ void llvm::printRelocations(const ObjectFile *Obj) { } } -void llvm::printDynamicRelocations(const ObjectFile *Obj) { +void printDynamicRelocations(const ObjectFile *Obj) { // For the moment, this option is for ELF only if (!Obj->isELF()) return; @@ -1526,7 +1522,7 @@ static bool shouldDisplayLMA(const ObjectFile *Obj) { return ShowLMA; } -void llvm::printSectionHeaders(const ObjectFile *Obj) { +void printSectionHeaders(const ObjectFile *Obj) { bool HasLMAColumn = shouldDisplayLMA(Obj); if (HasLMAColumn) outs() << "Sections:\n" @@ -1563,7 +1559,7 @@ void llvm::printSectionHeaders(const ObjectFile *Obj) { outs() << "\n"; } -void llvm::printSectionContents(const ObjectFile *Obj) { +void printSectionContents(const ObjectFile *Obj) { for (const SectionRef &Section : ToolSectionFilter(*Obj)) { StringRef Name; StringRef Contents; @@ -1609,8 +1605,8 @@ void llvm::printSectionContents(const ObjectFile *Obj) { } } -void llvm::printSymbolTable(const ObjectFile *O, StringRef ArchiveName, - StringRef ArchitectureName) { +void printSymbolTable(const ObjectFile *O, StringRef ArchiveName, + StringRef ArchitectureName) { outs() << "SYMBOL TABLE:\n"; if (const COFFObjectFile *Coff = dyn_cast(O)) { @@ -1724,7 +1720,7 @@ static void printUnwindInfo(const ObjectFile *O) { /// Dump the raw contents of the __clangast section so the output can be piped /// into llvm-bcanalyzer. -void llvm::printRawClangAST(const ObjectFile *Obj) { +void printRawClangAST(const ObjectFile *Obj) { if (outs().is_displayed()) { WithColor::error(errs(), ToolName) << "The -raw-clang-ast option will dump the raw binary contents of " @@ -1996,14 +1992,16 @@ static void dumpInput(StringRef file) { else report_error(errorCodeToError(object_error::invalid_file_type), file); } +} // namespace llvm int main(int argc, char **argv) { + using namespace llvm; InitLLVM X(argc, argv); // Initialize targets and assembly printers/parsers. - llvm::InitializeAllTargetInfos(); - llvm::InitializeAllTargetMCs(); - llvm::InitializeAllDisassemblers(); + InitializeAllTargetInfos(); + InitializeAllTargetMCs(); + InitializeAllDisassemblers(); // Register the target printer for --version. cl::AddExtraVersionPrinter(TargetRegistry::printRegisteredTargetsForVersion);