diff --git a/llvm/tools/llvm-objdump/MachODump.cpp b/llvm/tools/llvm-objdump/MachODump.cpp --- a/llvm/tools/llvm-objdump/MachODump.cpp +++ b/llvm/tools/llvm-objdump/MachODump.cpp @@ -82,7 +82,7 @@ bool objdump::InfoPlist; bool objdump::DylibsUsed; bool objdump::DylibId; -static bool NonVerbose; +static bool Verbose; bool objdump::ObjcMetaData; static std::string DisSymName; static bool NoSymbolicOperands; @@ -111,7 +111,7 @@ InfoPlist = InputArgs.hasArg(OBJDUMP_info_plist); DylibsUsed = InputArgs.hasArg(OBJDUMP_dylibs_used); DylibId = InputArgs.hasArg(OBJDUMP_dylib_id); - NonVerbose = InputArgs.hasArg(OBJDUMP_non_verbose); + Verbose = !InputArgs.hasArg(OBJDUMP_non_verbose); ObjcMetaData = InputArgs.hasArg(OBJDUMP_objc_meta_data); DisSymName = InputArgs.getLastArgValue(OBJDUMP_dis_symname).str(); NoSymbolicOperands = InputArgs.hasArg(OBJDUMP_no_symbolic_operands); @@ -1937,21 +1937,21 @@ DisassembleMachO(FileName, MachOOF, "__TEXT", "__text"); } if (IndirectSymbols) - PrintIndirectSymbols(MachOOF, !NonVerbose); + PrintIndirectSymbols(MachOOF, Verbose); if (DataInCode) - PrintDataInCodeTable(MachOOF, !NonVerbose); + PrintDataInCodeTable(MachOOF, Verbose); if (FunctionStarts) PrintFunctionStarts(MachOOF); if (LinkOptHints) PrintLinkOptHints(MachOOF); if (Relocations) - PrintRelocations(MachOOF, !NonVerbose); + PrintRelocations(MachOOF, Verbose); if (SectionHeaders) printSectionHeaders(MachOOF); if (SectionContents) printSectionContents(MachOOF); if (!FilterSections.empty()) - DumpSectionContents(FileName, MachOOF, !NonVerbose); + DumpSectionContents(FileName, MachOOF, Verbose); if (InfoPlist) DumpInfoPlistSectionContents(FileName, MachOOF); if (DylibsUsed) @@ -1969,7 +1969,7 @@ if (FirstPrivateHeader) printMachOFileHeader(MachOOF); if (ObjcMetaData) - printObjcMetaData(MachOOF, !NonVerbose); + printObjcMetaData(MachOOF, Verbose); if (ExportsTrie) printExportsTrie(MachOOF); if (Rebase) @@ -2308,7 +2308,7 @@ if (Archive *A = dyn_cast(&Bin)) { outs() << "Archive : " << Filename << "\n"; if (ArchiveHeaders) - printArchiveHeaders(Filename, A, !NonVerbose, ArchiveMemberOffsets); + printArchiveHeaders(Filename, A, Verbose, ArchiveMemberOffsets); Error Err = Error::success(); unsigned I = -1; @@ -2355,7 +2355,7 @@ auto Filename = UB->getFileName(); if (UniversalHeaders) - printMachOUniversalHeaders(UB, !NonVerbose); + printMachOUniversalHeaders(UB, Verbose); // If we have a list of architecture flags specified dump only those. if (!ArchAll && !ArchFlags.empty()) { @@ -2389,7 +2389,7 @@ outs() << " (architecture " << ArchitectureName << ")"; outs() << "\n"; if (ArchiveHeaders) - printArchiveHeaders(Filename, A.get(), !NonVerbose, + printArchiveHeaders(Filename, A.get(), Verbose, ArchiveMemberOffsets, ArchitectureName); Error Err = Error::success(); unsigned I = -1; @@ -2450,7 +2450,7 @@ std::unique_ptr &A = *AOrErr; outs() << "Archive : " << Filename << "\n"; if (ArchiveHeaders) - printArchiveHeaders(Filename, A.get(), !NonVerbose, + printArchiveHeaders(Filename, A.get(), Verbose, ArchiveMemberOffsets); Error Err = Error::success(); unsigned I = -1; @@ -2503,8 +2503,8 @@ outs() << " (architecture " << ArchitectureName << ")"; outs() << "\n"; if (ArchiveHeaders) - printArchiveHeaders(Filename, A.get(), !NonVerbose, - ArchiveMemberOffsets, ArchitectureName); + printArchiveHeaders(Filename, A.get(), Verbose, ArchiveMemberOffsets, + ArchitectureName); Error Err = Error::success(); unsigned I = -1; for (auto &C : A->children(Err)) { @@ -10211,7 +10211,7 @@ void objdump::printMachOFileHeader(const object::ObjectFile *Obj) { const MachOObjectFile *file = dyn_cast(Obj); - PrintMachHeader(file, !NonVerbose); + PrintMachHeader(file, Verbose); } void objdump::printMachOLoadCommands(const object::ObjectFile *Obj) { @@ -10229,7 +10229,7 @@ filetype = H.filetype; cputype = H.cputype; } - PrintLoadCommands(file, filetype, cputype, !NonVerbose); + PrintLoadCommands(file, filetype, cputype, Verbose); } //===----------------------------------------------------------------------===//