Move all sources from the llvm project into contrib/llvm-project.

This uses the new layout of the upstream repository, which was recently
migrated to GitHub, and converted into a "monorepo".  That is, most of
the earlier separate sub-projects with their own branches and tags were
consolidated into one top-level directory, and are now branched and
tagged together.

Updating the vendor area to match this layout is next.

6 files changed, 0 insertions, 13872 deletions

diff --git a/contrib/llvm/tools/llvm-objdump/COFFDump.cpp b/contrib/llvm/tools/llvm-objdump/COFFDump.cpp
deleted file mode 100644
index 1ba0a68902c9..000000000000
--- a/contrib/llvm/tools/llvm-objdump/COFFDump.cpp
+++ /dev/null
@@ -1,721 +0,0 @@
-//===-- COFFDump.cpp - COFF-specific dumper ---------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-///
-/// \file
-/// This file implements the COFF-specific dumper for llvm-objdump.
-/// It outputs the Win64 EH data structures as plain text.
-/// The encoding of the unwind codes is described in MSDN:
-/// http://msdn.microsoft.com/en-us/library/ck9asaa9.aspx
-///
-//===----------------------------------------------------------------------===//
-
-#include "llvm-objdump.h"
-#include "llvm/Demangle/Demangle.h"
-#include "llvm/Object/COFF.h"
-#include "llvm/Object/COFFImportFile.h"
-#include "llvm/Object/ObjectFile.h"
-#include "llvm/Support/Format.h"
-#include "llvm/Support/Win64EH.h"
-#include "llvm/Support/WithColor.h"
-#include "llvm/Support/raw_ostream.h"
-
-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) {
-  default: llvm_unreachable("Invalid unwind code");
-  case UOP_PushNonVol: return "UOP_PushNonVol";
-  case UOP_AllocLarge: return "UOP_AllocLarge";
-  case UOP_AllocSmall: return "UOP_AllocSmall";
-  case UOP_SetFPReg: return "UOP_SetFPReg";
-  case UOP_SaveNonVol: return "UOP_SaveNonVol";
-  case UOP_SaveNonVolBig: return "UOP_SaveNonVolBig";
-  case UOP_SaveXMM128: return "UOP_SaveXMM128";
-  case UOP_SaveXMM128Big: return "UOP_SaveXMM128Big";
-  case UOP_PushMachFrame: return "UOP_PushMachFrame";
-  }
-}
-
-// Returns the name of a referenced register.
-static StringRef getUnwindRegisterName(uint8_t Reg) {
-  switch(Reg) {
-  default: llvm_unreachable("Invalid register");
-  case 0: return "RAX";
-  case 1: return "RCX";
-  case 2: return "RDX";
-  case 3: return "RBX";
-  case 4: return "RSP";
-  case 5: return "RBP";
-  case 6: return "RSI";
-  case 7: return "RDI";
-  case 8: return "R8";
-  case 9: return "R9";
-  case 10: return "R10";
-  case 11: return "R11";
-  case 12: return "R12";
-  case 13: return "R13";
-  case 14: return "R14";
-  case 15: return "R15";
-  }
-}
-
-// Calculates the number of array slots required for the unwind code.
-static unsigned getNumUsedSlots(const UnwindCode &UnwindCode) {
-  switch (UnwindCode.getUnwindOp()) {
-  default: llvm_unreachable("Invalid unwind code");
-  case UOP_PushNonVol:
-  case UOP_AllocSmall:
-  case UOP_SetFPReg:
-  case UOP_PushMachFrame:
-    return 1;
-  case UOP_SaveNonVol:
-  case UOP_SaveXMM128:
-    return 2;
-  case UOP_SaveNonVolBig:
-  case UOP_SaveXMM128Big:
-    return 3;
-  case UOP_AllocLarge:
-    return (UnwindCode.getOpInfo() == 0) ? 2 : 3;
-  }
-}
-
-// Prints one unwind code. Because an unwind code can occupy up to 3 slots in
-// the unwind codes array, this function requires that the correct number of
-// slots is provided.
-static void printUnwindCode(ArrayRef<UnwindCode> UCs) {
-  assert(UCs.size() >= getNumUsedSlots(UCs[0]));
-  outs() <<  format("      0x%02x: ", unsigned(UCs[0].u.CodeOffset))
-         << getUnwindCodeTypeName(UCs[0].getUnwindOp());
-  switch (UCs[0].getUnwindOp()) {
-  case UOP_PushNonVol:
-    outs() << " " << getUnwindRegisterName(UCs[0].getOpInfo());
-    break;
-  case UOP_AllocLarge:
-    if (UCs[0].getOpInfo() == 0) {
-      outs() << " " << UCs[1].FrameOffset;
-    } else {
-      outs() << " " << UCs[1].FrameOffset
-                       + (static_cast<uint32_t>(UCs[2].FrameOffset) << 16);
-    }
-    break;
-  case UOP_AllocSmall:
-    outs() << " " << ((UCs[0].getOpInfo() + 1) * 8);
-    break;
-  case UOP_SetFPReg:
-    outs() << " ";
-    break;
-  case UOP_SaveNonVol:
-    outs() << " " << getUnwindRegisterName(UCs[0].getOpInfo())
-           << format(" [0x%04x]", 8 * UCs[1].FrameOffset);
-    break;
-  case UOP_SaveNonVolBig:
-    outs() << " " << getUnwindRegisterName(UCs[0].getOpInfo())
-           << format(" [0x%08x]", UCs[1].FrameOffset
-                    + (static_cast<uint32_t>(UCs[2].FrameOffset) << 16));
-    break;
-  case UOP_SaveXMM128:
-    outs() << " XMM" << static_cast<uint32_t>(UCs[0].getOpInfo())
-           << format(" [0x%04x]", 16 * UCs[1].FrameOffset);
-    break;
-  case UOP_SaveXMM128Big:
-    outs() << " XMM" << UCs[0].getOpInfo()
-           << format(" [0x%08x]", UCs[1].FrameOffset
-                           + (static_cast<uint32_t>(UCs[2].FrameOffset) << 16));
-    break;
-  case UOP_PushMachFrame:
-    outs() << " " << (UCs[0].getOpInfo() ? "w/o" : "w")
-           << " error code";
-    break;
-  }
-  outs() << "\n";
-}
-
-static void printAllUnwindCodes(ArrayRef<UnwindCode> UCs) {
-  for (const UnwindCode *I = UCs.begin(), *E = UCs.end(); I < E; ) {
-    unsigned UsedSlots = getNumUsedSlots(*I);
-    if (UsedSlots > UCs.size()) {
-      outs() << "Unwind data corrupted: Encountered unwind op "
-             << getUnwindCodeTypeName((*I).getUnwindOp())
-             << " which requires " << UsedSlots
-             << " slots, but only " << UCs.size()
-             << " remaining in buffer";
-      return ;
-    }
-    printUnwindCode(makeArrayRef(I, E));
-    I += UsedSlots;
-  }
-}
-
-// Given a symbol sym this functions returns the address and section of it.
-static Error resolveSectionAndAddress(const COFFObjectFile *Obj,
-                                      const SymbolRef &Sym,
-                                      const coff_section *&ResolvedSection,
-                                      uint64_t &ResolvedAddr) {
-  Expected<uint64_t> ResolvedAddrOrErr = Sym.getAddress();
-  if (!ResolvedAddrOrErr)
-    return ResolvedAddrOrErr.takeError();
-  ResolvedAddr = *ResolvedAddrOrErr;
-  Expected<section_iterator> Iter = Sym.getSection();
-  if (!Iter)
-    return Iter.takeError();
-  ResolvedSection = Obj->getCOFFSection(**Iter);
-  return Error::success();
-}
-
-// Given a vector of relocations for a section and an offset into this section
-// the function returns the symbol used for the relocation at the offset.
-static Error resolveSymbol(const std::vector<RelocationRef> &Rels,
-                                     uint64_t Offset, SymbolRef &Sym) {
-  for (auto &R : Rels) {
-    uint64_t Ofs = R.getOffset();
-    if (Ofs == Offset) {
-      Sym = *R.getSymbol();
-      return Error::success();
-    }
-  }
-  return make_error<BinaryError>();
-}
-
-// Given a vector of relocations for a section and an offset into this section
-// the function resolves the symbol used for the relocation at the offset and
-// returns the section content and the address inside the content pointed to
-// by the symbol.
-static Error
-getSectionContents(const COFFObjectFile *Obj,
-                   const std::vector<RelocationRef> &Rels, uint64_t Offset,
-                   ArrayRef<uint8_t> &Contents, uint64_t &Addr) {
-  SymbolRef Sym;
-  if (Error E = resolveSymbol(Rels, Offset, Sym))
-    return E;
-  const coff_section *Section;
-  if (Error E = resolveSectionAndAddress(Obj, Sym, Section, Addr))
-    return E;
-  return Obj->getSectionContents(Section, Contents);
-}
-
-// Given a vector of relocations for a section and an offset into this section
-// the function returns the name of the symbol used for the relocation at the
-// offset.
-static Error resolveSymbolName(const std::vector<RelocationRef> &Rels,
-                               uint64_t Offset, StringRef &Name) {
-  SymbolRef Sym;
-  if (Error EC = resolveSymbol(Rels, Offset, Sym))
-    return EC;
-  Expected<StringRef> NameOrErr = Sym.getName();
-  if (!NameOrErr)
-    return NameOrErr.takeError();
-  Name = *NameOrErr;
-  return Error::success();
-}
-
-static void printCOFFSymbolAddress(raw_ostream &Out,
-                                   const std::vector<RelocationRef> &Rels,
-                                   uint64_t Offset, uint32_t Disp) {
-  StringRef Sym;
-  if (!resolveSymbolName(Rels, Offset, Sym)) {
-    Out << Sym;
-    if (Disp > 0)
-      Out << format(" + 0x%04x", Disp);
-  } else {
-    Out << format("0x%04x", Disp);
-  }
-}
-
-static void
-printSEHTable(const COFFObjectFile *Obj, uint32_t TableVA, int Count) {
-  if (Count == 0)
-    return;
-
-  const pe32_header *PE32Header;
-  error(Obj->getPE32Header(PE32Header));
-  uint32_t ImageBase = PE32Header->ImageBase;
-  uintptr_t IntPtr = 0;
-  error(Obj->getVaPtr(TableVA, IntPtr));
-  const support::ulittle32_t *P = (const support::ulittle32_t *)IntPtr;
-  outs() << "SEH Table:";
-  for (int I = 0; I < Count; ++I)
-    outs() << format(" 0x%x", P[I] + ImageBase);
-  outs() << "\n\n";
-}
-
-template <typename T>
-static void printTLSDirectoryT(const coff_tls_directory<T> *TLSDir) {
-  size_t FormatWidth = sizeof(T) * 2;
-  outs() << "TLS directory:"
-         << "\n  StartAddressOfRawData: "
-         << format_hex(TLSDir->StartAddressOfRawData, FormatWidth)
-         << "\n  EndAddressOfRawData: "
-         << format_hex(TLSDir->EndAddressOfRawData, FormatWidth)
-         << "\n  AddressOfIndex: "
-         << format_hex(TLSDir->AddressOfIndex, FormatWidth)
-         << "\n  AddressOfCallBacks: "
-         << format_hex(TLSDir->AddressOfCallBacks, FormatWidth)
-         << "\n  SizeOfZeroFill: "
-         << TLSDir->SizeOfZeroFill
-         << "\n  Characteristics: "
-         << TLSDir->Characteristics
-         << "\n  Alignment: "
-         << TLSDir->getAlignment()
-         << "\n\n";
-}
-
-static void printTLSDirectory(const COFFObjectFile *Obj) {
-  const pe32_header *PE32Header;
-  error(Obj->getPE32Header(PE32Header));
-
-  const pe32plus_header *PE32PlusHeader;
-  error(Obj->getPE32PlusHeader(PE32PlusHeader));
-
-  // Skip if it's not executable.
-  if (!PE32Header && !PE32PlusHeader)
-    return;
-
-  const data_directory *DataDir;
-  error(Obj->getDataDirectory(COFF::TLS_TABLE, DataDir));
-  uintptr_t IntPtr = 0;
-  if (DataDir->RelativeVirtualAddress == 0)
-    return;
-  error(Obj->getRvaPtr(DataDir->RelativeVirtualAddress, IntPtr));
-
-  if (PE32Header) {
-    auto *TLSDir = reinterpret_cast<const coff_tls_directory32 *>(IntPtr);
-    printTLSDirectoryT(TLSDir);
-  } else {
-    auto *TLSDir = reinterpret_cast<const coff_tls_directory64 *>(IntPtr);
-    printTLSDirectoryT(TLSDir);
-  }
-
-  outs() << "\n";
-}
-
-static void printLoadConfiguration(const COFFObjectFile *Obj) {
-  // Skip if it's not executable.
-  const pe32_header *PE32Header;
-  error(Obj->getPE32Header(PE32Header));
-  if (!PE32Header)
-    return;
-
-  // Currently only x86 is supported
-  if (Obj->getMachine() != COFF::IMAGE_FILE_MACHINE_I386)
-    return;
-
-  const data_directory *DataDir;
-  error(Obj->getDataDirectory(COFF::LOAD_CONFIG_TABLE, DataDir));
-  uintptr_t IntPtr = 0;
-  if (DataDir->RelativeVirtualAddress == 0)
-    return;
-  error(Obj->getRvaPtr(DataDir->RelativeVirtualAddress, IntPtr));
-
-  auto *LoadConf = reinterpret_cast<const coff_load_configuration32 *>(IntPtr);
-  outs() << "Load configuration:"
-         << "\n  Timestamp: " << LoadConf->TimeDateStamp
-         << "\n  Major Version: " << LoadConf->MajorVersion
-         << "\n  Minor Version: " << LoadConf->MinorVersion
-         << "\n  GlobalFlags Clear: " << LoadConf->GlobalFlagsClear
-         << "\n  GlobalFlags Set: " << LoadConf->GlobalFlagsSet
-         << "\n  Critical Section Default Timeout: " << LoadConf->CriticalSectionDefaultTimeout
-         << "\n  Decommit Free Block Threshold: " << LoadConf->DeCommitFreeBlockThreshold
-         << "\n  Decommit Total Free Threshold: " << LoadConf->DeCommitTotalFreeThreshold
-         << "\n  Lock Prefix Table: " << LoadConf->LockPrefixTable
-         << "\n  Maximum Allocation Size: " << LoadConf->MaximumAllocationSize
-         << "\n  Virtual Memory Threshold: " << LoadConf->VirtualMemoryThreshold
-         << "\n  Process Affinity Mask: " << LoadConf->ProcessAffinityMask
-         << "\n  Process Heap Flags: " << LoadConf->ProcessHeapFlags
-         << "\n  CSD Version: " << LoadConf->CSDVersion
-         << "\n  Security Cookie: " << LoadConf->SecurityCookie
-         << "\n  SEH Table: " << LoadConf->SEHandlerTable
-         << "\n  SEH Count: " << LoadConf->SEHandlerCount
-         << "\n\n";
-  printSEHTable(Obj, LoadConf->SEHandlerTable, LoadConf->SEHandlerCount);
-  outs() << "\n";
-}
-
-// Prints import tables. The import table is a table containing the list of
-// DLL name and symbol names which will be linked by the loader.
-static void printImportTables(const COFFObjectFile *Obj) {
-  import_directory_iterator I = Obj->import_directory_begin();
-  import_directory_iterator E = Obj->import_directory_end();
-  if (I == E)
-    return;
-  outs() << "The Import Tables:\n";
-  for (const ImportDirectoryEntryRef &DirRef : Obj->import_directories()) {
-    const coff_import_directory_table_entry *Dir;
-    StringRef Name;
-    if (DirRef.getImportTableEntry(Dir)) return;
-    if (DirRef.getName(Name)) return;
-
-    outs() << format("  lookup %08x time %08x fwd %08x name %08x addr %08x\n\n",
-                     static_cast<uint32_t>(Dir->ImportLookupTableRVA),
-                     static_cast<uint32_t>(Dir->TimeDateStamp),
-                     static_cast<uint32_t>(Dir->ForwarderChain),
-                     static_cast<uint32_t>(Dir->NameRVA),
-                     static_cast<uint32_t>(Dir->ImportAddressTableRVA));
-    outs() << "    DLL Name: " << Name << "\n";
-    outs() << "    Hint/Ord  Name\n";
-    for (const ImportedSymbolRef &Entry : DirRef.imported_symbols()) {
-      bool IsOrdinal;
-      if (Entry.isOrdinal(IsOrdinal))
-        return;
-      if (IsOrdinal) {
-        uint16_t Ordinal;
-        if (Entry.getOrdinal(Ordinal))
-          return;
-        outs() << format("      % 6d\n", Ordinal);
-        continue;
-      }
-      uint32_t HintNameRVA;
-      if (Entry.getHintNameRVA(HintNameRVA))
-        return;
-      uint16_t Hint;
-      StringRef Name;
-      if (Obj->getHintName(HintNameRVA, Hint, Name))
-        return;
-      outs() << format("      % 6d  ", Hint) << Name << "\n";
-    }
-    outs() << "\n";
-  }
-}
-
-// Prints export tables. The export table is a table containing the list of
-// exported symbol from the DLL.
-static void printExportTable(const COFFObjectFile *Obj) {
-  outs() << "Export Table:\n";
-  export_directory_iterator I = Obj->export_directory_begin();
-  export_directory_iterator E = Obj->export_directory_end();
-  if (I == E)
-    return;
-  StringRef DllName;
-  uint32_t OrdinalBase;
-  if (I->getDllName(DllName))
-    return;
-  if (I->getOrdinalBase(OrdinalBase))
-    return;
-  outs() << " DLL name: " << DllName << "\n";
-  outs() << " Ordinal base: " << OrdinalBase << "\n";
-  outs() << " Ordinal      RVA  Name\n";
-  for (; I != E; I = ++I) {
-    uint32_t Ordinal;
-    if (I->getOrdinal(Ordinal))
-      return;
-    uint32_t RVA;
-    if (I->getExportRVA(RVA))
-      return;
-    bool IsForwarder;
-    if (I->isForwarder(IsForwarder))
-      return;
-
-    if (IsForwarder) {
-      // Export table entries can be used to re-export symbols that
-      // this COFF file is imported from some DLLs. This is rare.
-      // In most cases IsForwarder is false.
-      outs() << format("    % 4d         ", Ordinal);
-    } else {
-      outs() << format("    % 4d %# 8x", Ordinal, RVA);
-    }
-
-    StringRef Name;
-    if (I->getSymbolName(Name))
-      continue;
-    if (!Name.empty())
-      outs() << "  " << Name;
-    if (IsForwarder) {
-      StringRef S;
-      if (I->getForwardTo(S))
-        return;
-      outs() << " (forwarded to " << S << ")";
-    }
-    outs() << "\n";
-  }
-}
-
-// Given the COFF object file, this function returns the relocations for .pdata
-// and the pointer to "runtime function" structs.
-static bool getPDataSection(const COFFObjectFile *Obj,
-                            std::vector<RelocationRef> &Rels,
-                            const RuntimeFunction *&RFStart, int &NumRFs) {
-  for (const SectionRef &Section : Obj->sections()) {
-    StringRef Name;
-    error(Section.getName(Name));
-    if (Name != ".pdata")
-      continue;
-
-    const coff_section *Pdata = Obj->getCOFFSection(Section);
-    for (const RelocationRef &Reloc : Section.relocations())
-      Rels.push_back(Reloc);
-
-    // Sort relocations by address.
-    llvm::sort(Rels, isRelocAddressLess);
-
-    ArrayRef<uint8_t> Contents;
-    error(Obj->getSectionContents(Pdata, Contents));
-    if (Contents.empty())
-      continue;
-
-    RFStart = reinterpret_cast<const RuntimeFunction *>(Contents.data());
-    NumRFs = Contents.size() / sizeof(RuntimeFunction);
-    return true;
-  }
-  return false;
-}
-
-Error getCOFFRelocationValueString(const COFFObjectFile *Obj,
-                                         const RelocationRef &Rel,
-                                         SmallVectorImpl<char> &Result) {
-  symbol_iterator SymI = Rel.getSymbol();
-  Expected<StringRef> SymNameOrErr = SymI->getName();
-  if (!SymNameOrErr)
-    return SymNameOrErr.takeError();
-  StringRef SymName = *SymNameOrErr;
-  Result.append(SymName.begin(), SymName.end());
-  return Error::success();
-}
-
-static void printWin64EHUnwindInfo(const Win64EH::UnwindInfo *UI) {
-  // The casts to int are required in order to output the value as number.
-  // Without the casts the value would be interpreted as char data (which
-  // results in garbage output).
-  outs() << "    Version: " << static_cast<int>(UI->getVersion()) << "\n";
-  outs() << "    Flags: " << static_cast<int>(UI->getFlags());
-  if (UI->getFlags()) {
-    if (UI->getFlags() & UNW_ExceptionHandler)
-      outs() << " UNW_ExceptionHandler";
-    if (UI->getFlags() & UNW_TerminateHandler)
-      outs() << " UNW_TerminateHandler";
-    if (UI->getFlags() & UNW_ChainInfo)
-      outs() << " UNW_ChainInfo";
-  }
-  outs() << "\n";
-  outs() << "    Size of prolog: " << static_cast<int>(UI->PrologSize) << "\n";
-  outs() << "    Number of Codes: " << static_cast<int>(UI->NumCodes) << "\n";
-  // Maybe this should move to output of UOP_SetFPReg?
-  if (UI->getFrameRegister()) {
-    outs() << "    Frame register: "
-           << getUnwindRegisterName(UI->getFrameRegister()) << "\n";
-    outs() << "    Frame offset: " << 16 * UI->getFrameOffset() << "\n";
-  } else {
-    outs() << "    No frame pointer used\n";
-  }
-  if (UI->getFlags() & (UNW_ExceptionHandler | UNW_TerminateHandler)) {
-    // FIXME: Output exception handler data
-  } else if (UI->getFlags() & UNW_ChainInfo) {
-    // FIXME: Output chained unwind info
-  }
-
-  if (UI->NumCodes)
-    outs() << "    Unwind Codes:\n";
-
-  printAllUnwindCodes(makeArrayRef(&UI->UnwindCodes[0], UI->NumCodes));
-
-  outs() << "\n";
-  outs().flush();
-}
-
-/// Prints out the given RuntimeFunction struct for x64, assuming that Obj is
-/// pointing to an executable file.
-static void printRuntimeFunction(const COFFObjectFile *Obj,
-                                 const RuntimeFunction &RF) {
-  if (!RF.StartAddress)
-    return;
-  outs() << "Function Table:\n"
-         << format("  Start Address: 0x%04x\n",
-                   static_cast<uint32_t>(RF.StartAddress))
-         << format("  End Address: 0x%04x\n",
-                   static_cast<uint32_t>(RF.EndAddress))
-         << format("  Unwind Info Address: 0x%04x\n",
-                   static_cast<uint32_t>(RF.UnwindInfoOffset));
-  uintptr_t addr;
-  if (Obj->getRvaPtr(RF.UnwindInfoOffset, addr))
-    return;
-  printWin64EHUnwindInfo(reinterpret_cast<const Win64EH::UnwindInfo *>(addr));
-}
-
-/// Prints out the given RuntimeFunction struct for x64, assuming that Obj is
-/// pointing to an object file. Unlike executable, fields in RuntimeFunction
-/// struct are filled with zeros, but instead there are relocations pointing to
-/// them so that the linker will fill targets' RVAs to the fields at link
-/// time. This function interprets the relocations to find the data to be used
-/// in the resulting executable.
-static void printRuntimeFunctionRels(const COFFObjectFile *Obj,
-                                     const RuntimeFunction &RF,
-                                     uint64_t SectionOffset,
-                                     const std::vector<RelocationRef> &Rels) {
-  outs() << "Function Table:\n";
-  outs() << "  Start Address: ";
-  printCOFFSymbolAddress(outs(), Rels,
-                         SectionOffset +
-                             /*offsetof(RuntimeFunction, StartAddress)*/ 0,
-                         RF.StartAddress);
-  outs() << "\n";
-
-  outs() << "  End Address: ";
-  printCOFFSymbolAddress(outs(), Rels,
-                         SectionOffset +
-                             /*offsetof(RuntimeFunction, EndAddress)*/ 4,
-                         RF.EndAddress);
-  outs() << "\n";
-
-  outs() << "  Unwind Info Address: ";
-  printCOFFSymbolAddress(outs(), Rels,
-                         SectionOffset +
-                             /*offsetof(RuntimeFunction, UnwindInfoOffset)*/ 8,
-                         RF.UnwindInfoOffset);
-  outs() << "\n";
-
-  ArrayRef<uint8_t> XContents;
-  uint64_t UnwindInfoOffset = 0;
-  error(getSectionContents(
-          Obj, Rels, SectionOffset +
-                         /*offsetof(RuntimeFunction, UnwindInfoOffset)*/ 8,
-          XContents, UnwindInfoOffset));
-  if (XContents.empty())
-    return;
-
-  UnwindInfoOffset += RF.UnwindInfoOffset;
-  if (UnwindInfoOffset > XContents.size())
-    return;
-
-  auto *UI = reinterpret_cast<const Win64EH::UnwindInfo *>(XContents.data() +
-                                                           UnwindInfoOffset);
-  printWin64EHUnwindInfo(UI);
-}
-
-void printCOFFUnwindInfo(const COFFObjectFile *Obj) {
-  if (Obj->getMachine() != COFF::IMAGE_FILE_MACHINE_AMD64) {
-    WithColor::error(errs(), "llvm-objdump")
-        << "unsupported image machine type "
-           "(currently only AMD64 is supported).\n";
-    return;
-  }
-
-  std::vector<RelocationRef> Rels;
-  const RuntimeFunction *RFStart;
-  int NumRFs;
-  if (!getPDataSection(Obj, Rels, RFStart, NumRFs))
-    return;
-  ArrayRef<RuntimeFunction> RFs(RFStart, NumRFs);
-
-  bool IsExecutable = Rels.empty();
-  if (IsExecutable) {
-    for (const RuntimeFunction &RF : RFs)
-      printRuntimeFunction(Obj, RF);
-    return;
-  }
-
-  for (const RuntimeFunction &RF : RFs) {
-    uint64_t SectionOffset =
-        std::distance(RFs.begin(), &RF) * sizeof(RuntimeFunction);
-    printRuntimeFunctionRels(Obj, RF, SectionOffset, Rels);
-  }
-}
-
-void printCOFFFileHeader(const object::ObjectFile *Obj) {
-  const COFFObjectFile *file = dyn_cast<const COFFObjectFile>(Obj);
-  printTLSDirectory(file);
-  printLoadConfiguration(file);
-  printImportTables(file);
-  printExportTable(file);
-}
-
-void printCOFFSymbolTable(const object::COFFImportFile *i) {
-  unsigned Index = 0;
-  bool IsCode = i->getCOFFImportHeader()->getType() == COFF::IMPORT_CODE;
-
-  for (const object::BasicSymbolRef &Sym : i->symbols()) {
-    std::string Name;
-    raw_string_ostream NS(Name);
-
-    cantFail(Sym.printName(NS));
-    NS.flush();
-
-    outs() << "[" << format("%2d", Index) << "]"
-           << "(sec " << format("%2d", 0) << ")"
-           << "(fl 0x00)" // Flag bits, which COFF doesn't have.
-           << "(ty " << format("%3x", (IsCode && Index) ? 32 : 0) << ")"
-           << "(scl " << format("%3x", 0) << ") "
-           << "(nx " << 0 << ") "
-           << "0x" << format("%08x", 0) << " " << Name << '\n';
-
-    ++Index;
-  }
-}
-
-void printCOFFSymbolTable(const COFFObjectFile *coff) {
-  for (unsigned SI = 0, SE = coff->getNumberOfSymbols(); SI != SE; ++SI) {
-    Expected<COFFSymbolRef> Symbol = coff->getSymbol(SI);
-    StringRef Name;
-    error(Symbol.takeError());
-    error(coff->getSymbolName(*Symbol, Name));
-
-    outs() << "[" << format("%2d", SI) << "]"
-           << "(sec " << format("%2d", int(Symbol->getSectionNumber())) << ")"
-           << "(fl 0x00)" // Flag bits, which COFF doesn't have.
-           << "(ty " << format("%3x", unsigned(Symbol->getType())) << ")"
-           << "(scl " << format("%3x", unsigned(Symbol->getStorageClass()))
-           << ") "
-           << "(nx " << unsigned(Symbol->getNumberOfAuxSymbols()) << ") "
-           << "0x" << format("%08x", unsigned(Symbol->getValue())) << " "
-           << Name;
-    if (Demangle && Name.startswith("?")) {
-      char *DemangledSymbol = nullptr;
-      size_t Size = 0;
-      int Status = -1;
-      DemangledSymbol =
-          microsoftDemangle(Name.data(), DemangledSymbol, &Size, &Status);
-
-      if (Status == 0 && DemangledSymbol) {
-        outs() << " (" << StringRef(DemangledSymbol) << ")";
-        std::free(DemangledSymbol);
-      } else {
-        outs() << " (invalid mangled name)";
-      }
-    }
-    outs() << "\n";
-
-    for (unsigned AI = 0, AE = Symbol->getNumberOfAuxSymbols(); AI < AE; ++AI, ++SI) {
-      if (Symbol->isSectionDefinition()) {
-        const coff_aux_section_definition *asd;
-        error(coff->getAuxSymbol<coff_aux_section_definition>(SI + 1, asd));
-
-        int32_t AuxNumber = asd->getNumber(Symbol->isBigObj());
-
-        outs() << "AUX "
-               << format("scnlen 0x%x nreloc %d nlnno %d checksum 0x%x "
-                         , unsigned(asd->Length)
-                         , unsigned(asd->NumberOfRelocations)
-                         , unsigned(asd->NumberOfLinenumbers)
-                         , unsigned(asd->CheckSum))
-               << format("assoc %d comdat %d\n"
-                         , unsigned(AuxNumber)
-                         , unsigned(asd->Selection));
-      } else if (Symbol->isFileRecord()) {
-        const char *FileName;
-        error(coff->getAuxSymbol<char>(SI + 1, FileName));
-
-        StringRef Name(FileName, Symbol->getNumberOfAuxSymbols() *
-                                     coff->getSymbolTableEntrySize());
-        outs() << "AUX " << Name.rtrim(StringRef("\0", 1))  << '\n';
-
-        SI = SI + Symbol->getNumberOfAuxSymbols();
-        break;
-      } else if (Symbol->isWeakExternal()) {
-        const coff_aux_weak_external *awe;
-        error(coff->getAuxSymbol<coff_aux_weak_external>(SI + 1, awe));
-
-        outs() << "AUX " << format("indx %d srch %d\n",
-                                   static_cast<uint32_t>(awe->TagIndex),
-                                   static_cast<uint32_t>(awe->Characteristics));
-      } else {
-        outs() << "AUX Unknown\n";
-      }
-    }
-  }
-}
-} // namespace llvm
diff --git a/contrib/llvm/tools/llvm-objdump/ELFDump.cpp b/contrib/llvm/tools/llvm-objdump/ELFDump.cpp
deleted file mode 100644
index 9c4d67d0f1bd..000000000000
--- a/contrib/llvm/tools/llvm-objdump/ELFDump.cpp
+++ /dev/null
@@ -1,362 +0,0 @@
-//===-- ELFDump.cpp - ELF-specific dumper -----------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-///
-/// \file
-/// This file implements the ELF-specific dumper for llvm-objdump.
-///
-//===----------------------------------------------------------------------===//
-
-#include "llvm-objdump.h"
-#include "llvm/Demangle/Demangle.h"
-#include "llvm/Object/ELFObjectFile.h"
-#include "llvm/Support/Format.h"
-#include "llvm/Support/MathExtras.h"
-#include "llvm/Support/raw_ostream.h"
-
-using namespace llvm::object;
-
-namespace llvm {
-template <class ELFT>
-static Expected<StringRef> getDynamicStrTab(const ELFFile<ELFT> *Elf) {
-  auto DynamicEntriesOrError = Elf->dynamicEntries();
-  if (!DynamicEntriesOrError)
-    return DynamicEntriesOrError.takeError();
-
-  for (const typename ELFT::Dyn &Dyn : *DynamicEntriesOrError) {
-    if (Dyn.d_tag == ELF::DT_STRTAB) {
-      auto MappedAddrOrError = Elf->toMappedAddr(Dyn.getPtr());
-      if (!MappedAddrOrError)
-        consumeError(MappedAddrOrError.takeError());
-      return StringRef(reinterpret_cast<const char *>(*MappedAddrOrError));
-    }
-  }
-
-  // If the dynamic segment is not present, we fall back on the sections.
-  auto SectionsOrError = Elf->sections();
-  if (!SectionsOrError)
-    return SectionsOrError.takeError();
-
-  for (const typename ELFT::Shdr &Sec : *SectionsOrError) {
-    if (Sec.sh_type == ELF::SHT_DYNSYM)
-      return Elf->getStringTableForSymtab(Sec);
-  }
-
-  return createError("dynamic string table not found");
-}
-
-template <class ELFT>
-static Error getRelocationValueString(const ELFObjectFile<ELFT> *Obj,
-                                      const RelocationRef &RelRef,
-                                      SmallVectorImpl<char> &Result) {
-  const ELFFile<ELFT> &EF = *Obj->getELFFile();
-  DataRefImpl Rel = RelRef.getRawDataRefImpl();
-  auto SecOrErr = EF.getSection(Rel.d.a);
-  if (!SecOrErr)
-    return SecOrErr.takeError();
-
-  int64_t Addend = 0;
-  // If there is no Symbol associated with the relocation, we set the undef
-  // boolean value to 'true'. This will prevent us from calling functions that
-  // requires the relocation to be associated with a symbol.
-  //
-  // In SHT_REL case we would need to read the addend from section data.
-  // GNU objdump does not do that and we just follow for simplicity atm.
-  bool Undef = false;
-  if ((*SecOrErr)->sh_type == ELF::SHT_RELA) {
-    const typename ELFT::Rela *ERela = Obj->getRela(Rel);
-    Addend = ERela->r_addend;
-    Undef = ERela->getSymbol(false) == 0;
-  } else if ((*SecOrErr)->sh_type != ELF::SHT_REL) {
-    return make_error<BinaryError>();
-  }
-
-  // Default scheme is to print Target, as well as "+ <addend>" for nonzero
-  // addend. Should be acceptable for all normal purposes.
-  std::string FmtBuf;
-  raw_string_ostream Fmt(FmtBuf);
-
-  if (!Undef) {
-    symbol_iterator SI = RelRef.getSymbol();
-    const typename ELFT::Sym *Sym = Obj->getSymbol(SI->getRawDataRefImpl());
-    if (Sym->getType() == ELF::STT_SECTION) {
-      Expected<section_iterator> SymSI = SI->getSection();
-      if (!SymSI)
-        return SymSI.takeError();
-      const typename ELFT::Shdr *SymSec =
-          Obj->getSection((*SymSI)->getRawDataRefImpl());
-      auto SecName = EF.getSectionName(SymSec);
-      if (!SecName)
-        return SecName.takeError();
-      Fmt << *SecName;
-    } else {
-      Expected<StringRef> SymName = SI->getName();
-      if (!SymName)
-        return SymName.takeError();
-      if (Demangle)
-        Fmt << demangle(*SymName);
-      else
-        Fmt << *SymName;
-    }
-  } else {
-    Fmt << "*ABS*";
-  }
-
-  if (Addend != 0)
-    Fmt << (Addend < 0 ? "" : "+") << Addend;
-  Fmt.flush();
-  Result.append(FmtBuf.begin(), FmtBuf.end());
-  return Error::success();
-}
-
-Error getELFRelocationValueString(const ELFObjectFileBase *Obj,
-                                  const RelocationRef &Rel,
-                                  SmallVectorImpl<char> &Result) {
-  if (auto *ELF32LE = dyn_cast<ELF32LEObjectFile>(Obj))
-    return getRelocationValueString(ELF32LE, Rel, Result);
-  if (auto *ELF64LE = dyn_cast<ELF64LEObjectFile>(Obj))
-    return getRelocationValueString(ELF64LE, Rel, Result);
-  if (auto *ELF32BE = dyn_cast<ELF32BEObjectFile>(Obj))
-    return getRelocationValueString(ELF32BE, Rel, Result);
-  auto *ELF64BE = cast<ELF64BEObjectFile>(Obj);
-  return getRelocationValueString(ELF64BE, Rel, Result);
-}
-
-template <class ELFT>
-static uint64_t getSectionLMA(const ELFFile<ELFT> *Obj,
-                              const object::ELFSectionRef &Sec) {
-  auto PhdrRangeOrErr = Obj->program_headers();
-  if (!PhdrRangeOrErr)
-    report_fatal_error(toString(PhdrRangeOrErr.takeError()));
-
-  // Search for a PT_LOAD segment containing the requested section. Use this
-  // segment's p_addr to calculate the section's LMA.
-  for (const typename ELFT::Phdr &Phdr : *PhdrRangeOrErr)
-    if ((Phdr.p_type == ELF::PT_LOAD) && (Phdr.p_vaddr <= Sec.getAddress()) &&
-        (Phdr.p_vaddr + Phdr.p_memsz > Sec.getAddress()))
-      return Sec.getAddress() - Phdr.p_vaddr + Phdr.p_paddr;
-
-  // Return section's VMA if it isn't in a PT_LOAD segment.
-  return Sec.getAddress();
-}
-
-uint64_t getELFSectionLMA(const object::ELFSectionRef &Sec) {
-  if (const auto *ELFObj = dyn_cast<ELF32LEObjectFile>(Sec.getObject()))
-    return getSectionLMA(ELFObj->getELFFile(), Sec);
-  else if (const auto *ELFObj = dyn_cast<ELF32BEObjectFile>(Sec.getObject()))
-    return getSectionLMA(ELFObj->getELFFile(), Sec);
-  else if (const auto *ELFObj = dyn_cast<ELF64LEObjectFile>(Sec.getObject()))
-    return getSectionLMA(ELFObj->getELFFile(), Sec);
-  const auto *ELFObj = cast<ELF64BEObjectFile>(Sec.getObject());
-  return getSectionLMA(ELFObj->getELFFile(), Sec);
-}
-
-template <class ELFT>
-void printDynamicSection(const ELFFile<ELFT> *Elf, StringRef Filename) {
-  ArrayRef<typename ELFT::Dyn> DynamicEntries =
-      unwrapOrError(Elf->dynamicEntries(), Filename);
-  outs() << "Dynamic Section:\n";
-  for (const typename ELFT::Dyn &Dyn : DynamicEntries) {
-    if (Dyn.d_tag == ELF::DT_NULL)
-      continue;
-
-    std::string Str = Elf->getDynamicTagAsString(Dyn.d_tag);
-    outs() << format("  %-21s", Str.c_str());
-
-    const char *Fmt =
-        ELFT::Is64Bits ? "0x%016" PRIx64 "\n" : "0x%08" PRIx64 "\n";
-    if (Dyn.d_tag == ELF::DT_NEEDED || Dyn.d_tag == ELF::DT_RPATH ||
-        Dyn.d_tag == ELF::DT_RUNPATH || Dyn.d_tag == ELF::DT_SONAME ||
-        Dyn.d_tag == ELF::DT_AUXILIARY || Dyn.d_tag == ELF::DT_FILTER) {
-      Expected<StringRef> StrTabOrErr = getDynamicStrTab(Elf);
-      if (StrTabOrErr) {
-        const char *Data = StrTabOrErr.get().data();
-        outs() << (Data + Dyn.d_un.d_val) << "\n";
-        continue;
-      }
-      warn(toString(StrTabOrErr.takeError()));
-      consumeError(StrTabOrErr.takeError());
-    }
-    outs() << format(Fmt, (uint64_t)Dyn.d_un.d_val);
-  }
-}
-
-template <class ELFT> void printProgramHeaders(const ELFFile<ELFT> *o) {
-  outs() << "Program Header:\n";
-  auto ProgramHeaderOrError = o->program_headers();
-  if (!ProgramHeaderOrError)
-    report_fatal_error(toString(ProgramHeaderOrError.takeError()));
-  for (const typename ELFT::Phdr &Phdr : *ProgramHeaderOrError) {
-    switch (Phdr.p_type) {
-    case ELF::PT_DYNAMIC:
-      outs() << " DYNAMIC ";
-      break;
-    case ELF::PT_GNU_EH_FRAME:
-      outs() << "EH_FRAME ";
-      break;
-    case ELF::PT_GNU_RELRO:
-      outs() << "   RELRO ";
-      break;
-    case ELF::PT_GNU_STACK:
-      outs() << "   STACK ";
-      break;
-    case ELF::PT_INTERP:
-      outs() << "  INTERP ";
-      break;
-    case ELF::PT_LOAD:
-      outs() << "    LOAD ";
-      break;
-    case ELF::PT_NOTE:
-      outs() << "    NOTE ";
-      break;
-    case ELF::PT_OPENBSD_BOOTDATA:
-      outs() << "    OPENBSD_BOOTDATA ";
-      break;
-    case ELF::PT_OPENBSD_RANDOMIZE:
-      outs() << "    OPENBSD_RANDOMIZE ";
-      break;
-    case ELF::PT_OPENBSD_WXNEEDED:
-      outs() << "    OPENBSD_WXNEEDED ";
-      break;
-    case ELF::PT_PHDR:
-      outs() << "    PHDR ";
-      break;
-    case ELF::PT_TLS:
-      outs() << "    TLS ";
-      break;
-    default:
-      outs() << " UNKNOWN ";
-    }
-
-    const char *Fmt = ELFT::Is64Bits ? "0x%016" PRIx64 " " : "0x%08" PRIx64 " ";
-
-    outs() << "off    " << format(Fmt, (uint64_t)Phdr.p_offset) << "vaddr "
-           << format(Fmt, (uint64_t)Phdr.p_vaddr) << "paddr "
-           << format(Fmt, (uint64_t)Phdr.p_paddr)
-           << format("align 2**%u\n",
-                     countTrailingZeros<uint64_t>(Phdr.p_align))
-           << "         filesz " << format(Fmt, (uint64_t)Phdr.p_filesz)
-           << "memsz " << format(Fmt, (uint64_t)Phdr.p_memsz) << "flags "
-           << ((Phdr.p_flags & ELF::PF_R) ? "r" : "-")
-           << ((Phdr.p_flags & ELF::PF_W) ? "w" : "-")
-           << ((Phdr.p_flags & ELF::PF_X) ? "x" : "-") << "\n";
-  }
-  outs() << "\n";
-}
-
-template <class ELFT>
-void printSymbolVersionDependency(ArrayRef<uint8_t> Contents,
-                                  StringRef StrTab) {
-  outs() << "Version References:\n";
-
-  const uint8_t *Buf = Contents.data();
-  while (Buf) {
-    auto *Verneed = reinterpret_cast<const typename ELFT::Verneed *>(Buf);
-    outs() << "  required from "
-           << StringRef(StrTab.drop_front(Verneed->vn_file).data()) << ":\n";
-
-    const uint8_t *BufAux = Buf + Verneed->vn_aux;
-    while (BufAux) {
-      auto *Vernaux = reinterpret_cast<const typename ELFT::Vernaux *>(BufAux);
-      outs() << "    "
-             << format("0x%08" PRIx32 " ", (uint32_t)Vernaux->vna_hash)
-             << format("0x%02" PRIx16 " ", (uint16_t)Vernaux->vna_flags)
-             << format("%02" PRIu16 " ", (uint16_t)Vernaux->vna_other)
-             << StringRef(StrTab.drop_front(Vernaux->vna_name).data()) << '\n';
-      BufAux = Vernaux->vna_next ? BufAux + Vernaux->vna_next : nullptr;
-    }
-    Buf = Verneed->vn_next ? Buf + Verneed->vn_next : nullptr;
-  }
-}
-
-template <class ELFT>
-void printSymbolVersionDefinition(const typename ELFT::Shdr &Shdr,
-                                  ArrayRef<uint8_t> Contents,
-                                  StringRef StrTab) {
-  outs() << "Version definitions:\n";
-
-  const uint8_t *Buf = Contents.data();
-  uint32_t VerdefIndex = 1;
-  // sh_info contains the number of entries in the SHT_GNU_verdef section. To
-  // make the index column have consistent width, we should insert blank spaces
-  // according to sh_info.
-  uint16_t VerdefIndexWidth = std::to_string(Shdr.sh_info).size();
-  while (Buf) {
-    auto *Verdef = reinterpret_cast<const typename ELFT::Verdef *>(Buf);
-    outs() << format_decimal(VerdefIndex++, VerdefIndexWidth) << " "
-           << format("0x%02" PRIx16 " ", (uint16_t)Verdef->vd_flags)
-           << format("0x%08" PRIx32 " ", (uint32_t)Verdef->vd_hash);
-
-    const uint8_t *BufAux = Buf + Verdef->vd_aux;
-    uint16_t VerdauxIndex = 0;
-    while (BufAux) {
-      auto *Verdaux = reinterpret_cast<const typename ELFT::Verdaux *>(BufAux);
-      if (VerdauxIndex)
-        outs() << std::string(VerdefIndexWidth + 17, ' ');
-      outs() << StringRef(StrTab.drop_front(Verdaux->vda_name).data()) << '\n';
-      BufAux = Verdaux->vda_next ? BufAux + Verdaux->vda_next : nullptr;
-      ++VerdauxIndex;
-    }
-    Buf = Verdef->vd_next ? Buf + Verdef->vd_next : nullptr;
-  }
-}
-
-template <class ELFT>
-void printSymbolVersionInfo(const ELFFile<ELFT> *Elf, StringRef FileName) {
-  ArrayRef<typename ELFT::Shdr> Sections =
-      unwrapOrError(Elf->sections(), FileName);
-  for (const typename ELFT::Shdr &Shdr : Sections) {
-    if (Shdr.sh_type != ELF::SHT_GNU_verneed &&
-        Shdr.sh_type != ELF::SHT_GNU_verdef)
-      continue;
-
-    ArrayRef<uint8_t> Contents =
-        unwrapOrError(Elf->getSectionContents(&Shdr), FileName);
-    const typename ELFT::Shdr *StrTabSec =
-        unwrapOrError(Elf->getSection(Shdr.sh_link), FileName);
-    StringRef StrTab = unwrapOrError(Elf->getStringTable(StrTabSec), FileName);
-
-    if (Shdr.sh_type == ELF::SHT_GNU_verneed)
-      printSymbolVersionDependency<ELFT>(Contents, StrTab);
-    else
-      printSymbolVersionDefinition<ELFT>(Shdr, Contents, StrTab);
-  }
-}
-
-void printELFFileHeader(const object::ObjectFile *Obj) {
-  if (const auto *ELFObj = dyn_cast<ELF32LEObjectFile>(Obj))
-    printProgramHeaders(ELFObj->getELFFile());
-  else if (const auto *ELFObj = dyn_cast<ELF32BEObjectFile>(Obj))
-    printProgramHeaders(ELFObj->getELFFile());
-  else if (const auto *ELFObj = dyn_cast<ELF64LEObjectFile>(Obj))
-    printProgramHeaders(ELFObj->getELFFile());
-  else if (const auto *ELFObj = dyn_cast<ELF64BEObjectFile>(Obj))
-    printProgramHeaders(ELFObj->getELFFile());
-}
-
-void printELFDynamicSection(const object::ObjectFile *Obj) {
-  if (const auto *ELFObj = dyn_cast<ELF32LEObjectFile>(Obj))
-    printDynamicSection(ELFObj->getELFFile(), Obj->getFileName());
-  else if (const auto *ELFObj = dyn_cast<ELF32BEObjectFile>(Obj))
-    printDynamicSection(ELFObj->getELFFile(), Obj->getFileName());
-  else if (const auto *ELFObj = dyn_cast<ELF64LEObjectFile>(Obj))
-    printDynamicSection(ELFObj->getELFFile(), Obj->getFileName());
-  else if (const auto *ELFObj = dyn_cast<ELF64BEObjectFile>(Obj))
-    printDynamicSection(ELFObj->getELFFile(), Obj->getFileName());
-}
-
-void printELFSymbolVersionInfo(const object::ObjectFile *Obj) {
-  if (const auto *ELFObj = dyn_cast<ELF32LEObjectFile>(Obj))
-    printSymbolVersionInfo(ELFObj->getELFFile(), Obj->getFileName());
-  else if (const auto *ELFObj = dyn_cast<ELF32BEObjectFile>(Obj))
-    printSymbolVersionInfo(ELFObj->getELFFile(), Obj->getFileName());
-  else if (const auto *ELFObj = dyn_cast<ELF64LEObjectFile>(Obj))
-    printSymbolVersionInfo(ELFObj->getELFFile(), Obj->getFileName());
-  else if (const auto *ELFObj = dyn_cast<ELF64BEObjectFile>(Obj))
-    printSymbolVersionInfo(ELFObj->getELFFile(), Obj->getFileName());
-}
-} // namespace llvm
diff --git a/contrib/llvm/tools/llvm-objdump/MachODump.cpp b/contrib/llvm/tools/llvm-objdump/MachODump.cpp
deleted file mode 100644
index 58ff7be4543c..000000000000
--- a/contrib/llvm/tools/llvm-objdump/MachODump.cpp
+++ /dev/null
@@ -1,10398 +0,0 @@
-//===-- MachODump.cpp - Object file dumping utility for llvm --------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-//
-// This file implements the MachO-specific dumper for llvm-objdump.
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm-objdump.h"
-#include "llvm-c/Disassembler.h"
-#include "llvm/ADT/STLExtras.h"
-#include "llvm/ADT/StringExtras.h"
-#include "llvm/ADT/Triple.h"
-#include "llvm/BinaryFormat/MachO.h"
-#include "llvm/Config/config.h"
-#include "llvm/DebugInfo/DIContext.h"
-#include "llvm/DebugInfo/DWARF/DWARFContext.h"
-#include "llvm/Demangle/Demangle.h"
-#include "llvm/MC/MCAsmInfo.h"
-#include "llvm/MC/MCContext.h"
-#include "llvm/MC/MCDisassembler/MCDisassembler.h"
-#include "llvm/MC/MCInst.h"
-#include "llvm/MC/MCInstPrinter.h"
-#include "llvm/MC/MCInstrDesc.h"
-#include "llvm/MC/MCInstrInfo.h"
-#include "llvm/MC/MCRegisterInfo.h"
-#include "llvm/MC/MCSubtargetInfo.h"
-#include "llvm/Object/MachO.h"
-#include "llvm/Object/MachOUniversal.h"
-#include "llvm/Support/Casting.h"
-#include "llvm/Support/CommandLine.h"
-#include "llvm/Support/Debug.h"
-#include "llvm/Support/Endian.h"
-#include "llvm/Support/Format.h"
-#include "llvm/Support/FormattedStream.h"
-#include "llvm/Support/GraphWriter.h"
-#include "llvm/Support/LEB128.h"
-#include "llvm/Support/MemoryBuffer.h"
-#include "llvm/Support/TargetRegistry.h"
-#include "llvm/Support/TargetSelect.h"
-#include "llvm/Support/ToolOutputFile.h"
-#include "llvm/Support/WithColor.h"
-#include "llvm/Support/raw_ostream.h"
-#include <algorithm>
-#include <cstring>
-#include <system_error>
-
-#ifdef HAVE_LIBXAR
-extern "C" {
-#include <xar/xar.h>
-}
-#endif
-
-using namespace llvm::object;
-
-namespace llvm {
-
-cl::OptionCategory MachOCat("llvm-objdump MachO Specific Options");
-
-extern cl::opt<bool> ArchiveHeaders;
-extern cl::opt<bool> Disassemble;
-extern cl::opt<bool> DisassembleAll;
-extern cl::opt<DIDumpType> DwarfDumpType;
-extern cl::list<std::string> FilterSections;
-extern cl::list<std::string> MAttrs;
-extern cl::opt<std::string> MCPU;
-extern cl::opt<bool> NoShowRawInsn;
-extern cl::opt<bool> NoLeadingAddr;
-extern cl::opt<bool> PrintImmHex;
-extern cl::opt<bool> PrivateHeaders;
-extern cl::opt<bool> Relocations;
-extern cl::opt<bool> SectionHeaders;
-extern cl::opt<bool> SectionContents;
-extern cl::opt<bool> SymbolTable;
-extern cl::opt<std::string> TripleName;
-extern cl::opt<bool> UnwindInfo;
-
-cl::opt<bool>
-    FirstPrivateHeader("private-header",
-                       cl::desc("Display only the first format specific file "
-                                "header"),
-                       cl::cat(MachOCat));
-
-cl::opt<bool> ExportsTrie("exports-trie",
-                          cl::desc("Display mach-o exported symbols"),
-                          cl::cat(MachOCat));
-
-cl::opt<bool> Rebase("rebase", cl::desc("Display mach-o rebasing info"),
-                     cl::cat(MachOCat));
-
-cl::opt<bool> Bind("bind", cl::desc("Display mach-o binding info"),
-                   cl::cat(MachOCat));
-
-cl::opt<bool> LazyBind("lazy-bind",
-                       cl::desc("Display mach-o lazy binding info"),
-                       cl::cat(MachOCat));
-
-cl::opt<bool> WeakBind("weak-bind",
-                       cl::desc("Display mach-o weak binding info"),
-                       cl::cat(MachOCat));
-
-static cl::opt<bool>
-    UseDbg("g", cl::Grouping,
-           cl::desc("Print line information from debug info if available"),
-           cl::cat(MachOCat));
-
-static cl::opt<std::string> DSYMFile("dsym",
-                                     cl::desc("Use .dSYM file for debug info"),
-                                     cl::cat(MachOCat));
-
-static cl::opt<bool> FullLeadingAddr("full-leading-addr",
-                                     cl::desc("Print full leading address"),
-                                     cl::cat(MachOCat));
-
-static cl::opt<bool> NoLeadingHeaders("no-leading-headers",
-                                      cl::desc("Print no leading headers"),
-                                      cl::cat(MachOCat));
-
-cl::opt<bool> UniversalHeaders("universal-headers",
-                               cl::desc("Print Mach-O universal headers "
-                                        "(requires -macho)"),
-                               cl::cat(MachOCat));
-
-cl::opt<bool>
-    ArchiveMemberOffsets("archive-member-offsets",
-                         cl::desc("Print the offset to each archive member for "
-                                  "Mach-O archives (requires -macho and "
-                                  "-archive-headers)"),
-                         cl::cat(MachOCat));
-
-cl::opt<bool> IndirectSymbols("indirect-symbols",
-                              cl::desc("Print indirect symbol table for Mach-O "
-                                       "objects (requires -macho)"),
-                              cl::cat(MachOCat));
-
-cl::opt<bool>
-    DataInCode("data-in-code",
-               cl::desc("Print the data in code table for Mach-O objects "
-                        "(requires -macho)"),
-               cl::cat(MachOCat));
-
-cl::opt<bool> LinkOptHints("link-opt-hints",
-                           cl::desc("Print the linker optimization hints for "
-                                    "Mach-O objects (requires -macho)"),
-                           cl::cat(MachOCat));
-
-cl::opt<bool> InfoPlist("info-plist",
-                        cl::desc("Print the info plist section as strings for "
-                                 "Mach-O objects (requires -macho)"),
-                        cl::cat(MachOCat));
-
-cl::opt<bool> DylibsUsed("dylibs-used",
-                         cl::desc("Print the shared libraries used for linked "
-                                  "Mach-O files (requires -macho)"),
-                         cl::cat(MachOCat));
-
-cl::opt<bool>
-    DylibId("dylib-id",
-            cl::desc("Print the shared library's id for the dylib Mach-O "
-                     "file (requires -macho)"),
-            cl::cat(MachOCat));
-
-cl::opt<bool>
-    NonVerbose("non-verbose",
-               cl::desc("Print the info for Mach-O objects in "
-                        "non-verbose or numeric form (requires -macho)"),
-               cl::cat(MachOCat));
-
-cl::opt<bool>
-    ObjcMetaData("objc-meta-data",
-                 cl::desc("Print the Objective-C runtime meta data for "
-                          "Mach-O files (requires -macho)"),
-                 cl::cat(MachOCat));
-
-cl::opt<std::string> DisSymName(
-    "dis-symname",
-    cl::desc("disassemble just this symbol's instructions (requires -macho)"),
-    cl::cat(MachOCat));
-
-static cl::opt<bool> NoSymbolicOperands(
-    "no-symbolic-operands",
-    cl::desc("do not symbolic operands when disassembling (requires -macho)"),
-    cl::cat(MachOCat));
-
-static cl::list<std::string>
-    ArchFlags("arch", cl::desc("architecture(s) from a Mach-O file to dump"),
-              cl::ZeroOrMore, cl::cat(MachOCat));
-
-bool ArchAll = false;
-
-static std::string ThumbTripleName;
-
-static const Target *GetTarget(const MachOObjectFile *MachOObj,
-                               const char **McpuDefault,
-                               const Target **ThumbTarget) {
-  // Figure out the target triple.
-  Triple TT(TripleName);
-  if (TripleName.empty()) {
-    TT = MachOObj->getArchTriple(McpuDefault);
-    TripleName = TT.str();
-  }
-
-  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.
-    Triple ThumbTriple = TT;
-    std::string ThumbName = (Twine("thumb") + TT.getArchName().substr(3)).str();
-    ThumbTriple.setArchName(ThumbName);
-    ThumbTripleName = ThumbTriple.str();
-  }
-
-  // Get the target specific parser.
-  std::string Error;
-  const Target *TheTarget = TargetRegistry::lookupTarget(TripleName, Error);
-  if (TheTarget && ThumbTripleName.empty())
-    return TheTarget;
-
-  *ThumbTarget = TargetRegistry::lookupTarget(ThumbTripleName, Error);
-  if (*ThumbTarget)
-    return TheTarget;
-
-  WithColor::error(errs(), "llvm-objdump") << "unable to get target for '";
-  if (!TheTarget)
-    errs() << TripleName;
-  else
-    errs() << ThumbTripleName;
-  errs() << "', see --version and --triple.\n";
-  return nullptr;
-}
-
-struct SymbolSorter {
-  bool operator()(const SymbolRef &A, const SymbolRef &B) {
-    Expected<SymbolRef::Type> ATypeOrErr = A.getType();
-    if (!ATypeOrErr)
-      report_error(ATypeOrErr.takeError(), A.getObject()->getFileName());
-    SymbolRef::Type AType = *ATypeOrErr;
-    Expected<SymbolRef::Type> BTypeOrErr = B.getType();
-    if (!BTypeOrErr)
-      report_error(BTypeOrErr.takeError(), B.getObject()->getFileName());
-    SymbolRef::Type BType = *BTypeOrErr;
-    uint64_t AAddr = (AType != SymbolRef::ST_Function) ? 0 : A.getValue();
-    uint64_t BAddr = (BType != SymbolRef::ST_Function) ? 0 : B.getValue();
-    return AAddr < BAddr;
-  }
-};
-
-// Types for the storted data in code table that is built before disassembly
-// and the predicate function to sort them.
-typedef std::pair<uint64_t, DiceRef> DiceTableEntry;
-typedef std::vector<DiceTableEntry> DiceTable;
-typedef DiceTable::iterator dice_table_iterator;
-
-#ifdef HAVE_LIBXAR
-namespace {
-struct ScopedXarFile {
-  xar_t xar;
-  ScopedXarFile(const char *filename, int32_t flags)
-      : xar(xar_open(filename, flags)) {}
-  ~ScopedXarFile() {
-    if (xar)
-      xar_close(xar);
-  }
-  ScopedXarFile(const ScopedXarFile &) = delete;
-  ScopedXarFile &operator=(const ScopedXarFile &) = delete;
-  operator xar_t() { return xar; }
-};
-
-struct ScopedXarIter {
-  xar_iter_t iter;
-  ScopedXarIter() : iter(xar_iter_new()) {}
-  ~ScopedXarIter() {
-    if (iter)
-      xar_iter_free(iter);
-  }
-  ScopedXarIter(const ScopedXarIter &) = delete;
-  ScopedXarIter &operator=(const ScopedXarIter &) = delete;
-  operator xar_iter_t() { return iter; }
-};
-} // namespace
-#endif // defined(HAVE_LIBXAR)
-
-// This is used to search for a data in code table entry for the PC being
-// disassembled.  The j parameter has the PC in j.first.  A single data in code
-// table entry can cover many bytes for each of its Kind's.  So if the offset,
-// aka the i.first value, of the data in code table entry plus its Length
-// covers the PC being searched for this will return true.  If not it will
-// return false.
-static bool compareDiceTableEntries(const DiceTableEntry &i,
-                                    const DiceTableEntry &j) {
-  uint16_t Length;
-  i.second.getLength(Length);
-
-  return j.first >= i.first && j.first < i.first + Length;
-}
-
-static uint64_t DumpDataInCode(const uint8_t *bytes, uint64_t Length,
-                               unsigned short Kind) {
-  uint32_t Value, Size = 1;
-
-  switch (Kind) {
-  default:
-  case MachO::DICE_KIND_DATA:
-    if (Length >= 4) {
-      if (!NoShowRawInsn)
-        dumpBytes(makeArrayRef(bytes, 4), outs());
-      Value = bytes[3] << 24 | bytes[2] << 16 | bytes[1] << 8 | bytes[0];
-      outs() << "\t.long " << Value;
-      Size = 4;
-    } else if (Length >= 2) {
-      if (!NoShowRawInsn)
-        dumpBytes(makeArrayRef(bytes, 2), outs());
-      Value = bytes[1] << 8 | bytes[0];
-      outs() << "\t.short " << Value;
-      Size = 2;
-    } else {
-      if (!NoShowRawInsn)
-        dumpBytes(makeArrayRef(bytes, 2), outs());
-      Value = bytes[0];
-      outs() << "\t.byte " << Value;
-      Size = 1;
-    }
-    if (Kind == MachO::DICE_KIND_DATA)
-      outs() << "\t@ KIND_DATA\n";
-    else
-      outs() << "\t@ data in code kind = " << Kind << "\n";
-    break;
-  case MachO::DICE_KIND_JUMP_TABLE8:
-    if (!NoShowRawInsn)
-      dumpBytes(makeArrayRef(bytes, 1), outs());
-    Value = bytes[0];
-    outs() << "\t.byte " << format("%3u", Value) << "\t@ KIND_JUMP_TABLE8\n";
-    Size = 1;
-    break;
-  case MachO::DICE_KIND_JUMP_TABLE16:
-    if (!NoShowRawInsn)
-      dumpBytes(makeArrayRef(bytes, 2), outs());
-    Value = bytes[1] << 8 | bytes[0];
-    outs() << "\t.short " << format("%5u", Value & 0xffff)
-           << "\t@ KIND_JUMP_TABLE16\n";
-    Size = 2;
-    break;
-  case MachO::DICE_KIND_JUMP_TABLE32:
-  case MachO::DICE_KIND_ABS_JUMP_TABLE32:
-    if (!NoShowRawInsn)
-      dumpBytes(makeArrayRef(bytes, 4), outs());
-    Value = bytes[3] << 24 | bytes[2] << 16 | bytes[1] << 8 | bytes[0];
-    outs() << "\t.long " << Value;
-    if (Kind == MachO::DICE_KIND_JUMP_TABLE32)
-      outs() << "\t@ KIND_JUMP_TABLE32\n";
-    else
-      outs() << "\t@ KIND_ABS_JUMP_TABLE32\n";
-    Size = 4;
-    break;
-  }
-  return Size;
-}
-
-static void getSectionsAndSymbols(MachOObjectFile *MachOObj,
-                                  std::vector<SectionRef> &Sections,
-                                  std::vector<SymbolRef> &Symbols,
-                                  SmallVectorImpl<uint64_t> &FoundFns,
-                                  uint64_t &BaseSegmentAddress) {
-  const StringRef FileName = MachOObj->getFileName();
-  for (const SymbolRef &Symbol : MachOObj->symbols()) {
-    StringRef SymName = unwrapOrError(Symbol.getName(), FileName);
-    if (!SymName.startswith("ltmp"))
-      Symbols.push_back(Symbol);
-  }
-
-  for (const SectionRef &Section : MachOObj->sections()) {
-    StringRef SectName;
-    Section.getName(SectName);
-    Sections.push_back(Section);
-  }
-
-  bool BaseSegmentAddressSet = false;
-  for (const auto &Command : MachOObj->load_commands()) {
-    if (Command.C.cmd == MachO::LC_FUNCTION_STARTS) {
-      // We found a function starts segment, parse the addresses for later
-      // consumption.
-      MachO::linkedit_data_command LLC =
-          MachOObj->getLinkeditDataLoadCommand(Command);
-
-      MachOObj->ReadULEB128s(LLC.dataoff, FoundFns);
-    } else if (Command.C.cmd == MachO::LC_SEGMENT) {
-      MachO::segment_command SLC = MachOObj->getSegmentLoadCommand(Command);
-      StringRef SegName = SLC.segname;
-      if (!BaseSegmentAddressSet && SegName != "__PAGEZERO") {
-        BaseSegmentAddressSet = true;
-        BaseSegmentAddress = SLC.vmaddr;
-      }
-    }
-  }
-}
-
-static void printRelocationTargetName(const MachOObjectFile *O,
-                                      const MachO::any_relocation_info &RE,
-                                      raw_string_ostream &Fmt) {
-  // Target of a scattered relocation is an address.  In the interest of
-  // generating pretty output, scan through the symbol table looking for a
-  // symbol that aligns with that address.  If we find one, print it.
-  // Otherwise, we just print the hex address of the target.
-  const StringRef FileName = O->getFileName();
-  if (O->isRelocationScattered(RE)) {
-    uint32_t Val = O->getPlainRelocationSymbolNum(RE);
-
-    for (const SymbolRef &Symbol : O->symbols()) {
-      uint64_t Addr = unwrapOrError(Symbol.getAddress(), FileName);
-      if (Addr != Val)
-        continue;
-      Fmt << unwrapOrError(Symbol.getName(), FileName);
-      return;
-    }
-
-    // If we couldn't find a symbol that this relocation refers to, try
-    // to find a section beginning instead.
-    for (const SectionRef &Section : ToolSectionFilter(*O)) {
-      StringRef Name;
-      uint64_t Addr = Section.getAddress();
-      if (Addr != Val)
-        continue;
-      if (std::error_code EC = Section.getName(Name))
-        report_error(errorCodeToError(EC), O->getFileName());
-      Fmt << Name;
-      return;
-    }
-
-    Fmt << format("0x%x", Val);
-    return;
-  }
-
-  StringRef S;
-  bool isExtern = O->getPlainRelocationExternal(RE);
-  uint64_t Val = O->getPlainRelocationSymbolNum(RE);
-
-  if (O->getAnyRelocationType(RE) == MachO::ARM64_RELOC_ADDEND) {
-    Fmt << format("0x%0" PRIx64, Val);
-    return;
-  }
-
-  if (isExtern) {
-    symbol_iterator SI = O->symbol_begin();
-    advance(SI, Val);
-    S = unwrapOrError(SI->getName(), FileName);
-  } else {
-    section_iterator SI = O->section_begin();
-    // Adjust for the fact that sections are 1-indexed.
-    if (Val == 0) {
-      Fmt << "0 (?,?)";
-      return;
-    }
-    uint32_t I = Val - 1;
-    while (I != 0 && SI != O->section_end()) {
-      --I;
-      advance(SI, 1);
-    }
-    if (SI == O->section_end())
-      Fmt << Val << " (?,?)";
-    else
-      SI->getName(S);
-  }
-
-  Fmt << S;
-}
-
-Error getMachORelocationValueString(const MachOObjectFile *Obj,
-                                    const RelocationRef &RelRef,
-                                    SmallVectorImpl<char> &Result) {
-  DataRefImpl Rel = RelRef.getRawDataRefImpl();
-  MachO::any_relocation_info RE = Obj->getRelocation(Rel);
-
-  unsigned Arch = Obj->getArch();
-
-  std::string FmtBuf;
-  raw_string_ostream Fmt(FmtBuf);
-  unsigned Type = Obj->getAnyRelocationType(RE);
-  bool IsPCRel = Obj->getAnyRelocationPCRel(RE);
-
-  // Determine any addends that should be displayed with the relocation.
-  // These require decoding the relocation type, which is triple-specific.
-
-  // X86_64 has entirely custom relocation types.
-  if (Arch == Triple::x86_64) {
-    switch (Type) {
-    case MachO::X86_64_RELOC_GOT_LOAD:
-    case MachO::X86_64_RELOC_GOT: {
-      printRelocationTargetName(Obj, RE, Fmt);
-      Fmt << "@GOT";
-      if (IsPCRel)
-        Fmt << "PCREL";
-      break;
-    }
-    case MachO::X86_64_RELOC_SUBTRACTOR: {
-      DataRefImpl RelNext = Rel;
-      Obj->moveRelocationNext(RelNext);
-      MachO::any_relocation_info RENext = Obj->getRelocation(RelNext);
-
-      // X86_64_RELOC_SUBTRACTOR must be followed by a relocation of type
-      // X86_64_RELOC_UNSIGNED.
-      // NOTE: Scattered relocations don't exist on x86_64.
-      unsigned RType = Obj->getAnyRelocationType(RENext);
-      if (RType != MachO::X86_64_RELOC_UNSIGNED)
-        report_error(Obj->getFileName(), "Expected X86_64_RELOC_UNSIGNED after "
-                                         "X86_64_RELOC_SUBTRACTOR.");
-
-      // The X86_64_RELOC_UNSIGNED contains the minuend symbol;
-      // X86_64_RELOC_SUBTRACTOR contains the subtrahend.
-      printRelocationTargetName(Obj, RENext, Fmt);
-      Fmt << "-";
-      printRelocationTargetName(Obj, RE, Fmt);
-      break;
-    }
-    case MachO::X86_64_RELOC_TLV:
-      printRelocationTargetName(Obj, RE, Fmt);
-      Fmt << "@TLV";
-      if (IsPCRel)
-        Fmt << "P";
-      break;
-    case MachO::X86_64_RELOC_SIGNED_1:
-      printRelocationTargetName(Obj, RE, Fmt);
-      Fmt << "-1";
-      break;
-    case MachO::X86_64_RELOC_SIGNED_2:
-      printRelocationTargetName(Obj, RE, Fmt);
-      Fmt << "-2";
-      break;
-    case MachO::X86_64_RELOC_SIGNED_4:
-      printRelocationTargetName(Obj, RE, Fmt);
-      Fmt << "-4";
-      break;
-    default:
-      printRelocationTargetName(Obj, RE, Fmt);
-      break;
-    }
-    // X86 and ARM share some relocation types in common.
-  } else if (Arch == Triple::x86 || Arch == Triple::arm ||
-             Arch == Triple::ppc) {
-    // Generic relocation types...
-    switch (Type) {
-    case MachO::GENERIC_RELOC_PAIR: // prints no info
-      return Error::success();
-    case MachO::GENERIC_RELOC_SECTDIFF: {
-      DataRefImpl RelNext = Rel;
-      Obj->moveRelocationNext(RelNext);
-      MachO::any_relocation_info RENext = Obj->getRelocation(RelNext);
-
-      // X86 sect diff's must be followed by a relocation of type
-      // GENERIC_RELOC_PAIR.
-      unsigned RType = Obj->getAnyRelocationType(RENext);
-
-      if (RType != MachO::GENERIC_RELOC_PAIR)
-        report_error(Obj->getFileName(), "Expected GENERIC_RELOC_PAIR after "
-                                         "GENERIC_RELOC_SECTDIFF.");
-
-      printRelocationTargetName(Obj, RE, Fmt);
-      Fmt << "-";
-      printRelocationTargetName(Obj, RENext, Fmt);
-      break;
-    }
-    }
-
-    if (Arch == Triple::x86 || Arch == Triple::ppc) {
-      switch (Type) {
-      case MachO::GENERIC_RELOC_LOCAL_SECTDIFF: {
-        DataRefImpl RelNext = Rel;
-        Obj->moveRelocationNext(RelNext);
-        MachO::any_relocation_info RENext = Obj->getRelocation(RelNext);
-
-        // X86 sect diff's must be followed by a relocation of type
-        // GENERIC_RELOC_PAIR.
-        unsigned RType = Obj->getAnyRelocationType(RENext);
-        if (RType != MachO::GENERIC_RELOC_PAIR)
-          report_error(Obj->getFileName(), "Expected GENERIC_RELOC_PAIR after "
-                                           "GENERIC_RELOC_LOCAL_SECTDIFF.");
-
-        printRelocationTargetName(Obj, RE, Fmt);
-        Fmt << "-";
-        printRelocationTargetName(Obj, RENext, Fmt);
-        break;
-      }
-      case MachO::GENERIC_RELOC_TLV: {
-        printRelocationTargetName(Obj, RE, Fmt);
-        Fmt << "@TLV";
-        if (IsPCRel)
-          Fmt << "P";
-        break;
-      }
-      default:
-        printRelocationTargetName(Obj, RE, Fmt);
-      }
-    } else { // ARM-specific relocations
-      switch (Type) {
-      case MachO::ARM_RELOC_HALF:
-      case MachO::ARM_RELOC_HALF_SECTDIFF: {
-        // Half relocations steal a bit from the length field to encode
-        // whether this is an upper16 or a lower16 relocation.
-        bool isUpper = (Obj->getAnyRelocationLength(RE) & 0x1) == 1;
-
-        if (isUpper)
-          Fmt << ":upper16:(";
-        else
-          Fmt << ":lower16:(";
-        printRelocationTargetName(Obj, RE, Fmt);
-
-        DataRefImpl RelNext = Rel;
-        Obj->moveRelocationNext(RelNext);
-        MachO::any_relocation_info RENext = Obj->getRelocation(RelNext);
-
-        // ARM half relocs must be followed by a relocation of type
-        // ARM_RELOC_PAIR.
-        unsigned RType = Obj->getAnyRelocationType(RENext);
-        if (RType != MachO::ARM_RELOC_PAIR)
-          report_error(Obj->getFileName(), "Expected ARM_RELOC_PAIR after "
-                                           "ARM_RELOC_HALF");
-
-        // NOTE: The half of the target virtual address is stashed in the
-        // address field of the secondary relocation, but we can't reverse
-        // engineer the constant offset from it without decoding the movw/movt
-        // instruction to find the other half in its immediate field.
-
-        // ARM_RELOC_HALF_SECTDIFF encodes the second section in the
-        // symbol/section pointer of the follow-on relocation.
-        if (Type == MachO::ARM_RELOC_HALF_SECTDIFF) {
-          Fmt << "-";
-          printRelocationTargetName(Obj, RENext, Fmt);
-        }
-
-        Fmt << ")";
-        break;
-      }
-      default: {
-        printRelocationTargetName(Obj, RE, Fmt);
-      }
-      }
-    }
-  } else
-    printRelocationTargetName(Obj, RE, Fmt);
-
-  Fmt.flush();
-  Result.append(FmtBuf.begin(), FmtBuf.end());
-  return Error::success();
-}
-
-static void PrintIndirectSymbolTable(MachOObjectFile *O, bool verbose,
-                                     uint32_t n, uint32_t count,
-                                     uint32_t stride, uint64_t addr) {
-  MachO::dysymtab_command Dysymtab = O->getDysymtabLoadCommand();
-  uint32_t nindirectsyms = Dysymtab.nindirectsyms;
-  if (n > nindirectsyms)
-    outs() << " (entries start past the end of the indirect symbol "
-              "table) (reserved1 field greater than the table size)";
-  else if (n + count > nindirectsyms)
-    outs() << " (entries extends past the end of the indirect symbol "
-              "table)";
-  outs() << "\n";
-  uint32_t cputype = O->getHeader().cputype;
-  if (cputype & MachO::CPU_ARCH_ABI64)
-    outs() << "address            index";
-  else
-    outs() << "address    index";
-  if (verbose)
-    outs() << " name\n";
-  else
-    outs() << "\n";
-  for (uint32_t j = 0; j < count && n + j < nindirectsyms; j++) {
-    if (cputype & MachO::CPU_ARCH_ABI64)
-      outs() << format("0x%016" PRIx64, addr + j * stride) << " ";
-    else
-      outs() << format("0x%08" PRIx32, (uint32_t)addr + j * stride) << " ";
-    MachO::dysymtab_command Dysymtab = O->getDysymtabLoadCommand();
-    uint32_t indirect_symbol = O->getIndirectSymbolTableEntry(Dysymtab, n + j);
-    if (indirect_symbol == MachO::INDIRECT_SYMBOL_LOCAL) {
-      outs() << "LOCAL\n";
-      continue;
-    }
-    if (indirect_symbol ==
-        (MachO::INDIRECT_SYMBOL_LOCAL | MachO::INDIRECT_SYMBOL_ABS)) {
-      outs() << "LOCAL ABSOLUTE\n";
-      continue;
-    }
-    if (indirect_symbol == MachO::INDIRECT_SYMBOL_ABS) {
-      outs() << "ABSOLUTE\n";
-      continue;
-    }
-    outs() << format("%5u ", indirect_symbol);
-    if (verbose) {
-      MachO::symtab_command Symtab = O->getSymtabLoadCommand();
-      if (indirect_symbol < Symtab.nsyms) {
-        symbol_iterator Sym = O->getSymbolByIndex(indirect_symbol);
-        SymbolRef Symbol = *Sym;
-        outs() << unwrapOrError(Symbol.getName(), O->getFileName());
-      } else {
-        outs() << "?";
-      }
-    }
-    outs() << "\n";
-  }
-}
-
-static void PrintIndirectSymbols(MachOObjectFile *O, bool verbose) {
-  for (const auto &Load : O->load_commands()) {
-    if (Load.C.cmd == MachO::LC_SEGMENT_64) {
-      MachO::segment_command_64 Seg = O->getSegment64LoadCommand(Load);
-      for (unsigned J = 0; J < Seg.nsects; ++J) {
-        MachO::section_64 Sec = O->getSection64(Load, J);
-        uint32_t section_type = Sec.flags & MachO::SECTION_TYPE;
-        if (section_type == MachO::S_NON_LAZY_SYMBOL_POINTERS ||
-            section_type == MachO::S_LAZY_SYMBOL_POINTERS ||
-            section_type == MachO::S_LAZY_DYLIB_SYMBOL_POINTERS ||
-            section_type == MachO::S_THREAD_LOCAL_VARIABLE_POINTERS ||
-            section_type == MachO::S_SYMBOL_STUBS) {
-          uint32_t stride;
-          if (section_type == MachO::S_SYMBOL_STUBS)
-            stride = Sec.reserved2;
-          else
-            stride = 8;
-          if (stride == 0) {
-            outs() << "Can't print indirect symbols for (" << Sec.segname << ","
-                   << Sec.sectname << ") "
-                   << "(size of stubs in reserved2 field is zero)\n";
-            continue;
-          }
-          uint32_t count = Sec.size / stride;
-          outs() << "Indirect symbols for (" << Sec.segname << ","
-                 << Sec.sectname << ") " << count << " entries";
-          uint32_t n = Sec.reserved1;
-          PrintIndirectSymbolTable(O, verbose, n, count, stride, Sec.addr);
-        }
-      }
-    } else if (Load.C.cmd == MachO::LC_SEGMENT) {
-      MachO::segment_command Seg = O->getSegmentLoadCommand(Load);
-      for (unsigned J = 0; J < Seg.nsects; ++J) {
-        MachO::section Sec = O->getSection(Load, J);
-        uint32_t section_type = Sec.flags & MachO::SECTION_TYPE;
-        if (section_type == MachO::S_NON_LAZY_SYMBOL_POINTERS ||
-            section_type == MachO::S_LAZY_SYMBOL_POINTERS ||
-            section_type == MachO::S_LAZY_DYLIB_SYMBOL_POINTERS ||
-            section_type == MachO::S_THREAD_LOCAL_VARIABLE_POINTERS ||
-            section_type == MachO::S_SYMBOL_STUBS) {
-          uint32_t stride;
-          if (section_type == MachO::S_SYMBOL_STUBS)
-            stride = Sec.reserved2;
-          else
-            stride = 4;
-          if (stride == 0) {
-            outs() << "Can't print indirect symbols for (" << Sec.segname << ","
-                   << Sec.sectname << ") "
-                   << "(size of stubs in reserved2 field is zero)\n";
-            continue;
-          }
-          uint32_t count = Sec.size / stride;
-          outs() << "Indirect symbols for (" << Sec.segname << ","
-                 << Sec.sectname << ") " << count << " entries";
-          uint32_t n = Sec.reserved1;
-          PrintIndirectSymbolTable(O, verbose, n, count, stride, Sec.addr);
-        }
-      }
-    }
-  }
-}
-
-static void PrintRType(const uint64_t cputype, const unsigned r_type) {
-  static char const *generic_r_types[] = {
-    "VANILLA ", "PAIR    ", "SECTDIF ", "PBLAPTR ", "LOCSDIF ", "TLV     ",
-    "  6 (?) ", "  7 (?) ", "  8 (?) ", "  9 (?) ", " 10 (?) ", " 11 (?) ",
-    " 12 (?) ", " 13 (?) ", " 14 (?) ", " 15 (?) "
-  };
-  static char const *x86_64_r_types[] = {
-    "UNSIGND ", "SIGNED  ", "BRANCH  ", "GOT_LD  ", "GOT     ", "SUB     ",
-    "SIGNED1 ", "SIGNED2 ", "SIGNED4 ", "TLV     ", " 10 (?) ", " 11 (?) ",
-    " 12 (?) ", " 13 (?) ", " 14 (?) ", " 15 (?) "
-  };
-  static char const *arm_r_types[] = {
-    "VANILLA ", "PAIR    ", "SECTDIFF", "LOCSDIF ", "PBLAPTR ",
-    "BR24    ", "T_BR22  ", "T_BR32  ", "HALF    ", "HALFDIF ",
-    " 10 (?) ", " 11 (?) ", " 12 (?) ", " 13 (?) ", " 14 (?) ", " 15 (?) "
-  };
-  static char const *arm64_r_types[] = {
-    "UNSIGND ", "SUB     ", "BR26    ", "PAGE21  ", "PAGOF12 ",
-    "GOTLDP  ", "GOTLDPOF", "PTRTGOT ", "TLVLDP  ", "TLVLDPOF",
-    "ADDEND  ", " 11 (?) ", " 12 (?) ", " 13 (?) ", " 14 (?) ", " 15 (?) "
-  };
-
-  if (r_type > 0xf){
-    outs() << format("%-7u", r_type) << " ";
-    return;
-  }
-  switch (cputype) {
-    case MachO::CPU_TYPE_I386:
-      outs() << generic_r_types[r_type];
-      break;
-    case MachO::CPU_TYPE_X86_64:
-      outs() << x86_64_r_types[r_type];
-      break;
-    case MachO::CPU_TYPE_ARM:
-      outs() << arm_r_types[r_type];
-      break;
-    case MachO::CPU_TYPE_ARM64:
-    case MachO::CPU_TYPE_ARM64_32:
-      outs() << arm64_r_types[r_type];
-      break;
-    default:
-      outs() << format("%-7u ", 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 == MachO::ARM_RELOC_HALF ||
-       r_type == MachO::ARM_RELOC_HALF_SECTDIFF || previous_arm_half == true)) {
-    if ((r_length & 0x1) == 0)
-      outs() << "lo/";
-    else
-      outs() << "hi/";
-    if ((r_length & 0x1) == 0)
-      outs() << "arm ";
-    else
-      outs() << "thm ";
-  } else {
-    switch (r_length) {
-      case 0:
-        outs() << "byte   ";
-        break;
-      case 1:
-        outs() << "word   ";
-        break;
-      case 2:
-        outs() << "long   ";
-        break;
-      case 3:
-        if (cputype == MachO::CPU_TYPE_X86_64)
-          outs() << "quad   ";
-        else
-          outs() << format("?(%2d)  ", r_length);
-        break;
-      default:
-        outs() << format("?(%2d)  ", r_length);
-    }
-  }
-}
-
-static void PrintRelocationEntries(const MachOObjectFile *O,
-                                   const relocation_iterator Begin,
-                                   const relocation_iterator End,
-                                   const uint64_t cputype,
-                                   const bool verbose) {
-  const MachO::symtab_command Symtab = O->getSymtabLoadCommand();
-  bool previous_arm_half = false;
-  bool previous_sectdiff = false;
-  uint32_t sectdiff_r_type = 0;
-
-  for (relocation_iterator Reloc = Begin; Reloc != End; ++Reloc) {
-    const DataRefImpl Rel = Reloc->getRawDataRefImpl();
-    const MachO::any_relocation_info RE = O->getRelocation(Rel);
-    const unsigned r_type = O->getAnyRelocationType(RE);
-    const bool r_scattered = O->isRelocationScattered(RE);
-    const unsigned r_pcrel = O->getAnyRelocationPCRel(RE);
-    const unsigned r_length = O->getAnyRelocationLength(RE);
-    const unsigned r_address = O->getAnyRelocationAddress(RE);
-    const bool r_extern = (r_scattered ? false :
-                           O->getPlainRelocationExternal(RE));
-    const uint32_t r_value = (r_scattered ?
-                              O->getScatteredRelocationValue(RE) : 0);
-    const unsigned r_symbolnum = (r_scattered ? 0 :
-                                  O->getPlainRelocationSymbolNum(RE));
-
-    if (r_scattered && cputype != MachO::CPU_TYPE_X86_64) {
-      if (verbose) {
-        // scattered: address
-        if ((cputype == MachO::CPU_TYPE_I386 &&
-             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);
-
-        // scattered: pcrel
-        if (r_pcrel)
-          outs() << "True  ";
-        else
-          outs() << "False ";
-
-        // scattered: length
-        PrintRLength(cputype, r_type, r_length, previous_arm_half);
-
-        // scattered: extern & type
-        outs() << "n/a    ";
-        PrintRType(cputype, r_type);
-
-        // scattered: scattered & value
-        outs() << format("True      0x%08x", (unsigned int)r_value);
-        if (previous_sectdiff == false) {
-          if ((cputype == MachO::CPU_TYPE_ARM &&
-               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 == MachO::ARM_RELOC_HALF_SECTDIFF)
-          outs() << format(" other_half = 0x%04x ", (unsigned int)r_address);
-        if ((cputype == MachO::CPU_TYPE_I386 &&
-             (r_type == MachO::GENERIC_RELOC_SECTDIFF ||
-              r_type == MachO::GENERIC_RELOC_LOCAL_SECTDIFF)) ||
-            (cputype == MachO::CPU_TYPE_ARM &&
-             (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 == MachO::ARM_RELOC_HALF ||
-             r_type == MachO::ARM_RELOC_HALF_SECTDIFF))
-          previous_arm_half = true;
-        else
-          previous_arm_half = false;
-        outs() << "\n";
-      }
-      else {
-        // scattered: address pcrel length extern type scattered value
-        outs() << format("%08x %1d     %-2d     n/a    %-7d 1         0x%08x\n",
-                         (unsigned int)r_address, r_pcrel, r_length, r_type,
-                         (unsigned int)r_value);
-      }
-    }
-    else {
-      if (verbose) {
-        // plain: address
-        if (cputype == MachO::CPU_TYPE_ARM && r_type == MachO::ARM_RELOC_PAIR)
-          outs() << "         ";
-        else
-          outs() << format("%08x ", (unsigned int)r_address);
-
-        // plain: pcrel
-        if (r_pcrel)
-          outs() << "True  ";
-        else
-          outs() << "False ";
-
-        // plain: length
-        PrintRLength(cputype, r_type, r_length, previous_arm_half);
-
-        if (r_extern) {
-          // plain: extern & type & scattered
-          outs() << "True   ";
-          PrintRType(cputype, r_type);
-          outs() << "False     ";
-
-          // plain: symbolnum/value
-          if (r_symbolnum > Symtab.nsyms)
-            outs() << format("?(%d)\n", r_symbolnum);
-          else {
-            SymbolRef Symbol = *O->getSymbolByIndex(r_symbolnum);
-            Expected<StringRef> SymNameNext = Symbol.getName();
-            const char *name = NULL;
-            if (SymNameNext)
-              name = SymNameNext->data();
-            if (name == NULL)
-              outs() << format("?(%d)\n", r_symbolnum);
-            else
-              outs() << name << "\n";
-          }
-        }
-        else {
-          // plain: extern & type & scattered
-          outs() << "False  ";
-          PrintRType(cputype, r_type);
-          outs() << "False     ";
-
-          // plain: symbolnum/value
-          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 ||
-                    cputype == MachO::CPU_TYPE_ARM64_32) &&
-                   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 == 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) {
-                object::DataRefImpl DRI;
-                DRI.d.a = r_symbolnum-1;
-                StringRef SegName = O->getSectionFinalSegmentName(DRI);
-                if (Expected<StringRef> NameOrErr = O->getSectionName(DRI))
-                  outs() << "(" << SegName << "," << *NameOrErr << ")\n";
-                else
-                  outs() << "(?,?)\n";
-              }
-              else {
-                outs() << "(?,?)\n";
-              }
-            }
-          }
-        }
-        if (cputype == MachO::CPU_TYPE_ARM &&
-            (r_type == MachO::ARM_RELOC_HALF ||
-             r_type == MachO::ARM_RELOC_HALF_SECTDIFF))
-          previous_arm_half = true;
-        else
-          previous_arm_half = false;
-      }
-      else {
-        // plain: address pcrel length extern type scattered symbolnum/section
-        outs() << format("%08x %1d     %-2d     %1d      %-7d 0         %d\n",
-                         (unsigned int)r_address, r_pcrel, r_length, r_extern,
-                         r_type, r_symbolnum);
-      }
-    }
-  }
-}
-
-static void PrintRelocations(const MachOObjectFile *O, const bool verbose) {
-  const uint64_t cputype = O->getHeader().cputype;
-  const MachO::dysymtab_command Dysymtab = O->getDysymtabLoadCommand();
-  if (Dysymtab.nextrel != 0) {
-    outs() << "External relocation information " << Dysymtab.nextrel
-           << " entries";
-    outs() << "\naddress  pcrel length extern type    scattered "
-              "symbolnum/value\n";
-    PrintRelocationEntries(O, O->extrel_begin(), O->extrel_end(), cputype,
-                           verbose);
-  }
-  if (Dysymtab.nlocrel != 0) {
-    outs() << format("Local relocation information %u entries",
-                     Dysymtab.nlocrel);
-    outs() << "\naddress  pcrel length extern type    scattered "
-              "symbolnum/value\n";
-    PrintRelocationEntries(O, O->locrel_begin(), O->locrel_end(), cputype,
-                           verbose);
-  }
-  for (const auto &Load : O->load_commands()) {
-    if (Load.C.cmd == MachO::LC_SEGMENT_64) {
-      const MachO::segment_command_64 Seg = O->getSegment64LoadCommand(Load);
-      for (unsigned J = 0; J < Seg.nsects; ++J) {
-        const MachO::section_64 Sec = O->getSection64(Load, J);
-        if (Sec.nreloc != 0) {
-          DataRefImpl DRI;
-          DRI.d.a = J;
-          const StringRef SegName = O->getSectionFinalSegmentName(DRI);
-          if (Expected<StringRef> NameOrErr = O->getSectionName(DRI))
-            outs() << "Relocation information (" << SegName << "," << *NameOrErr
-                   << format(") %u entries", Sec.nreloc);
-          else
-            outs() << "Relocation information (" << SegName << ",?) "
-                   << format("%u entries", Sec.nreloc);
-          outs() << "\naddress  pcrel length extern type    scattered "
-                    "symbolnum/value\n";
-          PrintRelocationEntries(O, O->section_rel_begin(DRI),
-                                 O->section_rel_end(DRI), cputype, verbose);
-        }
-      }
-    } else if (Load.C.cmd == MachO::LC_SEGMENT) {
-      const MachO::segment_command Seg = O->getSegmentLoadCommand(Load);
-      for (unsigned J = 0; J < Seg.nsects; ++J) {
-        const MachO::section Sec = O->getSection(Load, J);
-        if (Sec.nreloc != 0) {
-          DataRefImpl DRI;
-          DRI.d.a = J;
-          const StringRef SegName = O->getSectionFinalSegmentName(DRI);
-          if (Expected<StringRef> NameOrErr = O->getSectionName(DRI))
-            outs() << "Relocation information (" << SegName << "," << *NameOrErr
-                   << format(") %u entries", Sec.nreloc);
-          else
-            outs() << "Relocation information (" << SegName << ",?) "
-                   << format("%u entries", Sec.nreloc);
-          outs() << "\naddress  pcrel length extern type    scattered "
-                    "symbolnum/value\n";
-          PrintRelocationEntries(O, O->section_rel_begin(DRI),
-                                 O->section_rel_end(DRI), cputype, verbose);
-        }
-      }
-    }
-  }
-}
-
-static void PrintDataInCodeTable(MachOObjectFile *O, bool verbose) {
-  MachO::linkedit_data_command DIC = O->getDataInCodeLoadCommand();
-  uint32_t nentries = DIC.datasize / sizeof(struct MachO::data_in_code_entry);
-  outs() << "Data in code table (" << nentries << " entries)\n";
-  outs() << "offset     length kind\n";
-  for (dice_iterator DI = O->begin_dices(), DE = O->end_dices(); DI != DE;
-       ++DI) {
-    uint32_t Offset;
-    DI->getOffset(Offset);
-    outs() << format("0x%08" PRIx32, Offset) << " ";
-    uint16_t Length;
-    DI->getLength(Length);
-    outs() << format("%6u", Length) << " ";
-    uint16_t Kind;
-    DI->getKind(Kind);
-    if (verbose) {
-      switch (Kind) {
-      case MachO::DICE_KIND_DATA:
-        outs() << "DATA";
-        break;
-      case MachO::DICE_KIND_JUMP_TABLE8:
-        outs() << "JUMP_TABLE8";
-        break;
-      case MachO::DICE_KIND_JUMP_TABLE16:
-        outs() << "JUMP_TABLE16";
-        break;
-      case MachO::DICE_KIND_JUMP_TABLE32:
-        outs() << "JUMP_TABLE32";
-        break;
-      case MachO::DICE_KIND_ABS_JUMP_TABLE32:
-        outs() << "ABS_JUMP_TABLE32";
-        break;
-      default:
-        outs() << format("0x%04" PRIx32, Kind);
-        break;
-      }
-    } else
-      outs() << format("0x%04" PRIx32, Kind);
-    outs() << "\n";
-  }
-}
-
-static void PrintLinkOptHints(MachOObjectFile *O) {
-  MachO::linkedit_data_command LohLC = O->getLinkOptHintsLoadCommand();
-  const char *loh = O->getData().substr(LohLC.dataoff, 1).data();
-  uint32_t nloh = LohLC.datasize;
-  outs() << "Linker optimiztion hints (" << nloh << " total bytes)\n";
-  for (uint32_t i = 0; i < nloh;) {
-    unsigned n;
-    uint64_t identifier = decodeULEB128((const uint8_t *)(loh + i), &n);
-    i += n;
-    outs() << "    identifier " << identifier << " ";
-    if (i >= nloh)
-      return;
-    switch (identifier) {
-    case 1:
-      outs() << "AdrpAdrp\n";
-      break;
-    case 2:
-      outs() << "AdrpLdr\n";
-      break;
-    case 3:
-      outs() << "AdrpAddLdr\n";
-      break;
-    case 4:
-      outs() << "AdrpLdrGotLdr\n";
-      break;
-    case 5:
-      outs() << "AdrpAddStr\n";
-      break;
-    case 6:
-      outs() << "AdrpLdrGotStr\n";
-      break;
-    case 7:
-      outs() << "AdrpAdd\n";
-      break;
-    case 8:
-      outs() << "AdrpLdrGot\n";
-      break;
-    default:
-      outs() << "Unknown identifier value\n";
-      break;
-    }
-    uint64_t narguments = decodeULEB128((const uint8_t *)(loh + i), &n);
-    i += n;
-    outs() << "    narguments " << narguments << "\n";
-    if (i >= nloh)
-      return;
-
-    for (uint32_t j = 0; j < narguments; j++) {
-      uint64_t value = decodeULEB128((const uint8_t *)(loh + i), &n);
-      i += n;
-      outs() << "\tvalue " << format("0x%" PRIx64, value) << "\n";
-      if (i >= nloh)
-        return;
-    }
-  }
-}
-
-static void PrintDylibs(MachOObjectFile *O, bool JustId) {
-  unsigned Index = 0;
-  for (const auto &Load : O->load_commands()) {
-    if ((JustId && Load.C.cmd == MachO::LC_ID_DYLIB) ||
-        (!JustId && (Load.C.cmd == MachO::LC_ID_DYLIB ||
-                     Load.C.cmd == MachO::LC_LOAD_DYLIB ||
-                     Load.C.cmd == MachO::LC_LOAD_WEAK_DYLIB ||
-                     Load.C.cmd == MachO::LC_REEXPORT_DYLIB ||
-                     Load.C.cmd == MachO::LC_LAZY_LOAD_DYLIB ||
-                     Load.C.cmd == MachO::LC_LOAD_UPWARD_DYLIB))) {
-      MachO::dylib_command dl = O->getDylibIDLoadCommand(Load);
-      if (dl.dylib.name < dl.cmdsize) {
-        const char *p = (const char *)(Load.Ptr) + dl.dylib.name;
-        if (JustId)
-          outs() << p << "\n";
-        else {
-          outs() << "\t" << p;
-          outs() << " (compatibility version "
-                 << ((dl.dylib.compatibility_version >> 16) & 0xffff) << "."
-                 << ((dl.dylib.compatibility_version >> 8) & 0xff) << "."
-                 << (dl.dylib.compatibility_version & 0xff) << ",";
-          outs() << " current version "
-                 << ((dl.dylib.current_version >> 16) & 0xffff) << "."
-                 << ((dl.dylib.current_version >> 8) & 0xff) << "."
-                 << (dl.dylib.current_version & 0xff);
-          if (Load.C.cmd == MachO::LC_LOAD_WEAK_DYLIB)
-            outs() << ", weak";
-          if (Load.C.cmd == MachO::LC_REEXPORT_DYLIB)
-            outs() << ", reexport";
-          if (Load.C.cmd == MachO::LC_LOAD_UPWARD_DYLIB)
-            outs() << ", upward";
-          if (Load.C.cmd == MachO::LC_LAZY_LOAD_DYLIB)
-            outs() << ", lazy";
-          outs() << ")\n";
-        }
-      } else {
-        outs() << "\tBad offset (" << dl.dylib.name << ") for name of ";
-        if (Load.C.cmd == MachO::LC_ID_DYLIB)
-          outs() << "LC_ID_DYLIB ";
-        else if (Load.C.cmd == MachO::LC_LOAD_DYLIB)
-          outs() << "LC_LOAD_DYLIB ";
-        else if (Load.C.cmd == MachO::LC_LOAD_WEAK_DYLIB)
-          outs() << "LC_LOAD_WEAK_DYLIB ";
-        else if (Load.C.cmd == MachO::LC_LAZY_LOAD_DYLIB)
-          outs() << "LC_LAZY_LOAD_DYLIB ";
-        else if (Load.C.cmd == MachO::LC_REEXPORT_DYLIB)
-          outs() << "LC_REEXPORT_DYLIB ";
-        else if (Load.C.cmd == MachO::LC_LOAD_UPWARD_DYLIB)
-          outs() << "LC_LOAD_UPWARD_DYLIB ";
-        else
-          outs() << "LC_??? ";
-        outs() << "command " << Index++ << "\n";
-      }
-    }
-  }
-}
-
-typedef DenseMap<uint64_t, StringRef> SymbolAddressMap;
-
-static void CreateSymbolAddressMap(MachOObjectFile *O,
-                                   SymbolAddressMap *AddrMap) {
-  // Create a map of symbol addresses to symbol names.
-  const StringRef FileName = O->getFileName();
-  for (const SymbolRef &Symbol : O->symbols()) {
-    SymbolRef::Type ST = unwrapOrError(Symbol.getType(), FileName);
-    if (ST == SymbolRef::ST_Function || ST == SymbolRef::ST_Data ||
-        ST == SymbolRef::ST_Other) {
-      uint64_t Address = Symbol.getValue();
-      StringRef SymName = unwrapOrError(Symbol.getName(), FileName);
-      if (!SymName.startswith(".objc"))
-        (*AddrMap)[Address] = SymName;
-    }
-  }
-}
-
-// GuessSymbolName is passed the address of what might be a symbol and a
-// pointer to the SymbolAddressMap.  It returns the name of a symbol
-// with that address or nullptr if no symbol is found with that address.
-static const char *GuessSymbolName(uint64_t value, SymbolAddressMap *AddrMap) {
-  const char *SymbolName = nullptr;
-  // A DenseMap can't lookup up some values.
-  if (value != 0xffffffffffffffffULL && value != 0xfffffffffffffffeULL) {
-    StringRef name = AddrMap->lookup(value);
-    if (!name.empty())
-      SymbolName = name.data();
-  }
-  return SymbolName;
-}
-
-static void DumpCstringChar(const char c) {
-  char p[2];
-  p[0] = c;
-  p[1] = '\0';
-  outs().write_escaped(p);
-}
-
-static void DumpCstringSection(MachOObjectFile *O, const char *sect,
-                               uint32_t sect_size, uint64_t sect_addr,
-                               bool print_addresses) {
-  for (uint32_t i = 0; i < sect_size; i++) {
-    if (print_addresses) {
-      if (O->is64Bit())
-        outs() << format("%016" PRIx64, sect_addr + i) << "  ";
-      else
-        outs() << format("%08" PRIx64, sect_addr + i) << "  ";
-    }
-    for (; i < sect_size && sect[i] != '\0'; i++)
-      DumpCstringChar(sect[i]);
-    if (i < sect_size && sect[i] == '\0')
-      outs() << "\n";
-  }
-}
-
-static void DumpLiteral4(uint32_t l, float f) {
-  outs() << format("0x%08" PRIx32, l);
-  if ((l & 0x7f800000) != 0x7f800000)
-    outs() << format(" (%.16e)\n", f);
-  else {
-    if (l == 0x7f800000)
-      outs() << " (+Infinity)\n";
-    else if (l == 0xff800000)
-      outs() << " (-Infinity)\n";
-    else if ((l & 0x00400000) == 0x00400000)
-      outs() << " (non-signaling Not-a-Number)\n";
-    else
-      outs() << " (signaling Not-a-Number)\n";
-  }
-}
-
-static void DumpLiteral4Section(MachOObjectFile *O, const char *sect,
-                                uint32_t sect_size, uint64_t sect_addr,
-                                bool print_addresses) {
-  for (uint32_t i = 0; i < sect_size; i += sizeof(float)) {
-    if (print_addresses) {
-      if (O->is64Bit())
-        outs() << format("%016" PRIx64, sect_addr + i) << "  ";
-      else
-        outs() << format("%08" PRIx64, sect_addr + i) << "  ";
-    }
-    float f;
-    memcpy(&f, sect + i, sizeof(float));
-    if (O->isLittleEndian() != sys::IsLittleEndianHost)
-      sys::swapByteOrder(f);
-    uint32_t l;
-    memcpy(&l, sect + i, sizeof(uint32_t));
-    if (O->isLittleEndian() != sys::IsLittleEndianHost)
-      sys::swapByteOrder(l);
-    DumpLiteral4(l, f);
-  }
-}
-
-static void DumpLiteral8(MachOObjectFile *O, uint32_t l0, uint32_t l1,
-                         double d) {
-  outs() << format("0x%08" PRIx32, l0) << " " << format("0x%08" PRIx32, l1);
-  uint32_t Hi, Lo;
-  Hi = (O->isLittleEndian()) ? l1 : l0;
-  Lo = (O->isLittleEndian()) ? l0 : l1;
-
-  // Hi is the high word, so this is equivalent to if(isfinite(d))
-  if ((Hi & 0x7ff00000) != 0x7ff00000)
-    outs() << format(" (%.16e)\n", d);
-  else {
-    if (Hi == 0x7ff00000 && Lo == 0)
-      outs() << " (+Infinity)\n";
-    else if (Hi == 0xfff00000 && Lo == 0)
-      outs() << " (-Infinity)\n";
-    else if ((Hi & 0x00080000) == 0x00080000)
-      outs() << " (non-signaling Not-a-Number)\n";
-    else
-      outs() << " (signaling Not-a-Number)\n";
-  }
-}
-
-static void DumpLiteral8Section(MachOObjectFile *O, const char *sect,
-                                uint32_t sect_size, uint64_t sect_addr,
-                                bool print_addresses) {
-  for (uint32_t i = 0; i < sect_size; i += sizeof(double)) {
-    if (print_addresses) {
-      if (O->is64Bit())
-        outs() << format("%016" PRIx64, sect_addr + i) << "  ";
-      else
-        outs() << format("%08" PRIx64, sect_addr + i) << "  ";
-    }
-    double d;
-    memcpy(&d, sect + i, sizeof(double));
-    if (O->isLittleEndian() != sys::IsLittleEndianHost)
-      sys::swapByteOrder(d);
-    uint32_t l0, l1;
-    memcpy(&l0, sect + i, sizeof(uint32_t));
-    memcpy(&l1, sect + i + sizeof(uint32_t), sizeof(uint32_t));
-    if (O->isLittleEndian() != sys::IsLittleEndianHost) {
-      sys::swapByteOrder(l0);
-      sys::swapByteOrder(l1);
-    }
-    DumpLiteral8(O, l0, l1, d);
-  }
-}
-
-static void DumpLiteral16(uint32_t l0, uint32_t l1, uint32_t l2, uint32_t l3) {
-  outs() << format("0x%08" PRIx32, l0) << " ";
-  outs() << format("0x%08" PRIx32, l1) << " ";
-  outs() << format("0x%08" PRIx32, l2) << " ";
-  outs() << format("0x%08" PRIx32, l3) << "\n";
-}
-
-static void DumpLiteral16Section(MachOObjectFile *O, const char *sect,
-                                 uint32_t sect_size, uint64_t sect_addr,
-                                 bool print_addresses) {
-  for (uint32_t i = 0; i < sect_size; i += 16) {
-    if (print_addresses) {
-      if (O->is64Bit())
-        outs() << format("%016" PRIx64, sect_addr + i) << "  ";
-      else
-        outs() << format("%08" PRIx64, sect_addr + i) << "  ";
-    }
-    uint32_t l0, l1, l2, l3;
-    memcpy(&l0, sect + i, sizeof(uint32_t));
-    memcpy(&l1, sect + i + sizeof(uint32_t), sizeof(uint32_t));
-    memcpy(&l2, sect + i + 2 * sizeof(uint32_t), sizeof(uint32_t));
-    memcpy(&l3, sect + i + 3 * sizeof(uint32_t), sizeof(uint32_t));
-    if (O->isLittleEndian() != sys::IsLittleEndianHost) {
-      sys::swapByteOrder(l0);
-      sys::swapByteOrder(l1);
-      sys::swapByteOrder(l2);
-      sys::swapByteOrder(l3);
-    }
-    DumpLiteral16(l0, l1, l2, l3);
-  }
-}
-
-static void DumpLiteralPointerSection(MachOObjectFile *O,
-                                      const SectionRef &Section,
-                                      const char *sect, uint32_t sect_size,
-                                      uint64_t sect_addr,
-                                      bool print_addresses) {
-  // Collect the literal sections in this Mach-O file.
-  std::vector<SectionRef> LiteralSections;
-  for (const SectionRef &Section : O->sections()) {
-    DataRefImpl Ref = Section.getRawDataRefImpl();
-    uint32_t section_type;
-    if (O->is64Bit()) {
-      const MachO::section_64 Sec = O->getSection64(Ref);
-      section_type = Sec.flags & MachO::SECTION_TYPE;
-    } else {
-      const MachO::section Sec = O->getSection(Ref);
-      section_type = Sec.flags & MachO::SECTION_TYPE;
-    }
-    if (section_type == MachO::S_CSTRING_LITERALS ||
-        section_type == MachO::S_4BYTE_LITERALS ||
-        section_type == MachO::S_8BYTE_LITERALS ||
-        section_type == MachO::S_16BYTE_LITERALS)
-      LiteralSections.push_back(Section);
-  }
-
-  // Set the size of the literal pointer.
-  uint32_t lp_size = O->is64Bit() ? 8 : 4;
-
-  // Collect the external relocation symbols for the literal pointers.
-  std::vector<std::pair<uint64_t, SymbolRef>> Relocs;
-  for (const RelocationRef &Reloc : Section.relocations()) {
-    DataRefImpl Rel;
-    MachO::any_relocation_info RE;
-    bool isExtern = false;
-    Rel = Reloc.getRawDataRefImpl();
-    RE = O->getRelocation(Rel);
-    isExtern = O->getPlainRelocationExternal(RE);
-    if (isExtern) {
-      uint64_t RelocOffset = Reloc.getOffset();
-      symbol_iterator RelocSym = Reloc.getSymbol();
-      Relocs.push_back(std::make_pair(RelocOffset, *RelocSym));
-    }
-  }
-  array_pod_sort(Relocs.begin(), Relocs.end());
-
-  // Dump each literal pointer.
-  for (uint32_t i = 0; i < sect_size; i += lp_size) {
-    if (print_addresses) {
-      if (O->is64Bit())
-        outs() << format("%016" PRIx64, sect_addr + i) << "  ";
-      else
-        outs() << format("%08" PRIx64, sect_addr + i) << "  ";
-    }
-    uint64_t lp;
-    if (O->is64Bit()) {
-      memcpy(&lp, sect + i, sizeof(uint64_t));
-      if (O->isLittleEndian() != sys::IsLittleEndianHost)
-        sys::swapByteOrder(lp);
-    } else {
-      uint32_t li;
-      memcpy(&li, sect + i, sizeof(uint32_t));
-      if (O->isLittleEndian() != sys::IsLittleEndianHost)
-        sys::swapByteOrder(li);
-      lp = li;
-    }
-
-    // First look for an external relocation entry for this literal pointer.
-    auto Reloc = find_if(Relocs, [&](const std::pair<uint64_t, SymbolRef> &P) {
-      return P.first == i;
-    });
-    if (Reloc != Relocs.end()) {
-      symbol_iterator RelocSym = Reloc->second;
-      StringRef SymName = unwrapOrError(RelocSym->getName(), O->getFileName());
-      outs() << "external relocation entry for symbol:" << SymName << "\n";
-      continue;
-    }
-
-    // For local references see what the section the literal pointer points to.
-    auto Sect = find_if(LiteralSections, [&](const SectionRef &R) {
-      return lp >= R.getAddress() && lp < R.getAddress() + R.getSize();
-    });
-    if (Sect == LiteralSections.end()) {
-      outs() << format("0x%" PRIx64, lp) << " (not in a literal section)\n";
-      continue;
-    }
-
-    uint64_t SectAddress = Sect->getAddress();
-    uint64_t SectSize = Sect->getSize();
-
-    StringRef SectName;
-    Sect->getName(SectName);
-    DataRefImpl Ref = Sect->getRawDataRefImpl();
-    StringRef SegmentName = O->getSectionFinalSegmentName(Ref);
-    outs() << SegmentName << ":" << SectName << ":";
-
-    uint32_t section_type;
-    if (O->is64Bit()) {
-      const MachO::section_64 Sec = O->getSection64(Ref);
-      section_type = Sec.flags & MachO::SECTION_TYPE;
-    } else {
-      const MachO::section Sec = O->getSection(Ref);
-      section_type = Sec.flags & MachO::SECTION_TYPE;
-    }
-
-    StringRef BytesStr = unwrapOrError(Sect->getContents(), O->getFileName());
-
-    const char *Contents = reinterpret_cast<const char *>(BytesStr.data());
-
-    switch (section_type) {
-    case MachO::S_CSTRING_LITERALS:
-      for (uint64_t i = lp - SectAddress; i < SectSize && Contents[i] != '\0';
-           i++) {
-        DumpCstringChar(Contents[i]);
-      }
-      outs() << "\n";
-      break;
-    case MachO::S_4BYTE_LITERALS:
-      float f;
-      memcpy(&f, Contents + (lp - SectAddress), sizeof(float));
-      uint32_t l;
-      memcpy(&l, Contents + (lp - SectAddress), sizeof(uint32_t));
-      if (O->isLittleEndian() != sys::IsLittleEndianHost) {
-        sys::swapByteOrder(f);
-        sys::swapByteOrder(l);
-      }
-      DumpLiteral4(l, f);
-      break;
-    case MachO::S_8BYTE_LITERALS: {
-      double d;
-      memcpy(&d, Contents + (lp - SectAddress), sizeof(double));
-      uint32_t l0, l1;
-      memcpy(&l0, Contents + (lp - SectAddress), sizeof(uint32_t));
-      memcpy(&l1, Contents + (lp - SectAddress) + sizeof(uint32_t),
-             sizeof(uint32_t));
-      if (O->isLittleEndian() != sys::IsLittleEndianHost) {
-        sys::swapByteOrder(f);
-        sys::swapByteOrder(l0);
-        sys::swapByteOrder(l1);
-      }
-      DumpLiteral8(O, l0, l1, d);
-      break;
-    }
-    case MachO::S_16BYTE_LITERALS: {
-      uint32_t l0, l1, l2, l3;
-      memcpy(&l0, Contents + (lp - SectAddress), sizeof(uint32_t));
-      memcpy(&l1, Contents + (lp - SectAddress) + sizeof(uint32_t),
-             sizeof(uint32_t));
-      memcpy(&l2, Contents + (lp - SectAddress) + 2 * sizeof(uint32_t),
-             sizeof(uint32_t));
-      memcpy(&l3, Contents + (lp - SectAddress) + 3 * sizeof(uint32_t),
-             sizeof(uint32_t));
-      if (O->isLittleEndian() != sys::IsLittleEndianHost) {
-        sys::swapByteOrder(l0);
-        sys::swapByteOrder(l1);
-        sys::swapByteOrder(l2);
-        sys::swapByteOrder(l3);
-      }
-      DumpLiteral16(l0, l1, l2, l3);
-      break;
-    }
-    }
-  }
-}
-
-static void DumpInitTermPointerSection(MachOObjectFile *O,
-                                       const SectionRef &Section,
-                                       const char *sect,
-                                       uint32_t sect_size, uint64_t sect_addr,
-                                       SymbolAddressMap *AddrMap,
-                                       bool verbose) {
-  uint32_t stride;
-  stride = (O->is64Bit()) ? sizeof(uint64_t) : sizeof(uint32_t);
-
-  // Collect the external relocation symbols for the pointers.
-  std::vector<std::pair<uint64_t, SymbolRef>> Relocs;
-  for (const RelocationRef &Reloc : Section.relocations()) {
-    DataRefImpl Rel;
-    MachO::any_relocation_info RE;
-    bool isExtern = false;
-    Rel = Reloc.getRawDataRefImpl();
-    RE = O->getRelocation(Rel);
-    isExtern = O->getPlainRelocationExternal(RE);
-    if (isExtern) {
-      uint64_t RelocOffset = Reloc.getOffset();
-      symbol_iterator RelocSym = Reloc.getSymbol();
-      Relocs.push_back(std::make_pair(RelocOffset, *RelocSym));
-    }
-  }
-  array_pod_sort(Relocs.begin(), Relocs.end());
-
-  for (uint32_t i = 0; i < sect_size; i += stride) {
-    const char *SymbolName = nullptr;
-    uint64_t p;
-    if (O->is64Bit()) {
-      outs() << format("0x%016" PRIx64, sect_addr + i * stride) << " ";
-      uint64_t pointer_value;
-      memcpy(&pointer_value, sect + i, stride);
-      if (O->isLittleEndian() != sys::IsLittleEndianHost)
-        sys::swapByteOrder(pointer_value);
-      outs() << format("0x%016" PRIx64, pointer_value);
-      p = pointer_value;
-    } else {
-      outs() << format("0x%08" PRIx64, sect_addr + i * stride) << " ";
-      uint32_t pointer_value;
-      memcpy(&pointer_value, sect + i, stride);
-      if (O->isLittleEndian() != sys::IsLittleEndianHost)
-        sys::swapByteOrder(pointer_value);
-      outs() << format("0x%08" PRIx32, pointer_value);
-      p = pointer_value;
-    }
-    if (verbose) {
-      // First look for an external relocation entry for this pointer.
-      auto Reloc = find_if(Relocs, [&](const std::pair<uint64_t, SymbolRef> &P) {
-        return P.first == i;
-      });
-      if (Reloc != Relocs.end()) {
-        symbol_iterator RelocSym = Reloc->second;
-        outs() << " " << unwrapOrError(RelocSym->getName(), O->getFileName());
-      } else {
-        SymbolName = GuessSymbolName(p, AddrMap);
-        if (SymbolName)
-          outs() << " " << SymbolName;
-      }
-    }
-    outs() << "\n";
-  }
-}
-
-static void DumpRawSectionContents(MachOObjectFile *O, const char *sect,
-                                   uint32_t size, uint64_t addr) {
-  uint32_t cputype = O->getHeader().cputype;
-  if (cputype == MachO::CPU_TYPE_I386 || cputype == MachO::CPU_TYPE_X86_64) {
-    uint32_t j;
-    for (uint32_t i = 0; i < size; i += j, addr += j) {
-      if (O->is64Bit())
-        outs() << format("%016" PRIx64, addr) << "\t";
-      else
-        outs() << format("%08" PRIx64, addr) << "\t";
-      for (j = 0; j < 16 && i + j < size; j++) {
-        uint8_t byte_word = *(sect + i + j);
-        outs() << format("%02" PRIx32, (uint32_t)byte_word) << " ";
-      }
-      outs() << "\n";
-    }
-  } else {
-    uint32_t j;
-    for (uint32_t i = 0; i < size; i += j, addr += j) {
-      if (O->is64Bit())
-        outs() << format("%016" PRIx64, addr) << "\t";
-      else
-        outs() << format("%08" PRIx64, addr) << "\t";
-      for (j = 0; j < 4 * sizeof(int32_t) && i + j < size;
-           j += sizeof(int32_t)) {
-        if (i + j + sizeof(int32_t) <= size) {
-          uint32_t long_word;
-          memcpy(&long_word, sect + i + j, sizeof(int32_t));
-          if (O->isLittleEndian() != sys::IsLittleEndianHost)
-            sys::swapByteOrder(long_word);
-          outs() << format("%08" PRIx32, long_word) << " ";
-        } else {
-          for (uint32_t k = 0; i + j + k < size; k++) {
-            uint8_t byte_word = *(sect + i + j + k);
-            outs() << format("%02" PRIx32, (uint32_t)byte_word) << " ";
-          }
-        }
-      }
-      outs() << "\n";
-    }
-  }
-}
-
-static void DisassembleMachO(StringRef Filename, MachOObjectFile *MachOOF,
-                             StringRef DisSegName, StringRef DisSectName);
-static void DumpProtocolSection(MachOObjectFile *O, const char *sect,
-                                uint32_t size, uint32_t addr);
-#ifdef HAVE_LIBXAR
-static void DumpBitcodeSection(MachOObjectFile *O, const char *sect,
-                                uint32_t size, bool verbose,
-                                bool PrintXarHeader, bool PrintXarFileHeaders,
-                                std::string XarMemberName);
-#endif // defined(HAVE_LIBXAR)
-
-static void DumpSectionContents(StringRef Filename, MachOObjectFile *O,
-                                bool verbose) {
-  SymbolAddressMap AddrMap;
-  if (verbose)
-    CreateSymbolAddressMap(O, &AddrMap);
-
-  for (unsigned i = 0; i < FilterSections.size(); ++i) {
-    StringRef DumpSection = FilterSections[i];
-    std::pair<StringRef, StringRef> DumpSegSectName;
-    DumpSegSectName = DumpSection.split(',');
-    StringRef DumpSegName, DumpSectName;
-    if (!DumpSegSectName.second.empty()) {
-      DumpSegName = DumpSegSectName.first;
-      DumpSectName = DumpSegSectName.second;
-    } else {
-      DumpSegName = "";
-      DumpSectName = DumpSegSectName.first;
-    }
-    for (const SectionRef &Section : O->sections()) {
-      StringRef SectName;
-      Section.getName(SectName);
-      DataRefImpl Ref = Section.getRawDataRefImpl();
-      StringRef SegName = O->getSectionFinalSegmentName(Ref);
-      if ((DumpSegName.empty() || SegName == DumpSegName) &&
-          (SectName == DumpSectName)) {
-
-        uint32_t section_flags;
-        if (O->is64Bit()) {
-          const MachO::section_64 Sec = O->getSection64(Ref);
-          section_flags = Sec.flags;
-
-        } else {
-          const MachO::section Sec = O->getSection(Ref);
-          section_flags = Sec.flags;
-        }
-        uint32_t section_type = section_flags & MachO::SECTION_TYPE;
-
-        StringRef BytesStr =
-            unwrapOrError(Section.getContents(), O->getFileName());
-        const char *sect = reinterpret_cast<const char *>(BytesStr.data());
-        uint32_t sect_size = BytesStr.size();
-        uint64_t sect_addr = Section.getAddress();
-
-        outs() << "Contents of (" << SegName << "," << SectName
-               << ") section\n";
-
-        if (verbose) {
-          if ((section_flags & MachO::S_ATTR_PURE_INSTRUCTIONS) ||
-              (section_flags & MachO::S_ATTR_SOME_INSTRUCTIONS)) {
-            DisassembleMachO(Filename, O, SegName, SectName);
-            continue;
-          }
-          if (SegName == "__TEXT" && SectName == "__info_plist") {
-            outs() << sect;
-            continue;
-          }
-          if (SegName == "__OBJC" && SectName == "__protocol") {
-            DumpProtocolSection(O, sect, sect_size, sect_addr);
-            continue;
-          }
-#ifdef HAVE_LIBXAR
-          if (SegName == "__LLVM" && SectName == "__bundle") {
-            DumpBitcodeSection(O, sect, sect_size, verbose, !NoSymbolicOperands,
-                               ArchiveHeaders, "");
-            continue;
-          }
-#endif // defined(HAVE_LIBXAR)
-          switch (section_type) {
-          case MachO::S_REGULAR:
-            DumpRawSectionContents(O, sect, sect_size, sect_addr);
-            break;
-          case MachO::S_ZEROFILL:
-            outs() << "zerofill section and has no contents in the file\n";
-            break;
-          case MachO::S_CSTRING_LITERALS:
-            DumpCstringSection(O, sect, sect_size, sect_addr, !NoLeadingAddr);
-            break;
-          case MachO::S_4BYTE_LITERALS:
-            DumpLiteral4Section(O, sect, sect_size, sect_addr, !NoLeadingAddr);
-            break;
-          case MachO::S_8BYTE_LITERALS:
-            DumpLiteral8Section(O, sect, sect_size, sect_addr, !NoLeadingAddr);
-            break;
-          case MachO::S_16BYTE_LITERALS:
-            DumpLiteral16Section(O, sect, sect_size, sect_addr, !NoLeadingAddr);
-            break;
-          case MachO::S_LITERAL_POINTERS:
-            DumpLiteralPointerSection(O, Section, sect, sect_size, sect_addr,
-                                      !NoLeadingAddr);
-            break;
-          case MachO::S_MOD_INIT_FUNC_POINTERS:
-          case MachO::S_MOD_TERM_FUNC_POINTERS:
-            DumpInitTermPointerSection(O, Section, sect, sect_size, sect_addr,
-                                       &AddrMap, verbose);
-            break;
-          default:
-            outs() << "Unknown section type ("
-                   << format("0x%08" PRIx32, section_type) << ")\n";
-            DumpRawSectionContents(O, sect, sect_size, sect_addr);
-            break;
-          }
-        } else {
-          if (section_type == MachO::S_ZEROFILL)
-            outs() << "zerofill section and has no contents in the file\n";
-          else
-            DumpRawSectionContents(O, sect, sect_size, sect_addr);
-        }
-      }
-    }
-  }
-}
-
-static void DumpInfoPlistSectionContents(StringRef Filename,
-                                         MachOObjectFile *O) {
-  for (const SectionRef &Section : O->sections()) {
-    StringRef SectName;
-    Section.getName(SectName);
-    DataRefImpl Ref = Section.getRawDataRefImpl();
-    StringRef SegName = O->getSectionFinalSegmentName(Ref);
-    if (SegName == "__TEXT" && SectName == "__info_plist") {
-      if (!NoLeadingHeaders)
-        outs() << "Contents of (" << SegName << "," << SectName << ") section\n";
-      StringRef BytesStr =
-          unwrapOrError(Section.getContents(), O->getFileName());
-      const char *sect = reinterpret_cast<const char *>(BytesStr.data());
-      outs() << format("%.*s", BytesStr.size(), sect) << "\n";
-      return;
-    }
-  }
-}
-
-// checkMachOAndArchFlags() checks to see if the ObjectFile is a Mach-O file
-// and if it is and there is a list of architecture flags is specified then
-// check to make sure this Mach-O file is one of those architectures or all
-// architectures were specified.  If not then an error is generated and this
-// routine returns false.  Else it returns true.
-static bool checkMachOAndArchFlags(ObjectFile *O, StringRef Filename) {
-  auto *MachO = dyn_cast<MachOObjectFile>(O);
-
-  if (!MachO || ArchAll || ArchFlags.empty())
-    return true;
-
-  MachO::mach_header H;
-  MachO::mach_header_64 H_64;
-  Triple T;
-  const char *McpuDefault, *ArchFlag;
-  if (MachO->is64Bit()) {
-    H_64 = MachO->MachOObjectFile::getHeader64();
-    T = MachOObjectFile::getArchTriple(H_64.cputype, H_64.cpusubtype,
-                                       &McpuDefault, &ArchFlag);
-  } else {
-    H = MachO->MachOObjectFile::getHeader();
-    T = MachOObjectFile::getArchTriple(H.cputype, H.cpusubtype,
-                                       &McpuDefault, &ArchFlag);
-  }
-  const std::string ArchFlagName(ArchFlag);
-  if (none_of(ArchFlags, [&](const std::string &Name) {
-        return Name == ArchFlagName;
-      })) {
-    WithColor::error(errs(), "llvm-objdump")
-        << Filename << ": no architecture specified.\n";
-    return false;
-  }
-  return true;
-}
-
-static void printObjcMetaData(MachOObjectFile *O, bool verbose);
-
-// ProcessMachO() is passed a single opened Mach-O file, which may be an
-// archive member and or in a slice of a universal file.  It prints the
-// the file name and header info and then processes it according to the
-// command line options.
-static void ProcessMachO(StringRef Name, MachOObjectFile *MachOOF,
-                         StringRef ArchiveMemberName = StringRef(),
-                         StringRef ArchitectureName = StringRef()) {
-  // If we are doing some processing here on the Mach-O file print the header
-  // info.  And don't print it otherwise like in the case of printing the
-  // UniversalHeaders or ArchiveHeaders.
-  if (Disassemble || Relocations || PrivateHeaders || ExportsTrie || Rebase ||
-      Bind || SymbolTable || LazyBind || WeakBind || IndirectSymbols ||
-      DataInCode || LinkOptHints || DylibsUsed || DylibId || ObjcMetaData ||
-      (!FilterSections.empty())) {
-    if (!NoLeadingHeaders) {
-      outs() << Name;
-      if (!ArchiveMemberName.empty())
-        outs() << '(' << ArchiveMemberName << ')';
-      if (!ArchitectureName.empty())
-        outs() << " (architecture " << ArchitectureName << ")";
-      outs() << ":\n";
-    }
-  }
-  // To use the report_error() form with an ArchiveName and FileName set
-  // these up based on what is passed for Name and ArchiveMemberName.
-  StringRef ArchiveName;
-  StringRef FileName;
-  if (!ArchiveMemberName.empty()) {
-    ArchiveName = Name;
-    FileName = ArchiveMemberName;
-  } else {
-    ArchiveName = StringRef();
-    FileName = Name;
-  }
-
-  // If we need the symbol table to do the operation then check it here to
-  // produce a good error message as to where the Mach-O file comes from in
-  // the error message.
-  if (Disassemble || IndirectSymbols || !FilterSections.empty() || UnwindInfo)
-    if (Error Err = MachOOF->checkSymbolTable())
-      report_error(std::move(Err), ArchiveName, FileName, ArchitectureName);
-
-  if (DisassembleAll) {
-    for (const SectionRef &Section : MachOOF->sections()) {
-      StringRef SectName;
-      Section.getName(SectName);
-      if (SectName.equals("__text")) {
-        DataRefImpl Ref = Section.getRawDataRefImpl();
-        StringRef SegName = MachOOF->getSectionFinalSegmentName(Ref);
-        DisassembleMachO(FileName, MachOOF, SegName, SectName);
-      }
-    }
-  }
-  else if (Disassemble) {
-    if (MachOOF->getHeader().filetype == MachO::MH_KEXT_BUNDLE &&
-        MachOOF->getHeader().cputype == MachO::CPU_TYPE_ARM64)
-      DisassembleMachO(FileName, MachOOF, "__TEXT_EXEC", "__text");
-    else
-      DisassembleMachO(FileName, MachOOF, "__TEXT", "__text");
-  }
-  if (IndirectSymbols)
-    PrintIndirectSymbols(MachOOF, !NonVerbose);
-  if (DataInCode)
-    PrintDataInCodeTable(MachOOF, !NonVerbose);
-  if (LinkOptHints)
-    PrintLinkOptHints(MachOOF);
-  if (Relocations)
-    PrintRelocations(MachOOF, !NonVerbose);
-  if (SectionHeaders)
-    printSectionHeaders(MachOOF);
-  if (SectionContents)
-    printSectionContents(MachOOF);
-  if (!FilterSections.empty())
-    DumpSectionContents(FileName, MachOOF, !NonVerbose);
-  if (InfoPlist)
-    DumpInfoPlistSectionContents(FileName, MachOOF);
-  if (DylibsUsed)
-    PrintDylibs(MachOOF, false);
-  if (DylibId)
-    PrintDylibs(MachOOF, true);
-  if (SymbolTable)
-    printSymbolTable(MachOOF, ArchiveName, ArchitectureName);
-  if (UnwindInfo)
-    printMachOUnwindInfo(MachOOF);
-  if (PrivateHeaders) {
-    printMachOFileHeader(MachOOF);
-    printMachOLoadCommands(MachOOF);
-  }
-  if (FirstPrivateHeader)
-    printMachOFileHeader(MachOOF);
-  if (ObjcMetaData)
-    printObjcMetaData(MachOOF, !NonVerbose);
-  if (ExportsTrie)
-    printExportsTrie(MachOOF);
-  if (Rebase)
-    printRebaseTable(MachOOF);
-  if (Bind)
-    printBindTable(MachOOF);
-  if (LazyBind)
-    printLazyBindTable(MachOOF);
-  if (WeakBind)
-    printWeakBindTable(MachOOF);
-
-  if (DwarfDumpType != DIDT_Null) {
-    std::unique_ptr<DIContext> DICtx = DWARFContext::create(*MachOOF);
-    // Dump the complete DWARF structure.
-    DIDumpOptions DumpOpts;
-    DumpOpts.DumpType = DwarfDumpType;
-    DICtx->dump(outs(), DumpOpts);
-  }
-}
-
-// printUnknownCPUType() helps print_fat_headers for unknown CPU's.
-static void printUnknownCPUType(uint32_t cputype, uint32_t cpusubtype) {
-  outs() << "    cputype (" << cputype << ")\n";
-  outs() << "    cpusubtype (" << cpusubtype << ")\n";
-}
-
-// printCPUType() helps print_fat_headers by printing the cputype and
-// pusubtype (symbolically for the one's it knows about).
-static void printCPUType(uint32_t cputype, uint32_t cpusubtype) {
-  switch (cputype) {
-  case MachO::CPU_TYPE_I386:
-    switch (cpusubtype) {
-    case MachO::CPU_SUBTYPE_I386_ALL:
-      outs() << "    cputype CPU_TYPE_I386\n";
-      outs() << "    cpusubtype CPU_SUBTYPE_I386_ALL\n";
-      break;
-    default:
-      printUnknownCPUType(cputype, cpusubtype);
-      break;
-    }
-    break;
-  case MachO::CPU_TYPE_X86_64:
-    switch (cpusubtype) {
-    case MachO::CPU_SUBTYPE_X86_64_ALL:
-      outs() << "    cputype CPU_TYPE_X86_64\n";
-      outs() << "    cpusubtype CPU_SUBTYPE_X86_64_ALL\n";
-      break;
-    case MachO::CPU_SUBTYPE_X86_64_H:
-      outs() << "    cputype CPU_TYPE_X86_64\n";
-      outs() << "    cpusubtype CPU_SUBTYPE_X86_64_H\n";
-      break;
-    default:
-      printUnknownCPUType(cputype, cpusubtype);
-      break;
-    }
-    break;
-  case MachO::CPU_TYPE_ARM:
-    switch (cpusubtype) {
-    case MachO::CPU_SUBTYPE_ARM_ALL:
-      outs() << "    cputype CPU_TYPE_ARM\n";
-      outs() << "    cpusubtype CPU_SUBTYPE_ARM_ALL\n";
-      break;
-    case MachO::CPU_SUBTYPE_ARM_V4T:
-      outs() << "    cputype CPU_TYPE_ARM\n";
-      outs() << "    cpusubtype CPU_SUBTYPE_ARM_V4T\n";
-      break;
-    case MachO::CPU_SUBTYPE_ARM_V5TEJ:
-      outs() << "    cputype CPU_TYPE_ARM\n";
-      outs() << "    cpusubtype CPU_SUBTYPE_ARM_V5TEJ\n";
-      break;
-    case MachO::CPU_SUBTYPE_ARM_XSCALE:
-      outs() << "    cputype CPU_TYPE_ARM\n";
-      outs() << "    cpusubtype CPU_SUBTYPE_ARM_XSCALE\n";
-      break;
-    case MachO::CPU_SUBTYPE_ARM_V6:
-      outs() << "    cputype CPU_TYPE_ARM\n";
-      outs() << "    cpusubtype CPU_SUBTYPE_ARM_V6\n";
-      break;
-    case MachO::CPU_SUBTYPE_ARM_V6M:
-      outs() << "    cputype CPU_TYPE_ARM\n";
-      outs() << "    cpusubtype CPU_SUBTYPE_ARM_V6M\n";
-      break;
-    case MachO::CPU_SUBTYPE_ARM_V7:
-      outs() << "    cputype CPU_TYPE_ARM\n";
-      outs() << "    cpusubtype CPU_SUBTYPE_ARM_V7\n";
-      break;
-    case MachO::CPU_SUBTYPE_ARM_V7EM:
-      outs() << "    cputype CPU_TYPE_ARM\n";
-      outs() << "    cpusubtype CPU_SUBTYPE_ARM_V7EM\n";
-      break;
-    case MachO::CPU_SUBTYPE_ARM_V7K:
-      outs() << "    cputype CPU_TYPE_ARM\n";
-      outs() << "    cpusubtype CPU_SUBTYPE_ARM_V7K\n";
-      break;
-    case MachO::CPU_SUBTYPE_ARM_V7M:
-      outs() << "    cputype CPU_TYPE_ARM\n";
-      outs() << "    cpusubtype CPU_SUBTYPE_ARM_V7M\n";
-      break;
-    case MachO::CPU_SUBTYPE_ARM_V7S:
-      outs() << "    cputype CPU_TYPE_ARM\n";
-      outs() << "    cpusubtype CPU_SUBTYPE_ARM_V7S\n";
-      break;
-    default:
-      printUnknownCPUType(cputype, cpusubtype);
-      break;
-    }
-    break;
-  case MachO::CPU_TYPE_ARM64:
-    switch (cpusubtype & ~MachO::CPU_SUBTYPE_MASK) {
-    case MachO::CPU_SUBTYPE_ARM64_ALL:
-      outs() << "    cputype CPU_TYPE_ARM64\n";
-      outs() << "    cpusubtype CPU_SUBTYPE_ARM64_ALL\n";
-      break;
-    case MachO::CPU_SUBTYPE_ARM64E:
-      outs() << "    cputype CPU_TYPE_ARM64\n";
-      outs() << "    cpusubtype CPU_SUBTYPE_ARM64E\n";
-      break;
-    default:
-      printUnknownCPUType(cputype, cpusubtype);
-      break;
-    }
-    break;
-  case MachO::CPU_TYPE_ARM64_32:
-    switch (cpusubtype & ~MachO::CPU_SUBTYPE_MASK) {
-    case MachO::CPU_SUBTYPE_ARM64_32_V8:
-      outs() << "    cputype CPU_TYPE_ARM64_32\n";
-      outs() << "    cpusubtype CPU_SUBTYPE_ARM64_32_V8\n";
-      break;
-    default:
-      printUnknownCPUType(cputype, cpusubtype);
-      break;
-    }
-    break;
-  default:
-    printUnknownCPUType(cputype, cpusubtype);
-    break;
-  }
-}
-
-static void printMachOUniversalHeaders(const object::MachOUniversalBinary *UB,
-                                       bool verbose) {
-  outs() << "Fat headers\n";
-  if (verbose) {
-    if (UB->getMagic() == MachO::FAT_MAGIC)
-      outs() << "fat_magic FAT_MAGIC\n";
-    else // UB->getMagic() == MachO::FAT_MAGIC_64
-      outs() << "fat_magic FAT_MAGIC_64\n";
-  } else
-    outs() << "fat_magic " << format("0x%" PRIx32, MachO::FAT_MAGIC) << "\n";
-
-  uint32_t nfat_arch = UB->getNumberOfObjects();
-  StringRef Buf = UB->getData();
-  uint64_t size = Buf.size();
-  uint64_t big_size = sizeof(struct MachO::fat_header) +
-                      nfat_arch * sizeof(struct MachO::fat_arch);
-  outs() << "nfat_arch " << UB->getNumberOfObjects();
-  if (nfat_arch == 0)
-    outs() << " (malformed, contains zero architecture types)\n";
-  else if (big_size > size)
-    outs() << " (malformed, architectures past end of file)\n";
-  else
-    outs() << "\n";
-
-  for (uint32_t i = 0; i < nfat_arch; ++i) {
-    MachOUniversalBinary::ObjectForArch OFA(UB, i);
-    uint32_t cputype = OFA.getCPUType();
-    uint32_t cpusubtype = OFA.getCPUSubType();
-    outs() << "architecture ";
-    for (uint32_t j = 0; i != 0 && j <= i - 1; j++) {
-      MachOUniversalBinary::ObjectForArch other_OFA(UB, j);
-      uint32_t other_cputype = other_OFA.getCPUType();
-      uint32_t other_cpusubtype = other_OFA.getCPUSubType();
-      if (cputype != 0 && cpusubtype != 0 && cputype == other_cputype &&
-          (cpusubtype & ~MachO::CPU_SUBTYPE_MASK) ==
-              (other_cpusubtype & ~MachO::CPU_SUBTYPE_MASK)) {
-        outs() << "(illegal duplicate architecture) ";
-        break;
-      }
-    }
-    if (verbose) {
-      outs() << OFA.getArchFlagName() << "\n";
-      printCPUType(cputype, cpusubtype & ~MachO::CPU_SUBTYPE_MASK);
-    } else {
-      outs() << i << "\n";
-      outs() << "    cputype " << cputype << "\n";
-      outs() << "    cpusubtype " << (cpusubtype & ~MachO::CPU_SUBTYPE_MASK)
-             << "\n";
-    }
-    if (verbose &&
-        (cpusubtype & MachO::CPU_SUBTYPE_MASK) == MachO::CPU_SUBTYPE_LIB64)
-      outs() << "    capabilities CPU_SUBTYPE_LIB64\n";
-    else
-      outs() << "    capabilities "
-             << format("0x%" PRIx32,
-                       (cpusubtype & MachO::CPU_SUBTYPE_MASK) >> 24) << "\n";
-    outs() << "    offset " << OFA.getOffset();
-    if (OFA.getOffset() > size)
-      outs() << " (past end of file)";
-    if (OFA.getOffset() % (1 << OFA.getAlign()) != 0)
-      outs() << " (not aligned on it's alignment (2^" << OFA.getAlign() << ")";
-    outs() << "\n";
-    outs() << "    size " << OFA.getSize();
-    big_size = OFA.getOffset() + OFA.getSize();
-    if (big_size > size)
-      outs() << " (past end of file)";
-    outs() << "\n";
-    outs() << "    align 2^" << OFA.getAlign() << " (" << (1 << OFA.getAlign())
-           << ")\n";
-  }
-}
-
-static void printArchiveChild(StringRef Filename, const Archive::Child &C,
-                              bool verbose, bool print_offset,
-                              StringRef ArchitectureName = StringRef()) {
-  if (print_offset)
-    outs() << C.getChildOffset() << "\t";
-  sys::fs::perms Mode =
-      unwrapOrError(C.getAccessMode(), Filename, C, ArchitectureName);
-  if (verbose) {
-    // FIXME: this first dash, "-", is for (Mode & S_IFMT) == S_IFREG.
-    // But there is nothing in sys::fs::perms for S_IFMT or S_IFREG.
-    outs() << "-";
-    outs() << ((Mode & sys::fs::owner_read) ? "r" : "-");
-    outs() << ((Mode & sys::fs::owner_write) ? "w" : "-");
-    outs() << ((Mode & sys::fs::owner_exe) ? "x" : "-");
-    outs() << ((Mode & sys::fs::group_read) ? "r" : "-");
-    outs() << ((Mode & sys::fs::group_write) ? "w" : "-");
-    outs() << ((Mode & sys::fs::group_exe) ? "x" : "-");
-    outs() << ((Mode & sys::fs::others_read) ? "r" : "-");
-    outs() << ((Mode & sys::fs::others_write) ? "w" : "-");
-    outs() << ((Mode & sys::fs::others_exe) ? "x" : "-");
-  } else {
-    outs() << format("0%o ", Mode);
-  }
-
-  outs() << format(
-      "%3d/%-3d %5" PRId64 " ",
-      unwrapOrError(C.getUID(), Filename, C, ArchitectureName),
-      unwrapOrError(C.getGID(), Filename, C, ArchitectureName),
-      unwrapOrError(C.getRawSize(), Filename, C, ArchitectureName));
-
-  StringRef RawLastModified = C.getRawLastModified();
-  if (verbose) {
-    unsigned Seconds;
-    if (RawLastModified.getAsInteger(10, Seconds))
-      outs() << "(date: \"" << RawLastModified
-             << "\" contains non-decimal chars) ";
-    else {
-      // Since cime(3) returns a 26 character string of the form:
-      // "Sun Sep 16 01:03:52 1973\n\0"
-      // just print 24 characters.
-      time_t t = Seconds;
-      outs() << format("%.24s ", ctime(&t));
-    }
-  } else {
-    outs() << RawLastModified << " ";
-  }
-
-  if (verbose) {
-    Expected<StringRef> NameOrErr = C.getName();
-    if (!NameOrErr) {
-      consumeError(NameOrErr.takeError());
-      outs() << unwrapOrError(C.getRawName(), Filename, C, ArchitectureName)
-             << "\n";
-    } else {
-      StringRef Name = NameOrErr.get();
-      outs() << Name << "\n";
-    }
-  } else {
-    outs() << unwrapOrError(C.getRawName(), Filename, C, ArchitectureName)
-           << "\n";
-  }
-}
-
-static void printArchiveHeaders(StringRef Filename, Archive *A, bool verbose,
-                                bool print_offset,
-                                StringRef ArchitectureName = StringRef()) {
-  Error Err = Error::success();
-  for (const auto &C : A->children(Err, false))
-    printArchiveChild(Filename, C, verbose, print_offset, ArchitectureName);
-
-  if (Err)
-    report_error(std::move(Err), StringRef(), Filename, ArchitectureName);
-}
-
-static bool ValidateArchFlags() {
-  // Check for -arch all and verifiy the -arch flags are valid.
-  for (unsigned i = 0; i < ArchFlags.size(); ++i) {
-    if (ArchFlags[i] == "all") {
-      ArchAll = true;
-    } else {
-      if (!MachOObjectFile::isValidArch(ArchFlags[i])) {
-        WithColor::error(errs(), "llvm-objdump")
-            << "unknown architecture named '" + ArchFlags[i] +
-                   "'for the -arch option\n";
-        return false;
-      }
-    }
-  }
-  return true;
-}
-
-// ParseInputMachO() parses the named Mach-O file in Filename and handles the
-// -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 parseInputMachO(StringRef Filename) {
-  if (!ValidateArchFlags())
-    return;
-
-  // Attempt to open the binary.
-  Expected<OwningBinary<Binary>> BinaryOrErr = createBinary(Filename);
-  if (!BinaryOrErr) {
-    if (Error E = isNotObjectErrorInvalidFileType(BinaryOrErr.takeError()))
-      report_error(std::move(E), Filename);
-    else
-      outs() << Filename << ": is not an object file\n";
-    return;
-  }
-  Binary &Bin = *BinaryOrErr.get().getBinary();
-
-  if (Archive *A = dyn_cast<Archive>(&Bin)) {
-    outs() << "Archive : " << Filename << "\n";
-    if (ArchiveHeaders)
-      printArchiveHeaders(Filename, A, !NonVerbose, ArchiveMemberOffsets);
-
-    Error Err = Error::success();
-    for (auto &C : A->children(Err)) {
-      Expected<std::unique_ptr<Binary>> ChildOrErr = C.getAsBinary();
-      if (!ChildOrErr) {
-        if (Error E = isNotObjectErrorInvalidFileType(ChildOrErr.takeError()))
-          report_error(std::move(E), Filename, C);
-        continue;
-      }
-      if (MachOObjectFile *O = dyn_cast<MachOObjectFile>(&*ChildOrErr.get())) {
-        if (!checkMachOAndArchFlags(O, Filename))
-          return;
-        ProcessMachO(Filename, O, O->getFileName());
-      }
-    }
-    if (Err)
-      report_error(std::move(Err), Filename);
-    return;
-  }
-  if (MachOUniversalBinary *UB = dyn_cast<MachOUniversalBinary>(&Bin)) {
-    parseInputMachO(UB);
-    return;
-  }
-  if (ObjectFile *O = dyn_cast<ObjectFile>(&Bin)) {
-    if (!checkMachOAndArchFlags(O, Filename))
-      return;
-    if (MachOObjectFile *MachOOF = dyn_cast<MachOObjectFile>(&*O))
-      ProcessMachO(Filename, MachOOF);
-    else
-      WithColor::error(errs(), "llvm-objdump")
-          << Filename << "': "
-          << "object is not a Mach-O file type.\n";
-    return;
-  }
-  llvm_unreachable("Input object can't be invalid at this point");
-}
-
-void parseInputMachO(MachOUniversalBinary *UB) {
-  if (!ValidateArchFlags())
-    return;
-
-  auto Filename = UB->getFileName();
-
-  if (UniversalHeaders)
-    printMachOUniversalHeaders(UB, !NonVerbose);
-
-  // If we have a list of architecture flags specified dump only those.
-  if (!ArchAll && !ArchFlags.empty()) {
-    // Look for a slice in the universal binary that matches each ArchFlag.
-    bool ArchFound;
-    for (unsigned i = 0; i < ArchFlags.size(); ++i) {
-      ArchFound = false;
-      for (MachOUniversalBinary::object_iterator I = UB->begin_objects(),
-                                                  E = UB->end_objects();
-            I != E; ++I) {
-        if (ArchFlags[i] == I->getArchFlagName()) {
-          ArchFound = true;
-          Expected<std::unique_ptr<ObjectFile>> ObjOrErr =
-              I->getAsObjectFile();
-          std::string ArchitectureName = "";
-          if (ArchFlags.size() > 1)
-            ArchitectureName = I->getArchFlagName();
-          if (ObjOrErr) {
-            ObjectFile &O = *ObjOrErr.get();
-            if (MachOObjectFile *MachOOF = dyn_cast<MachOObjectFile>(&O))
-              ProcessMachO(Filename, MachOOF, "", ArchitectureName);
-          } else if (Error E = isNotObjectErrorInvalidFileType(
-                         ObjOrErr.takeError())) {
-            report_error(std::move(E), Filename, StringRef(), ArchitectureName);
-            continue;
-          } else if (Expected<std::unique_ptr<Archive>> AOrErr =
-                         I->getAsArchive()) {
-            std::unique_ptr<Archive> &A = *AOrErr;
-            outs() << "Archive : " << Filename;
-            if (!ArchitectureName.empty())
-              outs() << " (architecture " << ArchitectureName << ")";
-            outs() << "\n";
-            if (ArchiveHeaders)
-              printArchiveHeaders(Filename, A.get(), !NonVerbose,
-                                  ArchiveMemberOffsets, ArchitectureName);
-            Error Err = Error::success();
-            for (auto &C : A->children(Err)) {
-              Expected<std::unique_ptr<Binary>> ChildOrErr = C.getAsBinary();
-              if (!ChildOrErr) {
-                if (Error E = isNotObjectErrorInvalidFileType(ChildOrErr.takeError()))
-                  report_error(std::move(E), Filename, C, ArchitectureName);
-                continue;
-              }
-              if (MachOObjectFile *O =
-                      dyn_cast<MachOObjectFile>(&*ChildOrErr.get()))
-                ProcessMachO(Filename, O, O->getFileName(), ArchitectureName);
-            }
-            if (Err)
-              report_error(std::move(Err), Filename);
-          } else {
-            consumeError(AOrErr.takeError());
-            error("Mach-O universal file: " + Filename + " for " +
-                  "architecture " + StringRef(I->getArchFlagName()) +
-                  " is not a Mach-O file or an archive file");
-          }
-        }
-      }
-      if (!ArchFound) {
-        WithColor::error(errs(), "llvm-objdump")
-            << "file: " + Filename + " does not contain "
-            << "architecture: " + ArchFlags[i] + "\n";
-        return;
-      }
-    }
-    return;
-  }
-  // No architecture flags were specified so if this contains a slice that
-  // matches the host architecture dump only that.
-  if (!ArchAll) {
-    for (MachOUniversalBinary::object_iterator I = UB->begin_objects(),
-                                                E = UB->end_objects();
-          I != E; ++I) {
-      if (MachOObjectFile::getHostArch().getArchName() ==
-          I->getArchFlagName()) {
-        Expected<std::unique_ptr<ObjectFile>> ObjOrErr = I->getAsObjectFile();
-        std::string ArchiveName;
-        ArchiveName.clear();
-        if (ObjOrErr) {
-          ObjectFile &O = *ObjOrErr.get();
-          if (MachOObjectFile *MachOOF = dyn_cast<MachOObjectFile>(&O))
-            ProcessMachO(Filename, MachOOF);
-        } else if (Error E =
-                       isNotObjectErrorInvalidFileType(ObjOrErr.takeError())) {
-          report_error(std::move(E), Filename);
-        } else if (Expected<std::unique_ptr<Archive>> AOrErr =
-                       I->getAsArchive()) {
-          std::unique_ptr<Archive> &A = *AOrErr;
-          outs() << "Archive : " << Filename << "\n";
-          if (ArchiveHeaders)
-            printArchiveHeaders(Filename, A.get(), !NonVerbose,
-                                ArchiveMemberOffsets);
-          Error Err = Error::success();
-          for (auto &C : A->children(Err)) {
-            Expected<std::unique_ptr<Binary>> ChildOrErr = C.getAsBinary();
-            if (!ChildOrErr) {
-              if (Error E =
-                      isNotObjectErrorInvalidFileType(ChildOrErr.takeError()))
-                report_error(std::move(E), Filename, C);
-              continue;
-            }
-            if (MachOObjectFile *O =
-                    dyn_cast<MachOObjectFile>(&*ChildOrErr.get()))
-              ProcessMachO(Filename, O, O->getFileName());
-          }
-          if (Err)
-            report_error(std::move(Err), Filename);
-        } else {
-          consumeError(AOrErr.takeError());
-          error("Mach-O universal file: " + Filename + " for architecture " +
-                StringRef(I->getArchFlagName()) +
-                " is not a Mach-O file or an archive file");
-        }
-        return;
-      }
-    }
-  }
-  // Either all architectures have been specified or none have been specified
-  // and this does not contain the host architecture so dump all the slices.
-  bool moreThanOneArch = UB->getNumberOfObjects() > 1;
-  for (MachOUniversalBinary::object_iterator I = UB->begin_objects(),
-                                              E = UB->end_objects();
-        I != E; ++I) {
-    Expected<std::unique_ptr<ObjectFile>> ObjOrErr = I->getAsObjectFile();
-    std::string ArchitectureName = "";
-    if (moreThanOneArch)
-      ArchitectureName = I->getArchFlagName();
-    if (ObjOrErr) {
-      ObjectFile &Obj = *ObjOrErr.get();
-      if (MachOObjectFile *MachOOF = dyn_cast<MachOObjectFile>(&Obj))
-        ProcessMachO(Filename, MachOOF, "", ArchitectureName);
-    } else if (Error E =
-                   isNotObjectErrorInvalidFileType(ObjOrErr.takeError())) {
-      report_error(std::move(E), StringRef(), Filename, ArchitectureName);
-    } else if (Expected<std::unique_ptr<Archive>> AOrErr = I->getAsArchive()) {
-      std::unique_ptr<Archive> &A = *AOrErr;
-      outs() << "Archive : " << Filename;
-      if (!ArchitectureName.empty())
-        outs() << " (architecture " << ArchitectureName << ")";
-      outs() << "\n";
-      if (ArchiveHeaders)
-        printArchiveHeaders(Filename, A.get(), !NonVerbose,
-                            ArchiveMemberOffsets, ArchitectureName);
-      Error Err = Error::success();
-      for (auto &C : A->children(Err)) {
-        Expected<std::unique_ptr<Binary>> ChildOrErr = C.getAsBinary();
-        if (!ChildOrErr) {
-          if (Error E = isNotObjectErrorInvalidFileType(ChildOrErr.takeError()))
-            report_error(std::move(E), Filename, C, ArchitectureName);
-          continue;
-        }
-        if (MachOObjectFile *O =
-                dyn_cast<MachOObjectFile>(&*ChildOrErr.get())) {
-          if (MachOObjectFile *MachOOF = dyn_cast<MachOObjectFile>(O))
-            ProcessMachO(Filename, MachOOF, MachOOF->getFileName(),
-                          ArchitectureName);
-        }
-      }
-      if (Err)
-        report_error(std::move(Err), Filename);
-    } else {
-      consumeError(AOrErr.takeError());
-      error("Mach-O universal file: " + Filename + " for architecture " +
-            StringRef(I->getArchFlagName()) +
-            " is not a Mach-O file or an archive file");
-    }
-  }
-}
-
-// The block of info used by the Symbolizer call backs.
-struct DisassembleInfo {
-  DisassembleInfo(MachOObjectFile *O, SymbolAddressMap *AddrMap,
-                  std::vector<SectionRef> *Sections, bool verbose)
-    : verbose(verbose), O(O), AddrMap(AddrMap), Sections(Sections) {}
-  bool verbose;
-  MachOObjectFile *O;
-  SectionRef S;
-  SymbolAddressMap *AddrMap;
-  std::vector<SectionRef> *Sections;
-  const char *class_name = nullptr;
-  const char *selector_name = nullptr;
-  std::unique_ptr<char[]> method = nullptr;
-  char *demangled_name = nullptr;
-  uint64_t adrp_addr = 0;
-  uint32_t adrp_inst = 0;
-  std::unique_ptr<SymbolAddressMap> bindtable;
-  uint32_t depth = 0;
-};
-
-// SymbolizerGetOpInfo() is the operand information call back function.
-// This is called to get the symbolic information for operand(s) of an
-// instruction when it is being done.  This routine does this from
-// the relocation information, symbol table, etc. That block of information
-// is a pointer to the struct DisassembleInfo that was passed when the
-// disassembler context was created and passed to back to here when
-// called back by the disassembler for instruction operands that could have
-// relocation information. The address of the instruction containing operand is
-// at the Pc parameter.  The immediate value the operand has is passed in
-// op_info->Value and is at Offset past the start of the instruction and has a
-// byte Size of 1, 2 or 4. The symbolc information is returned in TagBuf is the
-// LLVMOpInfo1 struct defined in the header "llvm-c/Disassembler.h" as symbol
-// names and addends of the symbolic expression to add for the operand.  The
-// value of TagType is currently 1 (for the LLVMOpInfo1 struct). If symbolic
-// information is returned then this function returns 1 else it returns 0.
-static int SymbolizerGetOpInfo(void *DisInfo, uint64_t Pc, uint64_t Offset,
-                               uint64_t Size, int TagType, void *TagBuf) {
-  struct DisassembleInfo *info = (struct DisassembleInfo *)DisInfo;
-  struct LLVMOpInfo1 *op_info = (struct LLVMOpInfo1 *)TagBuf;
-  uint64_t value = op_info->Value;
-
-  // Make sure all fields returned are zero if we don't set them.
-  memset((void *)op_info, '\0', sizeof(struct LLVMOpInfo1));
-  op_info->Value = value;
-
-  // If the TagType is not the value 1 which it code knows about or if no
-  // verbose symbolic information is wanted then just return 0, indicating no
-  // information is being returned.
-  if (TagType != 1 || !info->verbose)
-    return 0;
-
-  unsigned int Arch = info->O->getArch();
-  if (Arch == Triple::x86) {
-    if (Size != 1 && Size != 2 && Size != 4 && Size != 0)
-      return 0;
-    if (info->O->getHeader().filetype != MachO::MH_OBJECT) {
-      // TODO:
-      // Search the external relocation entries of a fully linked image
-      // (if any) for an entry that matches this segment offset.
-      // uint32_t seg_offset = (Pc + Offset);
-      return 0;
-    }
-    // In MH_OBJECT filetypes search the section's relocation entries (if any)
-    // for an entry for this section offset.
-    uint32_t sect_addr = info->S.getAddress();
-    uint32_t sect_offset = (Pc + Offset) - sect_addr;
-    bool reloc_found = false;
-    DataRefImpl Rel;
-    MachO::any_relocation_info RE;
-    bool isExtern = false;
-    SymbolRef Symbol;
-    bool r_scattered = false;
-    uint32_t r_value, pair_r_value, r_type;
-    for (const RelocationRef &Reloc : info->S.relocations()) {
-      uint64_t RelocOffset = Reloc.getOffset();
-      if (RelocOffset == sect_offset) {
-        Rel = Reloc.getRawDataRefImpl();
-        RE = info->O->getRelocation(Rel);
-        r_type = info->O->getAnyRelocationType(RE);
-        r_scattered = info->O->isRelocationScattered(RE);
-        if (r_scattered) {
-          r_value = info->O->getScatteredRelocationValue(RE);
-          if (r_type == MachO::GENERIC_RELOC_SECTDIFF ||
-              r_type == MachO::GENERIC_RELOC_LOCAL_SECTDIFF) {
-            DataRefImpl RelNext = Rel;
-            info->O->moveRelocationNext(RelNext);
-            MachO::any_relocation_info RENext;
-            RENext = info->O->getRelocation(RelNext);
-            if (info->O->isRelocationScattered(RENext))
-              pair_r_value = info->O->getScatteredRelocationValue(RENext);
-            else
-              return 0;
-          }
-        } else {
-          isExtern = info->O->getPlainRelocationExternal(RE);
-          if (isExtern) {
-            symbol_iterator RelocSym = Reloc.getSymbol();
-            Symbol = *RelocSym;
-          }
-        }
-        reloc_found = true;
-        break;
-      }
-    }
-    if (reloc_found && isExtern) {
-      op_info->AddSymbol.Present = 1;
-      op_info->AddSymbol.Name =
-          unwrapOrError(Symbol.getName(), info->O->getFileName()).data();
-      // For i386 extern relocation entries the value in the instruction is
-      // the offset from the symbol, and value is already set in op_info->Value.
-      return 1;
-    }
-    if (reloc_found && (r_type == MachO::GENERIC_RELOC_SECTDIFF ||
-                        r_type == MachO::GENERIC_RELOC_LOCAL_SECTDIFF)) {
-      const char *add = GuessSymbolName(r_value, info->AddrMap);
-      const char *sub = GuessSymbolName(pair_r_value, info->AddrMap);
-      uint32_t offset = value - (r_value - pair_r_value);
-      op_info->AddSymbol.Present = 1;
-      if (add != nullptr)
-        op_info->AddSymbol.Name = add;
-      else
-        op_info->AddSymbol.Value = r_value;
-      op_info->SubtractSymbol.Present = 1;
-      if (sub != nullptr)
-        op_info->SubtractSymbol.Name = sub;
-      else
-        op_info->SubtractSymbol.Value = pair_r_value;
-      op_info->Value = offset;
-      return 1;
-    }
-    return 0;
-  }
-  if (Arch == Triple::x86_64) {
-    if (Size != 1 && Size != 2 && Size != 4 && Size != 0)
-      return 0;
-    // For non MH_OBJECT types, like MH_KEXT_BUNDLE, Search the external
-    // relocation entries of a linked image (if any) for an entry that matches
-    // this segment offset.
-    if (info->O->getHeader().filetype != MachO::MH_OBJECT) {
-      uint64_t seg_offset = Pc + Offset;
-      bool reloc_found = false;
-      DataRefImpl Rel;
-      MachO::any_relocation_info RE;
-      bool isExtern = false;
-      SymbolRef Symbol;
-      for (const RelocationRef &Reloc : info->O->external_relocations()) {
-        uint64_t RelocOffset = Reloc.getOffset();
-        if (RelocOffset == seg_offset) {
-          Rel = Reloc.getRawDataRefImpl();
-          RE = info->O->getRelocation(Rel);
-          // external relocation entries should always be external.
-          isExtern = info->O->getPlainRelocationExternal(RE);
-          if (isExtern) {
-            symbol_iterator RelocSym = Reloc.getSymbol();
-            Symbol = *RelocSym;
-          }
-          reloc_found = true;
-          break;
-        }
-      }
-      if (reloc_found && isExtern) {
-        // The Value passed in will be adjusted by the Pc if the instruction
-        // adds the Pc.  But for x86_64 external relocation entries the Value
-        // is the offset from the external symbol.
-        if (info->O->getAnyRelocationPCRel(RE))
-          op_info->Value -= Pc + Offset + Size;
-        const char *name =
-            unwrapOrError(Symbol.getName(), info->O->getFileName()).data();
-        op_info->AddSymbol.Present = 1;
-        op_info->AddSymbol.Name = name;
-        return 1;
-      }
-      return 0;
-    }
-    // In MH_OBJECT filetypes search the section's relocation entries (if any)
-    // for an entry for this section offset.
-    uint64_t sect_addr = info->S.getAddress();
-    uint64_t sect_offset = (Pc + Offset) - sect_addr;
-    bool reloc_found = false;
-    DataRefImpl Rel;
-    MachO::any_relocation_info RE;
-    bool isExtern = false;
-    SymbolRef Symbol;
-    for (const RelocationRef &Reloc : info->S.relocations()) {
-      uint64_t RelocOffset = Reloc.getOffset();
-      if (RelocOffset == sect_offset) {
-        Rel = Reloc.getRawDataRefImpl();
-        RE = info->O->getRelocation(Rel);
-        // NOTE: Scattered relocations don't exist on x86_64.
-        isExtern = info->O->getPlainRelocationExternal(RE);
-        if (isExtern) {
-          symbol_iterator RelocSym = Reloc.getSymbol();
-          Symbol = *RelocSym;
-        }
-        reloc_found = true;
-        break;
-      }
-    }
-    if (reloc_found && isExtern) {
-      // The Value passed in will be adjusted by the Pc if the instruction
-      // adds the Pc.  But for x86_64 external relocation entries the Value
-      // is the offset from the external symbol.
-      if (info->O->getAnyRelocationPCRel(RE))
-        op_info->Value -= Pc + Offset + Size;
-      const char *name =
-          unwrapOrError(Symbol.getName(), info->O->getFileName()).data();
-      unsigned Type = info->O->getAnyRelocationType(RE);
-      if (Type == MachO::X86_64_RELOC_SUBTRACTOR) {
-        DataRefImpl RelNext = Rel;
-        info->O->moveRelocationNext(RelNext);
-        MachO::any_relocation_info RENext = info->O->getRelocation(RelNext);
-        unsigned TypeNext = info->O->getAnyRelocationType(RENext);
-        bool isExternNext = info->O->getPlainRelocationExternal(RENext);
-        unsigned SymbolNum = info->O->getPlainRelocationSymbolNum(RENext);
-        if (TypeNext == MachO::X86_64_RELOC_UNSIGNED && isExternNext) {
-          op_info->SubtractSymbol.Present = 1;
-          op_info->SubtractSymbol.Name = name;
-          symbol_iterator RelocSymNext = info->O->getSymbolByIndex(SymbolNum);
-          Symbol = *RelocSymNext;
-          name = unwrapOrError(Symbol.getName(), info->O->getFileName()).data();
-        }
-      }
-      // TODO: add the VariantKinds to op_info->VariantKind for relocation types
-      // like: X86_64_RELOC_TLV, X86_64_RELOC_GOT_LOAD and X86_64_RELOC_GOT.
-      op_info->AddSymbol.Present = 1;
-      op_info->AddSymbol.Name = name;
-      return 1;
-    }
-    return 0;
-  }
-  if (Arch == Triple::arm) {
-    if (Offset != 0 || (Size != 4 && Size != 2))
-      return 0;
-    if (info->O->getHeader().filetype != MachO::MH_OBJECT) {
-      // TODO:
-      // Search the external relocation entries of a fully linked image
-      // (if any) for an entry that matches this segment offset.
-      // uint32_t seg_offset = (Pc + Offset);
-      return 0;
-    }
-    // In MH_OBJECT filetypes search the section's relocation entries (if any)
-    // for an entry for this section offset.
-    uint32_t sect_addr = info->S.getAddress();
-    uint32_t sect_offset = (Pc + Offset) - sect_addr;
-    DataRefImpl Rel;
-    MachO::any_relocation_info RE;
-    bool isExtern = false;
-    SymbolRef Symbol;
-    bool r_scattered = false;
-    uint32_t r_value, pair_r_value, r_type, r_length, other_half;
-    auto Reloc =
-        find_if(info->S.relocations(), [&](const RelocationRef &Reloc) {
-          uint64_t RelocOffset = Reloc.getOffset();
-          return RelocOffset == sect_offset;
-        });
-
-    if (Reloc == info->S.relocations().end())
-      return 0;
-
-    Rel = Reloc->getRawDataRefImpl();
-    RE = info->O->getRelocation(Rel);
-    r_length = info->O->getAnyRelocationLength(RE);
-    r_scattered = info->O->isRelocationScattered(RE);
-    if (r_scattered) {
-      r_value = info->O->getScatteredRelocationValue(RE);
-      r_type = info->O->getScatteredRelocationType(RE);
-    } else {
-      r_type = info->O->getAnyRelocationType(RE);
-      isExtern = info->O->getPlainRelocationExternal(RE);
-      if (isExtern) {
-        symbol_iterator RelocSym = Reloc->getSymbol();
-        Symbol = *RelocSym;
-      }
-    }
-    if (r_type == MachO::ARM_RELOC_HALF ||
-        r_type == MachO::ARM_RELOC_SECTDIFF ||
-        r_type == MachO::ARM_RELOC_LOCAL_SECTDIFF ||
-        r_type == MachO::ARM_RELOC_HALF_SECTDIFF) {
-      DataRefImpl RelNext = Rel;
-      info->O->moveRelocationNext(RelNext);
-      MachO::any_relocation_info RENext;
-      RENext = info->O->getRelocation(RelNext);
-      other_half = info->O->getAnyRelocationAddress(RENext) & 0xffff;
-      if (info->O->isRelocationScattered(RENext))
-        pair_r_value = info->O->getScatteredRelocationValue(RENext);
-    }
-
-    if (isExtern) {
-      const char *name =
-          unwrapOrError(Symbol.getName(), info->O->getFileName()).data();
-      op_info->AddSymbol.Present = 1;
-      op_info->AddSymbol.Name = name;
-      switch (r_type) {
-      case MachO::ARM_RELOC_HALF:
-        if ((r_length & 0x1) == 1) {
-          op_info->Value = value << 16 | other_half;
-          op_info->VariantKind = LLVMDisassembler_VariantKind_ARM_HI16;
-        } else {
-          op_info->Value = other_half << 16 | value;
-          op_info->VariantKind = LLVMDisassembler_VariantKind_ARM_LO16;
-        }
-        break;
-      default:
-        break;
-      }
-      return 1;
-    }
-    // If we have a branch that is not an external relocation entry then
-    // return 0 so the code in tryAddingSymbolicOperand() can use the
-    // SymbolLookUp call back with the branch target address to look up the
-    // symbol and possibility add an annotation for a symbol stub.
-    if (isExtern == 0 && (r_type == MachO::ARM_RELOC_BR24 ||
-                          r_type == MachO::ARM_THUMB_RELOC_BR22))
-      return 0;
-
-    uint32_t offset = 0;
-    if (r_type == MachO::ARM_RELOC_HALF ||
-        r_type == MachO::ARM_RELOC_HALF_SECTDIFF) {
-      if ((r_length & 0x1) == 1)
-        value = value << 16 | other_half;
-      else
-        value = other_half << 16 | value;
-    }
-    if (r_scattered && (r_type != MachO::ARM_RELOC_HALF &&
-                        r_type != MachO::ARM_RELOC_HALF_SECTDIFF)) {
-      offset = value - r_value;
-      value = r_value;
-    }
-
-    if (r_type == MachO::ARM_RELOC_HALF_SECTDIFF) {
-      if ((r_length & 0x1) == 1)
-        op_info->VariantKind = LLVMDisassembler_VariantKind_ARM_HI16;
-      else
-        op_info->VariantKind = LLVMDisassembler_VariantKind_ARM_LO16;
-      const char *add = GuessSymbolName(r_value, info->AddrMap);
-      const char *sub = GuessSymbolName(pair_r_value, info->AddrMap);
-      int32_t offset = value - (r_value - pair_r_value);
-      op_info->AddSymbol.Present = 1;
-      if (add != nullptr)
-        op_info->AddSymbol.Name = add;
-      else
-        op_info->AddSymbol.Value = r_value;
-      op_info->SubtractSymbol.Present = 1;
-      if (sub != nullptr)
-        op_info->SubtractSymbol.Name = sub;
-      else
-        op_info->SubtractSymbol.Value = pair_r_value;
-      op_info->Value = offset;
-      return 1;
-    }
-
-    op_info->AddSymbol.Present = 1;
-    op_info->Value = offset;
-    if (r_type == MachO::ARM_RELOC_HALF) {
-      if ((r_length & 0x1) == 1)
-        op_info->VariantKind = LLVMDisassembler_VariantKind_ARM_HI16;
-      else
-        op_info->VariantKind = LLVMDisassembler_VariantKind_ARM_LO16;
-    }
-    const char *add = GuessSymbolName(value, info->AddrMap);
-    if (add != nullptr) {
-      op_info->AddSymbol.Name = add;
-      return 1;
-    }
-    op_info->AddSymbol.Value = value;
-    return 1;
-  }
-  if (Arch == Triple::aarch64) {
-    if (Offset != 0 || Size != 4)
-      return 0;
-    if (info->O->getHeader().filetype != MachO::MH_OBJECT) {
-      // TODO:
-      // Search the external relocation entries of a fully linked image
-      // (if any) for an entry that matches this segment offset.
-      // uint64_t seg_offset = (Pc + Offset);
-      return 0;
-    }
-    // In MH_OBJECT filetypes search the section's relocation entries (if any)
-    // for an entry for this section offset.
-    uint64_t sect_addr = info->S.getAddress();
-    uint64_t sect_offset = (Pc + Offset) - sect_addr;
-    auto Reloc =
-        find_if(info->S.relocations(), [&](const RelocationRef &Reloc) {
-          uint64_t RelocOffset = Reloc.getOffset();
-          return RelocOffset == sect_offset;
-        });
-
-    if (Reloc == info->S.relocations().end())
-      return 0;
-
-    DataRefImpl Rel = Reloc->getRawDataRefImpl();
-    MachO::any_relocation_info RE = info->O->getRelocation(Rel);
-    uint32_t r_type = info->O->getAnyRelocationType(RE);
-    if (r_type == MachO::ARM64_RELOC_ADDEND) {
-      DataRefImpl RelNext = Rel;
-      info->O->moveRelocationNext(RelNext);
-      MachO::any_relocation_info RENext = info->O->getRelocation(RelNext);
-      if (value == 0) {
-        value = info->O->getPlainRelocationSymbolNum(RENext);
-        op_info->Value = value;
-      }
-    }
-    // NOTE: Scattered relocations don't exist on arm64.
-    if (!info->O->getPlainRelocationExternal(RE))
-      return 0;
-    const char *name =
-        unwrapOrError(Reloc->getSymbol()->getName(), info->O->getFileName())
-            .data();
-    op_info->AddSymbol.Present = 1;
-    op_info->AddSymbol.Name = name;
-
-    switch (r_type) {
-    case MachO::ARM64_RELOC_PAGE21:
-      /* @page */
-      op_info->VariantKind = LLVMDisassembler_VariantKind_ARM64_PAGE;
-      break;
-    case MachO::ARM64_RELOC_PAGEOFF12:
-      /* @pageoff */
-      op_info->VariantKind = LLVMDisassembler_VariantKind_ARM64_PAGEOFF;
-      break;
-    case MachO::ARM64_RELOC_GOT_LOAD_PAGE21:
-      /* @gotpage */
-      op_info->VariantKind = LLVMDisassembler_VariantKind_ARM64_GOTPAGE;
-      break;
-    case MachO::ARM64_RELOC_GOT_LOAD_PAGEOFF12:
-      /* @gotpageoff */
-      op_info->VariantKind = LLVMDisassembler_VariantKind_ARM64_GOTPAGEOFF;
-      break;
-    case MachO::ARM64_RELOC_TLVP_LOAD_PAGE21:
-      /* @tvlppage is not implemented in llvm-mc */
-      op_info->VariantKind = LLVMDisassembler_VariantKind_ARM64_TLVP;
-      break;
-    case MachO::ARM64_RELOC_TLVP_LOAD_PAGEOFF12:
-      /* @tvlppageoff is not implemented in llvm-mc */
-      op_info->VariantKind = LLVMDisassembler_VariantKind_ARM64_TLVOFF;
-      break;
-    default:
-    case MachO::ARM64_RELOC_BRANCH26:
-      op_info->VariantKind = LLVMDisassembler_VariantKind_None;
-      break;
-    }
-    return 1;
-  }
-  return 0;
-}
-
-// GuessCstringPointer is passed the address of what might be a pointer to a
-// literal string in a cstring section.  If that address is in a cstring section
-// it returns a pointer to that string.  Else it returns nullptr.
-static const char *GuessCstringPointer(uint64_t ReferenceValue,
-                                       struct DisassembleInfo *info) {
-  for (const auto &Load : info->O->load_commands()) {
-    if (Load.C.cmd == MachO::LC_SEGMENT_64) {
-      MachO::segment_command_64 Seg = info->O->getSegment64LoadCommand(Load);
-      for (unsigned J = 0; J < Seg.nsects; ++J) {
-        MachO::section_64 Sec = info->O->getSection64(Load, J);
-        uint32_t section_type = Sec.flags & MachO::SECTION_TYPE;
-        if (section_type == MachO::S_CSTRING_LITERALS &&
-            ReferenceValue >= Sec.addr &&
-            ReferenceValue < Sec.addr + Sec.size) {
-          uint64_t sect_offset = ReferenceValue - Sec.addr;
-          uint64_t object_offset = Sec.offset + sect_offset;
-          StringRef MachOContents = info->O->getData();
-          uint64_t object_size = MachOContents.size();
-          const char *object_addr = (const char *)MachOContents.data();
-          if (object_offset < object_size) {
-            const char *name = object_addr + object_offset;
-            return name;
-          } else {
-            return nullptr;
-          }
-        }
-      }
-    } else if (Load.C.cmd == MachO::LC_SEGMENT) {
-      MachO::segment_command Seg = info->O->getSegmentLoadCommand(Load);
-      for (unsigned J = 0; J < Seg.nsects; ++J) {
-        MachO::section Sec = info->O->getSection(Load, J);
-        uint32_t section_type = Sec.flags & MachO::SECTION_TYPE;
-        if (section_type == MachO::S_CSTRING_LITERALS &&
-            ReferenceValue >= Sec.addr &&
-            ReferenceValue < Sec.addr + Sec.size) {
-          uint64_t sect_offset = ReferenceValue - Sec.addr;
-          uint64_t object_offset = Sec.offset + sect_offset;
-          StringRef MachOContents = info->O->getData();
-          uint64_t object_size = MachOContents.size();
-          const char *object_addr = (const char *)MachOContents.data();
-          if (object_offset < object_size) {
-            const char *name = object_addr + object_offset;
-            return name;
-          } else {
-            return nullptr;
-          }
-        }
-      }
-    }
-  }
-  return nullptr;
-}
-
-// GuessIndirectSymbol returns the name of the indirect symbol for the
-// ReferenceValue passed in or nullptr.  This is used when ReferenceValue maybe
-// an address of a symbol stub or a lazy or non-lazy pointer to associate the
-// symbol name being referenced by the stub or pointer.
-static const char *GuessIndirectSymbol(uint64_t ReferenceValue,
-                                       struct DisassembleInfo *info) {
-  MachO::dysymtab_command Dysymtab = info->O->getDysymtabLoadCommand();
-  MachO::symtab_command Symtab = info->O->getSymtabLoadCommand();
-  for (const auto &Load : info->O->load_commands()) {
-    if (Load.C.cmd == MachO::LC_SEGMENT_64) {
-      MachO::segment_command_64 Seg = info->O->getSegment64LoadCommand(Load);
-      for (unsigned J = 0; J < Seg.nsects; ++J) {
-        MachO::section_64 Sec = info->O->getSection64(Load, J);
-        uint32_t section_type = Sec.flags & MachO::SECTION_TYPE;
-        if ((section_type == MachO::S_NON_LAZY_SYMBOL_POINTERS ||
-             section_type == MachO::S_LAZY_SYMBOL_POINTERS ||
-             section_type == MachO::S_LAZY_DYLIB_SYMBOL_POINTERS ||
-             section_type == MachO::S_THREAD_LOCAL_VARIABLE_POINTERS ||
-             section_type == MachO::S_SYMBOL_STUBS) &&
-            ReferenceValue >= Sec.addr &&
-            ReferenceValue < Sec.addr + Sec.size) {
-          uint32_t stride;
-          if (section_type == MachO::S_SYMBOL_STUBS)
-            stride = Sec.reserved2;
-          else
-            stride = 8;
-          if (stride == 0)
-            return nullptr;
-          uint32_t index = Sec.reserved1 + (ReferenceValue - Sec.addr) / stride;
-          if (index < Dysymtab.nindirectsyms) {
-            uint32_t indirect_symbol =
-                info->O->getIndirectSymbolTableEntry(Dysymtab, index);
-            if (indirect_symbol < Symtab.nsyms) {
-              symbol_iterator Sym = info->O->getSymbolByIndex(indirect_symbol);
-              return unwrapOrError(Sym->getName(), info->O->getFileName())
-                  .data();
-            }
-          }
-        }
-      }
-    } else if (Load.C.cmd == MachO::LC_SEGMENT) {
-      MachO::segment_command Seg = info->O->getSegmentLoadCommand(Load);
-      for (unsigned J = 0; J < Seg.nsects; ++J) {
-        MachO::section Sec = info->O->getSection(Load, J);
-        uint32_t section_type = Sec.flags & MachO::SECTION_TYPE;
-        if ((section_type == MachO::S_NON_LAZY_SYMBOL_POINTERS ||
-             section_type == MachO::S_LAZY_SYMBOL_POINTERS ||
-             section_type == MachO::S_LAZY_DYLIB_SYMBOL_POINTERS ||
-             section_type == MachO::S_THREAD_LOCAL_VARIABLE_POINTERS ||
-             section_type == MachO::S_SYMBOL_STUBS) &&
-            ReferenceValue >= Sec.addr &&
-            ReferenceValue < Sec.addr + Sec.size) {
-          uint32_t stride;
-          if (section_type == MachO::S_SYMBOL_STUBS)
-            stride = Sec.reserved2;
-          else
-            stride = 4;
-          if (stride == 0)
-            return nullptr;
-          uint32_t index = Sec.reserved1 + (ReferenceValue - Sec.addr) / stride;
-          if (index < Dysymtab.nindirectsyms) {
-            uint32_t indirect_symbol =
-                info->O->getIndirectSymbolTableEntry(Dysymtab, index);
-            if (indirect_symbol < Symtab.nsyms) {
-              symbol_iterator Sym = info->O->getSymbolByIndex(indirect_symbol);
-              return unwrapOrError(Sym->getName(), info->O->getFileName())
-                  .data();
-            }
-          }
-        }
-      }
-    }
-  }
-  return nullptr;
-}
-
-// method_reference() is called passing it the ReferenceName that might be
-// a reference it to an Objective-C method call.  If so then it allocates and
-// assembles a method call string with the values last seen and saved in
-// the DisassembleInfo's class_name and selector_name fields.  This is saved
-// into the method field of the info and any previous string is free'ed.
-// Then the class_name field in the info is set to nullptr.  The method call
-// string is set into ReferenceName and ReferenceType is set to
-// LLVMDisassembler_ReferenceType_Out_Objc_Message.  If this not a method call
-// then both ReferenceType and ReferenceName are left unchanged.
-static void method_reference(struct DisassembleInfo *info,
-                             uint64_t *ReferenceType,
-                             const char **ReferenceName) {
-  unsigned int Arch = info->O->getArch();
-  if (*ReferenceName != nullptr) {
-    if (strcmp(*ReferenceName, "_objc_msgSend") == 0) {
-      if (info->selector_name != nullptr) {
-        if (info->class_name != nullptr) {
-          info->method = llvm::make_unique<char[]>(
-              5 + strlen(info->class_name) + strlen(info->selector_name));
-          char *method = info->method.get();
-          if (method != nullptr) {
-            strcpy(method, "+[");
-            strcat(method, info->class_name);
-            strcat(method, " ");
-            strcat(method, info->selector_name);
-            strcat(method, "]");
-            *ReferenceName = method;
-            *ReferenceType = LLVMDisassembler_ReferenceType_Out_Objc_Message;
-          }
-        } else {
-          info->method =
-              llvm::make_unique<char[]>(9 + strlen(info->selector_name));
-          char *method = info->method.get();
-          if (method != nullptr) {
-            if (Arch == Triple::x86_64)
-              strcpy(method, "-[%rdi ");
-            else if (Arch == Triple::aarch64)
-              strcpy(method, "-[x0 ");
-            else
-              strcpy(method, "-[r? ");
-            strcat(method, info->selector_name);
-            strcat(method, "]");
-            *ReferenceName = method;
-            *ReferenceType = LLVMDisassembler_ReferenceType_Out_Objc_Message;
-          }
-        }
-        info->class_name = nullptr;
-      }
-    } else if (strcmp(*ReferenceName, "_objc_msgSendSuper2") == 0) {
-      if (info->selector_name != nullptr) {
-        info->method =
-            llvm::make_unique<char[]>(17 + strlen(info->selector_name));
-        char *method = info->method.get();
-        if (method != nullptr) {
-          if (Arch == Triple::x86_64)
-            strcpy(method, "-[[%rdi super] ");
-          else if (Arch == Triple::aarch64)
-            strcpy(method, "-[[x0 super] ");
-          else
-            strcpy(method, "-[[r? super] ");
-          strcat(method, info->selector_name);
-          strcat(method, "]");
-          *ReferenceName = method;
-          *ReferenceType = LLVMDisassembler_ReferenceType_Out_Objc_Message;
-        }
-        info->class_name = nullptr;
-      }
-    }
-  }
-}
-
-// GuessPointerPointer() is passed the address of what might be a pointer to
-// a reference to an Objective-C class, selector, message ref or cfstring.
-// If so the value of the pointer is returned and one of the booleans are set
-// to true.  If not zero is returned and all the booleans are set to false.
-static uint64_t GuessPointerPointer(uint64_t ReferenceValue,
-                                    struct DisassembleInfo *info,
-                                    bool &classref, bool &selref, bool &msgref,
-                                    bool &cfstring) {
-  classref = false;
-  selref = false;
-  msgref = false;
-  cfstring = false;
-  for (const auto &Load : info->O->load_commands()) {
-    if (Load.C.cmd == MachO::LC_SEGMENT_64) {
-      MachO::segment_command_64 Seg = info->O->getSegment64LoadCommand(Load);
-      for (unsigned J = 0; J < Seg.nsects; ++J) {
-        MachO::section_64 Sec = info->O->getSection64(Load, J);
-        if ((strncmp(Sec.sectname, "__objc_selrefs", 16) == 0 ||
-             strncmp(Sec.sectname, "__objc_classrefs", 16) == 0 ||
-             strncmp(Sec.sectname, "__objc_superrefs", 16) == 0 ||
-             strncmp(Sec.sectname, "__objc_msgrefs", 16) == 0 ||
-             strncmp(Sec.sectname, "__cfstring", 16) == 0) &&
-            ReferenceValue >= Sec.addr &&
-            ReferenceValue < Sec.addr + Sec.size) {
-          uint64_t sect_offset = ReferenceValue - Sec.addr;
-          uint64_t object_offset = Sec.offset + sect_offset;
-          StringRef MachOContents = info->O->getData();
-          uint64_t object_size = MachOContents.size();
-          const char *object_addr = (const char *)MachOContents.data();
-          if (object_offset < object_size) {
-            uint64_t pointer_value;
-            memcpy(&pointer_value, object_addr + object_offset,
-                   sizeof(uint64_t));
-            if (info->O->isLittleEndian() != sys::IsLittleEndianHost)
-              sys::swapByteOrder(pointer_value);
-            if (strncmp(Sec.sectname, "__objc_selrefs", 16) == 0)
-              selref = true;
-            else if (strncmp(Sec.sectname, "__objc_classrefs", 16) == 0 ||
-                     strncmp(Sec.sectname, "__objc_superrefs", 16) == 0)
-              classref = true;
-            else if (strncmp(Sec.sectname, "__objc_msgrefs", 16) == 0 &&
-                     ReferenceValue + 8 < Sec.addr + Sec.size) {
-              msgref = true;
-              memcpy(&pointer_value, object_addr + object_offset + 8,
-                     sizeof(uint64_t));
-              if (info->O->isLittleEndian() != sys::IsLittleEndianHost)
-                sys::swapByteOrder(pointer_value);
-            } else if (strncmp(Sec.sectname, "__cfstring", 16) == 0)
-              cfstring = true;
-            return pointer_value;
-          } else {
-            return 0;
-          }
-        }
-      }
-    }
-    // TODO: Look for LC_SEGMENT for 32-bit Mach-O files.
-  }
-  return 0;
-}
-
-// get_pointer_64 returns a pointer to the bytes in the object file at the
-// Address from a section in the Mach-O file.  And indirectly returns the
-// offset into the section, number of bytes left in the section past the offset
-// and which section is was being referenced.  If the Address is not in a
-// section nullptr is returned.
-static const char *get_pointer_64(uint64_t Address, uint32_t &offset,
-                                  uint32_t &left, SectionRef &S,
-                                  DisassembleInfo *info,
-                                  bool objc_only = false) {
-  offset = 0;
-  left = 0;
-  S = SectionRef();
-  for (unsigned SectIdx = 0; SectIdx != info->Sections->size(); SectIdx++) {
-    uint64_t SectAddress = ((*(info->Sections))[SectIdx]).getAddress();
-    uint64_t SectSize = ((*(info->Sections))[SectIdx]).getSize();
-    if (SectSize == 0)
-      continue;
-    if (objc_only) {
-      StringRef SectName;
-      ((*(info->Sections))[SectIdx]).getName(SectName);
-      DataRefImpl Ref = ((*(info->Sections))[SectIdx]).getRawDataRefImpl();
-      StringRef SegName = info->O->getSectionFinalSegmentName(Ref);
-      if (SegName != "__OBJC" && SectName != "__cstring")
-        continue;
-    }
-    if (Address >= SectAddress && Address < SectAddress + SectSize) {
-      S = (*(info->Sections))[SectIdx];
-      offset = Address - SectAddress;
-      left = SectSize - offset;
-      StringRef SectContents = unwrapOrError(
-          ((*(info->Sections))[SectIdx]).getContents(), info->O->getFileName());
-      return SectContents.data() + offset;
-    }
-  }
-  return nullptr;
-}
-
-static const char *get_pointer_32(uint32_t Address, uint32_t &offset,
-                                  uint32_t &left, SectionRef &S,
-                                  DisassembleInfo *info,
-                                  bool objc_only = false) {
-  return get_pointer_64(Address, offset, left, S, info, objc_only);
-}
-
-// get_symbol_64() returns the name of a symbol (or nullptr) and the address of
-// the symbol indirectly through n_value. Based on the relocation information
-// for the specified section offset in the specified section reference.
-// If no relocation information is found and a non-zero ReferenceValue for the
-// symbol is passed, look up that address in the info's AddrMap.
-static const char *get_symbol_64(uint32_t sect_offset, SectionRef S,
-                                 DisassembleInfo *info, uint64_t &n_value,
-                                 uint64_t ReferenceValue = 0) {
-  n_value = 0;
-  if (!info->verbose)
-    return nullptr;
-
-  // See if there is an external relocation entry at the sect_offset.
-  bool reloc_found = false;
-  DataRefImpl Rel;
-  MachO::any_relocation_info RE;
-  bool isExtern = false;
-  SymbolRef Symbol;
-  for (const RelocationRef &Reloc : S.relocations()) {
-    uint64_t RelocOffset = Reloc.getOffset();
-    if (RelocOffset == sect_offset) {
-      Rel = Reloc.getRawDataRefImpl();
-      RE = info->O->getRelocation(Rel);
-      if (info->O->isRelocationScattered(RE))
-        continue;
-      isExtern = info->O->getPlainRelocationExternal(RE);
-      if (isExtern) {
-        symbol_iterator RelocSym = Reloc.getSymbol();
-        Symbol = *RelocSym;
-      }
-      reloc_found = true;
-      break;
-    }
-  }
-  // If there is an external relocation entry for a symbol in this section
-  // at this section_offset then use that symbol's value for the n_value
-  // and return its name.
-  const char *SymbolName = nullptr;
-  if (reloc_found && isExtern) {
-    n_value = Symbol.getValue();
-    StringRef Name = unwrapOrError(Symbol.getName(), info->O->getFileName());
-    if (!Name.empty()) {
-      SymbolName = Name.data();
-      return SymbolName;
-    }
-  }
-
-  // TODO: For fully linked images, look through the external relocation
-  // entries off the dynamic symtab command. For these the r_offset is from the
-  // start of the first writeable segment in the Mach-O file.  So the offset
-  // to this section from that segment is passed to this routine by the caller,
-  // as the database_offset. Which is the difference of the section's starting
-  // address and the first writable segment.
-  //
-  // NOTE: need add passing the database_offset to this routine.
-
-  // We did not find an external relocation entry so look up the ReferenceValue
-  // as an address of a symbol and if found return that symbol's name.
-  SymbolName = GuessSymbolName(ReferenceValue, info->AddrMap);
-
-  return SymbolName;
-}
-
-static const char *get_symbol_32(uint32_t sect_offset, SectionRef S,
-                                 DisassembleInfo *info,
-                                 uint32_t ReferenceValue) {
-  uint64_t n_value64;
-  return get_symbol_64(sect_offset, S, info, n_value64, ReferenceValue);
-}
-
-// These are structs in the Objective-C meta data and read to produce the
-// comments for disassembly.  While these are part of the ABI they are no
-// public defintions.  So the are here not in include/llvm/BinaryFormat/MachO.h
-// .
-
-// The cfstring object in a 64-bit Mach-O file.
-struct cfstring64_t {
-  uint64_t isa;        // class64_t * (64-bit pointer)
-  uint64_t flags;      // flag bits
-  uint64_t characters; // char * (64-bit pointer)
-  uint64_t length;     // number of non-NULL characters in above
-};
-
-// The class object in a 64-bit Mach-O file.
-struct class64_t {
-  uint64_t isa;        // class64_t * (64-bit pointer)
-  uint64_t superclass; // class64_t * (64-bit pointer)
-  uint64_t cache;      // Cache (64-bit pointer)
-  uint64_t vtable;     // IMP * (64-bit pointer)
-  uint64_t data;       // class_ro64_t * (64-bit pointer)
-};
-
-struct class32_t {
-  uint32_t isa;        /* class32_t * (32-bit pointer) */
-  uint32_t superclass; /* class32_t * (32-bit pointer) */
-  uint32_t cache;      /* Cache (32-bit pointer) */
-  uint32_t vtable;     /* IMP * (32-bit pointer) */
-  uint32_t data;       /* class_ro32_t * (32-bit pointer) */
-};
-
-struct class_ro64_t {
-  uint32_t flags;
-  uint32_t instanceStart;
-  uint32_t instanceSize;
-  uint32_t reserved;
-  uint64_t ivarLayout;     // const uint8_t * (64-bit pointer)
-  uint64_t name;           // const char * (64-bit pointer)
-  uint64_t baseMethods;    // const method_list_t * (64-bit pointer)
-  uint64_t baseProtocols;  // const protocol_list_t * (64-bit pointer)
-  uint64_t ivars;          // const ivar_list_t * (64-bit pointer)
-  uint64_t weakIvarLayout; // const uint8_t * (64-bit pointer)
-  uint64_t baseProperties; // const struct objc_property_list (64-bit pointer)
-};
-
-struct class_ro32_t {
-  uint32_t flags;
-  uint32_t instanceStart;
-  uint32_t instanceSize;
-  uint32_t ivarLayout;     /* const uint8_t * (32-bit pointer) */
-  uint32_t name;           /* const char * (32-bit pointer) */
-  uint32_t baseMethods;    /* const method_list_t * (32-bit pointer) */
-  uint32_t baseProtocols;  /* const protocol_list_t * (32-bit pointer) */
-  uint32_t ivars;          /* const ivar_list_t * (32-bit pointer) */
-  uint32_t weakIvarLayout; /* const uint8_t * (32-bit pointer) */
-  uint32_t baseProperties; /* const struct objc_property_list *
-                                                   (32-bit pointer) */
-};
-
-/* Values for class_ro{64,32}_t->flags */
-#define RO_META (1 << 0)
-#define RO_ROOT (1 << 1)
-#define RO_HAS_CXX_STRUCTORS (1 << 2)
-
-struct method_list64_t {
-  uint32_t entsize;
-  uint32_t count;
-  /* struct method64_t first;  These structures follow inline */
-};
-
-struct method_list32_t {
-  uint32_t entsize;
-  uint32_t count;
-  /* struct method32_t first;  These structures follow inline */
-};
-
-struct method64_t {
-  uint64_t name;  /* SEL (64-bit pointer) */
-  uint64_t types; /* const char * (64-bit pointer) */
-  uint64_t imp;   /* IMP (64-bit pointer) */
-};
-
-struct method32_t {
-  uint32_t name;  /* SEL (32-bit pointer) */
-  uint32_t types; /* const char * (32-bit pointer) */
-  uint32_t imp;   /* IMP (32-bit pointer) */
-};
-
-struct protocol_list64_t {
-  uint64_t count; /* uintptr_t (a 64-bit value) */
-  /* struct protocol64_t * list[0];  These pointers follow inline */
-};
-
-struct protocol_list32_t {
-  uint32_t count; /* uintptr_t (a 32-bit value) */
-  /* struct protocol32_t * list[0];  These pointers follow inline */
-};
-
-struct protocol64_t {
-  uint64_t isa;                     /* id * (64-bit pointer) */
-  uint64_t name;                    /* const char * (64-bit pointer) */
-  uint64_t protocols;               /* struct protocol_list64_t *
-                                                    (64-bit pointer) */
-  uint64_t instanceMethods;         /* method_list_t * (64-bit pointer) */
-  uint64_t classMethods;            /* method_list_t * (64-bit pointer) */
-  uint64_t optionalInstanceMethods; /* method_list_t * (64-bit pointer) */
-  uint64_t optionalClassMethods;    /* method_list_t * (64-bit pointer) */
-  uint64_t instanceProperties;      /* struct objc_property_list *
-                                                       (64-bit pointer) */
-};
-
-struct protocol32_t {
-  uint32_t isa;                     /* id * (32-bit pointer) */
-  uint32_t name;                    /* const char * (32-bit pointer) */
-  uint32_t protocols;               /* struct protocol_list_t *
-                                                    (32-bit pointer) */
-  uint32_t instanceMethods;         /* method_list_t * (32-bit pointer) */
-  uint32_t classMethods;            /* method_list_t * (32-bit pointer) */
-  uint32_t optionalInstanceMethods; /* method_list_t * (32-bit pointer) */
-  uint32_t optionalClassMethods;    /* method_list_t * (32-bit pointer) */
-  uint32_t instanceProperties;      /* struct objc_property_list *
-                                                       (32-bit pointer) */
-};
-
-struct ivar_list64_t {
-  uint32_t entsize;
-  uint32_t count;
-  /* struct ivar64_t first;  These structures follow inline */
-};
-
-struct ivar_list32_t {
-  uint32_t entsize;
-  uint32_t count;
-  /* struct ivar32_t first;  These structures follow inline */
-};
-
-struct ivar64_t {
-  uint64_t offset; /* uintptr_t * (64-bit pointer) */
-  uint64_t name;   /* const char * (64-bit pointer) */
-  uint64_t type;   /* const char * (64-bit pointer) */
-  uint32_t alignment;
-  uint32_t size;
-};
-
-struct ivar32_t {
-  uint32_t offset; /* uintptr_t * (32-bit pointer) */
-  uint32_t name;   /* const char * (32-bit pointer) */
-  uint32_t type;   /* const char * (32-bit pointer) */
-  uint32_t alignment;
-  uint32_t size;
-};
-
-struct objc_property_list64 {
-  uint32_t entsize;
-  uint32_t count;
-  /* struct objc_property64 first;  These structures follow inline */
-};
-
-struct objc_property_list32 {
-  uint32_t entsize;
-  uint32_t count;
-  /* struct objc_property32 first;  These structures follow inline */
-};
-
-struct objc_property64 {
-  uint64_t name;       /* const char * (64-bit pointer) */
-  uint64_t attributes; /* const char * (64-bit pointer) */
-};
-
-struct objc_property32 {
-  uint32_t name;       /* const char * (32-bit pointer) */
-  uint32_t attributes; /* const char * (32-bit pointer) */
-};
-
-struct category64_t {
-  uint64_t name;               /* const char * (64-bit pointer) */
-  uint64_t cls;                /* struct class_t * (64-bit pointer) */
-  uint64_t instanceMethods;    /* struct method_list_t * (64-bit pointer) */
-  uint64_t classMethods;       /* struct method_list_t * (64-bit pointer) */
-  uint64_t protocols;          /* struct protocol_list_t * (64-bit pointer) */
-  uint64_t instanceProperties; /* struct objc_property_list *
-                                  (64-bit pointer) */
-};
-
-struct category32_t {
-  uint32_t name;               /* const char * (32-bit pointer) */
-  uint32_t cls;                /* struct class_t * (32-bit pointer) */
-  uint32_t instanceMethods;    /* struct method_list_t * (32-bit pointer) */
-  uint32_t classMethods;       /* struct method_list_t * (32-bit pointer) */
-  uint32_t protocols;          /* struct protocol_list_t * (32-bit pointer) */
-  uint32_t instanceProperties; /* struct objc_property_list *
-                                  (32-bit pointer) */
-};
-
-struct objc_image_info64 {
-  uint32_t version;
-  uint32_t flags;
-};
-struct objc_image_info32 {
-  uint32_t version;
-  uint32_t flags;
-};
-struct imageInfo_t {
-  uint32_t version;
-  uint32_t flags;
-};
-/* masks for objc_image_info.flags */
-#define OBJC_IMAGE_IS_REPLACEMENT (1 << 0)
-#define OBJC_IMAGE_SUPPORTS_GC (1 << 1)
-#define OBJC_IMAGE_IS_SIMULATED (1 << 5)
-#define OBJC_IMAGE_HAS_CATEGORY_CLASS_PROPERTIES (1 << 6)
-
-struct message_ref64 {
-  uint64_t imp; /* IMP (64-bit pointer) */
-  uint64_t sel; /* SEL (64-bit pointer) */
-};
-
-struct message_ref32 {
-  uint32_t imp; /* IMP (32-bit pointer) */
-  uint32_t sel; /* SEL (32-bit pointer) */
-};
-
-// Objective-C 1 (32-bit only) meta data structs.
-
-struct objc_module_t {
-  uint32_t version;
-  uint32_t size;
-  uint32_t name;   /* char * (32-bit pointer) */
-  uint32_t symtab; /* struct objc_symtab * (32-bit pointer) */
-};
-
-struct objc_symtab_t {
-  uint32_t sel_ref_cnt;
-  uint32_t refs; /* SEL * (32-bit pointer) */
-  uint16_t cls_def_cnt;
-  uint16_t cat_def_cnt;
-  // uint32_t defs[1];        /* void * (32-bit pointer) variable size */
-};
-
-struct objc_class_t {
-  uint32_t isa;         /* struct objc_class * (32-bit pointer) */
-  uint32_t super_class; /* struct objc_class * (32-bit pointer) */
-  uint32_t name;        /* const char * (32-bit pointer) */
-  int32_t version;
-  int32_t info;
-  int32_t instance_size;
-  uint32_t ivars;       /* struct objc_ivar_list * (32-bit pointer) */
-  uint32_t methodLists; /* struct objc_method_list ** (32-bit pointer) */
-  uint32_t cache;       /* struct objc_cache * (32-bit pointer) */
-  uint32_t protocols;   /* struct objc_protocol_list * (32-bit pointer) */
-};
-
-#define CLS_GETINFO(cls, infomask) ((cls)->info & (infomask))
-// class is not a metaclass
-#define CLS_CLASS 0x1
-// class is a metaclass
-#define CLS_META 0x2
-
-struct objc_category_t {
-  uint32_t category_name;    /* char * (32-bit pointer) */
-  uint32_t class_name;       /* char * (32-bit pointer) */
-  uint32_t instance_methods; /* struct objc_method_list * (32-bit pointer) */
-  uint32_t class_methods;    /* struct objc_method_list * (32-bit pointer) */
-  uint32_t protocols;        /* struct objc_protocol_list * (32-bit ptr) */
-};
-
-struct objc_ivar_t {
-  uint32_t ivar_name; /* char * (32-bit pointer) */
-  uint32_t ivar_type; /* char * (32-bit pointer) */
-  int32_t ivar_offset;
-};
-
-struct objc_ivar_list_t {
-  int32_t ivar_count;
-  // struct objc_ivar_t ivar_list[1];          /* variable length structure */
-};
-
-struct objc_method_list_t {
-  uint32_t obsolete; /* struct objc_method_list * (32-bit pointer) */
-  int32_t method_count;
-  // struct objc_method_t method_list[1];      /* variable length structure */
-};
-
-struct objc_method_t {
-  uint32_t method_name;  /* SEL, aka struct objc_selector * (32-bit pointer) */
-  uint32_t method_types; /* char * (32-bit pointer) */
-  uint32_t method_imp;   /* IMP, aka function pointer, (*IMP)(id, SEL, ...)
-                            (32-bit pointer) */
-};
-
-struct objc_protocol_list_t {
-  uint32_t next; /* struct objc_protocol_list * (32-bit pointer) */
-  int32_t count;
-  // uint32_t list[1];   /* Protocol *, aka struct objc_protocol_t *
-  //                        (32-bit pointer) */
-};
-
-struct objc_protocol_t {
-  uint32_t isa;              /* struct objc_class * (32-bit pointer) */
-  uint32_t protocol_name;    /* char * (32-bit pointer) */
-  uint32_t protocol_list;    /* struct objc_protocol_list * (32-bit pointer) */
-  uint32_t instance_methods; /* struct objc_method_description_list *
-                                (32-bit pointer) */
-  uint32_t class_methods;    /* struct objc_method_description_list *
-                                (32-bit pointer) */
-};
-
-struct objc_method_description_list_t {
-  int32_t count;
-  // struct objc_method_description_t list[1];
-};
-
-struct objc_method_description_t {
-  uint32_t name;  /* SEL, aka struct objc_selector * (32-bit pointer) */
-  uint32_t types; /* char * (32-bit pointer) */
-};
-
-inline void swapStruct(struct cfstring64_t &cfs) {
-  sys::swapByteOrder(cfs.isa);
-  sys::swapByteOrder(cfs.flags);
-  sys::swapByteOrder(cfs.characters);
-  sys::swapByteOrder(cfs.length);
-}
-
-inline void swapStruct(struct class64_t &c) {
-  sys::swapByteOrder(c.isa);
-  sys::swapByteOrder(c.superclass);
-  sys::swapByteOrder(c.cache);
-  sys::swapByteOrder(c.vtable);
-  sys::swapByteOrder(c.data);
-}
-
-inline void swapStruct(struct class32_t &c) {
-  sys::swapByteOrder(c.isa);
-  sys::swapByteOrder(c.superclass);
-  sys::swapByteOrder(c.cache);
-  sys::swapByteOrder(c.vtable);
-  sys::swapByteOrder(c.data);
-}
-
-inline void swapStruct(struct class_ro64_t &cro) {
-  sys::swapByteOrder(cro.flags);
-  sys::swapByteOrder(cro.instanceStart);
-  sys::swapByteOrder(cro.instanceSize);
-  sys::swapByteOrder(cro.reserved);
-  sys::swapByteOrder(cro.ivarLayout);
-  sys::swapByteOrder(cro.name);
-  sys::swapByteOrder(cro.baseMethods);
-  sys::swapByteOrder(cro.baseProtocols);
-  sys::swapByteOrder(cro.ivars);
-  sys::swapByteOrder(cro.weakIvarLayout);
-  sys::swapByteOrder(cro.baseProperties);
-}
-
-inline void swapStruct(struct class_ro32_t &cro) {
-  sys::swapByteOrder(cro.flags);
-  sys::swapByteOrder(cro.instanceStart);
-  sys::swapByteOrder(cro.instanceSize);
-  sys::swapByteOrder(cro.ivarLayout);
-  sys::swapByteOrder(cro.name);
-  sys::swapByteOrder(cro.baseMethods);
-  sys::swapByteOrder(cro.baseProtocols);
-  sys::swapByteOrder(cro.ivars);
-  sys::swapByteOrder(cro.weakIvarLayout);
-  sys::swapByteOrder(cro.baseProperties);
-}
-
-inline void swapStruct(struct method_list64_t &ml) {
-  sys::swapByteOrder(ml.entsize);
-  sys::swapByteOrder(ml.count);
-}
-
-inline void swapStruct(struct method_list32_t &ml) {
-  sys::swapByteOrder(ml.entsize);
-  sys::swapByteOrder(ml.count);
-}
-
-inline void swapStruct(struct method64_t &m) {
-  sys::swapByteOrder(m.name);
-  sys::swapByteOrder(m.types);
-  sys::swapByteOrder(m.imp);
-}
-
-inline void swapStruct(struct method32_t &m) {
-  sys::swapByteOrder(m.name);
-  sys::swapByteOrder(m.types);
-  sys::swapByteOrder(m.imp);
-}
-
-inline void swapStruct(struct protocol_list64_t &pl) {
-  sys::swapByteOrder(pl.count);
-}
-
-inline void swapStruct(struct protocol_list32_t &pl) {
-  sys::swapByteOrder(pl.count);
-}
-
-inline void swapStruct(struct protocol64_t &p) {
-  sys::swapByteOrder(p.isa);
-  sys::swapByteOrder(p.name);
-  sys::swapByteOrder(p.protocols);
-  sys::swapByteOrder(p.instanceMethods);
-  sys::swapByteOrder(p.classMethods);
-  sys::swapByteOrder(p.optionalInstanceMethods);
-  sys::swapByteOrder(p.optionalClassMethods);
-  sys::swapByteOrder(p.instanceProperties);
-}
-
-inline void swapStruct(struct protocol32_t &p) {
-  sys::swapByteOrder(p.isa);
-  sys::swapByteOrder(p.name);
-  sys::swapByteOrder(p.protocols);
-  sys::swapByteOrder(p.instanceMethods);
-  sys::swapByteOrder(p.classMethods);
-  sys::swapByteOrder(p.optionalInstanceMethods);
-  sys::swapByteOrder(p.optionalClassMethods);
-  sys::swapByteOrder(p.instanceProperties);
-}
-
-inline void swapStruct(struct ivar_list64_t &il) {
-  sys::swapByteOrder(il.entsize);
-  sys::swapByteOrder(il.count);
-}
-
-inline void swapStruct(struct ivar_list32_t &il) {
-  sys::swapByteOrder(il.entsize);
-  sys::swapByteOrder(il.count);
-}
-
-inline void swapStruct(struct ivar64_t &i) {
-  sys::swapByteOrder(i.offset);
-  sys::swapByteOrder(i.name);
-  sys::swapByteOrder(i.type);
-  sys::swapByteOrder(i.alignment);
-  sys::swapByteOrder(i.size);
-}
-
-inline void swapStruct(struct ivar32_t &i) {
-  sys::swapByteOrder(i.offset);
-  sys::swapByteOrder(i.name);
-  sys::swapByteOrder(i.type);
-  sys::swapByteOrder(i.alignment);
-  sys::swapByteOrder(i.size);
-}
-
-inline void swapStruct(struct objc_property_list64 &pl) {
-  sys::swapByteOrder(pl.entsize);
-  sys::swapByteOrder(pl.count);
-}
-
-inline void swapStruct(struct objc_property_list32 &pl) {
-  sys::swapByteOrder(pl.entsize);
-  sys::swapByteOrder(pl.count);
-}
-
-inline void swapStruct(struct objc_property64 &op) {
-  sys::swapByteOrder(op.name);
-  sys::swapByteOrder(op.attributes);
-}
-
-inline void swapStruct(struct objc_property32 &op) {
-  sys::swapByteOrder(op.name);
-  sys::swapByteOrder(op.attributes);
-}
-
-inline void swapStruct(struct category64_t &c) {
-  sys::swapByteOrder(c.name);
-  sys::swapByteOrder(c.cls);
-  sys::swapByteOrder(c.instanceMethods);
-  sys::swapByteOrder(c.classMethods);
-  sys::swapByteOrder(c.protocols);
-  sys::swapByteOrder(c.instanceProperties);
-}
-
-inline void swapStruct(struct category32_t &c) {
-  sys::swapByteOrder(c.name);
-  sys::swapByteOrder(c.cls);
-  sys::swapByteOrder(c.instanceMethods);
-  sys::swapByteOrder(c.classMethods);
-  sys::swapByteOrder(c.protocols);
-  sys::swapByteOrder(c.instanceProperties);
-}
-
-inline void swapStruct(struct objc_image_info64 &o) {
-  sys::swapByteOrder(o.version);
-  sys::swapByteOrder(o.flags);
-}
-
-inline void swapStruct(struct objc_image_info32 &o) {
-  sys::swapByteOrder(o.version);
-  sys::swapByteOrder(o.flags);
-}
-
-inline void swapStruct(struct imageInfo_t &o) {
-  sys::swapByteOrder(o.version);
-  sys::swapByteOrder(o.flags);
-}
-
-inline void swapStruct(struct message_ref64 &mr) {
-  sys::swapByteOrder(mr.imp);
-  sys::swapByteOrder(mr.sel);
-}
-
-inline void swapStruct(struct message_ref32 &mr) {
-  sys::swapByteOrder(mr.imp);
-  sys::swapByteOrder(mr.sel);
-}
-
-inline void swapStruct(struct objc_module_t &module) {
-  sys::swapByteOrder(module.version);
-  sys::swapByteOrder(module.size);
-  sys::swapByteOrder(module.name);
-  sys::swapByteOrder(module.symtab);
-}
-
-inline void swapStruct(struct objc_symtab_t &symtab) {
-  sys::swapByteOrder(symtab.sel_ref_cnt);
-  sys::swapByteOrder(symtab.refs);
-  sys::swapByteOrder(symtab.cls_def_cnt);
-  sys::swapByteOrder(symtab.cat_def_cnt);
-}
-
-inline void swapStruct(struct objc_class_t &objc_class) {
-  sys::swapByteOrder(objc_class.isa);
-  sys::swapByteOrder(objc_class.super_class);
-  sys::swapByteOrder(objc_class.name);
-  sys::swapByteOrder(objc_class.version);
-  sys::swapByteOrder(objc_class.info);
-  sys::swapByteOrder(objc_class.instance_size);
-  sys::swapByteOrder(objc_class.ivars);
-  sys::swapByteOrder(objc_class.methodLists);
-  sys::swapByteOrder(objc_class.cache);
-  sys::swapByteOrder(objc_class.protocols);
-}
-
-inline void swapStruct(struct objc_category_t &objc_category) {
-  sys::swapByteOrder(objc_category.category_name);
-  sys::swapByteOrder(objc_category.class_name);
-  sys::swapByteOrder(objc_category.instance_methods);
-  sys::swapByteOrder(objc_category.class_methods);
-  sys::swapByteOrder(objc_category.protocols);
-}
-
-inline void swapStruct(struct objc_ivar_list_t &objc_ivar_list) {
-  sys::swapByteOrder(objc_ivar_list.ivar_count);
-}
-
-inline void swapStruct(struct objc_ivar_t &objc_ivar) {
-  sys::swapByteOrder(objc_ivar.ivar_name);
-  sys::swapByteOrder(objc_ivar.ivar_type);
-  sys::swapByteOrder(objc_ivar.ivar_offset);
-}
-
-inline void swapStruct(struct objc_method_list_t &method_list) {
-  sys::swapByteOrder(method_list.obsolete);
-  sys::swapByteOrder(method_list.method_count);
-}
-
-inline void swapStruct(struct objc_method_t &method) {
-  sys::swapByteOrder(method.method_name);
-  sys::swapByteOrder(method.method_types);
-  sys::swapByteOrder(method.method_imp);
-}
-
-inline void swapStruct(struct objc_protocol_list_t &protocol_list) {
-  sys::swapByteOrder(protocol_list.next);
-  sys::swapByteOrder(protocol_list.count);
-}
-
-inline void swapStruct(struct objc_protocol_t &protocol) {
-  sys::swapByteOrder(protocol.isa);
-  sys::swapByteOrder(protocol.protocol_name);
-  sys::swapByteOrder(protocol.protocol_list);
-  sys::swapByteOrder(protocol.instance_methods);
-  sys::swapByteOrder(protocol.class_methods);
-}
-
-inline void swapStruct(struct objc_method_description_list_t &mdl) {
-  sys::swapByteOrder(mdl.count);
-}
-
-inline void swapStruct(struct objc_method_description_t &md) {
-  sys::swapByteOrder(md.name);
-  sys::swapByteOrder(md.types);
-}
-
-static const char *get_dyld_bind_info_symbolname(uint64_t ReferenceValue,
-                                                 struct DisassembleInfo *info);
-
-// get_objc2_64bit_class_name() is used for disassembly and is passed a pointer
-// to an Objective-C class and returns the class name.  It is also passed the
-// address of the pointer, so when the pointer is zero as it can be in an .o
-// file, that is used to look for an external relocation entry with a symbol
-// name.
-static const char *get_objc2_64bit_class_name(uint64_t pointer_value,
-                                              uint64_t ReferenceValue,
-                                              struct DisassembleInfo *info) {
-  const char *r;
-  uint32_t offset, left;
-  SectionRef S;
-
-  // The pointer_value can be 0 in an object file and have a relocation
-  // entry for the class symbol at the ReferenceValue (the address of the
-  // pointer).
-  if (pointer_value == 0) {
-    r = get_pointer_64(ReferenceValue, offset, left, S, info);
-    if (r == nullptr || left < sizeof(uint64_t))
-      return nullptr;
-    uint64_t n_value;
-    const char *symbol_name = get_symbol_64(offset, S, info, n_value);
-    if (symbol_name == nullptr)
-      return nullptr;
-    const char *class_name = strrchr(symbol_name, '$');
-    if (class_name != nullptr && class_name[1] == '_' && class_name[2] != '\0')
-      return class_name + 2;
-    else
-      return nullptr;
-  }
-
-  // The case were the pointer_value is non-zero and points to a class defined
-  // in this Mach-O file.
-  r = get_pointer_64(pointer_value, offset, left, S, info);
-  if (r == nullptr || left < sizeof(struct class64_t))
-    return nullptr;
-  struct class64_t c;
-  memcpy(&c, r, sizeof(struct class64_t));
-  if (info->O->isLittleEndian() != sys::IsLittleEndianHost)
-    swapStruct(c);
-  if (c.data == 0)
-    return nullptr;
-  r = get_pointer_64(c.data, offset, left, S, info);
-  if (r == nullptr || left < sizeof(struct class_ro64_t))
-    return nullptr;
-  struct class_ro64_t cro;
-  memcpy(&cro, r, sizeof(struct class_ro64_t));
-  if (info->O->isLittleEndian() != sys::IsLittleEndianHost)
-    swapStruct(cro);
-  if (cro.name == 0)
-    return nullptr;
-  const char *name = get_pointer_64(cro.name, offset, left, S, info);
-  return name;
-}
-
-// get_objc2_64bit_cfstring_name is used for disassembly and is passed a
-// pointer to a cfstring and returns its name or nullptr.
-static const char *get_objc2_64bit_cfstring_name(uint64_t ReferenceValue,
-                                                 struct DisassembleInfo *info) {
-  const char *r, *name;
-  uint32_t offset, left;
-  SectionRef S;
-  struct cfstring64_t cfs;
-  uint64_t cfs_characters;
-
-  r = get_pointer_64(ReferenceValue, offset, left, S, info);
-  if (r == nullptr || left < sizeof(struct cfstring64_t))
-    return nullptr;
-  memcpy(&cfs, r, sizeof(struct cfstring64_t));
-  if (info->O->isLittleEndian() != sys::IsLittleEndianHost)
-    swapStruct(cfs);
-  if (cfs.characters == 0) {
-    uint64_t n_value;
-    const char *symbol_name = get_symbol_64(
-        offset + offsetof(struct cfstring64_t, characters), S, info, n_value);
-    if (symbol_name == nullptr)
-      return nullptr;
-    cfs_characters = n_value;
-  } else
-    cfs_characters = cfs.characters;
-  name = get_pointer_64(cfs_characters, offset, left, S, info);
-
-  return name;
-}
-
-// get_objc2_64bit_selref() is used for disassembly and is passed a the address
-// of a pointer to an Objective-C selector reference when the pointer value is
-// zero as in a .o file and is likely to have a external relocation entry with
-// who's symbol's n_value is the real pointer to the selector name.  If that is
-// the case the real pointer to the selector name is returned else 0 is
-// returned
-static uint64_t get_objc2_64bit_selref(uint64_t ReferenceValue,
-                                       struct DisassembleInfo *info) {
-  uint32_t offset, left;
-  SectionRef S;
-
-  const char *r = get_pointer_64(ReferenceValue, offset, left, S, info);
-  if (r == nullptr || left < sizeof(uint64_t))
-    return 0;
-  uint64_t n_value;
-  const char *symbol_name = get_symbol_64(offset, S, info, n_value);
-  if (symbol_name == nullptr)
-    return 0;
-  return n_value;
-}
-
-static const SectionRef get_section(MachOObjectFile *O, const char *segname,
-                                    const char *sectname) {
-  for (const SectionRef &Section : O->sections()) {
-    StringRef SectName;
-    Section.getName(SectName);
-    DataRefImpl Ref = Section.getRawDataRefImpl();
-    StringRef SegName = O->getSectionFinalSegmentName(Ref);
-    if (SegName == segname && SectName == sectname)
-      return Section;
-  }
-  return SectionRef();
-}
-
-static void
-walk_pointer_list_64(const char *listname, const SectionRef S,
-                     MachOObjectFile *O, struct DisassembleInfo *info,
-                     void (*func)(uint64_t, struct DisassembleInfo *info)) {
-  if (S == SectionRef())
-    return;
-
-  StringRef SectName;
-  S.getName(SectName);
-  DataRefImpl Ref = S.getRawDataRefImpl();
-  StringRef SegName = O->getSectionFinalSegmentName(Ref);
-  outs() << "Contents of (" << SegName << "," << SectName << ") section\n";
-
-  StringRef BytesStr = unwrapOrError(S.getContents(), O->getFileName());
-  const char *Contents = reinterpret_cast<const char *>(BytesStr.data());
-
-  for (uint32_t i = 0; i < S.getSize(); i += sizeof(uint64_t)) {
-    uint32_t left = S.getSize() - i;
-    uint32_t size = left < sizeof(uint64_t) ? left : sizeof(uint64_t);
-    uint64_t p = 0;
-    memcpy(&p, Contents + i, size);
-    if (i + sizeof(uint64_t) > S.getSize())
-      outs() << listname << " list pointer extends past end of (" << SegName
-             << "," << SectName << ") section\n";
-    outs() << format("%016" PRIx64, S.getAddress() + i) << " ";
-
-    if (O->isLittleEndian() != sys::IsLittleEndianHost)
-      sys::swapByteOrder(p);
-
-    uint64_t n_value = 0;
-    const char *name = get_symbol_64(i, S, info, n_value, p);
-    if (name == nullptr)
-      name = get_dyld_bind_info_symbolname(S.getAddress() + i, info);
-
-    if (n_value != 0) {
-      outs() << format("0x%" PRIx64, n_value);
-      if (p != 0)
-        outs() << " + " << format("0x%" PRIx64, p);
-    } else
-      outs() << format("0x%" PRIx64, p);
-    if (name != nullptr)
-      outs() << " " << name;
-    outs() << "\n";
-
-    p += n_value;
-    if (func)
-      func(p, info);
-  }
-}
-
-static void
-walk_pointer_list_32(const char *listname, const SectionRef S,
-                     MachOObjectFile *O, struct DisassembleInfo *info,
-                     void (*func)(uint32_t, struct DisassembleInfo *info)) {
-  if (S == SectionRef())
-    return;
-
-  StringRef SectName;
-  S.getName(SectName);
-  DataRefImpl Ref = S.getRawDataRefImpl();
-  StringRef SegName = O->getSectionFinalSegmentName(Ref);
-  outs() << "Contents of (" << SegName << "," << SectName << ") section\n";
-
-  StringRef BytesStr = unwrapOrError(S.getContents(), O->getFileName());
-  const char *Contents = reinterpret_cast<const char *>(BytesStr.data());
-
-  for (uint32_t i = 0; i < S.getSize(); i += sizeof(uint32_t)) {
-    uint32_t left = S.getSize() - i;
-    uint32_t size = left < sizeof(uint32_t) ? left : sizeof(uint32_t);
-    uint32_t p = 0;
-    memcpy(&p, Contents + i, size);
-    if (i + sizeof(uint32_t) > S.getSize())
-      outs() << listname << " list pointer extends past end of (" << SegName
-             << "," << SectName << ") section\n";
-    uint32_t Address = S.getAddress() + i;
-    outs() << format("%08" PRIx32, Address) << " ";
-
-    if (O->isLittleEndian() != sys::IsLittleEndianHost)
-      sys::swapByteOrder(p);
-    outs() << format("0x%" PRIx32, p);
-
-    const char *name = get_symbol_32(i, S, info, p);
-    if (name != nullptr)
-      outs() << " " << name;
-    outs() << "\n";
-
-    if (func)
-      func(p, info);
-  }
-}
-
-static void print_layout_map(const char *layout_map, uint32_t left) {
-  if (layout_map == nullptr)
-    return;
-  outs() << "                layout map: ";
-  do {
-    outs() << format("0x%02" PRIx32, (*layout_map) & 0xff) << " ";
-    left--;
-    layout_map++;
-  } while (*layout_map != '\0' && left != 0);
-  outs() << "\n";
-}
-
-static void print_layout_map64(uint64_t p, struct DisassembleInfo *info) {
-  uint32_t offset, left;
-  SectionRef S;
-  const char *layout_map;
-
-  if (p == 0)
-    return;
-  layout_map = get_pointer_64(p, offset, left, S, info);
-  print_layout_map(layout_map, left);
-}
-
-static void print_layout_map32(uint32_t p, struct DisassembleInfo *info) {
-  uint32_t offset, left;
-  SectionRef S;
-  const char *layout_map;
-
-  if (p == 0)
-    return;
-  layout_map = get_pointer_32(p, offset, left, S, info);
-  print_layout_map(layout_map, left);
-}
-
-static void print_method_list64_t(uint64_t p, struct DisassembleInfo *info,
-                                  const char *indent) {
-  struct method_list64_t ml;
-  struct method64_t m;
-  const char *r;
-  uint32_t offset, xoffset, left, i;
-  SectionRef S, xS;
-  const char *name, *sym_name;
-  uint64_t n_value;
-
-  r = get_pointer_64(p, offset, left, S, info);
-  if (r == nullptr)
-    return;
-  memset(&ml, '\0', sizeof(struct method_list64_t));
-  if (left < sizeof(struct method_list64_t)) {
-    memcpy(&ml, r, left);
-    outs() << "   (method_list_t entends past the end of the section)\n";
-  } else
-    memcpy(&ml, r, sizeof(struct method_list64_t));
-  if (info->O->isLittleEndian() != sys::IsLittleEndianHost)
-    swapStruct(ml);
-  outs() << indent << "\t\t   entsize " << ml.entsize << "\n";
-  outs() << indent << "\t\t     count " << ml.count << "\n";
-
-  p += sizeof(struct method_list64_t);
-  offset += sizeof(struct method_list64_t);
-  for (i = 0; i < ml.count; i++) {
-    r = get_pointer_64(p, offset, left, S, info);
-    if (r == nullptr)
-      return;
-    memset(&m, '\0', sizeof(struct method64_t));
-    if (left < sizeof(struct method64_t)) {
-      memcpy(&m, r, left);
-      outs() << indent << "   (method_t extends past the end of the section)\n";
-    } else
-      memcpy(&m, r, sizeof(struct method64_t));
-    if (info->O->isLittleEndian() != sys::IsLittleEndianHost)
-      swapStruct(m);
-
-    outs() << indent << "\t\t      name ";
-    sym_name = get_symbol_64(offset + offsetof(struct method64_t, name), S,
-                             info, n_value, m.name);
-    if (n_value != 0) {
-      if (info->verbose && sym_name != nullptr)
-        outs() << sym_name;
-      else
-        outs() << format("0x%" PRIx64, n_value);
-      if (m.name != 0)
-        outs() << " + " << format("0x%" PRIx64, m.name);
-    } else
-      outs() << format("0x%" PRIx64, m.name);
-    name = get_pointer_64(m.name + n_value, xoffset, left, xS, info);
-    if (name != nullptr)
-      outs() << format(" %.*s", left, name);
-    outs() << "\n";
-
-    outs() << indent << "\t\t     types ";
-    sym_name = get_symbol_64(offset + offsetof(struct method64_t, types), S,
-                             info, n_value, m.types);
-    if (n_value != 0) {
-      if (info->verbose && sym_name != nullptr)
-        outs() << sym_name;
-      else
-        outs() << format("0x%" PRIx64, n_value);
-      if (m.types != 0)
-        outs() << " + " << format("0x%" PRIx64, m.types);
-    } else
-      outs() << format("0x%" PRIx64, m.types);
-    name = get_pointer_64(m.types + n_value, xoffset, left, xS, info);
-    if (name != nullptr)
-      outs() << format(" %.*s", left, name);
-    outs() << "\n";
-
-    outs() << indent << "\t\t       imp ";
-    name = get_symbol_64(offset + offsetof(struct method64_t, imp), S, info,
-                         n_value, m.imp);
-    if (info->verbose && name == nullptr) {
-      if (n_value != 0) {
-        outs() << format("0x%" PRIx64, n_value) << " ";
-        if (m.imp != 0)
-          outs() << "+ " << format("0x%" PRIx64, m.imp) << " ";
-      } else
-        outs() << format("0x%" PRIx64, m.imp) << " ";
-    }
-    if (name != nullptr)
-      outs() << name;
-    outs() << "\n";
-
-    p += sizeof(struct method64_t);
-    offset += sizeof(struct method64_t);
-  }
-}
-
-static void print_method_list32_t(uint64_t p, struct DisassembleInfo *info,
-                                  const char *indent) {
-  struct method_list32_t ml;
-  struct method32_t m;
-  const char *r, *name;
-  uint32_t offset, xoffset, left, i;
-  SectionRef S, xS;
-
-  r = get_pointer_32(p, offset, left, S, info);
-  if (r == nullptr)
-    return;
-  memset(&ml, '\0', sizeof(struct method_list32_t));
-  if (left < sizeof(struct method_list32_t)) {
-    memcpy(&ml, r, left);
-    outs() << "   (method_list_t entends past the end of the section)\n";
-  } else
-    memcpy(&ml, r, sizeof(struct method_list32_t));
-  if (info->O->isLittleEndian() != sys::IsLittleEndianHost)
-    swapStruct(ml);
-  outs() << indent << "\t\t   entsize " << ml.entsize << "\n";
-  outs() << indent << "\t\t     count " << ml.count << "\n";
-
-  p += sizeof(struct method_list32_t);
-  offset += sizeof(struct method_list32_t);
-  for (i = 0; i < ml.count; i++) {
-    r = get_pointer_32(p, offset, left, S, info);
-    if (r == nullptr)
-      return;
-    memset(&m, '\0', sizeof(struct method32_t));
-    if (left < sizeof(struct method32_t)) {
-      memcpy(&ml, r, left);
-      outs() << indent << "   (method_t entends past the end of the section)\n";
-    } else
-      memcpy(&m, r, sizeof(struct method32_t));
-    if (info->O->isLittleEndian() != sys::IsLittleEndianHost)
-      swapStruct(m);
-
-    outs() << indent << "\t\t      name " << format("0x%" PRIx32, m.name);
-    name = get_pointer_32(m.name, xoffset, left, xS, info);
-    if (name != nullptr)
-      outs() << format(" %.*s", left, name);
-    outs() << "\n";
-
-    outs() << indent << "\t\t     types " << format("0x%" PRIx32, m.types);
-    name = get_pointer_32(m.types, xoffset, left, xS, info);
-    if (name != nullptr)
-      outs() << format(" %.*s", left, name);
-    outs() << "\n";
-
-    outs() << indent << "\t\t       imp " << format("0x%" PRIx32, m.imp);
-    name = get_symbol_32(offset + offsetof(struct method32_t, imp), S, info,
-                         m.imp);
-    if (name != nullptr)
-      outs() << " " << name;
-    outs() << "\n";
-
-    p += sizeof(struct method32_t);
-    offset += sizeof(struct method32_t);
-  }
-}
-
-static bool print_method_list(uint32_t p, struct DisassembleInfo *info) {
-  uint32_t offset, left, xleft;
-  SectionRef S;
-  struct objc_method_list_t method_list;
-  struct objc_method_t method;
-  const char *r, *methods, *name, *SymbolName;
-  int32_t i;
-
-  r = get_pointer_32(p, offset, left, S, info, true);
-  if (r == nullptr)
-    return true;
-
-  outs() << "\n";
-  if (left > sizeof(struct objc_method_list_t)) {
-    memcpy(&method_list, r, sizeof(struct objc_method_list_t));
-  } else {
-    outs() << "\t\t objc_method_list extends past end of the section\n";
-    memset(&method_list, '\0', sizeof(struct objc_method_list_t));
-    memcpy(&method_list, r, left);
-  }
-  if (info->O->isLittleEndian() != sys::IsLittleEndianHost)
-    swapStruct(method_list);
-
-  outs() << "\t\t         obsolete "
-         << format("0x%08" PRIx32, method_list.obsolete) << "\n";
-  outs() << "\t\t     method_count " << method_list.method_count << "\n";
-
-  methods = r + sizeof(struct objc_method_list_t);
-  for (i = 0; i < method_list.method_count; i++) {
-    if ((i + 1) * sizeof(struct objc_method_t) > left) {
-      outs() << "\t\t remaining method's extend past the of the section\n";
-      break;
-    }
-    memcpy(&method, methods + i * sizeof(struct objc_method_t),
-           sizeof(struct objc_method_t));
-    if (info->O->isLittleEndian() != sys::IsLittleEndianHost)
-      swapStruct(method);
-
-    outs() << "\t\t      method_name "
-           << format("0x%08" PRIx32, method.method_name);
-    if (info->verbose) {
-      name = get_pointer_32(method.method_name, offset, xleft, S, info, true);
-      if (name != nullptr)
-        outs() << format(" %.*s", xleft, name);
-      else
-        outs() << " (not in an __OBJC section)";
-    }
-    outs() << "\n";
-
-    outs() << "\t\t     method_types "
-           << format("0x%08" PRIx32, method.method_types);
-    if (info->verbose) {
-      name = get_pointer_32(method.method_types, offset, xleft, S, info, true);
-      if (name != nullptr)
-        outs() << format(" %.*s", xleft, name);
-      else
-        outs() << " (not in an __OBJC section)";
-    }
-    outs() << "\n";
-
-    outs() << "\t\t       method_imp "
-           << format("0x%08" PRIx32, method.method_imp) << " ";
-    if (info->verbose) {
-      SymbolName = GuessSymbolName(method.method_imp, info->AddrMap);
-      if (SymbolName != nullptr)
-        outs() << SymbolName;
-    }
-    outs() << "\n";
-  }
-  return false;
-}
-
-static void print_protocol_list64_t(uint64_t p, struct DisassembleInfo *info) {
-  struct protocol_list64_t pl;
-  uint64_t q, n_value;
-  struct protocol64_t pc;
-  const char *r;
-  uint32_t offset, xoffset, left, i;
-  SectionRef S, xS;
-  const char *name, *sym_name;
-
-  r = get_pointer_64(p, offset, left, S, info);
-  if (r == nullptr)
-    return;
-  memset(&pl, '\0', sizeof(struct protocol_list64_t));
-  if (left < sizeof(struct protocol_list64_t)) {
-    memcpy(&pl, r, left);
-    outs() << "   (protocol_list_t entends past the end of the section)\n";
-  } else
-    memcpy(&pl, r, sizeof(struct protocol_list64_t));
-  if (info->O->isLittleEndian() != sys::IsLittleEndianHost)
-    swapStruct(pl);
-  outs() << "                      count " << pl.count << "\n";
-
-  p += sizeof(struct protocol_list64_t);
-  offset += sizeof(struct protocol_list64_t);
-  for (i = 0; i < pl.count; i++) {
-    r = get_pointer_64(p, offset, left, S, info);
-    if (r == nullptr)
-      return;
-    q = 0;
-    if (left < sizeof(uint64_t)) {
-      memcpy(&q, r, left);
-      outs() << "   (protocol_t * entends past the end of the section)\n";
-    } else
-      memcpy(&q, r, sizeof(uint64_t));
-    if (info->O->isLittleEndian() != sys::IsLittleEndianHost)
-      sys::swapByteOrder(q);
-
-    outs() << "\t\t      list[" << i << "] ";
-    sym_name = get_symbol_64(offset, S, info, n_value, q);
-    if (n_value != 0) {
-      if (info->verbose && sym_name != nullptr)
-        outs() << sym_name;
-      else
-        outs() << format("0x%" PRIx64, n_value);
-      if (q != 0)
-        outs() << " + " << format("0x%" PRIx64, q);
-    } else
-      outs() << format("0x%" PRIx64, q);
-    outs() << " (struct protocol_t *)\n";
-
-    r = get_pointer_64(q + n_value, offset, left, S, info);
-    if (r == nullptr)
-      return;
-    memset(&pc, '\0', sizeof(struct protocol64_t));
-    if (left < sizeof(struct protocol64_t)) {
-      memcpy(&pc, r, left);
-      outs() << "   (protocol_t entends past the end of the section)\n";
-    } else
-      memcpy(&pc, r, sizeof(struct protocol64_t));
-    if (info->O->isLittleEndian() != sys::IsLittleEndianHost)
-      swapStruct(pc);
-
-    outs() << "\t\t\t      isa " << format("0x%" PRIx64, pc.isa) << "\n";
-
-    outs() << "\t\t\t     name ";
-    sym_name = get_symbol_64(offset + offsetof(struct protocol64_t, name), S,
-                             info, n_value, pc.name);
-    if (n_value != 0) {
-      if (info->verbose && sym_name != nullptr)
-        outs() << sym_name;
-      else
-        outs() << format("0x%" PRIx64, n_value);
-      if (pc.name != 0)
-        outs() << " + " << format("0x%" PRIx64, pc.name);
-    } else
-      outs() << format("0x%" PRIx64, pc.name);
-    name = get_pointer_64(pc.name + n_value, xoffset, left, xS, info);
-    if (name != nullptr)
-      outs() << format(" %.*s", left, name);
-    outs() << "\n";
-
-    outs() << "\t\t\tprotocols " << format("0x%" PRIx64, pc.protocols) << "\n";
-
-    outs() << "\t\t  instanceMethods ";
-    sym_name =
-        get_symbol_64(offset + offsetof(struct protocol64_t, instanceMethods),
-                      S, info, n_value, pc.instanceMethods);
-    if (n_value != 0) {
-      if (info->verbose && sym_name != nullptr)
-        outs() << sym_name;
-      else
-        outs() << format("0x%" PRIx64, n_value);
-      if (pc.instanceMethods != 0)
-        outs() << " + " << format("0x%" PRIx64, pc.instanceMethods);
-    } else
-      outs() << format("0x%" PRIx64, pc.instanceMethods);
-    outs() << " (struct method_list_t *)\n";
-    if (pc.instanceMethods + n_value != 0)
-      print_method_list64_t(pc.instanceMethods + n_value, info, "\t");
-
-    outs() << "\t\t     classMethods ";
-    sym_name =
-        get_symbol_64(offset + offsetof(struct protocol64_t, classMethods), S,
-                      info, n_value, pc.classMethods);
-    if (n_value != 0) {
-      if (info->verbose && sym_name != nullptr)
-        outs() << sym_name;
-      else
-        outs() << format("0x%" PRIx64, n_value);
-      if (pc.classMethods != 0)
-        outs() << " + " << format("0x%" PRIx64, pc.classMethods);
-    } else
-      outs() << format("0x%" PRIx64, pc.classMethods);
-    outs() << " (struct method_list_t *)\n";
-    if (pc.classMethods + n_value != 0)
-      print_method_list64_t(pc.classMethods + n_value, info, "\t");
-
-    outs() << "\t  optionalInstanceMethods "
-           << format("0x%" PRIx64, pc.optionalInstanceMethods) << "\n";
-    outs() << "\t     optionalClassMethods "
-           << format("0x%" PRIx64, pc.optionalClassMethods) << "\n";
-    outs() << "\t       instanceProperties "
-           << format("0x%" PRIx64, pc.instanceProperties) << "\n";
-
-    p += sizeof(uint64_t);
-    offset += sizeof(uint64_t);
-  }
-}
-
-static void print_protocol_list32_t(uint32_t p, struct DisassembleInfo *info) {
-  struct protocol_list32_t pl;
-  uint32_t q;
-  struct protocol32_t pc;
-  const char *r;
-  uint32_t offset, xoffset, left, i;
-  SectionRef S, xS;
-  const char *name;
-
-  r = get_pointer_32(p, offset, left, S, info);
-  if (r == nullptr)
-    return;
-  memset(&pl, '\0', sizeof(struct protocol_list32_t));
-  if (left < sizeof(struct protocol_list32_t)) {
-    memcpy(&pl, r, left);
-    outs() << "   (protocol_list_t entends past the end of the section)\n";
-  } else
-    memcpy(&pl, r, sizeof(struct protocol_list32_t));
-  if (info->O->isLittleEndian() != sys::IsLittleEndianHost)
-    swapStruct(pl);
-  outs() << "                      count " << pl.count << "\n";
-
-  p += sizeof(struct protocol_list32_t);
-  offset += sizeof(struct protocol_list32_t);
-  for (i = 0; i < pl.count; i++) {
-    r = get_pointer_32(p, offset, left, S, info);
-    if (r == nullptr)
-      return;
-    q = 0;
-    if (left < sizeof(uint32_t)) {
-      memcpy(&q, r, left);
-      outs() << "   (protocol_t * entends past the end of the section)\n";
-    } else
-      memcpy(&q, r, sizeof(uint32_t));
-    if (info->O->isLittleEndian() != sys::IsLittleEndianHost)
-      sys::swapByteOrder(q);
-    outs() << "\t\t      list[" << i << "] " << format("0x%" PRIx32, q)
-           << " (struct protocol_t *)\n";
-    r = get_pointer_32(q, offset, left, S, info);
-    if (r == nullptr)
-      return;
-    memset(&pc, '\0', sizeof(struct protocol32_t));
-    if (left < sizeof(struct protocol32_t)) {
-      memcpy(&pc, r, left);
-      outs() << "   (protocol_t entends past the end of the section)\n";
-    } else
-      memcpy(&pc, r, sizeof(struct protocol32_t));
-    if (info->O->isLittleEndian() != sys::IsLittleEndianHost)
-      swapStruct(pc);
-    outs() << "\t\t\t      isa " << format("0x%" PRIx32, pc.isa) << "\n";
-    outs() << "\t\t\t     name " << format("0x%" PRIx32, pc.name);
-    name = get_pointer_32(pc.name, xoffset, left, xS, info);
-    if (name != nullptr)
-      outs() << format(" %.*s", left, name);
-    outs() << "\n";
-    outs() << "\t\t\tprotocols " << format("0x%" PRIx32, pc.protocols) << "\n";
-    outs() << "\t\t  instanceMethods "
-           << format("0x%" PRIx32, pc.instanceMethods)
-           << " (struct method_list_t *)\n";
-    if (pc.instanceMethods != 0)
-      print_method_list32_t(pc.instanceMethods, info, "\t");
-    outs() << "\t\t     classMethods " << format("0x%" PRIx32, pc.classMethods)
-           << " (struct method_list_t *)\n";
-    if (pc.classMethods != 0)
-      print_method_list32_t(pc.classMethods, info, "\t");
-    outs() << "\t  optionalInstanceMethods "
-           << format("0x%" PRIx32, pc.optionalInstanceMethods) << "\n";
-    outs() << "\t     optionalClassMethods "
-           << format("0x%" PRIx32, pc.optionalClassMethods) << "\n";
-    outs() << "\t       instanceProperties "
-           << format("0x%" PRIx32, pc.instanceProperties) << "\n";
-    p += sizeof(uint32_t);
-    offset += sizeof(uint32_t);
-  }
-}
-
-static void print_indent(uint32_t indent) {
-  for (uint32_t i = 0; i < indent;) {
-    if (indent - i >= 8) {
-      outs() << "\t";
-      i += 8;
-    } else {
-      for (uint32_t j = i; j < indent; j++)
-        outs() << " ";
-      return;
-    }
-  }
-}
-
-static bool print_method_description_list(uint32_t p, uint32_t indent,
-                                          struct DisassembleInfo *info) {
-  uint32_t offset, left, xleft;
-  SectionRef S;
-  struct objc_method_description_list_t mdl;
-  struct objc_method_description_t md;
-  const char *r, *list, *name;
-  int32_t i;
-
-  r = get_pointer_32(p, offset, left, S, info, true);
-  if (r == nullptr)
-    return true;
-
-  outs() << "\n";
-  if (left > sizeof(struct objc_method_description_list_t)) {
-    memcpy(&mdl, r, sizeof(struct objc_method_description_list_t));
-  } else {
-    print_indent(indent);
-    outs() << " objc_method_description_list extends past end of the section\n";
-    memset(&mdl, '\0', sizeof(struct objc_method_description_list_t));
-    memcpy(&mdl, r, left);
-  }
-  if (info->O->isLittleEndian() != sys::IsLittleEndianHost)
-    swapStruct(mdl);
-
-  print_indent(indent);
-  outs() << "        count " << mdl.count << "\n";
-
-  list = r + sizeof(struct objc_method_description_list_t);
-  for (i = 0; i < mdl.count; i++) {
-    if ((i + 1) * sizeof(struct objc_method_description_t) > left) {
-      print_indent(indent);
-      outs() << " remaining list entries extend past the of the section\n";
-      break;
-    }
-    print_indent(indent);
-    outs() << "        list[" << i << "]\n";
-    memcpy(&md, list + i * sizeof(struct objc_method_description_t),
-           sizeof(struct objc_method_description_t));
-    if (info->O->isLittleEndian() != sys::IsLittleEndianHost)
-      swapStruct(md);
-
-    print_indent(indent);
-    outs() << "             name " << format("0x%08" PRIx32, md.name);
-    if (info->verbose) {
-      name = get_pointer_32(md.name, offset, xleft, S, info, true);
-      if (name != nullptr)
-        outs() << format(" %.*s", xleft, name);
-      else
-        outs() << " (not in an __OBJC section)";
-    }
-    outs() << "\n";
-
-    print_indent(indent);
-    outs() << "            types " << format("0x%08" PRIx32, md.types);
-    if (info->verbose) {
-      name = get_pointer_32(md.types, offset, xleft, S, info, true);
-      if (name != nullptr)
-        outs() << format(" %.*s", xleft, name);
-      else
-        outs() << " (not in an __OBJC section)";
-    }
-    outs() << "\n";
-  }
-  return false;
-}
-
-static bool print_protocol_list(uint32_t p, uint32_t indent,
-                                struct DisassembleInfo *info);
-
-static bool print_protocol(uint32_t p, uint32_t indent,
-                           struct DisassembleInfo *info) {
-  uint32_t offset, left;
-  SectionRef S;
-  struct objc_protocol_t protocol;
-  const char *r, *name;
-
-  r = get_pointer_32(p, offset, left, S, info, true);
-  if (r == nullptr)
-    return true;
-
-  outs() << "\n";
-  if (left >= sizeof(struct objc_protocol_t)) {
-    memcpy(&protocol, r, sizeof(struct objc_protocol_t));
-  } else {
-    print_indent(indent);
-    outs() << "            Protocol extends past end of the section\n";
-    memset(&protocol, '\0', sizeof(struct objc_protocol_t));
-    memcpy(&protocol, r, left);
-  }
-  if (info->O->isLittleEndian() != sys::IsLittleEndianHost)
-    swapStruct(protocol);
-
-  print_indent(indent);
-  outs() << "              isa " << format("0x%08" PRIx32, protocol.isa)
-         << "\n";
-
-  print_indent(indent);
-  outs() << "    protocol_name "
-         << format("0x%08" PRIx32, protocol.protocol_name);
-  if (info->verbose) {
-    name = get_pointer_32(protocol.protocol_name, offset, left, S, info, true);
-    if (name != nullptr)
-      outs() << format(" %.*s", left, name);
-    else
-      outs() << " (not in an __OBJC section)";
-  }
-  outs() << "\n";
-
-  print_indent(indent);
-  outs() << "    protocol_list "
-         << format("0x%08" PRIx32, protocol.protocol_list);
-  if (print_protocol_list(protocol.protocol_list, indent + 4, info))
-    outs() << " (not in an __OBJC section)\n";
-
-  print_indent(indent);
-  outs() << " instance_methods "
-         << format("0x%08" PRIx32, protocol.instance_methods);
-  if (print_method_description_list(protocol.instance_methods, indent, info))
-    outs() << " (not in an __OBJC section)\n";
-
-  print_indent(indent);
-  outs() << "    class_methods "
-         << format("0x%08" PRIx32, protocol.class_methods);
-  if (print_method_description_list(protocol.class_methods, indent, info))
-    outs() << " (not in an __OBJC section)\n";
-
-  return false;
-}
-
-static bool print_protocol_list(uint32_t p, uint32_t indent,
-                                struct DisassembleInfo *info) {
-  uint32_t offset, left, l;
-  SectionRef S;
-  struct objc_protocol_list_t protocol_list;
-  const char *r, *list;
-  int32_t i;
-
-  r = get_pointer_32(p, offset, left, S, info, true);
-  if (r == nullptr)
-    return true;
-
-  outs() << "\n";
-  if (left > sizeof(struct objc_protocol_list_t)) {
-    memcpy(&protocol_list, r, sizeof(struct objc_protocol_list_t));
-  } else {
-    outs() << "\t\t objc_protocol_list_t extends past end of the section\n";
-    memset(&protocol_list, '\0', sizeof(struct objc_protocol_list_t));
-    memcpy(&protocol_list, r, left);
-  }
-  if (info->O->isLittleEndian() != sys::IsLittleEndianHost)
-    swapStruct(protocol_list);
-
-  print_indent(indent);
-  outs() << "         next " << format("0x%08" PRIx32, protocol_list.next)
-         << "\n";
-  print_indent(indent);
-  outs() << "        count " << protocol_list.count << "\n";
-
-  list = r + sizeof(struct objc_protocol_list_t);
-  for (i = 0; i < protocol_list.count; i++) {
-    if ((i + 1) * sizeof(uint32_t) > left) {
-      outs() << "\t\t remaining list entries extend past the of the section\n";
-      break;
-    }
-    memcpy(&l, list + i * sizeof(uint32_t), sizeof(uint32_t));
-    if (info->O->isLittleEndian() != sys::IsLittleEndianHost)
-      sys::swapByteOrder(l);
-
-    print_indent(indent);
-    outs() << "      list[" << i << "] " << format("0x%08" PRIx32, l);
-    if (print_protocol(l, indent, info))
-      outs() << "(not in an __OBJC section)\n";
-  }
-  return false;
-}
-
-static void print_ivar_list64_t(uint64_t p, struct DisassembleInfo *info) {
-  struct ivar_list64_t il;
-  struct ivar64_t i;
-  const char *r;
-  uint32_t offset, xoffset, left, j;
-  SectionRef S, xS;
-  const char *name, *sym_name, *ivar_offset_p;
-  uint64_t ivar_offset, n_value;
-
-  r = get_pointer_64(p, offset, left, S, info);
-  if (r == nullptr)
-    return;
-  memset(&il, '\0', sizeof(struct ivar_list64_t));
-  if (left < sizeof(struct ivar_list64_t)) {
-    memcpy(&il, r, left);
-    outs() << "   (ivar_list_t entends past the end of the section)\n";
-  } else
-    memcpy(&il, r, sizeof(struct ivar_list64_t));
-  if (info->O->isLittleEndian() != sys::IsLittleEndianHost)
-    swapStruct(il);
-  outs() << "                    entsize " << il.entsize << "\n";
-  outs() << "                      count " << il.count << "\n";
-
-  p += sizeof(struct ivar_list64_t);
-  offset += sizeof(struct ivar_list64_t);
-  for (j = 0; j < il.count; j++) {
-    r = get_pointer_64(p, offset, left, S, info);
-    if (r == nullptr)
-      return;
-    memset(&i, '\0', sizeof(struct ivar64_t));
-    if (left < sizeof(struct ivar64_t)) {
-      memcpy(&i, r, left);
-      outs() << "   (ivar_t entends past the end of the section)\n";
-    } else
-      memcpy(&i, r, sizeof(struct ivar64_t));
-    if (info->O->isLittleEndian() != sys::IsLittleEndianHost)
-      swapStruct(i);
-
-    outs() << "\t\t\t   offset ";
-    sym_name = get_symbol_64(offset + offsetof(struct ivar64_t, offset), S,
-                             info, n_value, i.offset);
-    if (n_value != 0) {
-      if (info->verbose && sym_name != nullptr)
-        outs() << sym_name;
-      else
-        outs() << format("0x%" PRIx64, n_value);
-      if (i.offset != 0)
-        outs() << " + " << format("0x%" PRIx64, i.offset);
-    } else
-      outs() << format("0x%" PRIx64, i.offset);
-    ivar_offset_p = get_pointer_64(i.offset + n_value, xoffset, left, xS, info);
-    if (ivar_offset_p != nullptr && left >= sizeof(*ivar_offset_p)) {
-      memcpy(&ivar_offset, ivar_offset_p, sizeof(ivar_offset));
-      if (info->O->isLittleEndian() != sys::IsLittleEndianHost)
-        sys::swapByteOrder(ivar_offset);
-      outs() << " " << ivar_offset << "\n";
-    } else
-      outs() << "\n";
-
-    outs() << "\t\t\t     name ";
-    sym_name = get_symbol_64(offset + offsetof(struct ivar64_t, name), S, info,
-                             n_value, i.name);
-    if (n_value != 0) {
-      if (info->verbose && sym_name != nullptr)
-        outs() << sym_name;
-      else
-        outs() << format("0x%" PRIx64, n_value);
-      if (i.name != 0)
-        outs() << " + " << format("0x%" PRIx64, i.name);
-    } else
-      outs() << format("0x%" PRIx64, i.name);
-    name = get_pointer_64(i.name + n_value, xoffset, left, xS, info);
-    if (name != nullptr)
-      outs() << format(" %.*s", left, name);
-    outs() << "\n";
-
-    outs() << "\t\t\t     type ";
-    sym_name = get_symbol_64(offset + offsetof(struct ivar64_t, type), S, info,
-                             n_value, i.name);
-    name = get_pointer_64(i.type + n_value, xoffset, left, xS, info);
-    if (n_value != 0) {
-      if (info->verbose && sym_name != nullptr)
-        outs() << sym_name;
-      else
-        outs() << format("0x%" PRIx64, n_value);
-      if (i.type != 0)
-        outs() << " + " << format("0x%" PRIx64, i.type);
-    } else
-      outs() << format("0x%" PRIx64, i.type);
-    if (name != nullptr)
-      outs() << format(" %.*s", left, name);
-    outs() << "\n";
-
-    outs() << "\t\t\talignment " << i.alignment << "\n";
-    outs() << "\t\t\t     size " << i.size << "\n";
-
-    p += sizeof(struct ivar64_t);
-    offset += sizeof(struct ivar64_t);
-  }
-}
-
-static void print_ivar_list32_t(uint32_t p, struct DisassembleInfo *info) {
-  struct ivar_list32_t il;
-  struct ivar32_t i;
-  const char *r;
-  uint32_t offset, xoffset, left, j;
-  SectionRef S, xS;
-  const char *name, *ivar_offset_p;
-  uint32_t ivar_offset;
-
-  r = get_pointer_32(p, offset, left, S, info);
-  if (r == nullptr)
-    return;
-  memset(&il, '\0', sizeof(struct ivar_list32_t));
-  if (left < sizeof(struct ivar_list32_t)) {
-    memcpy(&il, r, left);
-    outs() << "   (ivar_list_t entends past the end of the section)\n";
-  } else
-    memcpy(&il, r, sizeof(struct ivar_list32_t));
-  if (info->O->isLittleEndian() != sys::IsLittleEndianHost)
-    swapStruct(il);
-  outs() << "                    entsize " << il.entsize << "\n";
-  outs() << "                      count " << il.count << "\n";
-
-  p += sizeof(struct ivar_list32_t);
-  offset += sizeof(struct ivar_list32_t);
-  for (j = 0; j < il.count; j++) {
-    r = get_pointer_32(p, offset, left, S, info);
-    if (r == nullptr)
-      return;
-    memset(&i, '\0', sizeof(struct ivar32_t));
-    if (left < sizeof(struct ivar32_t)) {
-      memcpy(&i, r, left);
-      outs() << "   (ivar_t entends past the end of the section)\n";
-    } else
-      memcpy(&i, r, sizeof(struct ivar32_t));
-    if (info->O->isLittleEndian() != sys::IsLittleEndianHost)
-      swapStruct(i);
-
-    outs() << "\t\t\t   offset " << format("0x%" PRIx32, i.offset);
-    ivar_offset_p = get_pointer_32(i.offset, xoffset, left, xS, info);
-    if (ivar_offset_p != nullptr && left >= sizeof(*ivar_offset_p)) {
-      memcpy(&ivar_offset, ivar_offset_p, sizeof(ivar_offset));
-      if (info->O->isLittleEndian() != sys::IsLittleEndianHost)
-        sys::swapByteOrder(ivar_offset);
-      outs() << " " << ivar_offset << "\n";
-    } else
-      outs() << "\n";
-
-    outs() << "\t\t\t     name " << format("0x%" PRIx32, i.name);
-    name = get_pointer_32(i.name, xoffset, left, xS, info);
-    if (name != nullptr)
-      outs() << format(" %.*s", left, name);
-    outs() << "\n";
-
-    outs() << "\t\t\t     type " << format("0x%" PRIx32, i.type);
-    name = get_pointer_32(i.type, xoffset, left, xS, info);
-    if (name != nullptr)
-      outs() << format(" %.*s", left, name);
-    outs() << "\n";
-
-    outs() << "\t\t\talignment " << i.alignment << "\n";
-    outs() << "\t\t\t     size " << i.size << "\n";
-
-    p += sizeof(struct ivar32_t);
-    offset += sizeof(struct ivar32_t);
-  }
-}
-
-static void print_objc_property_list64(uint64_t p,
-                                       struct DisassembleInfo *info) {
-  struct objc_property_list64 opl;
-  struct objc_property64 op;
-  const char *r;
-  uint32_t offset, xoffset, left, j;
-  SectionRef S, xS;
-  const char *name, *sym_name;
-  uint64_t n_value;
-
-  r = get_pointer_64(p, offset, left, S, info);
-  if (r == nullptr)
-    return;
-  memset(&opl, '\0', sizeof(struct objc_property_list64));
-  if (left < sizeof(struct objc_property_list64)) {
-    memcpy(&opl, r, left);
-    outs() << "   (objc_property_list entends past the end of the section)\n";
-  } else
-    memcpy(&opl, r, sizeof(struct objc_property_list64));
-  if (info->O->isLittleEndian() != sys::IsLittleEndianHost)
-    swapStruct(opl);
-  outs() << "                    entsize " << opl.entsize << "\n";
-  outs() << "                      count " << opl.count << "\n";
-
-  p += sizeof(struct objc_property_list64);
-  offset += sizeof(struct objc_property_list64);
-  for (j = 0; j < opl.count; j++) {
-    r = get_pointer_64(p, offset, left, S, info);
-    if (r == nullptr)
-      return;
-    memset(&op, '\0', sizeof(struct objc_property64));
-    if (left < sizeof(struct objc_property64)) {
-      memcpy(&op, r, left);
-      outs() << "   (objc_property entends past the end of the section)\n";
-    } else
-      memcpy(&op, r, sizeof(struct objc_property64));
-    if (info->O->isLittleEndian() != sys::IsLittleEndianHost)
-      swapStruct(op);
-
-    outs() << "\t\t\t     name ";
-    sym_name = get_symbol_64(offset + offsetof(struct objc_property64, name), S,
-                             info, n_value, op.name);
-    if (n_value != 0) {
-      if (info->verbose && sym_name != nullptr)
-        outs() << sym_name;
-      else
-        outs() << format("0x%" PRIx64, n_value);
-      if (op.name != 0)
-        outs() << " + " << format("0x%" PRIx64, op.name);
-    } else
-      outs() << format("0x%" PRIx64, op.name);
-    name = get_pointer_64(op.name + n_value, xoffset, left, xS, info);
-    if (name != nullptr)
-      outs() << format(" %.*s", left, name);
-    outs() << "\n";
-
-    outs() << "\t\t\tattributes ";
-    sym_name =
-        get_symbol_64(offset + offsetof(struct objc_property64, attributes), S,
-                      info, n_value, op.attributes);
-    if (n_value != 0) {
-      if (info->verbose && sym_name != nullptr)
-        outs() << sym_name;
-      else
-        outs() << format("0x%" PRIx64, n_value);
-      if (op.attributes != 0)
-        outs() << " + " << format("0x%" PRIx64, op.attributes);
-    } else
-      outs() << format("0x%" PRIx64, op.attributes);
-    name = get_pointer_64(op.attributes + n_value, xoffset, left, xS, info);
-    if (name != nullptr)
-      outs() << format(" %.*s", left, name);
-    outs() << "\n";
-
-    p += sizeof(struct objc_property64);
-    offset += sizeof(struct objc_property64);
-  }
-}
-
-static void print_objc_property_list32(uint32_t p,
-                                       struct DisassembleInfo *info) {
-  struct objc_property_list32 opl;
-  struct objc_property32 op;
-  const char *r;
-  uint32_t offset, xoffset, left, j;
-  SectionRef S, xS;
-  const char *name;
-
-  r = get_pointer_32(p, offset, left, S, info);
-  if (r == nullptr)
-    return;
-  memset(&opl, '\0', sizeof(struct objc_property_list32));
-  if (left < sizeof(struct objc_property_list32)) {
-    memcpy(&opl, r, left);
-    outs() << "   (objc_property_list entends past the end of the section)\n";
-  } else
-    memcpy(&opl, r, sizeof(struct objc_property_list32));
-  if (info->O->isLittleEndian() != sys::IsLittleEndianHost)
-    swapStruct(opl);
-  outs() << "                    entsize " << opl.entsize << "\n";
-  outs() << "                      count " << opl.count << "\n";
-
-  p += sizeof(struct objc_property_list32);
-  offset += sizeof(struct objc_property_list32);
-  for (j = 0; j < opl.count; j++) {
-    r = get_pointer_32(p, offset, left, S, info);
-    if (r == nullptr)
-      return;
-    memset(&op, '\0', sizeof(struct objc_property32));
-    if (left < sizeof(struct objc_property32)) {
-      memcpy(&op, r, left);
-      outs() << "   (objc_property entends past the end of the section)\n";
-    } else
-      memcpy(&op, r, sizeof(struct objc_property32));
-    if (info->O->isLittleEndian() != sys::IsLittleEndianHost)
-      swapStruct(op);
-
-    outs() << "\t\t\t     name " << format("0x%" PRIx32, op.name);
-    name = get_pointer_32(op.name, xoffset, left, xS, info);
-    if (name != nullptr)
-      outs() << format(" %.*s", left, name);
-    outs() << "\n";
-
-    outs() << "\t\t\tattributes " << format("0x%" PRIx32, op.attributes);
-    name = get_pointer_32(op.attributes, xoffset, left, xS, info);
-    if (name != nullptr)
-      outs() << format(" %.*s", left, name);
-    outs() << "\n";
-
-    p += sizeof(struct objc_property32);
-    offset += sizeof(struct objc_property32);
-  }
-}
-
-static bool print_class_ro64_t(uint64_t p, struct DisassembleInfo *info,
-                               bool &is_meta_class) {
-  struct class_ro64_t cro;
-  const char *r;
-  uint32_t offset, xoffset, left;
-  SectionRef S, xS;
-  const char *name, *sym_name;
-  uint64_t n_value;
-
-  r = get_pointer_64(p, offset, left, S, info);
-  if (r == nullptr || left < sizeof(struct class_ro64_t))
-    return false;
-  memcpy(&cro, r, sizeof(struct class_ro64_t));
-  if (info->O->isLittleEndian() != sys::IsLittleEndianHost)
-    swapStruct(cro);
-  outs() << "                    flags " << format("0x%" PRIx32, cro.flags);
-  if (cro.flags & RO_META)
-    outs() << " RO_META";
-  if (cro.flags & RO_ROOT)
-    outs() << " RO_ROOT";
-  if (cro.flags & RO_HAS_CXX_STRUCTORS)
-    outs() << " RO_HAS_CXX_STRUCTORS";
-  outs() << "\n";
-  outs() << "            instanceStart " << cro.instanceStart << "\n";
-  outs() << "             instanceSize " << cro.instanceSize << "\n";
-  outs() << "                 reserved " << format("0x%" PRIx32, cro.reserved)
-         << "\n";
-  outs() << "               ivarLayout " << format("0x%" PRIx64, cro.ivarLayout)
-         << "\n";
-  print_layout_map64(cro.ivarLayout, info);
-
-  outs() << "                     name ";
-  sym_name = get_symbol_64(offset + offsetof(struct class_ro64_t, name), S,
-                           info, n_value, cro.name);
-  if (n_value != 0) {
-    if (info->verbose && sym_name != nullptr)
-      outs() << sym_name;
-    else
-      outs() << format("0x%" PRIx64, n_value);
-    if (cro.name != 0)
-      outs() << " + " << format("0x%" PRIx64, cro.name);
-  } else
-    outs() << format("0x%" PRIx64, cro.name);
-  name = get_pointer_64(cro.name + n_value, xoffset, left, xS, info);
-  if (name != nullptr)
-    outs() << format(" %.*s", left, name);
-  outs() << "\n";
-
-  outs() << "              baseMethods ";
-  sym_name = get_symbol_64(offset + offsetof(struct class_ro64_t, baseMethods),
-                           S, info, n_value, cro.baseMethods);
-  if (n_value != 0) {
-    if (info->verbose && sym_name != nullptr)
-      outs() << sym_name;
-    else
-      outs() << format("0x%" PRIx64, n_value);
-    if (cro.baseMethods != 0)
-      outs() << " + " << format("0x%" PRIx64, cro.baseMethods);
-  } else
-    outs() << format("0x%" PRIx64, cro.baseMethods);
-  outs() << " (struct method_list_t *)\n";
-  if (cro.baseMethods + n_value != 0)
-    print_method_list64_t(cro.baseMethods + n_value, info, "");
-
-  outs() << "            baseProtocols ";
-  sym_name =
-      get_symbol_64(offset + offsetof(struct class_ro64_t, baseProtocols), S,
-                    info, n_value, cro.baseProtocols);
-  if (n_value != 0) {
-    if (info->verbose && sym_name != nullptr)
-      outs() << sym_name;
-    else
-      outs() << format("0x%" PRIx64, n_value);
-    if (cro.baseProtocols != 0)
-      outs() << " + " << format("0x%" PRIx64, cro.baseProtocols);
-  } else
-    outs() << format("0x%" PRIx64, cro.baseProtocols);
-  outs() << "\n";
-  if (cro.baseProtocols + n_value != 0)
-    print_protocol_list64_t(cro.baseProtocols + n_value, info);
-
-  outs() << "                    ivars ";
-  sym_name = get_symbol_64(offset + offsetof(struct class_ro64_t, ivars), S,
-                           info, n_value, cro.ivars);
-  if (n_value != 0) {
-    if (info->verbose && sym_name != nullptr)
-      outs() << sym_name;
-    else
-      outs() << format("0x%" PRIx64, n_value);
-    if (cro.ivars != 0)
-      outs() << " + " << format("0x%" PRIx64, cro.ivars);
-  } else
-    outs() << format("0x%" PRIx64, cro.ivars);
-  outs() << "\n";
-  if (cro.ivars + n_value != 0)
-    print_ivar_list64_t(cro.ivars + n_value, info);
-
-  outs() << "           weakIvarLayout ";
-  sym_name =
-      get_symbol_64(offset + offsetof(struct class_ro64_t, weakIvarLayout), S,
-                    info, n_value, cro.weakIvarLayout);
-  if (n_value != 0) {
-    if (info->verbose && sym_name != nullptr)
-      outs() << sym_name;
-    else
-      outs() << format("0x%" PRIx64, n_value);
-    if (cro.weakIvarLayout != 0)
-      outs() << " + " << format("0x%" PRIx64, cro.weakIvarLayout);
-  } else
-    outs() << format("0x%" PRIx64, cro.weakIvarLayout);
-  outs() << "\n";
-  print_layout_map64(cro.weakIvarLayout + n_value, info);
-
-  outs() << "           baseProperties ";
-  sym_name =
-      get_symbol_64(offset + offsetof(struct class_ro64_t, baseProperties), S,
-                    info, n_value, cro.baseProperties);
-  if (n_value != 0) {
-    if (info->verbose && sym_name != nullptr)
-      outs() << sym_name;
-    else
-      outs() << format("0x%" PRIx64, n_value);
-    if (cro.baseProperties != 0)
-      outs() << " + " << format("0x%" PRIx64, cro.baseProperties);
-  } else
-    outs() << format("0x%" PRIx64, cro.baseProperties);
-  outs() << "\n";
-  if (cro.baseProperties + n_value != 0)
-    print_objc_property_list64(cro.baseProperties + n_value, info);
-
-  is_meta_class = (cro.flags & RO_META) != 0;
-  return true;
-}
-
-static bool print_class_ro32_t(uint32_t p, struct DisassembleInfo *info,
-                               bool &is_meta_class) {
-  struct class_ro32_t cro;
-  const char *r;
-  uint32_t offset, xoffset, left;
-  SectionRef S, xS;
-  const char *name;
-
-  r = get_pointer_32(p, offset, left, S, info);
-  if (r == nullptr)
-    return false;
-  memset(&cro, '\0', sizeof(struct class_ro32_t));
-  if (left < sizeof(struct class_ro32_t)) {
-    memcpy(&cro, r, left);
-    outs() << "   (class_ro_t entends past the end of the section)\n";
-  } else
-    memcpy(&cro, r, sizeof(struct class_ro32_t));
-  if (info->O->isLittleEndian() != sys::IsLittleEndianHost)
-    swapStruct(cro);
-  outs() << "                    flags " << format("0x%" PRIx32, cro.flags);
-  if (cro.flags & RO_META)
-    outs() << " RO_META";
-  if (cro.flags & RO_ROOT)
-    outs() << " RO_ROOT";
-  if (cro.flags & RO_HAS_CXX_STRUCTORS)
-    outs() << " RO_HAS_CXX_STRUCTORS";
-  outs() << "\n";
-  outs() << "            instanceStart " << cro.instanceStart << "\n";
-  outs() << "             instanceSize " << cro.instanceSize << "\n";
-  outs() << "               ivarLayout " << format("0x%" PRIx32, cro.ivarLayout)
-         << "\n";
-  print_layout_map32(cro.ivarLayout, info);
-
-  outs() << "                     name " << format("0x%" PRIx32, cro.name);
-  name = get_pointer_32(cro.name, xoffset, left, xS, info);
-  if (name != nullptr)
-    outs() << format(" %.*s", left, name);
-  outs() << "\n";
-
-  outs() << "              baseMethods "
-         << format("0x%" PRIx32, cro.baseMethods)
-         << " (struct method_list_t *)\n";
-  if (cro.baseMethods != 0)
-    print_method_list32_t(cro.baseMethods, info, "");
-
-  outs() << "            baseProtocols "
-         << format("0x%" PRIx32, cro.baseProtocols) << "\n";
-  if (cro.baseProtocols != 0)
-    print_protocol_list32_t(cro.baseProtocols, info);
-  outs() << "                    ivars " << format("0x%" PRIx32, cro.ivars)
-         << "\n";
-  if (cro.ivars != 0)
-    print_ivar_list32_t(cro.ivars, info);
-  outs() << "           weakIvarLayout "
-         << format("0x%" PRIx32, cro.weakIvarLayout) << "\n";
-  print_layout_map32(cro.weakIvarLayout, info);
-  outs() << "           baseProperties "
-         << format("0x%" PRIx32, cro.baseProperties) << "\n";
-  if (cro.baseProperties != 0)
-    print_objc_property_list32(cro.baseProperties, info);
-  is_meta_class = (cro.flags & RO_META) != 0;
-  return true;
-}
-
-static void print_class64_t(uint64_t p, struct DisassembleInfo *info) {
-  struct class64_t c;
-  const char *r;
-  uint32_t offset, left;
-  SectionRef S;
-  const char *name;
-  uint64_t isa_n_value, n_value;
-
-  r = get_pointer_64(p, offset, left, S, info);
-  if (r == nullptr || left < sizeof(struct class64_t))
-    return;
-  memcpy(&c, r, sizeof(struct class64_t));
-  if (info->O->isLittleEndian() != sys::IsLittleEndianHost)
-    swapStruct(c);
-
-  outs() << "           isa " << format("0x%" PRIx64, c.isa);
-  name = get_symbol_64(offset + offsetof(struct class64_t, isa), S, info,
-                       isa_n_value, c.isa);
-  if (name != nullptr)
-    outs() << " " << name;
-  outs() << "\n";
-
-  outs() << "    superclass " << format("0x%" PRIx64, c.superclass);
-  name = get_symbol_64(offset + offsetof(struct class64_t, superclass), S, info,
-                       n_value, c.superclass);
-  if (name != nullptr)
-    outs() << " " << name;
-  else {
-    name = get_dyld_bind_info_symbolname(S.getAddress() +
-             offset + offsetof(struct class64_t, superclass), info);
-    if (name != nullptr)
-      outs() << " " << name;
-  }
-  outs() << "\n";
-
-  outs() << "         cache " << format("0x%" PRIx64, c.cache);
-  name = get_symbol_64(offset + offsetof(struct class64_t, cache), S, info,
-                       n_value, c.cache);
-  if (name != nullptr)
-    outs() << " " << name;
-  outs() << "\n";
-
-  outs() << "        vtable " << format("0x%" PRIx64, c.vtable);
-  name = get_symbol_64(offset + offsetof(struct class64_t, vtable), S, info,
-                       n_value, c.vtable);
-  if (name != nullptr)
-    outs() << " " << name;
-  outs() << "\n";
-
-  name = get_symbol_64(offset + offsetof(struct class64_t, data), S, info,
-                       n_value, c.data);
-  outs() << "          data ";
-  if (n_value != 0) {
-    if (info->verbose && name != nullptr)
-      outs() << name;
-    else
-      outs() << format("0x%" PRIx64, n_value);
-    if (c.data != 0)
-      outs() << " + " << format("0x%" PRIx64, c.data);
-  } else
-    outs() << format("0x%" PRIx64, c.data);
-  outs() << " (struct class_ro_t *)";
-
-  // This is a Swift class if some of the low bits of the pointer are set.
-  if ((c.data + n_value) & 0x7)
-    outs() << " Swift class";
-  outs() << "\n";
-  bool is_meta_class;
-  if (!print_class_ro64_t((c.data + n_value) & ~0x7, info, is_meta_class))
-    return;
-
-  if (!is_meta_class &&
-      c.isa + isa_n_value != p &&
-      c.isa + isa_n_value != 0 &&
-      info->depth < 100) {
-      info->depth++;
-      outs() << "Meta Class\n";
-      print_class64_t(c.isa + isa_n_value, info);
-  }
-}
-
-static void print_class32_t(uint32_t p, struct DisassembleInfo *info) {
-  struct class32_t c;
-  const char *r;
-  uint32_t offset, left;
-  SectionRef S;
-  const char *name;
-
-  r = get_pointer_32(p, offset, left, S, info);
-  if (r == nullptr)
-    return;
-  memset(&c, '\0', sizeof(struct class32_t));
-  if (left < sizeof(struct class32_t)) {
-    memcpy(&c, r, left);
-    outs() << "   (class_t entends past the end of the section)\n";
-  } else
-    memcpy(&c, r, sizeof(struct class32_t));
-  if (info->O->isLittleEndian() != sys::IsLittleEndianHost)
-    swapStruct(c);
-
-  outs() << "           isa " << format("0x%" PRIx32, c.isa);
-  name =
-      get_symbol_32(offset + offsetof(struct class32_t, isa), S, info, c.isa);
-  if (name != nullptr)
-    outs() << " " << name;
-  outs() << "\n";
-
-  outs() << "    superclass " << format("0x%" PRIx32, c.superclass);
-  name = get_symbol_32(offset + offsetof(struct class32_t, superclass), S, info,
-                       c.superclass);
-  if (name != nullptr)
-    outs() << " " << name;
-  outs() << "\n";
-
-  outs() << "         cache " << format("0x%" PRIx32, c.cache);
-  name = get_symbol_32(offset + offsetof(struct class32_t, cache), S, info,
-                       c.cache);
-  if (name != nullptr)
-    outs() << " " << name;
-  outs() << "\n";
-
-  outs() << "        vtable " << format("0x%" PRIx32, c.vtable);
-  name = get_symbol_32(offset + offsetof(struct class32_t, vtable), S, info,
-                       c.vtable);
-  if (name != nullptr)
-    outs() << " " << name;
-  outs() << "\n";
-
-  name =
-      get_symbol_32(offset + offsetof(struct class32_t, data), S, info, c.data);
-  outs() << "          data " << format("0x%" PRIx32, c.data)
-         << " (struct class_ro_t *)";
-
-  // This is a Swift class if some of the low bits of the pointer are set.
-  if (c.data & 0x3)
-    outs() << " Swift class";
-  outs() << "\n";
-  bool is_meta_class;
-  if (!print_class_ro32_t(c.data & ~0x3, info, is_meta_class))
-    return;
-
-  if (!is_meta_class) {
-    outs() << "Meta Class\n";
-    print_class32_t(c.isa, info);
-  }
-}
-
-static void print_objc_class_t(struct objc_class_t *objc_class,
-                               struct DisassembleInfo *info) {
-  uint32_t offset, left, xleft;
-  const char *name, *p, *ivar_list;
-  SectionRef S;
-  int32_t i;
-  struct objc_ivar_list_t objc_ivar_list;
-  struct objc_ivar_t ivar;
-
-  outs() << "\t\t      isa " << format("0x%08" PRIx32, objc_class->isa);
-  if (info->verbose && CLS_GETINFO(objc_class, CLS_META)) {
-    name = get_pointer_32(objc_class->isa, offset, left, S, info, true);
-    if (name != nullptr)
-      outs() << format(" %.*s", left, name);
-    else
-      outs() << " (not in an __OBJC section)";
-  }
-  outs() << "\n";
-
-  outs() << "\t      super_class "
-         << format("0x%08" PRIx32, objc_class->super_class);
-  if (info->verbose) {
-    name = get_pointer_32(objc_class->super_class, offset, left, S, info, true);
-    if (name != nullptr)
-      outs() << format(" %.*s", left, name);
-    else
-      outs() << " (not in an __OBJC section)";
-  }
-  outs() << "\n";
-
-  outs() << "\t\t     name " << format("0x%08" PRIx32, objc_class->name);
-  if (info->verbose) {
-    name = get_pointer_32(objc_class->name, offset, left, S, info, true);
-    if (name != nullptr)
-      outs() << format(" %.*s", left, name);
-    else
-      outs() << " (not in an __OBJC section)";
-  }
-  outs() << "\n";
-
-  outs() << "\t\t  version " << format("0x%08" PRIx32, objc_class->version)
-         << "\n";
-
-  outs() << "\t\t     info " << format("0x%08" PRIx32, objc_class->info);
-  if (info->verbose) {
-    if (CLS_GETINFO(objc_class, CLS_CLASS))
-      outs() << " CLS_CLASS";
-    else if (CLS_GETINFO(objc_class, CLS_META))
-      outs() << " CLS_META";
-  }
-  outs() << "\n";
-
-  outs() << "\t    instance_size "
-         << format("0x%08" PRIx32, objc_class->instance_size) << "\n";
-
-  p = get_pointer_32(objc_class->ivars, offset, left, S, info, true);
-  outs() << "\t\t    ivars " << format("0x%08" PRIx32, objc_class->ivars);
-  if (p != nullptr) {
-    if (left > sizeof(struct objc_ivar_list_t)) {
-      outs() << "\n";
-      memcpy(&objc_ivar_list, p, sizeof(struct objc_ivar_list_t));
-    } else {
-      outs() << " (entends past the end of the section)\n";
-      memset(&objc_ivar_list, '\0', sizeof(struct objc_ivar_list_t));
-      memcpy(&objc_ivar_list, p, left);
-    }
-    if (info->O->isLittleEndian() != sys::IsLittleEndianHost)
-      swapStruct(objc_ivar_list);
-    outs() << "\t\t       ivar_count " << objc_ivar_list.ivar_count << "\n";
-    ivar_list = p + sizeof(struct objc_ivar_list_t);
-    for (i = 0; i < objc_ivar_list.ivar_count; i++) {
-      if ((i + 1) * sizeof(struct objc_ivar_t) > left) {
-        outs() << "\t\t remaining ivar's extend past the of the section\n";
-        break;
-      }
-      memcpy(&ivar, ivar_list + i * sizeof(struct objc_ivar_t),
-             sizeof(struct objc_ivar_t));
-      if (info->O->isLittleEndian() != sys::IsLittleEndianHost)
-        swapStruct(ivar);
-
-      outs() << "\t\t\tivar_name " << format("0x%08" PRIx32, ivar.ivar_name);
-      if (info->verbose) {
-        name = get_pointer_32(ivar.ivar_name, offset, xleft, S, info, true);
-        if (name != nullptr)
-          outs() << format(" %.*s", xleft, name);
-        else
-          outs() << " (not in an __OBJC section)";
-      }
-      outs() << "\n";
-
-      outs() << "\t\t\tivar_type " << format("0x%08" PRIx32, ivar.ivar_type);
-      if (info->verbose) {
-        name = get_pointer_32(ivar.ivar_type, offset, xleft, S, info, true);
-        if (name != nullptr)
-          outs() << format(" %.*s", xleft, name);
-        else
-          outs() << " (not in an __OBJC section)";
-      }
-      outs() << "\n";
-
-      outs() << "\t\t      ivar_offset "
-             << format("0x%08" PRIx32, ivar.ivar_offset) << "\n";
-    }
-  } else {
-    outs() << " (not in an __OBJC section)\n";
-  }
-
-  outs() << "\t\t  methods " << format("0x%08" PRIx32, objc_class->methodLists);
-  if (print_method_list(objc_class->methodLists, info))
-    outs() << " (not in an __OBJC section)\n";
-
-  outs() << "\t\t    cache " << format("0x%08" PRIx32, objc_class->cache)
-         << "\n";
-
-  outs() << "\t\tprotocols " << format("0x%08" PRIx32, objc_class->protocols);
-  if (print_protocol_list(objc_class->protocols, 16, info))
-    outs() << " (not in an __OBJC section)\n";
-}
-
-static void print_objc_objc_category_t(struct objc_category_t *objc_category,
-                                       struct DisassembleInfo *info) {
-  uint32_t offset, left;
-  const char *name;
-  SectionRef S;
-
-  outs() << "\t       category name "
-         << format("0x%08" PRIx32, objc_category->category_name);
-  if (info->verbose) {
-    name = get_pointer_32(objc_category->category_name, offset, left, S, info,
-                          true);
-    if (name != nullptr)
-      outs() << format(" %.*s", left, name);
-    else
-      outs() << " (not in an __OBJC section)";
-  }
-  outs() << "\n";
-
-  outs() << "\t\t  class name "
-         << format("0x%08" PRIx32, objc_category->class_name);
-  if (info->verbose) {
-    name =
-        get_pointer_32(objc_category->class_name, offset, left, S, info, true);
-    if (name != nullptr)
-      outs() << format(" %.*s", left, name);
-    else
-      outs() << " (not in an __OBJC section)";
-  }
-  outs() << "\n";
-
-  outs() << "\t    instance methods "
-         << format("0x%08" PRIx32, objc_category->instance_methods);
-  if (print_method_list(objc_category->instance_methods, info))
-    outs() << " (not in an __OBJC section)\n";
-
-  outs() << "\t       class methods "
-         << format("0x%08" PRIx32, objc_category->class_methods);
-  if (print_method_list(objc_category->class_methods, info))
-    outs() << " (not in an __OBJC section)\n";
-}
-
-static void print_category64_t(uint64_t p, struct DisassembleInfo *info) {
-  struct category64_t c;
-  const char *r;
-  uint32_t offset, xoffset, left;
-  SectionRef S, xS;
-  const char *name, *sym_name;
-  uint64_t n_value;
-
-  r = get_pointer_64(p, offset, left, S, info);
-  if (r == nullptr)
-    return;
-  memset(&c, '\0', sizeof(struct category64_t));
-  if (left < sizeof(struct category64_t)) {
-    memcpy(&c, r, left);
-    outs() << "   (category_t entends past the end of the section)\n";
-  } else
-    memcpy(&c, r, sizeof(struct category64_t));
-  if (info->O->isLittleEndian() != sys::IsLittleEndianHost)
-    swapStruct(c);
-
-  outs() << "              name ";
-  sym_name = get_symbol_64(offset + offsetof(struct category64_t, name), S,
-                           info, n_value, c.name);
-  if (n_value != 0) {
-    if (info->verbose && sym_name != nullptr)
-      outs() << sym_name;
-    else
-      outs() << format("0x%" PRIx64, n_value);
-    if (c.name != 0)
-      outs() << " + " << format("0x%" PRIx64, c.name);
-  } else
-    outs() << format("0x%" PRIx64, c.name);
-  name = get_pointer_64(c.name + n_value, xoffset, left, xS, info);
-  if (name != nullptr)
-    outs() << format(" %.*s", left, name);
-  outs() << "\n";
-
-  outs() << "               cls ";
-  sym_name = get_symbol_64(offset + offsetof(struct category64_t, cls), S, info,
-                           n_value, c.cls);
-  if (n_value != 0) {
-    if (info->verbose && sym_name != nullptr)
-      outs() << sym_name;
-    else
-      outs() << format("0x%" PRIx64, n_value);
-    if (c.cls != 0)
-      outs() << " + " << format("0x%" PRIx64, c.cls);
-  } else
-    outs() << format("0x%" PRIx64, c.cls);
-  outs() << "\n";
-  if (c.cls + n_value != 0)
-    print_class64_t(c.cls + n_value, info);
-
-  outs() << "   instanceMethods ";
-  sym_name =
-      get_symbol_64(offset + offsetof(struct category64_t, instanceMethods), S,
-                    info, n_value, c.instanceMethods);
-  if (n_value != 0) {
-    if (info->verbose && sym_name != nullptr)
-      outs() << sym_name;
-    else
-      outs() << format("0x%" PRIx64, n_value);
-    if (c.instanceMethods != 0)
-      outs() << " + " << format("0x%" PRIx64, c.instanceMethods);
-  } else
-    outs() << format("0x%" PRIx64, c.instanceMethods);
-  outs() << "\n";
-  if (c.instanceMethods + n_value != 0)
-    print_method_list64_t(c.instanceMethods + n_value, info, "");
-
-  outs() << "      classMethods ";
-  sym_name = get_symbol_64(offset + offsetof(struct category64_t, classMethods),
-                           S, info, n_value, c.classMethods);
-  if (n_value != 0) {
-    if (info->verbose && sym_name != nullptr)
-      outs() << sym_name;
-    else
-      outs() << format("0x%" PRIx64, n_value);
-    if (c.classMethods != 0)
-      outs() << " + " << format("0x%" PRIx64, c.classMethods);
-  } else
-    outs() << format("0x%" PRIx64, c.classMethods);
-  outs() << "\n";
-  if (c.classMethods + n_value != 0)
-    print_method_list64_t(c.classMethods + n_value, info, "");
-
-  outs() << "         protocols ";
-  sym_name = get_symbol_64(offset + offsetof(struct category64_t, protocols), S,
-                           info, n_value, c.protocols);
-  if (n_value != 0) {
-    if (info->verbose && sym_name != nullptr)
-      outs() << sym_name;
-    else
-      outs() << format("0x%" PRIx64, n_value);
-    if (c.protocols != 0)
-      outs() << " + " << format("0x%" PRIx64, c.protocols);
-  } else
-    outs() << format("0x%" PRIx64, c.protocols);
-  outs() << "\n";
-  if (c.protocols + n_value != 0)
-    print_protocol_list64_t(c.protocols + n_value, info);
-
-  outs() << "instanceProperties ";
-  sym_name =
-      get_symbol_64(offset + offsetof(struct category64_t, instanceProperties),
-                    S, info, n_value, c.instanceProperties);
-  if (n_value != 0) {
-    if (info->verbose && sym_name != nullptr)
-      outs() << sym_name;
-    else
-      outs() << format("0x%" PRIx64, n_value);
-    if (c.instanceProperties != 0)
-      outs() << " + " << format("0x%" PRIx64, c.instanceProperties);
-  } else
-    outs() << format("0x%" PRIx64, c.instanceProperties);
-  outs() << "\n";
-  if (c.instanceProperties + n_value != 0)
-    print_objc_property_list64(c.instanceProperties + n_value, info);
-}
-
-static void print_category32_t(uint32_t p, struct DisassembleInfo *info) {
-  struct category32_t c;
-  const char *r;
-  uint32_t offset, left;
-  SectionRef S, xS;
-  const char *name;
-
-  r = get_pointer_32(p, offset, left, S, info);
-  if (r == nullptr)
-    return;
-  memset(&c, '\0', sizeof(struct category32_t));
-  if (left < sizeof(struct category32_t)) {
-    memcpy(&c, r, left);
-    outs() << "   (category_t entends past the end of the section)\n";
-  } else
-    memcpy(&c, r, sizeof(struct category32_t));
-  if (info->O->isLittleEndian() != sys::IsLittleEndianHost)
-    swapStruct(c);
-
-  outs() << "              name " << format("0x%" PRIx32, c.name);
-  name = get_symbol_32(offset + offsetof(struct category32_t, name), S, info,
-                       c.name);
-  if (name)
-    outs() << " " << name;
-  outs() << "\n";
-
-  outs() << "               cls " << format("0x%" PRIx32, c.cls) << "\n";
-  if (c.cls != 0)
-    print_class32_t(c.cls, info);
-  outs() << "   instanceMethods " << format("0x%" PRIx32, c.instanceMethods)
-         << "\n";
-  if (c.instanceMethods != 0)
-    print_method_list32_t(c.instanceMethods, info, "");
-  outs() << "      classMethods " << format("0x%" PRIx32, c.classMethods)
-         << "\n";
-  if (c.classMethods != 0)
-    print_method_list32_t(c.classMethods, info, "");
-  outs() << "         protocols " << format("0x%" PRIx32, c.protocols) << "\n";
-  if (c.protocols != 0)
-    print_protocol_list32_t(c.protocols, info);
-  outs() << "instanceProperties " << format("0x%" PRIx32, c.instanceProperties)
-         << "\n";
-  if (c.instanceProperties != 0)
-    print_objc_property_list32(c.instanceProperties, info);
-}
-
-static void print_message_refs64(SectionRef S, struct DisassembleInfo *info) {
-  uint32_t i, left, offset, xoffset;
-  uint64_t p, n_value;
-  struct message_ref64 mr;
-  const char *name, *sym_name;
-  const char *r;
-  SectionRef xS;
-
-  if (S == SectionRef())
-    return;
-
-  StringRef SectName;
-  S.getName(SectName);
-  DataRefImpl Ref = S.getRawDataRefImpl();
-  StringRef SegName = info->O->getSectionFinalSegmentName(Ref);
-  outs() << "Contents of (" << SegName << "," << SectName << ") section\n";
-  offset = 0;
-  for (i = 0; i < S.getSize(); i += sizeof(struct message_ref64)) {
-    p = S.getAddress() + i;
-    r = get_pointer_64(p, offset, left, S, info);
-    if (r == nullptr)
-      return;
-    memset(&mr, '\0', sizeof(struct message_ref64));
-    if (left < sizeof(struct message_ref64)) {
-      memcpy(&mr, r, left);
-      outs() << "   (message_ref entends past the end of the section)\n";
-    } else
-      memcpy(&mr, r, sizeof(struct message_ref64));
-    if (info->O->isLittleEndian() != sys::IsLittleEndianHost)
-      swapStruct(mr);
-
-    outs() << "  imp ";
-    name = get_symbol_64(offset + offsetof(struct message_ref64, imp), S, info,
-                         n_value, mr.imp);
-    if (n_value != 0) {
-      outs() << format("0x%" PRIx64, n_value) << " ";
-      if (mr.imp != 0)
-        outs() << "+ " << format("0x%" PRIx64, mr.imp) << " ";
-    } else
-      outs() << format("0x%" PRIx64, mr.imp) << " ";
-    if (name != nullptr)
-      outs() << " " << name;
-    outs() << "\n";
-
-    outs() << "  sel ";
-    sym_name = get_symbol_64(offset + offsetof(struct message_ref64, sel), S,
-                             info, n_value, mr.sel);
-    if (n_value != 0) {
-      if (info->verbose && sym_name != nullptr)
-        outs() << sym_name;
-      else
-        outs() << format("0x%" PRIx64, n_value);
-      if (mr.sel != 0)
-        outs() << " + " << format("0x%" PRIx64, mr.sel);
-    } else
-      outs() << format("0x%" PRIx64, mr.sel);
-    name = get_pointer_64(mr.sel + n_value, xoffset, left, xS, info);
-    if (name != nullptr)
-      outs() << format(" %.*s", left, name);
-    outs() << "\n";
-
-    offset += sizeof(struct message_ref64);
-  }
-}
-
-static void print_message_refs32(SectionRef S, struct DisassembleInfo *info) {
-  uint32_t i, left, offset, xoffset, p;
-  struct message_ref32 mr;
-  const char *name, *r;
-  SectionRef xS;
-
-  if (S == SectionRef())
-    return;
-
-  StringRef SectName;
-  S.getName(SectName);
-  DataRefImpl Ref = S.getRawDataRefImpl();
-  StringRef SegName = info->O->getSectionFinalSegmentName(Ref);
-  outs() << "Contents of (" << SegName << "," << SectName << ") section\n";
-  offset = 0;
-  for (i = 0; i < S.getSize(); i += sizeof(struct message_ref64)) {
-    p = S.getAddress() + i;
-    r = get_pointer_32(p, offset, left, S, info);
-    if (r == nullptr)
-      return;
-    memset(&mr, '\0', sizeof(struct message_ref32));
-    if (left < sizeof(struct message_ref32)) {
-      memcpy(&mr, r, left);
-      outs() << "   (message_ref entends past the end of the section)\n";
-    } else
-      memcpy(&mr, r, sizeof(struct message_ref32));
-    if (info->O->isLittleEndian() != sys::IsLittleEndianHost)
-      swapStruct(mr);
-
-    outs() << "  imp " << format("0x%" PRIx32, mr.imp);
-    name = get_symbol_32(offset + offsetof(struct message_ref32, imp), S, info,
-                         mr.imp);
-    if (name != nullptr)
-      outs() << " " << name;
-    outs() << "\n";
-
-    outs() << "  sel " << format("0x%" PRIx32, mr.sel);
-    name = get_pointer_32(mr.sel, xoffset, left, xS, info);
-    if (name != nullptr)
-      outs() << " " << name;
-    outs() << "\n";
-
-    offset += sizeof(struct message_ref32);
-  }
-}
-
-static void print_image_info64(SectionRef S, struct DisassembleInfo *info) {
-  uint32_t left, offset, swift_version;
-  uint64_t p;
-  struct objc_image_info64 o;
-  const char *r;
-
-  if (S == SectionRef())
-    return;
-
-  StringRef SectName;
-  S.getName(SectName);
-  DataRefImpl Ref = S.getRawDataRefImpl();
-  StringRef SegName = info->O->getSectionFinalSegmentName(Ref);
-  outs() << "Contents of (" << SegName << "," << SectName << ") section\n";
-  p = S.getAddress();
-  r = get_pointer_64(p, offset, left, S, info);
-  if (r == nullptr)
-    return;
-  memset(&o, '\0', sizeof(struct objc_image_info64));
-  if (left < sizeof(struct objc_image_info64)) {
-    memcpy(&o, r, left);
-    outs() << "   (objc_image_info entends past the end of the section)\n";
-  } else
-    memcpy(&o, r, sizeof(struct objc_image_info64));
-  if (info->O->isLittleEndian() != sys::IsLittleEndianHost)
-    swapStruct(o);
-  outs() << "  version " << o.version << "\n";
-  outs() << "    flags " << format("0x%" PRIx32, o.flags);
-  if (o.flags & OBJC_IMAGE_IS_REPLACEMENT)
-    outs() << " OBJC_IMAGE_IS_REPLACEMENT";
-  if (o.flags & OBJC_IMAGE_SUPPORTS_GC)
-    outs() << " OBJC_IMAGE_SUPPORTS_GC";
-  if (o.flags & OBJC_IMAGE_IS_SIMULATED)
-    outs() << " OBJC_IMAGE_IS_SIMULATED";
-  if (o.flags & OBJC_IMAGE_HAS_CATEGORY_CLASS_PROPERTIES)
-    outs() << " OBJC_IMAGE_HAS_CATEGORY_CLASS_PROPERTIES";
-  swift_version = (o.flags >> 8) & 0xff;
-  if (swift_version != 0) {
-    if (swift_version == 1)
-      outs() << " Swift 1.0";
-    else if (swift_version == 2)
-      outs() << " Swift 1.1";
-    else if(swift_version == 3)
-      outs() << " Swift 2.0";
-    else if(swift_version == 4)
-      outs() << " Swift 3.0";
-    else if(swift_version == 5)
-      outs() << " Swift 4.0";
-    else if(swift_version == 6)
-      outs() << " Swift 4.1/Swift 4.2";
-    else if(swift_version == 7)
-      outs() << " Swift 5 or later";
-    else
-      outs() << " unknown future Swift version (" << swift_version << ")";
-  }
-  outs() << "\n";
-}
-
-static void print_image_info32(SectionRef S, struct DisassembleInfo *info) {
-  uint32_t left, offset, swift_version, p;
-  struct objc_image_info32 o;
-  const char *r;
-
-  if (S == SectionRef())
-    return;
-
-  StringRef SectName;
-  S.getName(SectName);
-  DataRefImpl Ref = S.getRawDataRefImpl();
-  StringRef SegName = info->O->getSectionFinalSegmentName(Ref);
-  outs() << "Contents of (" << SegName << "," << SectName << ") section\n";
-  p = S.getAddress();
-  r = get_pointer_32(p, offset, left, S, info);
-  if (r == nullptr)
-    return;
-  memset(&o, '\0', sizeof(struct objc_image_info32));
-  if (left < sizeof(struct objc_image_info32)) {
-    memcpy(&o, r, left);
-    outs() << "   (objc_image_info entends past the end of the section)\n";
-  } else
-    memcpy(&o, r, sizeof(struct objc_image_info32));
-  if (info->O->isLittleEndian() != sys::IsLittleEndianHost)
-    swapStruct(o);
-  outs() << "  version " << o.version << "\n";
-  outs() << "    flags " << format("0x%" PRIx32, o.flags);
-  if (o.flags & OBJC_IMAGE_IS_REPLACEMENT)
-    outs() << " OBJC_IMAGE_IS_REPLACEMENT";
-  if (o.flags & OBJC_IMAGE_SUPPORTS_GC)
-    outs() << " OBJC_IMAGE_SUPPORTS_GC";
-  swift_version = (o.flags >> 8) & 0xff;
-  if (swift_version != 0) {
-    if (swift_version == 1)
-      outs() << " Swift 1.0";
-    else if (swift_version == 2)
-      outs() << " Swift 1.1";
-    else if(swift_version == 3)
-      outs() << " Swift 2.0";
-    else if(swift_version == 4)
-      outs() << " Swift 3.0";
-    else if(swift_version == 5)
-      outs() << " Swift 4.0";
-    else if(swift_version == 6)
-      outs() << " Swift 4.1/Swift 4.2";
-    else if(swift_version == 7)
-      outs() << " Swift 5 or later";
-    else
-      outs() << " unknown future Swift version (" << swift_version << ")";
-  }
-  outs() << "\n";
-}
-
-static void print_image_info(SectionRef S, struct DisassembleInfo *info) {
-  uint32_t left, offset, p;
-  struct imageInfo_t o;
-  const char *r;
-
-  StringRef SectName;
-  S.getName(SectName);
-  DataRefImpl Ref = S.getRawDataRefImpl();
-  StringRef SegName = info->O->getSectionFinalSegmentName(Ref);
-  outs() << "Contents of (" << SegName << "," << SectName << ") section\n";
-  p = S.getAddress();
-  r = get_pointer_32(p, offset, left, S, info);
-  if (r == nullptr)
-    return;
-  memset(&o, '\0', sizeof(struct imageInfo_t));
-  if (left < sizeof(struct imageInfo_t)) {
-    memcpy(&o, r, left);
-    outs() << " (imageInfo entends past the end of the section)\n";
-  } else
-    memcpy(&o, r, sizeof(struct imageInfo_t));
-  if (info->O->isLittleEndian() != sys::IsLittleEndianHost)
-    swapStruct(o);
-  outs() << "  version " << o.version << "\n";
-  outs() << "    flags " << format("0x%" PRIx32, o.flags);
-  if (o.flags & 0x1)
-    outs() << "  F&C";
-  if (o.flags & 0x2)
-    outs() << " GC";
-  if (o.flags & 0x4)
-    outs() << " GC-only";
-  else
-    outs() << " RR";
-  outs() << "\n";
-}
-
-static void printObjc2_64bit_MetaData(MachOObjectFile *O, bool verbose) {
-  SymbolAddressMap AddrMap;
-  if (verbose)
-    CreateSymbolAddressMap(O, &AddrMap);
-
-  std::vector<SectionRef> Sections;
-  for (const SectionRef &Section : O->sections()) {
-    StringRef SectName;
-    Section.getName(SectName);
-    Sections.push_back(Section);
-  }
-
-  struct DisassembleInfo info(O, &AddrMap, &Sections, verbose);
-
-  SectionRef CL = get_section(O, "__OBJC2", "__class_list");
-  if (CL == SectionRef())
-    CL = get_section(O, "__DATA", "__objc_classlist");
-  if (CL == SectionRef())
-    CL = get_section(O, "__DATA_CONST", "__objc_classlist");
-  if (CL == SectionRef())
-    CL = get_section(O, "__DATA_DIRTY", "__objc_classlist");
-  info.S = CL;
-  walk_pointer_list_64("class", CL, O, &info, print_class64_t);
-
-  SectionRef CR = get_section(O, "__OBJC2", "__class_refs");
-  if (CR == SectionRef())
-    CR = get_section(O, "__DATA", "__objc_classrefs");
-  if (CR == SectionRef())
-    CR = get_section(O, "__DATA_CONST", "__objc_classrefs");
-  if (CR == SectionRef())
-    CR = get_section(O, "__DATA_DIRTY", "__objc_classrefs");
-  info.S = CR;
-  walk_pointer_list_64("class refs", CR, O, &info, nullptr);
-
-  SectionRef SR = get_section(O, "__OBJC2", "__super_refs");
-  if (SR == SectionRef())
-    SR = get_section(O, "__DATA", "__objc_superrefs");
-  if (SR == SectionRef())
-    SR = get_section(O, "__DATA_CONST", "__objc_superrefs");
-  if (SR == SectionRef())
-    SR = get_section(O, "__DATA_DIRTY", "__objc_superrefs");
-  info.S = SR;
-  walk_pointer_list_64("super refs", SR, O, &info, nullptr);
-
-  SectionRef CA = get_section(O, "__OBJC2", "__category_list");
-  if (CA == SectionRef())
-    CA = get_section(O, "__DATA", "__objc_catlist");
-  if (CA == SectionRef())
-    CA = get_section(O, "__DATA_CONST", "__objc_catlist");
-  if (CA == SectionRef())
-    CA = get_section(O, "__DATA_DIRTY", "__objc_catlist");
-  info.S = CA;
-  walk_pointer_list_64("category", CA, O, &info, print_category64_t);
-
-  SectionRef PL = get_section(O, "__OBJC2", "__protocol_list");
-  if (PL == SectionRef())
-    PL = get_section(O, "__DATA", "__objc_protolist");
-  if (PL == SectionRef())
-    PL = get_section(O, "__DATA_CONST", "__objc_protolist");
-  if (PL == SectionRef())
-    PL = get_section(O, "__DATA_DIRTY", "__objc_protolist");
-  info.S = PL;
-  walk_pointer_list_64("protocol", PL, O, &info, nullptr);
-
-  SectionRef MR = get_section(O, "__OBJC2", "__message_refs");
-  if (MR == SectionRef())
-    MR = get_section(O, "__DATA", "__objc_msgrefs");
-  if (MR == SectionRef())
-    MR = get_section(O, "__DATA_CONST", "__objc_msgrefs");
-  if (MR == SectionRef())
-    MR = get_section(O, "__DATA_DIRTY", "__objc_msgrefs");
-  info.S = MR;
-  print_message_refs64(MR, &info);
-
-  SectionRef II = get_section(O, "__OBJC2", "__image_info");
-  if (II == SectionRef())
-    II = get_section(O, "__DATA", "__objc_imageinfo");
-  if (II == SectionRef())
-    II = get_section(O, "__DATA_CONST", "__objc_imageinfo");
-  if (II == SectionRef())
-    II = get_section(O, "__DATA_DIRTY", "__objc_imageinfo");
-  info.S = II;
-  print_image_info64(II, &info);
-}
-
-static void printObjc2_32bit_MetaData(MachOObjectFile *O, bool verbose) {
-  SymbolAddressMap AddrMap;
-  if (verbose)
-    CreateSymbolAddressMap(O, &AddrMap);
-
-  std::vector<SectionRef> Sections;
-  for (const SectionRef &Section : O->sections()) {
-    StringRef SectName;
-    Section.getName(SectName);
-    Sections.push_back(Section);
-  }
-
-  struct DisassembleInfo info(O, &AddrMap, &Sections, verbose);
-
-  SectionRef CL = get_section(O, "__OBJC2", "__class_list");
-  if (CL == SectionRef())
-    CL = get_section(O, "__DATA", "__objc_classlist");
-  if (CL == SectionRef())
-    CL = get_section(O, "__DATA_CONST", "__objc_classlist");
-  if (CL == SectionRef())
-    CL = get_section(O, "__DATA_DIRTY", "__objc_classlist");
-  info.S = CL;
-  walk_pointer_list_32("class", CL, O, &info, print_class32_t);
-
-  SectionRef CR = get_section(O, "__OBJC2", "__class_refs");
-  if (CR == SectionRef())
-    CR = get_section(O, "__DATA", "__objc_classrefs");
-  if (CR == SectionRef())
-    CR = get_section(O, "__DATA_CONST", "__objc_classrefs");
-  if (CR == SectionRef())
-    CR = get_section(O, "__DATA_DIRTY", "__objc_classrefs");
-  info.S = CR;
-  walk_pointer_list_32("class refs", CR, O, &info, nullptr);
-
-  SectionRef SR = get_section(O, "__OBJC2", "__super_refs");
-  if (SR == SectionRef())
-    SR = get_section(O, "__DATA", "__objc_superrefs");
-  if (SR == SectionRef())
-    SR = get_section(O, "__DATA_CONST", "__objc_superrefs");
-  if (SR == SectionRef())
-    SR = get_section(O, "__DATA_DIRTY", "__objc_superrefs");
-  info.S = SR;
-  walk_pointer_list_32("super refs", SR, O, &info, nullptr);
-
-  SectionRef CA = get_section(O, "__OBJC2", "__category_list");
-  if (CA == SectionRef())
-    CA = get_section(O, "__DATA", "__objc_catlist");
-  if (CA == SectionRef())
-    CA = get_section(O, "__DATA_CONST", "__objc_catlist");
-  if (CA == SectionRef())
-    CA = get_section(O, "__DATA_DIRTY", "__objc_catlist");
-  info.S = CA;
-  walk_pointer_list_32("category", CA, O, &info, print_category32_t);
-
-  SectionRef PL = get_section(O, "__OBJC2", "__protocol_list");
-  if (PL == SectionRef())
-    PL = get_section(O, "__DATA", "__objc_protolist");
-  if (PL == SectionRef())
-    PL = get_section(O, "__DATA_CONST", "__objc_protolist");
-  if (PL == SectionRef())
-    PL = get_section(O, "__DATA_DIRTY", "__objc_protolist");
-  info.S = PL;
-  walk_pointer_list_32("protocol", PL, O, &info, nullptr);
-
-  SectionRef MR = get_section(O, "__OBJC2", "__message_refs");
-  if (MR == SectionRef())
-    MR = get_section(O, "__DATA", "__objc_msgrefs");
-  if (MR == SectionRef())
-    MR = get_section(O, "__DATA_CONST", "__objc_msgrefs");
-  if (MR == SectionRef())
-    MR = get_section(O, "__DATA_DIRTY", "__objc_msgrefs");
-  info.S = MR;
-  print_message_refs32(MR, &info);
-
-  SectionRef II = get_section(O, "__OBJC2", "__image_info");
-  if (II == SectionRef())
-    II = get_section(O, "__DATA", "__objc_imageinfo");
-  if (II == SectionRef())
-    II = get_section(O, "__DATA_CONST", "__objc_imageinfo");
-  if (II == SectionRef())
-    II = get_section(O, "__DATA_DIRTY", "__objc_imageinfo");
-  info.S = II;
-  print_image_info32(II, &info);
-}
-
-static bool printObjc1_32bit_MetaData(MachOObjectFile *O, bool verbose) {
-  uint32_t i, j, p, offset, xoffset, left, defs_left, def;
-  const char *r, *name, *defs;
-  struct objc_module_t module;
-  SectionRef S, xS;
-  struct objc_symtab_t symtab;
-  struct objc_class_t objc_class;
-  struct objc_category_t objc_category;
-
-  outs() << "Objective-C segment\n";
-  S = get_section(O, "__OBJC", "__module_info");
-  if (S == SectionRef())
-    return false;
-
-  SymbolAddressMap AddrMap;
-  if (verbose)
-    CreateSymbolAddressMap(O, &AddrMap);
-
-  std::vector<SectionRef> Sections;
-  for (const SectionRef &Section : O->sections()) {
-    StringRef SectName;
-    Section.getName(SectName);
-    Sections.push_back(Section);
-  }
-
-  struct DisassembleInfo info(O, &AddrMap, &Sections, verbose);
-
-  for (i = 0; i < S.getSize(); i += sizeof(struct objc_module_t)) {
-    p = S.getAddress() + i;
-    r = get_pointer_32(p, offset, left, S, &info, true);
-    if (r == nullptr)
-      return true;
-    memset(&module, '\0', sizeof(struct objc_module_t));
-    if (left < sizeof(struct objc_module_t)) {
-      memcpy(&module, r, left);
-      outs() << "   (module extends past end of __module_info section)\n";
-    } else
-      memcpy(&module, r, sizeof(struct objc_module_t));
-    if (O->isLittleEndian() != sys::IsLittleEndianHost)
-      swapStruct(module);
-
-    outs() << "Module " << format("0x%" PRIx32, p) << "\n";
-    outs() << "    version " << module.version << "\n";
-    outs() << "       size " << module.size << "\n";
-    outs() << "       name ";
-    name = get_pointer_32(module.name, xoffset, left, xS, &info, true);
-    if (name != nullptr)
-      outs() << format("%.*s", left, name);
-    else
-      outs() << format("0x%08" PRIx32, module.name)
-             << "(not in an __OBJC section)";
-    outs() << "\n";
-
-    r = get_pointer_32(module.symtab, xoffset, left, xS, &info, true);
-    if (module.symtab == 0 || r == nullptr) {
-      outs() << "     symtab " << format("0x%08" PRIx32, module.symtab)
-             << " (not in an __OBJC section)\n";
-      continue;
-    }
-    outs() << "     symtab " << format("0x%08" PRIx32, module.symtab) << "\n";
-    memset(&symtab, '\0', sizeof(struct objc_symtab_t));
-    defs_left = 0;
-    defs = nullptr;
-    if (left < sizeof(struct objc_symtab_t)) {
-      memcpy(&symtab, r, left);
-      outs() << "\tsymtab extends past end of an __OBJC section)\n";
-    } else {
-      memcpy(&symtab, r, sizeof(struct objc_symtab_t));
-      if (left > sizeof(struct objc_symtab_t)) {
-        defs_left = left - sizeof(struct objc_symtab_t);
-        defs = r + sizeof(struct objc_symtab_t);
-      }
-    }
-    if (O->isLittleEndian() != sys::IsLittleEndianHost)
-      swapStruct(symtab);
-
-    outs() << "\tsel_ref_cnt " << symtab.sel_ref_cnt << "\n";
-    r = get_pointer_32(symtab.refs, xoffset, left, xS, &info, true);
-    outs() << "\trefs " << format("0x%08" PRIx32, symtab.refs);
-    if (r == nullptr)
-      outs() << " (not in an __OBJC section)";
-    outs() << "\n";
-    outs() << "\tcls_def_cnt " << symtab.cls_def_cnt << "\n";
-    outs() << "\tcat_def_cnt " << symtab.cat_def_cnt << "\n";
-    if (symtab.cls_def_cnt > 0)
-      outs() << "\tClass Definitions\n";
-    for (j = 0; j < symtab.cls_def_cnt; j++) {
-      if ((j + 1) * sizeof(uint32_t) > defs_left) {
-        outs() << "\t(remaining class defs entries entends past the end of the "
-               << "section)\n";
-        break;
-      }
-      memcpy(&def, defs + j * sizeof(uint32_t), sizeof(uint32_t));
-      if (O->isLittleEndian() != sys::IsLittleEndianHost)
-        sys::swapByteOrder(def);
-
-      r = get_pointer_32(def, xoffset, left, xS, &info, true);
-      outs() << "\tdefs[" << j << "] " << format("0x%08" PRIx32, def);
-      if (r != nullptr) {
-        if (left > sizeof(struct objc_class_t)) {
-          outs() << "\n";
-          memcpy(&objc_class, r, sizeof(struct objc_class_t));
-        } else {
-          outs() << " (entends past the end of the section)\n";
-          memset(&objc_class, '\0', sizeof(struct objc_class_t));
-          memcpy(&objc_class, r, left);
-        }
-        if (O->isLittleEndian() != sys::IsLittleEndianHost)
-          swapStruct(objc_class);
-        print_objc_class_t(&objc_class, &info);
-      } else {
-        outs() << "(not in an __OBJC section)\n";
-      }
-
-      if (CLS_GETINFO(&objc_class, CLS_CLASS)) {
-        outs() << "\tMeta Class";
-        r = get_pointer_32(objc_class.isa, xoffset, left, xS, &info, true);
-        if (r != nullptr) {
-          if (left > sizeof(struct objc_class_t)) {
-            outs() << "\n";
-            memcpy(&objc_class, r, sizeof(struct objc_class_t));
-          } else {
-            outs() << " (entends past the end of the section)\n";
-            memset(&objc_class, '\0', sizeof(struct objc_class_t));
-            memcpy(&objc_class, r, left);
-          }
-          if (O->isLittleEndian() != sys::IsLittleEndianHost)
-            swapStruct(objc_class);
-          print_objc_class_t(&objc_class, &info);
-        } else {
-          outs() << "(not in an __OBJC section)\n";
-        }
-      }
-    }
-    if (symtab.cat_def_cnt > 0)
-      outs() << "\tCategory Definitions\n";
-    for (j = 0; j < symtab.cat_def_cnt; j++) {
-      if ((j + symtab.cls_def_cnt + 1) * sizeof(uint32_t) > defs_left) {
-        outs() << "\t(remaining category defs entries entends past the end of "
-               << "the section)\n";
-        break;
-      }
-      memcpy(&def, defs + (j + symtab.cls_def_cnt) * sizeof(uint32_t),
-             sizeof(uint32_t));
-      if (O->isLittleEndian() != sys::IsLittleEndianHost)
-        sys::swapByteOrder(def);
-
-      r = get_pointer_32(def, xoffset, left, xS, &info, true);
-      outs() << "\tdefs[" << j + symtab.cls_def_cnt << "] "
-             << format("0x%08" PRIx32, def);
-      if (r != nullptr) {
-        if (left > sizeof(struct objc_category_t)) {
-          outs() << "\n";
-          memcpy(&objc_category, r, sizeof(struct objc_category_t));
-        } else {
-          outs() << " (entends past the end of the section)\n";
-          memset(&objc_category, '\0', sizeof(struct objc_category_t));
-          memcpy(&objc_category, r, left);
-        }
-        if (O->isLittleEndian() != sys::IsLittleEndianHost)
-          swapStruct(objc_category);
-        print_objc_objc_category_t(&objc_category, &info);
-      } else {
-        outs() << "(not in an __OBJC section)\n";
-      }
-    }
-  }
-  const SectionRef II = get_section(O, "__OBJC", "__image_info");
-  if (II != SectionRef())
-    print_image_info(II, &info);
-
-  return true;
-}
-
-static void DumpProtocolSection(MachOObjectFile *O, const char *sect,
-                                uint32_t size, uint32_t addr) {
-  SymbolAddressMap AddrMap;
-  CreateSymbolAddressMap(O, &AddrMap);
-
-  std::vector<SectionRef> Sections;
-  for (const SectionRef &Section : O->sections()) {
-    StringRef SectName;
-    Section.getName(SectName);
-    Sections.push_back(Section);
-  }
-
-  struct DisassembleInfo info(O, &AddrMap, &Sections, true);
-
-  const char *p;
-  struct objc_protocol_t protocol;
-  uint32_t left, paddr;
-  for (p = sect; p < sect + size; p += sizeof(struct objc_protocol_t)) {
-    memset(&protocol, '\0', sizeof(struct objc_protocol_t));
-    left = size - (p - sect);
-    if (left < sizeof(struct objc_protocol_t)) {
-      outs() << "Protocol extends past end of __protocol section\n";
-      memcpy(&protocol, p, left);
-    } else
-      memcpy(&protocol, p, sizeof(struct objc_protocol_t));
-    if (O->isLittleEndian() != sys::IsLittleEndianHost)
-      swapStruct(protocol);
-    paddr = addr + (p - sect);
-    outs() << "Protocol " << format("0x%" PRIx32, paddr);
-    if (print_protocol(paddr, 0, &info))
-      outs() << "(not in an __OBJC section)\n";
-  }
-}
-
-#ifdef HAVE_LIBXAR
-inline void swapStruct(struct xar_header &xar) {
-  sys::swapByteOrder(xar.magic);
-  sys::swapByteOrder(xar.size);
-  sys::swapByteOrder(xar.version);
-  sys::swapByteOrder(xar.toc_length_compressed);
-  sys::swapByteOrder(xar.toc_length_uncompressed);
-  sys::swapByteOrder(xar.cksum_alg);
-}
-
-static void PrintModeVerbose(uint32_t mode) {
-  switch(mode & S_IFMT){
-  case S_IFDIR:
-    outs() << "d";
-    break;
-  case S_IFCHR:
-    outs() << "c";
-    break;
-  case S_IFBLK:
-    outs() << "b";
-    break;
-  case S_IFREG:
-    outs() << "-";
-    break;
-  case S_IFLNK:
-    outs() << "l";
-    break;
-  case S_IFSOCK:
-    outs() << "s";
-    break;
-  default:
-    outs() << "?";
-    break;
-  }
-
-  /* owner permissions */
-  if(mode & S_IREAD)
-    outs() << "r";
-  else
-    outs() << "-";
-  if(mode & S_IWRITE)
-    outs() << "w";
-  else
-    outs() << "-";
-  if(mode & S_ISUID)
-    outs() << "s";
-  else if(mode & S_IEXEC)
-    outs() << "x";
-  else
-    outs() << "-";
-
-  /* group permissions */
-  if(mode & (S_IREAD >> 3))
-    outs() << "r";
-  else
-    outs() << "-";
-  if(mode & (S_IWRITE >> 3))
-    outs() << "w";
-  else
-    outs() << "-";
-  if(mode & S_ISGID)
-    outs() << "s";
-  else if(mode & (S_IEXEC >> 3))
-    outs() << "x";
-  else
-    outs() << "-";
-
-  /* other permissions */
-  if(mode & (S_IREAD >> 6))
-    outs() << "r";
-  else
-    outs() << "-";
-  if(mode & (S_IWRITE >> 6))
-    outs() << "w";
-  else
-    outs() << "-";
-  if(mode & S_ISVTX)
-    outs() << "t";
-  else if(mode & (S_IEXEC >> 6))
-    outs() << "x";
-  else
-    outs() << "-";
-}
-
-static void PrintXarFilesSummary(const char *XarFilename, xar_t xar) {
-  xar_file_t xf;
-  const char *key, *type, *mode, *user, *group, *size, *mtime, *name, *m;
-  char *endp;
-  uint32_t mode_value;
-
-  ScopedXarIter xi;
-  if (!xi) {
-    WithColor::error(errs(), "llvm-objdump")
-        << "can't obtain an xar iterator for xar archive " << XarFilename
-        << "\n";
-    return;
-  }
-
-  // Go through the xar's files.
-  for (xf = xar_file_first(xar, xi); xf; xf = xar_file_next(xi)) {
-    ScopedXarIter xp;
-    if(!xp){
-      WithColor::error(errs(), "llvm-objdump")
-          << "can't obtain an xar iterator for xar archive " << XarFilename
-          << "\n";
-      return;
-    }
-    type = nullptr;
-    mode = nullptr;
-    user = nullptr;
-    group = nullptr;
-    size = nullptr;
-    mtime = nullptr;
-    name = nullptr;
-    for(key = xar_prop_first(xf, xp); key; key = xar_prop_next(xp)){
-      const char *val = nullptr;
-      xar_prop_get(xf, key, &val);
-#if 0 // Useful for debugging.
-      outs() << "key: " << key << " value: " << val << "\n";
-#endif
-      if(strcmp(key, "type") == 0)
-        type = val;
-      if(strcmp(key, "mode") == 0)
-        mode = val;
-      if(strcmp(key, "user") == 0)
-        user = val;
-      if(strcmp(key, "group") == 0)
-        group = val;
-      if(strcmp(key, "data/size") == 0)
-        size = val;
-      if(strcmp(key, "mtime") == 0)
-        mtime = val;
-      if(strcmp(key, "name") == 0)
-        name = val;
-    }
-    if(mode != nullptr){
-      mode_value = strtoul(mode, &endp, 8);
-      if(*endp != '\0')
-        outs() << "(mode: \"" << mode << "\" contains non-octal chars) ";
-      if(strcmp(type, "file") == 0)
-        mode_value |= S_IFREG;
-      PrintModeVerbose(mode_value);
-      outs() << " ";
-    }
-    if(user != nullptr)
-      outs() << format("%10s/", user);
-    if(group != nullptr)
-      outs() << format("%-10s ", group);
-    if(size != nullptr)
-      outs() << format("%7s ", size);
-    if(mtime != nullptr){
-      for(m = mtime; *m != 'T' && *m != '\0'; m++)
-        outs() << *m;
-      if(*m == 'T')
-        m++;
-      outs() << " ";
-      for( ; *m != 'Z' && *m != '\0'; m++)
-        outs() << *m;
-      outs() << " ";
-    }
-    if(name != nullptr)
-      outs() << name;
-    outs() << "\n";
-  }
-}
-
-static void DumpBitcodeSection(MachOObjectFile *O, const char *sect,
-                                uint32_t size, bool verbose,
-                                bool PrintXarHeader, bool PrintXarFileHeaders,
-                                std::string XarMemberName) {
-  if(size < sizeof(struct xar_header)) {
-    outs() << "size of (__LLVM,__bundle) section too small (smaller than size "
-              "of struct xar_header)\n";
-    return;
-  }
-  struct xar_header XarHeader;
-  memcpy(&XarHeader, sect, sizeof(struct xar_header));
-  if (sys::IsLittleEndianHost)
-    swapStruct(XarHeader);
-  if (PrintXarHeader) {
-    if (!XarMemberName.empty())
-      outs() << "In xar member " << XarMemberName << ": ";
-    else
-      outs() << "For (__LLVM,__bundle) section: ";
-    outs() << "xar header\n";
-    if (XarHeader.magic == XAR_HEADER_MAGIC)
-      outs() << "                  magic XAR_HEADER_MAGIC\n";
-    else
-      outs() << "                  magic "
-             << format_hex(XarHeader.magic, 10, true)
-             << " (not XAR_HEADER_MAGIC)\n";
-    outs() << "                   size " << XarHeader.size << "\n";
-    outs() << "                version " << XarHeader.version << "\n";
-    outs() << "  toc_length_compressed " << XarHeader.toc_length_compressed
-           << "\n";
-    outs() << "toc_length_uncompressed " << XarHeader.toc_length_uncompressed
-           << "\n";
-    outs() << "              cksum_alg ";
-    switch (XarHeader.cksum_alg) {
-      case XAR_CKSUM_NONE:
-        outs() << "XAR_CKSUM_NONE\n";
-        break;
-      case XAR_CKSUM_SHA1:
-        outs() << "XAR_CKSUM_SHA1\n";
-        break;
-      case XAR_CKSUM_MD5:
-        outs() << "XAR_CKSUM_MD5\n";
-        break;
-#ifdef XAR_CKSUM_SHA256
-      case XAR_CKSUM_SHA256:
-        outs() << "XAR_CKSUM_SHA256\n";
-        break;
-#endif
-#ifdef XAR_CKSUM_SHA512
-      case XAR_CKSUM_SHA512:
-        outs() << "XAR_CKSUM_SHA512\n";
-        break;
-#endif
-      default:
-        outs() << XarHeader.cksum_alg << "\n";
-    }
-  }
-
-  SmallString<128> XarFilename;
-  int FD;
-  std::error_code XarEC =
-      sys::fs::createTemporaryFile("llvm-objdump", "xar", FD, XarFilename);
-  if (XarEC) {
-    WithColor::error(errs(), "llvm-objdump") << XarEC.message() << "\n";
-    return;
-  }
-  ToolOutputFile XarFile(XarFilename, FD);
-  raw_fd_ostream &XarOut = XarFile.os();
-  StringRef XarContents(sect, size);
-  XarOut << XarContents;
-  XarOut.close();
-  if (XarOut.has_error())
-    return;
-
-  ScopedXarFile xar(XarFilename.c_str(), READ);
-  if (!xar) {
-    WithColor::error(errs(), "llvm-objdump")
-        << "can't create temporary xar archive " << XarFilename << "\n";
-    return;
-  }
-
-  SmallString<128> TocFilename;
-  std::error_code TocEC =
-      sys::fs::createTemporaryFile("llvm-objdump", "toc", TocFilename);
-  if (TocEC) {
-    WithColor::error(errs(), "llvm-objdump") << TocEC.message() << "\n";
-    return;
-  }
-  xar_serialize(xar, TocFilename.c_str());
-
-  if (PrintXarFileHeaders) {
-    if (!XarMemberName.empty())
-      outs() << "In xar member " << XarMemberName << ": ";
-    else
-      outs() << "For (__LLVM,__bundle) section: ";
-    outs() << "xar archive files:\n";
-    PrintXarFilesSummary(XarFilename.c_str(), xar);
-  }
-
-  ErrorOr<std::unique_ptr<MemoryBuffer>> FileOrErr =
-    MemoryBuffer::getFileOrSTDIN(TocFilename.c_str());
-  if (std::error_code EC = FileOrErr.getError()) {
-    WithColor::error(errs(), "llvm-objdump") << EC.message() << "\n";
-    return;
-  }
-  std::unique_ptr<MemoryBuffer> &Buffer = FileOrErr.get();
-
-  if (!XarMemberName.empty())
-    outs() << "In xar member " << XarMemberName << ": ";
-  else
-    outs() << "For (__LLVM,__bundle) section: ";
-  outs() << "xar table of contents:\n";
-  outs() << Buffer->getBuffer() << "\n";
-
-  // TODO: Go through the xar's files.
-  ScopedXarIter xi;
-  if(!xi){
-    WithColor::error(errs(), "llvm-objdump")
-        << "can't obtain an xar iterator for xar archive "
-        << XarFilename.c_str() << "\n";
-    return;
-  }
-  for(xar_file_t xf = xar_file_first(xar, xi); xf; xf = xar_file_next(xi)){
-    const char *key;
-    const char *member_name, *member_type, *member_size_string;
-    size_t member_size;
-
-    ScopedXarIter xp;
-    if(!xp){
-      WithColor::error(errs(), "llvm-objdump")
-          << "can't obtain an xar iterator for xar archive "
-          << XarFilename.c_str() << "\n";
-      return;
-    }
-    member_name = NULL;
-    member_type = NULL;
-    member_size_string = NULL;
-    for(key = xar_prop_first(xf, xp); key; key = xar_prop_next(xp)){
-      const char *val = nullptr;
-      xar_prop_get(xf, key, &val);
-#if 0 // Useful for debugging.
-      outs() << "key: " << key << " value: " << val << "\n";
-#endif
-      if (strcmp(key, "name") == 0)
-        member_name = val;
-      if (strcmp(key, "type") == 0)
-        member_type = val;
-      if (strcmp(key, "data/size") == 0)
-        member_size_string = val;
-    }
-    /*
-     * If we find a file with a name, date/size and type properties
-     * and with the type being "file" see if that is a xar file.
-     */
-    if (member_name != NULL && member_type != NULL &&
-        strcmp(member_type, "file") == 0 &&
-        member_size_string != NULL){
-      // Extract the file into a buffer.
-      char *endptr;
-      member_size = strtoul(member_size_string, &endptr, 10);
-      if (*endptr == '\0' && member_size != 0) {
-        char *buffer;
-        if (xar_extract_tobuffersz(xar, xf, &buffer, &member_size) == 0) {
-#if 0 // Useful for debugging.
-          outs() << "xar member: " << member_name << " extracted\n";
-#endif
-          // Set the XarMemberName we want to see printed in the header.
-          std::string OldXarMemberName;
-          // If XarMemberName is already set this is nested. So
-          // save the old name and create the nested name.
-          if (!XarMemberName.empty()) {
-            OldXarMemberName = XarMemberName;
-            XarMemberName =
-                (Twine("[") + XarMemberName + "]" + member_name).str();
-          } else {
-            OldXarMemberName = "";
-            XarMemberName = member_name;
-          }
-          // See if this is could be a xar file (nested).
-          if (member_size >= sizeof(struct xar_header)) {
-#if 0 // Useful for debugging.
-            outs() << "could be a xar file: " << member_name << "\n";
-#endif
-            memcpy((char *)&XarHeader, buffer, sizeof(struct xar_header));
-            if (sys::IsLittleEndianHost)
-              swapStruct(XarHeader);
-            if (XarHeader.magic == XAR_HEADER_MAGIC)
-              DumpBitcodeSection(O, buffer, member_size, verbose,
-                                 PrintXarHeader, PrintXarFileHeaders,
-                                 XarMemberName);
-          }
-          XarMemberName = OldXarMemberName;
-          delete buffer;
-        }
-      }
-    }
-  }
-}
-#endif // defined(HAVE_LIBXAR)
-
-static void printObjcMetaData(MachOObjectFile *O, bool verbose) {
-  if (O->is64Bit())
-    printObjc2_64bit_MetaData(O, verbose);
-  else {
-    MachO::mach_header H;
-    H = O->getHeader();
-    if (H.cputype == MachO::CPU_TYPE_ARM)
-      printObjc2_32bit_MetaData(O, verbose);
-    else {
-      // This is the 32-bit non-arm cputype case.  Which is normally
-      // the first Objective-C ABI.  But it may be the case of a
-      // binary for the iOS simulator which is the second Objective-C
-      // ABI.  In that case printObjc1_32bit_MetaData() will determine that
-      // and return false.
-      if (!printObjc1_32bit_MetaData(O, verbose))
-        printObjc2_32bit_MetaData(O, verbose);
-    }
-  }
-}
-
-// GuessLiteralPointer returns a string which for the item in the Mach-O file
-// for the address passed in as ReferenceValue for printing as a comment with
-// the instruction and also returns the corresponding type of that item
-// indirectly through ReferenceType.
-//
-// If ReferenceValue is an address of literal cstring then a pointer to the
-// cstring is returned and ReferenceType is set to
-// LLVMDisassembler_ReferenceType_Out_LitPool_CstrAddr .
-//
-// If ReferenceValue is an address of an Objective-C CFString, Selector ref or
-// Class ref that name is returned and the ReferenceType is set accordingly.
-//
-// Lastly, literals which are Symbol address in a literal pool are looked for
-// and if found the symbol name is returned and ReferenceType is set to
-// LLVMDisassembler_ReferenceType_Out_LitPool_SymAddr .
-//
-// If there is no item in the Mach-O file for the address passed in as
-// ReferenceValue nullptr is returned and ReferenceType is unchanged.
-static const char *GuessLiteralPointer(uint64_t ReferenceValue,
-                                       uint64_t ReferencePC,
-                                       uint64_t *ReferenceType,
-                                       struct DisassembleInfo *info) {
-  // First see if there is an external relocation entry at the ReferencePC.
-  if (info->O->getHeader().filetype == MachO::MH_OBJECT) {
-    uint64_t sect_addr = info->S.getAddress();
-    uint64_t sect_offset = ReferencePC - sect_addr;
-    bool reloc_found = false;
-    DataRefImpl Rel;
-    MachO::any_relocation_info RE;
-    bool isExtern = false;
-    SymbolRef Symbol;
-    for (const RelocationRef &Reloc : info->S.relocations()) {
-      uint64_t RelocOffset = Reloc.getOffset();
-      if (RelocOffset == sect_offset) {
-        Rel = Reloc.getRawDataRefImpl();
-        RE = info->O->getRelocation(Rel);
-        if (info->O->isRelocationScattered(RE))
-          continue;
-        isExtern = info->O->getPlainRelocationExternal(RE);
-        if (isExtern) {
-          symbol_iterator RelocSym = Reloc.getSymbol();
-          Symbol = *RelocSym;
-        }
-        reloc_found = true;
-        break;
-      }
-    }
-    // If there is an external relocation entry for a symbol in a section
-    // then used that symbol's value for the value of the reference.
-    if (reloc_found && isExtern) {
-      if (info->O->getAnyRelocationPCRel(RE)) {
-        unsigned Type = info->O->getAnyRelocationType(RE);
-        if (Type == MachO::X86_64_RELOC_SIGNED) {
-          ReferenceValue = Symbol.getValue();
-        }
-      }
-    }
-  }
-
-  // Look for literals such as Objective-C CFStrings refs, Selector refs,
-  // Message refs and Class refs.
-  bool classref, selref, msgref, cfstring;
-  uint64_t pointer_value = GuessPointerPointer(ReferenceValue, info, classref,
-                                               selref, msgref, cfstring);
-  if (classref && pointer_value == 0) {
-    // Note the ReferenceValue is a pointer into the __objc_classrefs section.
-    // And the pointer_value in that section is typically zero as it will be
-    // set by dyld as part of the "bind information".
-    const char *name = get_dyld_bind_info_symbolname(ReferenceValue, info);
-    if (name != nullptr) {
-      *ReferenceType = LLVMDisassembler_ReferenceType_Out_Objc_Class_Ref;
-      const char *class_name = strrchr(name, '$');
-      if (class_name != nullptr && class_name[1] == '_' &&
-          class_name[2] != '\0') {
-        info->class_name = class_name + 2;
-        return name;
-      }
-    }
-  }
-
-  if (classref) {
-    *ReferenceType = LLVMDisassembler_ReferenceType_Out_Objc_Class_Ref;
-    const char *name =
-        get_objc2_64bit_class_name(pointer_value, ReferenceValue, info);
-    if (name != nullptr)
-      info->class_name = name;
-    else
-      name = "bad class ref";
-    return name;
-  }
-
-  if (cfstring) {
-    *ReferenceType = LLVMDisassembler_ReferenceType_Out_Objc_CFString_Ref;
-    const char *name = get_objc2_64bit_cfstring_name(ReferenceValue, info);
-    return name;
-  }
-
-  if (selref && pointer_value == 0)
-    pointer_value = get_objc2_64bit_selref(ReferenceValue, info);
-
-  if (pointer_value != 0)
-    ReferenceValue = pointer_value;
-
-  const char *name = GuessCstringPointer(ReferenceValue, info);
-  if (name) {
-    if (pointer_value != 0 && selref) {
-      *ReferenceType = LLVMDisassembler_ReferenceType_Out_Objc_Selector_Ref;
-      info->selector_name = name;
-    } else if (pointer_value != 0 && msgref) {
-      info->class_name = nullptr;
-      *ReferenceType = LLVMDisassembler_ReferenceType_Out_Objc_Message_Ref;
-      info->selector_name = name;
-    } else
-      *ReferenceType = LLVMDisassembler_ReferenceType_Out_LitPool_CstrAddr;
-    return name;
-  }
-
-  // Lastly look for an indirect symbol with this ReferenceValue which is in
-  // a literal pool.  If found return that symbol name.
-  name = GuessIndirectSymbol(ReferenceValue, info);
-  if (name) {
-    *ReferenceType = LLVMDisassembler_ReferenceType_Out_LitPool_SymAddr;
-    return name;
-  }
-
-  return nullptr;
-}
-
-// SymbolizerSymbolLookUp is the symbol lookup function passed when creating
-// the Symbolizer.  It looks up the ReferenceValue using the info passed via the
-// pointer to the struct DisassembleInfo that was passed when MCSymbolizer
-// is created and returns the symbol name that matches the ReferenceValue or
-// nullptr if none.  The ReferenceType is passed in for the IN type of
-// reference the instruction is making from the values in defined in the header
-// "llvm-c/Disassembler.h".  On return the ReferenceType can set to a specific
-// Out type and the ReferenceName will also be set which is added as a comment
-// to the disassembled instruction.
-//
-// If the symbol name is a C++ mangled name then the demangled name is
-// returned through ReferenceName and ReferenceType is set to
-// LLVMDisassembler_ReferenceType_DeMangled_Name .
-//
-// When this is called to get a symbol name for a branch target then the
-// ReferenceType will be LLVMDisassembler_ReferenceType_In_Branch and then
-// SymbolValue will be looked for in the indirect symbol table to determine if
-// it is an address for a symbol stub.  If so then the symbol name for that
-// stub is returned indirectly through ReferenceName and then ReferenceType is
-// set to LLVMDisassembler_ReferenceType_Out_SymbolStub.
-//
-// When this is called with an value loaded via a PC relative load then
-// ReferenceType will be LLVMDisassembler_ReferenceType_In_PCrel_Load then the
-// SymbolValue is checked to be an address of literal pointer, symbol pointer,
-// or an Objective-C meta data reference.  If so the output ReferenceType is
-// set to correspond to that as well as setting the ReferenceName.
-static const char *SymbolizerSymbolLookUp(void *DisInfo,
-                                          uint64_t ReferenceValue,
-                                          uint64_t *ReferenceType,
-                                          uint64_t ReferencePC,
-                                          const char **ReferenceName) {
-  struct DisassembleInfo *info = (struct DisassembleInfo *)DisInfo;
-  // If no verbose symbolic information is wanted then just return nullptr.
-  if (!info->verbose) {
-    *ReferenceName = nullptr;
-    *ReferenceType = LLVMDisassembler_ReferenceType_InOut_None;
-    return nullptr;
-  }
-
-  const char *SymbolName = GuessSymbolName(ReferenceValue, info->AddrMap);
-
-  if (*ReferenceType == LLVMDisassembler_ReferenceType_In_Branch) {
-    *ReferenceName = GuessIndirectSymbol(ReferenceValue, info);
-    if (*ReferenceName != nullptr) {
-      method_reference(info, ReferenceType, ReferenceName);
-      if (*ReferenceType != LLVMDisassembler_ReferenceType_Out_Objc_Message)
-        *ReferenceType = LLVMDisassembler_ReferenceType_Out_SymbolStub;
-    } else if (SymbolName != nullptr && strncmp(SymbolName, "__Z", 3) == 0) {
-      if (info->demangled_name != nullptr)
-        free(info->demangled_name);
-      int status;
-      info->demangled_name =
-          itaniumDemangle(SymbolName + 1, nullptr, nullptr, &status);
-      if (info->demangled_name != nullptr) {
-        *ReferenceName = info->demangled_name;
-        *ReferenceType = LLVMDisassembler_ReferenceType_DeMangled_Name;
-      } else
-        *ReferenceType = LLVMDisassembler_ReferenceType_InOut_None;
-    } else
-      *ReferenceType = LLVMDisassembler_ReferenceType_InOut_None;
-  } else if (*ReferenceType == LLVMDisassembler_ReferenceType_In_PCrel_Load) {
-    *ReferenceName =
-        GuessLiteralPointer(ReferenceValue, ReferencePC, ReferenceType, info);
-    if (*ReferenceName)
-      method_reference(info, ReferenceType, ReferenceName);
-    else
-      *ReferenceType = LLVMDisassembler_ReferenceType_InOut_None;
-    // If this is arm64 and the reference is an adrp instruction save the
-    // instruction, passed in ReferenceValue and the address of the instruction
-    // for use later if we see and add immediate instruction.
-  } else if (info->O->getArch() == Triple::aarch64 &&
-             *ReferenceType == LLVMDisassembler_ReferenceType_In_ARM64_ADRP) {
-    info->adrp_inst = ReferenceValue;
-    info->adrp_addr = ReferencePC;
-    SymbolName = nullptr;
-    *ReferenceName = nullptr;
-    *ReferenceType = LLVMDisassembler_ReferenceType_InOut_None;
-    // If this is arm64 and reference is an add immediate instruction and we
-    // have
-    // seen an adrp instruction just before it and the adrp's Xd register
-    // matches
-    // this add's Xn register reconstruct the value being referenced and look to
-    // see if it is a literal pointer.  Note the add immediate instruction is
-    // passed in ReferenceValue.
-  } else if (info->O->getArch() == Triple::aarch64 &&
-             *ReferenceType == LLVMDisassembler_ReferenceType_In_ARM64_ADDXri &&
-             ReferencePC - 4 == info->adrp_addr &&
-             (info->adrp_inst & 0x9f000000) == 0x90000000 &&
-             (info->adrp_inst & 0x1f) == ((ReferenceValue >> 5) & 0x1f)) {
-    uint32_t addxri_inst;
-    uint64_t adrp_imm, addxri_imm;
-
-    adrp_imm =
-        ((info->adrp_inst & 0x00ffffe0) >> 3) | ((info->adrp_inst >> 29) & 0x3);
-    if (info->adrp_inst & 0x0200000)
-      adrp_imm |= 0xfffffffffc000000LL;
-
-    addxri_inst = ReferenceValue;
-    addxri_imm = (addxri_inst >> 10) & 0xfff;
-    if (((addxri_inst >> 22) & 0x3) == 1)
-      addxri_imm <<= 12;
-
-    ReferenceValue = (info->adrp_addr & 0xfffffffffffff000LL) +
-                     (adrp_imm << 12) + addxri_imm;
-
-    *ReferenceName =
-        GuessLiteralPointer(ReferenceValue, ReferencePC, ReferenceType, info);
-    if (*ReferenceName == nullptr)
-      *ReferenceType = LLVMDisassembler_ReferenceType_InOut_None;
-    // If this is arm64 and the reference is a load register instruction and we
-    // have seen an adrp instruction just before it and the adrp's Xd register
-    // matches this add's Xn register reconstruct the value being referenced and
-    // look to see if it is a literal pointer.  Note the load register
-    // instruction is passed in ReferenceValue.
-  } else if (info->O->getArch() == Triple::aarch64 &&
-             *ReferenceType == LLVMDisassembler_ReferenceType_In_ARM64_LDRXui &&
-             ReferencePC - 4 == info->adrp_addr &&
-             (info->adrp_inst & 0x9f000000) == 0x90000000 &&
-             (info->adrp_inst & 0x1f) == ((ReferenceValue >> 5) & 0x1f)) {
-    uint32_t ldrxui_inst;
-    uint64_t adrp_imm, ldrxui_imm;
-
-    adrp_imm =
-        ((info->adrp_inst & 0x00ffffe0) >> 3) | ((info->adrp_inst >> 29) & 0x3);
-    if (info->adrp_inst & 0x0200000)
-      adrp_imm |= 0xfffffffffc000000LL;
-
-    ldrxui_inst = ReferenceValue;
-    ldrxui_imm = (ldrxui_inst >> 10) & 0xfff;
-
-    ReferenceValue = (info->adrp_addr & 0xfffffffffffff000LL) +
-                     (adrp_imm << 12) + (ldrxui_imm << 3);
-
-    *ReferenceName =
-        GuessLiteralPointer(ReferenceValue, ReferencePC, ReferenceType, info);
-    if (*ReferenceName == nullptr)
-      *ReferenceType = LLVMDisassembler_ReferenceType_InOut_None;
-  }
-  // If this arm64 and is an load register (PC-relative) instruction the
-  // ReferenceValue is the PC plus the immediate value.
-  else if (info->O->getArch() == Triple::aarch64 &&
-           (*ReferenceType == LLVMDisassembler_ReferenceType_In_ARM64_LDRXl ||
-            *ReferenceType == LLVMDisassembler_ReferenceType_In_ARM64_ADR)) {
-    *ReferenceName =
-        GuessLiteralPointer(ReferenceValue, ReferencePC, ReferenceType, info);
-    if (*ReferenceName == nullptr)
-      *ReferenceType = LLVMDisassembler_ReferenceType_InOut_None;
-  } else if (SymbolName != nullptr && strncmp(SymbolName, "__Z", 3) == 0) {
-    if (info->demangled_name != nullptr)
-      free(info->demangled_name);
-    int status;
-    info->demangled_name =
-        itaniumDemangle(SymbolName + 1, nullptr, nullptr, &status);
-    if (info->demangled_name != nullptr) {
-      *ReferenceName = info->demangled_name;
-      *ReferenceType = LLVMDisassembler_ReferenceType_DeMangled_Name;
-    }
-  }
-  else {
-    *ReferenceName = nullptr;
-    *ReferenceType = LLVMDisassembler_ReferenceType_InOut_None;
-  }
-
-  return SymbolName;
-}
-
-/// Emits the comments that are stored in the CommentStream.
-/// Each comment in the CommentStream must end with a newline.
-static void emitComments(raw_svector_ostream &CommentStream,
-                         SmallString<128> &CommentsToEmit,
-                         formatted_raw_ostream &FormattedOS,
-                         const MCAsmInfo &MAI) {
-  // Flush the stream before taking its content.
-  StringRef Comments = CommentsToEmit.str();
-  // Get the default information for printing a comment.
-  StringRef CommentBegin = MAI.getCommentString();
-  unsigned CommentColumn = MAI.getCommentColumn();
-  bool IsFirst = true;
-  while (!Comments.empty()) {
-    if (!IsFirst)
-      FormattedOS << '\n';
-    // Emit a line of comments.
-    FormattedOS.PadToColumn(CommentColumn);
-    size_t Position = Comments.find('\n');
-    FormattedOS << CommentBegin << ' ' << Comments.substr(0, Position);
-    // Move after the newline character.
-    Comments = Comments.substr(Position + 1);
-    IsFirst = false;
-  }
-  FormattedOS.flush();
-
-  // Tell the comment stream that the vector changed underneath it.
-  CommentsToEmit.clear();
-}
-
-static void DisassembleMachO(StringRef Filename, MachOObjectFile *MachOOF,
-                             StringRef DisSegName, StringRef DisSectName) {
-  const char *McpuDefault = nullptr;
-  const Target *ThumbTarget = nullptr;
-  const Target *TheTarget = GetTarget(MachOOF, &McpuDefault, &ThumbTarget);
-  if (!TheTarget) {
-    // GetTarget prints out stuff.
-    return;
-  }
-  std::string MachOMCPU;
-  if (MCPU.empty() && McpuDefault)
-    MachOMCPU = McpuDefault;
-  else
-    MachOMCPU = MCPU;
-
-  std::unique_ptr<const MCInstrInfo> InstrInfo(TheTarget->createMCInstrInfo());
-  std::unique_ptr<const MCInstrInfo> ThumbInstrInfo;
-  if (ThumbTarget)
-    ThumbInstrInfo.reset(ThumbTarget->createMCInstrInfo());
-
-  // Package up features to be passed to target/subtarget
-  std::string FeaturesStr;
-  if (!MAttrs.empty()) {
-    SubtargetFeatures Features;
-    for (unsigned i = 0; i != MAttrs.size(); ++i)
-      Features.AddFeature(MAttrs[i]);
-    FeaturesStr = Features.getString();
-  }
-
-  // Set up disassembler.
-  std::unique_ptr<const MCRegisterInfo> MRI(
-      TheTarget->createMCRegInfo(TripleName));
-  std::unique_ptr<const MCAsmInfo> AsmInfo(
-      TheTarget->createMCAsmInfo(*MRI, TripleName));
-  std::unique_ptr<const MCSubtargetInfo> STI(
-      TheTarget->createMCSubtargetInfo(TripleName, MachOMCPU, FeaturesStr));
-  MCContext Ctx(AsmInfo.get(), MRI.get(), nullptr);
-  std::unique_ptr<MCDisassembler> DisAsm(
-      TheTarget->createMCDisassembler(*STI, Ctx));
-  std::unique_ptr<MCSymbolizer> Symbolizer;
-  struct DisassembleInfo SymbolizerInfo(nullptr, nullptr, nullptr, false);
-  std::unique_ptr<MCRelocationInfo> RelInfo(
-      TheTarget->createMCRelocationInfo(TripleName, Ctx));
-  if (RelInfo) {
-    Symbolizer.reset(TheTarget->createMCSymbolizer(
-        TripleName, SymbolizerGetOpInfo, SymbolizerSymbolLookUp,
-        &SymbolizerInfo, &Ctx, std::move(RelInfo)));
-    DisAsm->setSymbolizer(std::move(Symbolizer));
-  }
-  int AsmPrinterVariant = AsmInfo->getAssemblerDialect();
-  std::unique_ptr<MCInstPrinter> IP(TheTarget->createMCInstPrinter(
-      Triple(TripleName), AsmPrinterVariant, *AsmInfo, *InstrInfo, *MRI));
-  // Set the display preference for hex vs. decimal immediates.
-  IP->setPrintImmHex(PrintImmHex);
-  // Comment stream and backing vector.
-  SmallString<128> CommentsToEmit;
-  raw_svector_ostream CommentStream(CommentsToEmit);
-  // FIXME: Setting the CommentStream in the InstPrinter is problematic in that
-  // if it is done then arm64 comments for string literals don't get printed
-  // and some constant get printed instead and not setting it causes intel
-  // (32-bit and 64-bit) comments printed with different spacing before the
-  // comment causing different diffs with the 'C' disassembler library API.
-  // IP->setCommentStream(CommentStream);
-
-  if (!AsmInfo || !STI || !DisAsm || !IP) {
-    WithColor::error(errs(), "llvm-objdump")
-        << "couldn't initialize disassembler for target " << TripleName << '\n';
-    return;
-  }
-
-  // Set up separate thumb disassembler if needed.
-  std::unique_ptr<const MCRegisterInfo> ThumbMRI;
-  std::unique_ptr<const MCAsmInfo> ThumbAsmInfo;
-  std::unique_ptr<const MCSubtargetInfo> ThumbSTI;
-  std::unique_ptr<MCDisassembler> ThumbDisAsm;
-  std::unique_ptr<MCInstPrinter> ThumbIP;
-  std::unique_ptr<MCContext> ThumbCtx;
-  std::unique_ptr<MCSymbolizer> ThumbSymbolizer;
-  struct DisassembleInfo ThumbSymbolizerInfo(nullptr, nullptr, nullptr, false);
-  std::unique_ptr<MCRelocationInfo> ThumbRelInfo;
-  if (ThumbTarget) {
-    ThumbMRI.reset(ThumbTarget->createMCRegInfo(ThumbTripleName));
-    ThumbAsmInfo.reset(
-        ThumbTarget->createMCAsmInfo(*ThumbMRI, ThumbTripleName));
-    ThumbSTI.reset(
-        ThumbTarget->createMCSubtargetInfo(ThumbTripleName, MachOMCPU,
-                                           FeaturesStr));
-    ThumbCtx.reset(new MCContext(ThumbAsmInfo.get(), ThumbMRI.get(), nullptr));
-    ThumbDisAsm.reset(ThumbTarget->createMCDisassembler(*ThumbSTI, *ThumbCtx));
-    MCContext *PtrThumbCtx = ThumbCtx.get();
-    ThumbRelInfo.reset(
-        ThumbTarget->createMCRelocationInfo(ThumbTripleName, *PtrThumbCtx));
-    if (ThumbRelInfo) {
-      ThumbSymbolizer.reset(ThumbTarget->createMCSymbolizer(
-          ThumbTripleName, SymbolizerGetOpInfo, SymbolizerSymbolLookUp,
-          &ThumbSymbolizerInfo, PtrThumbCtx, std::move(ThumbRelInfo)));
-      ThumbDisAsm->setSymbolizer(std::move(ThumbSymbolizer));
-    }
-    int ThumbAsmPrinterVariant = ThumbAsmInfo->getAssemblerDialect();
-    ThumbIP.reset(ThumbTarget->createMCInstPrinter(
-        Triple(ThumbTripleName), ThumbAsmPrinterVariant, *ThumbAsmInfo,
-        *ThumbInstrInfo, *ThumbMRI));
-    // Set the display preference for hex vs. decimal immediates.
-    ThumbIP->setPrintImmHex(PrintImmHex);
-  }
-
-  if (ThumbTarget && (!ThumbAsmInfo || !ThumbSTI || !ThumbDisAsm || !ThumbIP)) {
-    WithColor::error(errs(), "llvm-objdump")
-        << "couldn't initialize disassembler for target " << ThumbTripleName
-        << '\n';
-    return;
-  }
-
-  MachO::mach_header Header = MachOOF->getHeader();
-
-  // FIXME: Using the -cfg command line option, this code used to be able to
-  // annotate relocations with the referenced symbol's name, and if this was
-  // inside a __[cf]string section, the data it points to. This is now replaced
-  // by the upcoming MCSymbolizer, which needs the appropriate setup done above.
-  std::vector<SectionRef> Sections;
-  std::vector<SymbolRef> Symbols;
-  SmallVector<uint64_t, 8> FoundFns;
-  uint64_t BaseSegmentAddress;
-
-  getSectionsAndSymbols(MachOOF, Sections, Symbols, FoundFns,
-                        BaseSegmentAddress);
-
-  // Sort the symbols by address, just in case they didn't come in that way.
-  llvm::sort(Symbols, SymbolSorter());
-
-  // Build a data in code table that is sorted on by the address of each entry.
-  uint64_t BaseAddress = 0;
-  if (Header.filetype == MachO::MH_OBJECT)
-    BaseAddress = Sections[0].getAddress();
-  else
-    BaseAddress = BaseSegmentAddress;
-  DiceTable Dices;
-  for (dice_iterator DI = MachOOF->begin_dices(), DE = MachOOF->end_dices();
-       DI != DE; ++DI) {
-    uint32_t Offset;
-    DI->getOffset(Offset);
-    Dices.push_back(std::make_pair(BaseAddress + Offset, *DI));
-  }
-  array_pod_sort(Dices.begin(), Dices.end());
-
-#ifndef NDEBUG
-  raw_ostream &DebugOut = DebugFlag ? dbgs() : nulls();
-#else
-  raw_ostream &DebugOut = nulls();
-#endif
-
-  // Try to find debug info and set up the DIContext for it.
-  std::unique_ptr<DIContext> diContext;
-  std::unique_ptr<Binary> DSYMBinary;
-  std::unique_ptr<MemoryBuffer> DSYMBuf;
-  if (UseDbg) {
-    ObjectFile *DbgObj = MachOOF;
-
-    // A separate DSym file path was specified, parse it as a macho file,
-    // get the sections and supply it to the section name parsing machinery.
-    if (!DSYMFile.empty()) {
-      ErrorOr<std::unique_ptr<MemoryBuffer>> BufOrErr =
-          MemoryBuffer::getFileOrSTDIN(DSYMFile);
-      if (std::error_code EC = BufOrErr.getError()) {
-        report_error(errorCodeToError(EC), DSYMFile);
-        return;
-      }
-
-      // We need to keep the file alive, because we're replacing DbgObj with it.
-      DSYMBuf = std::move(BufOrErr.get());
-
-      Expected<std::unique_ptr<Binary>> BinaryOrErr =
-      createBinary(DSYMBuf.get()->getMemBufferRef());
-      if (!BinaryOrErr) {
-        report_error(BinaryOrErr.takeError(), DSYMFile);
-        return;
-      }
-
-      // We need to keep the Binary elive with the buffer
-      DSYMBinary = std::move(BinaryOrErr.get());
-    
-      if (ObjectFile *O = dyn_cast<ObjectFile>(DSYMBinary.get())) {
-        // this is a Mach-O object file, use it
-        if (MachOObjectFile *MachDSYM = dyn_cast<MachOObjectFile>(&*O)) {
-          DbgObj = MachDSYM;
-        }
-        else {
-          WithColor::error(errs(), "llvm-objdump")
-            << DSYMFile << " is not a Mach-O file type.\n";
-          return;
-        }
-      }
-      else if (auto UB = dyn_cast<MachOUniversalBinary>(DSYMBinary.get())){
-        // this is a Universal Binary, find a Mach-O for this architecture
-        uint32_t CPUType, CPUSubType;
-        const char *ArchFlag;
-        if (MachOOF->is64Bit()) {
-          const MachO::mach_header_64 H_64 = MachOOF->getHeader64();
-          CPUType = H_64.cputype;
-          CPUSubType = H_64.cpusubtype;
-        } else {
-          const MachO::mach_header H = MachOOF->getHeader();
-          CPUType = H.cputype;
-          CPUSubType = H.cpusubtype;
-        }
-        Triple T = MachOObjectFile::getArchTriple(CPUType, CPUSubType, nullptr,
-                                                  &ArchFlag);
-        Expected<std::unique_ptr<MachOObjectFile>> MachDSYM =
-            UB->getObjectForArch(ArchFlag);
-        if (!MachDSYM) {
-          report_error(MachDSYM.takeError(), DSYMFile);
-          return;
-        }
-    
-        // We need to keep the Binary elive with the buffer
-        DbgObj = &*MachDSYM.get();
-        DSYMBinary = std::move(*MachDSYM);
-      }
-      else {
-        WithColor::error(errs(), "llvm-objdump")
-          << DSYMFile << " is not a Mach-O or Universal file type.\n";
-        return;
-      }
-    }
-
-    // Setup the DIContext
-    diContext = DWARFContext::create(*DbgObj);
-  }
-
-  if (FilterSections.empty())
-    outs() << "(" << DisSegName << "," << DisSectName << ") section\n";
-
-  for (unsigned SectIdx = 0; SectIdx != Sections.size(); SectIdx++) {
-    StringRef SectName;
-    if (Sections[SectIdx].getName(SectName) || SectName != DisSectName)
-      continue;
-
-    DataRefImpl DR = Sections[SectIdx].getRawDataRefImpl();
-
-    StringRef SegmentName = MachOOF->getSectionFinalSegmentName(DR);
-    if (SegmentName != DisSegName)
-      continue;
-
-    StringRef BytesStr =
-        unwrapOrError(Sections[SectIdx].getContents(), Filename);
-    ArrayRef<uint8_t> Bytes = arrayRefFromStringRef(BytesStr);
-    uint64_t SectAddress = Sections[SectIdx].getAddress();
-
-    bool symbolTableWorked = false;
-
-    // Create a map of symbol addresses to symbol names for use by
-    // the SymbolizerSymbolLookUp() routine.
-    SymbolAddressMap AddrMap;
-    bool DisSymNameFound = false;
-    for (const SymbolRef &Symbol : MachOOF->symbols()) {
-      SymbolRef::Type ST =
-          unwrapOrError(Symbol.getType(), MachOOF->getFileName());
-      if (ST == SymbolRef::ST_Function || ST == SymbolRef::ST_Data ||
-          ST == SymbolRef::ST_Other) {
-        uint64_t Address = Symbol.getValue();
-        StringRef SymName =
-            unwrapOrError(Symbol.getName(), MachOOF->getFileName());
-        AddrMap[Address] = SymName;
-        if (!DisSymName.empty() && DisSymName == SymName)
-          DisSymNameFound = true;
-      }
-    }
-    if (!DisSymName.empty() && !DisSymNameFound) {
-      outs() << "Can't find -dis-symname: " << DisSymName << "\n";
-      return;
-    }
-    // Set up the block of info used by the Symbolizer call backs.
-    SymbolizerInfo.verbose = !NoSymbolicOperands;
-    SymbolizerInfo.O = MachOOF;
-    SymbolizerInfo.S = Sections[SectIdx];
-    SymbolizerInfo.AddrMap = &AddrMap;
-    SymbolizerInfo.Sections = &Sections;
-    // Same for the ThumbSymbolizer
-    ThumbSymbolizerInfo.verbose = !NoSymbolicOperands;
-    ThumbSymbolizerInfo.O = MachOOF;
-    ThumbSymbolizerInfo.S = Sections[SectIdx];
-    ThumbSymbolizerInfo.AddrMap = &AddrMap;
-    ThumbSymbolizerInfo.Sections = &Sections;
-
-    unsigned int Arch = MachOOF->getArch();
-
-    // Skip all symbols if this is a stubs file.
-    if (Bytes.empty())
-      return;
-
-    // If the section has symbols but no symbol at the start of the section
-    // these are used to make sure the bytes before the first symbol are
-    // disassembled.
-    bool FirstSymbol = true;
-    bool FirstSymbolAtSectionStart = true;
-
-    // Disassemble symbol by symbol.
-    for (unsigned SymIdx = 0; SymIdx != Symbols.size(); SymIdx++) {
-      StringRef SymName =
-          unwrapOrError(Symbols[SymIdx].getName(), MachOOF->getFileName());
-      SymbolRef::Type ST =
-          unwrapOrError(Symbols[SymIdx].getType(), MachOOF->getFileName());
-      if (ST != SymbolRef::ST_Function && ST != SymbolRef::ST_Data)
-        continue;
-
-      // Make sure the symbol is defined in this section.
-      bool containsSym = Sections[SectIdx].containsSymbol(Symbols[SymIdx]);
-      if (!containsSym) {
-        if (!DisSymName.empty() && DisSymName == SymName) {
-          outs() << "-dis-symname: " << DisSymName << " not in the section\n";
-          return;
-        }
-        continue;
-      }
-      // The __mh_execute_header is special and we need to deal with that fact
-      // this symbol is before the start of the (__TEXT,__text) section and at the
-      // address of the start of the __TEXT segment.  This is because this symbol
-      // is an N_SECT symbol in the (__TEXT,__text) but its address is before the
-      // start of the section in a standard MH_EXECUTE filetype.
-      if (!DisSymName.empty() && DisSymName == "__mh_execute_header") {
-        outs() << "-dis-symname: __mh_execute_header not in any section\n";
-        return;
-      }
-      // When this code is trying to disassemble a symbol at a time and in the
-      // case there is only the __mh_execute_header symbol left as in a stripped
-      // executable, we need to deal with this by ignoring this symbol so the
-      // whole section is disassembled and this symbol is then not displayed.
-      if (SymName == "__mh_execute_header" || SymName == "__mh_dylib_header" ||
-          SymName == "__mh_bundle_header" || SymName == "__mh_object_header" ||
-          SymName == "__mh_preload_header" || SymName == "__mh_dylinker_header")
-        continue;
-
-      // If we are only disassembling one symbol see if this is that symbol.
-      if (!DisSymName.empty() && DisSymName != SymName)
-        continue;
-
-      // Start at the address of the symbol relative to the section's address.
-      uint64_t SectSize = Sections[SectIdx].getSize();
-      uint64_t Start = Symbols[SymIdx].getValue();
-      uint64_t SectionAddress = Sections[SectIdx].getAddress();
-      Start -= SectionAddress;
-
-      if (Start > SectSize) {
-        outs() << "section data ends, " << SymName
-               << " lies outside valid range\n";
-        return;
-      }
-
-      // Stop disassembling either at the beginning of the next symbol or at
-      // the end of the section.
-      bool containsNextSym = false;
-      uint64_t NextSym = 0;
-      uint64_t NextSymIdx = SymIdx + 1;
-      while (Symbols.size() > NextSymIdx) {
-        SymbolRef::Type NextSymType = unwrapOrError(
-            Symbols[NextSymIdx].getType(), MachOOF->getFileName());
-        if (NextSymType == SymbolRef::ST_Function) {
-          containsNextSym =
-              Sections[SectIdx].containsSymbol(Symbols[NextSymIdx]);
-          NextSym = Symbols[NextSymIdx].getValue();
-          NextSym -= SectionAddress;
-          break;
-        }
-        ++NextSymIdx;
-      }
-
-      uint64_t End = containsNextSym ? std::min(NextSym, SectSize) : SectSize;
-      uint64_t Size;
-
-      symbolTableWorked = true;
-
-      DataRefImpl Symb = Symbols[SymIdx].getRawDataRefImpl();
-      bool IsThumb = MachOOF->getSymbolFlags(Symb) & SymbolRef::SF_Thumb;
-
-      // We only need the dedicated Thumb target if there's a real choice
-      // (i.e. we're not targeting M-class) and the function is Thumb.
-      bool UseThumbTarget = IsThumb && ThumbTarget;
-
-      // If we are not specifying a symbol to start disassembly with and this
-      // is the first symbol in the section but not at the start of the section
-      // then move the disassembly index to the start of the section and
-      // don't print the symbol name just yet.  This is so the bytes before the
-      // first symbol are disassembled.
-      uint64_t SymbolStart = Start;
-      if (DisSymName.empty() && FirstSymbol && Start != 0) {
-        FirstSymbolAtSectionStart = false;
-        Start = 0;
-      }
-      else
-        outs() << SymName << ":\n";
-
-      DILineInfo lastLine;
-      for (uint64_t Index = Start; Index < End; Index += Size) {
-        MCInst Inst;
-
-        // If this is the first symbol in the section and it was not at the
-        // start of the section, see if we are at its Index now and if so print
-        // the symbol name.
-        if (FirstSymbol && !FirstSymbolAtSectionStart && Index == SymbolStart)
-          outs() << SymName << ":\n";
-
-        uint64_t PC = SectAddress + Index;
-        if (!NoLeadingAddr) {
-          if (FullLeadingAddr) {
-            if (MachOOF->is64Bit())
-              outs() << format("%016" PRIx64, PC);
-            else
-              outs() << format("%08" PRIx64, PC);
-          } else {
-            outs() << format("%8" PRIx64 ":", PC);
-          }
-        }
-        if (!NoShowRawInsn || Arch == Triple::arm)
-          outs() << "\t";
-
-        // Check the data in code table here to see if this is data not an
-        // instruction to be disassembled.
-        DiceTable Dice;
-        Dice.push_back(std::make_pair(PC, DiceRef()));
-        dice_table_iterator DTI =
-            std::search(Dices.begin(), Dices.end(), Dice.begin(), Dice.end(),
-                        compareDiceTableEntries);
-        if (DTI != Dices.end()) {
-          uint16_t Length;
-          DTI->second.getLength(Length);
-          uint16_t Kind;
-          DTI->second.getKind(Kind);
-          Size = DumpDataInCode(Bytes.data() + Index, Length, Kind);
-          if ((Kind == MachO::DICE_KIND_JUMP_TABLE8) &&
-              (PC == (DTI->first + Length - 1)) && (Length & 1))
-            Size++;
-          continue;
-        }
-
-        SmallVector<char, 64> AnnotationsBytes;
-        raw_svector_ostream Annotations(AnnotationsBytes);
-
-        bool gotInst;
-        if (UseThumbTarget)
-          gotInst = ThumbDisAsm->getInstruction(Inst, Size, Bytes.slice(Index),
-                                                PC, DebugOut, Annotations);
-        else
-          gotInst = DisAsm->getInstruction(Inst, Size, Bytes.slice(Index), PC,
-                                           DebugOut, Annotations);
-        if (gotInst) {
-          if (!NoShowRawInsn || Arch == Triple::arm) {
-            dumpBytes(makeArrayRef(Bytes.data() + Index, Size), outs());
-          }
-          formatted_raw_ostream FormattedOS(outs());
-          StringRef AnnotationsStr = Annotations.str();
-          if (UseThumbTarget)
-            ThumbIP->printInst(&Inst, FormattedOS, AnnotationsStr, *ThumbSTI);
-          else
-            IP->printInst(&Inst, FormattedOS, AnnotationsStr, *STI);
-          emitComments(CommentStream, CommentsToEmit, FormattedOS, *AsmInfo);
-
-          // Print debug info.
-          if (diContext) {
-            DILineInfo dli = diContext->getLineInfoForAddress({PC, SectIdx});
-            // Print valid line info if it changed.
-            if (dli != lastLine && dli.Line != 0)
-              outs() << "\t## " << dli.FileName << ':' << dli.Line << ':'
-                     << dli.Column;
-            lastLine = dli;
-          }
-          outs() << "\n";
-        } else {
-          unsigned int Arch = MachOOF->getArch();
-          if (Arch == Triple::x86_64 || Arch == Triple::x86) {
-            outs() << format("\t.byte 0x%02x #bad opcode\n",
-                             *(Bytes.data() + Index) & 0xff);
-            Size = 1; // skip exactly one illegible byte and move on.
-          } else if (Arch == Triple::aarch64 ||
-                     (Arch == Triple::arm && !IsThumb)) {
-            uint32_t opcode = (*(Bytes.data() + Index) & 0xff) |
-                              (*(Bytes.data() + Index + 1) & 0xff) << 8 |
-                              (*(Bytes.data() + Index + 2) & 0xff) << 16 |
-                              (*(Bytes.data() + Index + 3) & 0xff) << 24;
-            outs() << format("\t.long\t0x%08x\n", opcode);
-            Size = 4;
-          } else if (Arch == Triple::arm) {
-            assert(IsThumb && "ARM mode should have been dealt with above");
-            uint32_t opcode = (*(Bytes.data() + Index) & 0xff) |
-                              (*(Bytes.data() + Index + 1) & 0xff) << 8;
-            outs() << format("\t.short\t0x%04x\n", opcode);
-            Size = 2;
-          } else{
-            WithColor::warning(errs(), "llvm-objdump")
-                << "invalid instruction encoding\n";
-            if (Size == 0)
-              Size = 1; // skip illegible bytes
-          }
-        }
-      }
-      // Now that we are done disassembled the first symbol set the bool that
-      // were doing this to false.
-      FirstSymbol = false;
-    }
-    if (!symbolTableWorked) {
-      // Reading the symbol table didn't work, disassemble the whole section.
-      uint64_t SectAddress = Sections[SectIdx].getAddress();
-      uint64_t SectSize = Sections[SectIdx].getSize();
-      uint64_t InstSize;
-      for (uint64_t Index = 0; Index < SectSize; Index += InstSize) {
-        MCInst Inst;
-
-        uint64_t PC = SectAddress + Index;
-        SmallVector<char, 64> AnnotationsBytes;
-        raw_svector_ostream Annotations(AnnotationsBytes);
-        if (DisAsm->getInstruction(Inst, InstSize, Bytes.slice(Index), PC,
-                                   DebugOut, Annotations)) {
-          if (!NoLeadingAddr) {
-            if (FullLeadingAddr) {
-              if (MachOOF->is64Bit())
-                outs() << format("%016" PRIx64, PC);
-              else
-                outs() << format("%08" PRIx64, PC);
-            } else {
-              outs() << format("%8" PRIx64 ":", PC);
-            }
-          }
-          if (!NoShowRawInsn || Arch == Triple::arm) {
-            outs() << "\t";
-            dumpBytes(makeArrayRef(Bytes.data() + Index, InstSize), outs());
-          }
-          StringRef AnnotationsStr = Annotations.str();
-          IP->printInst(&Inst, outs(), AnnotationsStr, *STI);
-          outs() << "\n";
-        } else {
-          unsigned int Arch = MachOOF->getArch();
-          if (Arch == Triple::x86_64 || Arch == Triple::x86) {
-            outs() << format("\t.byte 0x%02x #bad opcode\n",
-                             *(Bytes.data() + Index) & 0xff);
-            InstSize = 1; // skip exactly one illegible byte and move on.
-          } else {
-            WithColor::warning(errs(), "llvm-objdump")
-                << "invalid instruction encoding\n";
-            if (InstSize == 0)
-              InstSize = 1; // skip illegible bytes
-          }
-        }
-      }
-    }
-    // The TripleName's need to be reset if we are called again for a different
-    // archtecture.
-    TripleName = "";
-    ThumbTripleName = "";
-
-    if (SymbolizerInfo.demangled_name != nullptr)
-      free(SymbolizerInfo.demangled_name);
-    if (ThumbSymbolizerInfo.demangled_name != nullptr)
-      free(ThumbSymbolizerInfo.demangled_name);
-  }
-}
-
-//===----------------------------------------------------------------------===//
-// __compact_unwind section dumping
-//===----------------------------------------------------------------------===//
-
-namespace {
-
-template <typename T>
-static uint64_t read(StringRef Contents, ptrdiff_t Offset) {
-  using llvm::support::little;
-  using llvm::support::unaligned;
-
-  if (Offset + sizeof(T) > Contents.size()) {
-    outs() << "warning: attempt to read past end of buffer\n";
-    return T();
-  }
-
-  uint64_t Val =
-      support::endian::read<T, little, unaligned>(Contents.data() + Offset);
-  return Val;
-}
-
-template <typename T>
-static uint64_t readNext(StringRef Contents, ptrdiff_t &Offset) {
-  T Val = read<T>(Contents, Offset);
-  Offset += sizeof(T);
-  return Val;
-}
-
-struct CompactUnwindEntry {
-  uint32_t OffsetInSection;
-
-  uint64_t FunctionAddr;
-  uint32_t Length;
-  uint32_t CompactEncoding;
-  uint64_t PersonalityAddr;
-  uint64_t LSDAAddr;
-
-  RelocationRef FunctionReloc;
-  RelocationRef PersonalityReloc;
-  RelocationRef LSDAReloc;
-
-  CompactUnwindEntry(StringRef Contents, unsigned Offset, bool Is64)
-      : OffsetInSection(Offset) {
-    if (Is64)
-      read<uint64_t>(Contents, Offset);
-    else
-      read<uint32_t>(Contents, Offset);
-  }
-
-private:
-  template <typename UIntPtr> void read(StringRef Contents, ptrdiff_t Offset) {
-    FunctionAddr = readNext<UIntPtr>(Contents, Offset);
-    Length = readNext<uint32_t>(Contents, Offset);
-    CompactEncoding = readNext<uint32_t>(Contents, Offset);
-    PersonalityAddr = readNext<UIntPtr>(Contents, Offset);
-    LSDAAddr = readNext<UIntPtr>(Contents, Offset);
-  }
-};
-}
-
-/// Given a relocation from __compact_unwind, consisting of the RelocationRef
-/// and data being relocated, determine the best base Name and Addend to use for
-/// display purposes.
-///
-/// 1. An Extern relocation will directly reference a symbol (and the data is
-///    then already an addend), so use that.
-/// 2. Otherwise the data is an offset in the object file's layout; try to find
-//     a symbol before it in the same section, and use the offset from there.
-/// 3. Finally, if all that fails, fall back to an offset from the start of the
-///    referenced section.
-static void findUnwindRelocNameAddend(const MachOObjectFile *Obj,
-                                      std::map<uint64_t, SymbolRef> &Symbols,
-                                      const RelocationRef &Reloc, uint64_t Addr,
-                                      StringRef &Name, uint64_t &Addend) {
-  if (Reloc.getSymbol() != Obj->symbol_end()) {
-    Name = unwrapOrError(Reloc.getSymbol()->getName(), Obj->getFileName());
-    Addend = Addr;
-    return;
-  }
-
-  auto RE = Obj->getRelocation(Reloc.getRawDataRefImpl());
-  SectionRef RelocSection = Obj->getAnyRelocationSection(RE);
-
-  uint64_t SectionAddr = RelocSection.getAddress();
-
-  auto Sym = Symbols.upper_bound(Addr);
-  if (Sym == Symbols.begin()) {
-    // The first symbol in the object is after this reference, the best we can
-    // do is section-relative notation.
-    RelocSection.getName(Name);
-    Addend = Addr - SectionAddr;
-    return;
-  }
-
-  // Go back one so that SymbolAddress <= Addr.
-  --Sym;
-
-  section_iterator SymSection =
-      unwrapOrError(Sym->second.getSection(), Obj->getFileName());
-  if (RelocSection == *SymSection) {
-    // There's a valid symbol in the same section before this reference.
-    Name = unwrapOrError(Sym->second.getName(), Obj->getFileName());
-    Addend = Addr - Sym->first;
-    return;
-  }
-
-  // There is a symbol before this reference, but it's in a different
-  // section. Probably not helpful to mention it, so use the section name.
-  RelocSection.getName(Name);
-  Addend = Addr - SectionAddr;
-}
-
-static void printUnwindRelocDest(const MachOObjectFile *Obj,
-                                 std::map<uint64_t, SymbolRef> &Symbols,
-                                 const RelocationRef &Reloc, uint64_t Addr) {
-  StringRef Name;
-  uint64_t Addend;
-
-  if (!Reloc.getObject())
-    return;
-
-  findUnwindRelocNameAddend(Obj, Symbols, Reloc, Addr, Name, Addend);
-
-  outs() << Name;
-  if (Addend)
-    outs() << " + " << format("0x%" PRIx64, Addend);
-}
-
-static void
-printMachOCompactUnwindSection(const MachOObjectFile *Obj,
-                               std::map<uint64_t, SymbolRef> &Symbols,
-                               const SectionRef &CompactUnwind) {
-
-  if (!Obj->isLittleEndian()) {
-    outs() << "Skipping big-endian __compact_unwind section\n";
-    return;
-  }
-
-  bool Is64 = Obj->is64Bit();
-  uint32_t PointerSize = Is64 ? sizeof(uint64_t) : sizeof(uint32_t);
-  uint32_t EntrySize = 3 * PointerSize + 2 * sizeof(uint32_t);
-
-  StringRef Contents =
-      unwrapOrError(CompactUnwind.getContents(), Obj->getFileName());
-  SmallVector<CompactUnwindEntry, 4> CompactUnwinds;
-
-  // First populate the initial raw offsets, encodings and so on from the entry.
-  for (unsigned Offset = 0; Offset < Contents.size(); Offset += EntrySize) {
-    CompactUnwindEntry Entry(Contents, Offset, Is64);
-    CompactUnwinds.push_back(Entry);
-  }
-
-  // Next we need to look at the relocations to find out what objects are
-  // actually being referred to.
-  for (const RelocationRef &Reloc : CompactUnwind.relocations()) {
-    uint64_t RelocAddress = Reloc.getOffset();
-
-    uint32_t EntryIdx = RelocAddress / EntrySize;
-    uint32_t OffsetInEntry = RelocAddress - EntryIdx * EntrySize;
-    CompactUnwindEntry &Entry = CompactUnwinds[EntryIdx];
-
-    if (OffsetInEntry == 0)
-      Entry.FunctionReloc = Reloc;
-    else if (OffsetInEntry == PointerSize + 2 * sizeof(uint32_t))
-      Entry.PersonalityReloc = Reloc;
-    else if (OffsetInEntry == 2 * PointerSize + 2 * sizeof(uint32_t))
-      Entry.LSDAReloc = Reloc;
-    else {
-      outs() << "Invalid relocation in __compact_unwind section\n";
-      return;
-    }
-  }
-
-  // Finally, we're ready to print the data we've gathered.
-  outs() << "Contents of __compact_unwind section:\n";
-  for (auto &Entry : CompactUnwinds) {
-    outs() << "  Entry at offset "
-           << format("0x%" PRIx32, Entry.OffsetInSection) << ":\n";
-
-    // 1. Start of the region this entry applies to.
-    outs() << "    start:                " << format("0x%" PRIx64,
-                                                     Entry.FunctionAddr) << ' ';
-    printUnwindRelocDest(Obj, Symbols, Entry.FunctionReloc, Entry.FunctionAddr);
-    outs() << '\n';
-
-    // 2. Length of the region this entry applies to.
-    outs() << "    length:               " << format("0x%" PRIx32, Entry.Length)
-           << '\n';
-    // 3. The 32-bit compact encoding.
-    outs() << "    compact encoding:     "
-           << format("0x%08" PRIx32, Entry.CompactEncoding) << '\n';
-
-    // 4. The personality function, if present.
-    if (Entry.PersonalityReloc.getObject()) {
-      outs() << "    personality function: "
-             << format("0x%" PRIx64, Entry.PersonalityAddr) << ' ';
-      printUnwindRelocDest(Obj, Symbols, Entry.PersonalityReloc,
-                           Entry.PersonalityAddr);
-      outs() << '\n';
-    }
-
-    // 5. This entry's language-specific data area.
-    if (Entry.LSDAReloc.getObject()) {
-      outs() << "    LSDA:                 " << format("0x%" PRIx64,
-                                                       Entry.LSDAAddr) << ' ';
-      printUnwindRelocDest(Obj, Symbols, Entry.LSDAReloc, Entry.LSDAAddr);
-      outs() << '\n';
-    }
-  }
-}
-
-//===----------------------------------------------------------------------===//
-// __unwind_info section dumping
-//===----------------------------------------------------------------------===//
-
-static void printRegularSecondLevelUnwindPage(StringRef PageData) {
-  ptrdiff_t Pos = 0;
-  uint32_t Kind = readNext<uint32_t>(PageData, Pos);
-  (void)Kind;
-  assert(Kind == 2 && "kind for a regular 2nd level index should be 2");
-
-  uint16_t EntriesStart = readNext<uint16_t>(PageData, Pos);
-  uint16_t NumEntries = readNext<uint16_t>(PageData, Pos);
-
-  Pos = EntriesStart;
-  for (unsigned i = 0; i < NumEntries; ++i) {
-    uint32_t FunctionOffset = readNext<uint32_t>(PageData, Pos);
-    uint32_t Encoding = readNext<uint32_t>(PageData, Pos);
-
-    outs() << "      [" << i << "]: "
-           << "function offset=" << format("0x%08" PRIx32, FunctionOffset)
-           << ", "
-           << "encoding=" << format("0x%08" PRIx32, Encoding) << '\n';
-  }
-}
-
-static void printCompressedSecondLevelUnwindPage(
-    StringRef PageData, uint32_t FunctionBase,
-    const SmallVectorImpl<uint32_t> &CommonEncodings) {
-  ptrdiff_t Pos = 0;
-  uint32_t Kind = readNext<uint32_t>(PageData, Pos);
-  (void)Kind;
-  assert(Kind == 3 && "kind for a compressed 2nd level index should be 3");
-
-  uint16_t EntriesStart = readNext<uint16_t>(PageData, Pos);
-  uint16_t NumEntries = readNext<uint16_t>(PageData, Pos);
-
-  uint16_t EncodingsStart = readNext<uint16_t>(PageData, Pos);
-  readNext<uint16_t>(PageData, Pos);
-  StringRef PageEncodings = PageData.substr(EncodingsStart, StringRef::npos);
-
-  Pos = EntriesStart;
-  for (unsigned i = 0; i < NumEntries; ++i) {
-    uint32_t Entry = readNext<uint32_t>(PageData, Pos);
-    uint32_t FunctionOffset = FunctionBase + (Entry & 0xffffff);
-    uint32_t EncodingIdx = Entry >> 24;
-
-    uint32_t Encoding;
-    if (EncodingIdx < CommonEncodings.size())
-      Encoding = CommonEncodings[EncodingIdx];
-    else
-      Encoding = read<uint32_t>(PageEncodings,
-                                sizeof(uint32_t) *
-                                    (EncodingIdx - CommonEncodings.size()));
-
-    outs() << "      [" << i << "]: "
-           << "function offset=" << format("0x%08" PRIx32, FunctionOffset)
-           << ", "
-           << "encoding[" << EncodingIdx
-           << "]=" << format("0x%08" PRIx32, Encoding) << '\n';
-  }
-}
-
-static void printMachOUnwindInfoSection(const MachOObjectFile *Obj,
-                                        std::map<uint64_t, SymbolRef> &Symbols,
-                                        const SectionRef &UnwindInfo) {
-
-  if (!Obj->isLittleEndian()) {
-    outs() << "Skipping big-endian __unwind_info section\n";
-    return;
-  }
-
-  outs() << "Contents of __unwind_info section:\n";
-
-  StringRef Contents =
-      unwrapOrError(UnwindInfo.getContents(), Obj->getFileName());
-  ptrdiff_t Pos = 0;
-
-  //===----------------------------------
-  // Section header
-  //===----------------------------------
-
-  uint32_t Version = readNext<uint32_t>(Contents, Pos);
-  outs() << "  Version:                                   "
-         << format("0x%" PRIx32, Version) << '\n';
-  if (Version != 1) {
-    outs() << "    Skipping section with unknown version\n";
-    return;
-  }
-
-  uint32_t CommonEncodingsStart = readNext<uint32_t>(Contents, Pos);
-  outs() << "  Common encodings array section offset:     "
-         << format("0x%" PRIx32, CommonEncodingsStart) << '\n';
-  uint32_t NumCommonEncodings = readNext<uint32_t>(Contents, Pos);
-  outs() << "  Number of common encodings in array:       "
-         << format("0x%" PRIx32, NumCommonEncodings) << '\n';
-
-  uint32_t PersonalitiesStart = readNext<uint32_t>(Contents, Pos);
-  outs() << "  Personality function array section offset: "
-         << format("0x%" PRIx32, PersonalitiesStart) << '\n';
-  uint32_t NumPersonalities = readNext<uint32_t>(Contents, Pos);
-  outs() << "  Number of personality functions in array:  "
-         << format("0x%" PRIx32, NumPersonalities) << '\n';
-
-  uint32_t IndicesStart = readNext<uint32_t>(Contents, Pos);
-  outs() << "  Index array section offset:                "
-         << format("0x%" PRIx32, IndicesStart) << '\n';
-  uint32_t NumIndices = readNext<uint32_t>(Contents, Pos);
-  outs() << "  Number of indices in array:                "
-         << format("0x%" PRIx32, NumIndices) << '\n';
-
-  //===----------------------------------
-  // A shared list of common encodings
-  //===----------------------------------
-
-  // These occupy indices in the range [0, N] whenever an encoding is referenced
-  // from a compressed 2nd level index table. In practice the linker only
-  // creates ~128 of these, so that indices are available to embed encodings in
-  // the 2nd level index.
-
-  SmallVector<uint32_t, 64> CommonEncodings;
-  outs() << "  Common encodings: (count = " << NumCommonEncodings << ")\n";
-  Pos = CommonEncodingsStart;
-  for (unsigned i = 0; i < NumCommonEncodings; ++i) {
-    uint32_t Encoding = readNext<uint32_t>(Contents, Pos);
-    CommonEncodings.push_back(Encoding);
-
-    outs() << "    encoding[" << i << "]: " << format("0x%08" PRIx32, Encoding)
-           << '\n';
-  }
-
-  //===----------------------------------
-  // Personality functions used in this executable
-  //===----------------------------------
-
-  // There should be only a handful of these (one per source language,
-  // roughly). Particularly since they only get 2 bits in the compact encoding.
-
-  outs() << "  Personality functions: (count = " << NumPersonalities << ")\n";
-  Pos = PersonalitiesStart;
-  for (unsigned i = 0; i < NumPersonalities; ++i) {
-    uint32_t PersonalityFn = readNext<uint32_t>(Contents, Pos);
-    outs() << "    personality[" << i + 1
-           << "]: " << format("0x%08" PRIx32, PersonalityFn) << '\n';
-  }
-
-  //===----------------------------------
-  // The level 1 index entries
-  //===----------------------------------
-
-  // These specify an approximate place to start searching for the more detailed
-  // information, sorted by PC.
-
-  struct IndexEntry {
-    uint32_t FunctionOffset;
-    uint32_t SecondLevelPageStart;
-    uint32_t LSDAStart;
-  };
-
-  SmallVector<IndexEntry, 4> IndexEntries;
-
-  outs() << "  Top level indices: (count = " << NumIndices << ")\n";
-  Pos = IndicesStart;
-  for (unsigned i = 0; i < NumIndices; ++i) {
-    IndexEntry Entry;
-
-    Entry.FunctionOffset = readNext<uint32_t>(Contents, Pos);
-    Entry.SecondLevelPageStart = readNext<uint32_t>(Contents, Pos);
-    Entry.LSDAStart = readNext<uint32_t>(Contents, Pos);
-    IndexEntries.push_back(Entry);
-
-    outs() << "    [" << i << "]: "
-           << "function offset=" << format("0x%08" PRIx32, Entry.FunctionOffset)
-           << ", "
-           << "2nd level page offset="
-           << format("0x%08" PRIx32, Entry.SecondLevelPageStart) << ", "
-           << "LSDA offset=" << format("0x%08" PRIx32, Entry.LSDAStart) << '\n';
-  }
-
-  //===----------------------------------
-  // Next come the LSDA tables
-  //===----------------------------------
-
-  // The LSDA layout is rather implicit: it's a contiguous array of entries from
-  // the first top-level index's LSDAOffset to the last (sentinel).
-
-  outs() << "  LSDA descriptors:\n";
-  Pos = IndexEntries[0].LSDAStart;
-  const uint32_t LSDASize = 2 * sizeof(uint32_t);
-  int NumLSDAs =
-      (IndexEntries.back().LSDAStart - IndexEntries[0].LSDAStart) / LSDASize;
-
-  for (int i = 0; i < NumLSDAs; ++i) {
-    uint32_t FunctionOffset = readNext<uint32_t>(Contents, Pos);
-    uint32_t LSDAOffset = readNext<uint32_t>(Contents, Pos);
-    outs() << "    [" << i << "]: "
-           << "function offset=" << format("0x%08" PRIx32, FunctionOffset)
-           << ", "
-           << "LSDA offset=" << format("0x%08" PRIx32, LSDAOffset) << '\n';
-  }
-
-  //===----------------------------------
-  // Finally, the 2nd level indices
-  //===----------------------------------
-
-  // Generally these are 4K in size, and have 2 possible forms:
-  //   + Regular stores up to 511 entries with disparate encodings
-  //   + Compressed stores up to 1021 entries if few enough compact encoding
-  //     values are used.
-  outs() << "  Second level indices:\n";
-  for (unsigned i = 0; i < IndexEntries.size() - 1; ++i) {
-    // The final sentinel top-level index has no associated 2nd level page
-    if (IndexEntries[i].SecondLevelPageStart == 0)
-      break;
-
-    outs() << "    Second level index[" << i << "]: "
-           << "offset in section="
-           << format("0x%08" PRIx32, IndexEntries[i].SecondLevelPageStart)
-           << ", "
-           << "base function offset="
-           << format("0x%08" PRIx32, IndexEntries[i].FunctionOffset) << '\n';
-
-    Pos = IndexEntries[i].SecondLevelPageStart;
-    if (Pos + sizeof(uint32_t) > Contents.size()) {
-      outs() << "warning: invalid offset for second level page: " << Pos << '\n';
-      continue;
-    }
-
-    uint32_t Kind =
-        *reinterpret_cast<const support::ulittle32_t *>(Contents.data() + Pos);
-    if (Kind == 2)
-      printRegularSecondLevelUnwindPage(Contents.substr(Pos, 4096));
-    else if (Kind == 3)
-      printCompressedSecondLevelUnwindPage(Contents.substr(Pos, 4096),
-                                           IndexEntries[i].FunctionOffset,
-                                           CommonEncodings);
-    else
-      outs() << "    Skipping 2nd level page with unknown kind " << Kind
-             << '\n';
-  }
-}
-
-void printMachOUnwindInfo(const MachOObjectFile *Obj) {
-  std::map<uint64_t, SymbolRef> Symbols;
-  for (const SymbolRef &SymRef : Obj->symbols()) {
-    // Discard any undefined or absolute symbols. They're not going to take part
-    // in the convenience lookup for unwind info and just take up resources.
-    auto SectOrErr = SymRef.getSection();
-    if (!SectOrErr) {
-      // TODO: Actually report errors helpfully.
-      consumeError(SectOrErr.takeError());
-      continue;
-    }
-    section_iterator Section = *SectOrErr;
-    if (Section == Obj->section_end())
-      continue;
-
-    uint64_t Addr = SymRef.getValue();
-    Symbols.insert(std::make_pair(Addr, SymRef));
-  }
-
-  for (const SectionRef &Section : Obj->sections()) {
-    StringRef SectName;
-    Section.getName(SectName);
-    if (SectName == "__compact_unwind")
-      printMachOCompactUnwindSection(Obj, Symbols, Section);
-    else if (SectName == "__unwind_info")
-      printMachOUnwindInfoSection(Obj, Symbols, Section);
-  }
-}
-
-static void PrintMachHeader(uint32_t magic, uint32_t cputype,
-                            uint32_t cpusubtype, uint32_t filetype,
-                            uint32_t ncmds, uint32_t sizeofcmds, uint32_t flags,
-                            bool verbose) {
-  outs() << "Mach header\n";
-  outs() << "      magic cputype cpusubtype  caps    filetype ncmds "
-            "sizeofcmds      flags\n";
-  if (verbose) {
-    if (magic == MachO::MH_MAGIC)
-      outs() << "   MH_MAGIC";
-    else if (magic == MachO::MH_MAGIC_64)
-      outs() << "MH_MAGIC_64";
-    else
-      outs() << format(" 0x%08" PRIx32, magic);
-    switch (cputype) {
-    case MachO::CPU_TYPE_I386:
-      outs() << "    I386";
-      switch (cpusubtype & ~MachO::CPU_SUBTYPE_MASK) {
-      case MachO::CPU_SUBTYPE_I386_ALL:
-        outs() << "        ALL";
-        break;
-      default:
-        outs() << format(" %10d", cpusubtype & ~MachO::CPU_SUBTYPE_MASK);
-        break;
-      }
-      break;
-    case MachO::CPU_TYPE_X86_64:
-      outs() << "  X86_64";
-      switch (cpusubtype & ~MachO::CPU_SUBTYPE_MASK) {
-      case MachO::CPU_SUBTYPE_X86_64_ALL:
-        outs() << "        ALL";
-        break;
-      case MachO::CPU_SUBTYPE_X86_64_H:
-        outs() << "    Haswell";
-        break;
-      default:
-        outs() << format(" %10d", cpusubtype & ~MachO::CPU_SUBTYPE_MASK);
-        break;
-      }
-      break;
-    case MachO::CPU_TYPE_ARM:
-      outs() << "     ARM";
-      switch (cpusubtype & ~MachO::CPU_SUBTYPE_MASK) {
-      case MachO::CPU_SUBTYPE_ARM_ALL:
-        outs() << "        ALL";
-        break;
-      case MachO::CPU_SUBTYPE_ARM_V4T:
-        outs() << "        V4T";
-        break;
-      case MachO::CPU_SUBTYPE_ARM_V5TEJ:
-        outs() << "      V5TEJ";
-        break;
-      case MachO::CPU_SUBTYPE_ARM_XSCALE:
-        outs() << "     XSCALE";
-        break;
-      case MachO::CPU_SUBTYPE_ARM_V6:
-        outs() << "         V6";
-        break;
-      case MachO::CPU_SUBTYPE_ARM_V6M:
-        outs() << "        V6M";
-        break;
-      case MachO::CPU_SUBTYPE_ARM_V7:
-        outs() << "         V7";
-        break;
-      case MachO::CPU_SUBTYPE_ARM_V7EM:
-        outs() << "       V7EM";
-        break;
-      case MachO::CPU_SUBTYPE_ARM_V7K:
-        outs() << "        V7K";
-        break;
-      case MachO::CPU_SUBTYPE_ARM_V7M:
-        outs() << "        V7M";
-        break;
-      case MachO::CPU_SUBTYPE_ARM_V7S:
-        outs() << "        V7S";
-        break;
-      default:
-        outs() << format(" %10d", cpusubtype & ~MachO::CPU_SUBTYPE_MASK);
-        break;
-      }
-      break;
-    case MachO::CPU_TYPE_ARM64:
-      outs() << "   ARM64";
-      switch (cpusubtype & ~MachO::CPU_SUBTYPE_MASK) {
-      case MachO::CPU_SUBTYPE_ARM64_ALL:
-        outs() << "        ALL";
-        break;
-      case MachO::CPU_SUBTYPE_ARM64E:
-        outs() << "          E";
-        break;
-      default:
-        outs() << format(" %10d", cpusubtype & ~MachO::CPU_SUBTYPE_MASK);
-        break;
-      }
-      break;
-    case MachO::CPU_TYPE_ARM64_32:
-      outs() << " ARM64_32";
-      switch (cpusubtype & ~MachO::CPU_SUBTYPE_MASK) {
-      case MachO::CPU_SUBTYPE_ARM64_32_V8:
-        outs() << "        V8";
-        break;
-      default:
-        outs() << format(" %10d", cpusubtype & ~MachO::CPU_SUBTYPE_MASK);
-        break;
-      }
-      break;
-    case MachO::CPU_TYPE_POWERPC:
-      outs() << "     PPC";
-      switch (cpusubtype & ~MachO::CPU_SUBTYPE_MASK) {
-      case MachO::CPU_SUBTYPE_POWERPC_ALL:
-        outs() << "        ALL";
-        break;
-      default:
-        outs() << format(" %10d", cpusubtype & ~MachO::CPU_SUBTYPE_MASK);
-        break;
-      }
-      break;
-    case MachO::CPU_TYPE_POWERPC64:
-      outs() << "   PPC64";
-      switch (cpusubtype & ~MachO::CPU_SUBTYPE_MASK) {
-      case MachO::CPU_SUBTYPE_POWERPC_ALL:
-        outs() << "        ALL";
-        break;
-      default:
-        outs() << format(" %10d", cpusubtype & ~MachO::CPU_SUBTYPE_MASK);
-        break;
-      }
-      break;
-    default:
-      outs() << format(" %7d", cputype);
-      outs() << format(" %10d", cpusubtype & ~MachO::CPU_SUBTYPE_MASK);
-      break;
-    }
-    if ((cpusubtype & MachO::CPU_SUBTYPE_MASK) == MachO::CPU_SUBTYPE_LIB64) {
-      outs() << " LIB64";
-    } else {
-      outs() << format("  0x%02" PRIx32,
-                       (cpusubtype & MachO::CPU_SUBTYPE_MASK) >> 24);
-    }
-    switch (filetype) {
-    case MachO::MH_OBJECT:
-      outs() << "      OBJECT";
-      break;
-    case MachO::MH_EXECUTE:
-      outs() << "     EXECUTE";
-      break;
-    case MachO::MH_FVMLIB:
-      outs() << "      FVMLIB";
-      break;
-    case MachO::MH_CORE:
-      outs() << "        CORE";
-      break;
-    case MachO::MH_PRELOAD:
-      outs() << "     PRELOAD";
-      break;
-    case MachO::MH_DYLIB:
-      outs() << "       DYLIB";
-      break;
-    case MachO::MH_DYLIB_STUB:
-      outs() << "  DYLIB_STUB";
-      break;
-    case MachO::MH_DYLINKER:
-      outs() << "    DYLINKER";
-      break;
-    case MachO::MH_BUNDLE:
-      outs() << "      BUNDLE";
-      break;
-    case MachO::MH_DSYM:
-      outs() << "        DSYM";
-      break;
-    case MachO::MH_KEXT_BUNDLE:
-      outs() << "  KEXTBUNDLE";
-      break;
-    default:
-      outs() << format("  %10u", filetype);
-      break;
-    }
-    outs() << format(" %5u", ncmds);
-    outs() << format(" %10u", sizeofcmds);
-    uint32_t f = flags;
-    if (f & MachO::MH_NOUNDEFS) {
-      outs() << "   NOUNDEFS";
-      f &= ~MachO::MH_NOUNDEFS;
-    }
-    if (f & MachO::MH_INCRLINK) {
-      outs() << " INCRLINK";
-      f &= ~MachO::MH_INCRLINK;
-    }
-    if (f & MachO::MH_DYLDLINK) {
-      outs() << " DYLDLINK";
-      f &= ~MachO::MH_DYLDLINK;
-    }
-    if (f & MachO::MH_BINDATLOAD) {
-      outs() << " BINDATLOAD";
-      f &= ~MachO::MH_BINDATLOAD;
-    }
-    if (f & MachO::MH_PREBOUND) {
-      outs() << " PREBOUND";
-      f &= ~MachO::MH_PREBOUND;
-    }
-    if (f & MachO::MH_SPLIT_SEGS) {
-      outs() << " SPLIT_SEGS";
-      f &= ~MachO::MH_SPLIT_SEGS;
-    }
-    if (f & MachO::MH_LAZY_INIT) {
-      outs() << " LAZY_INIT";
-      f &= ~MachO::MH_LAZY_INIT;
-    }
-    if (f & MachO::MH_TWOLEVEL) {
-      outs() << " TWOLEVEL";
-      f &= ~MachO::MH_TWOLEVEL;
-    }
-    if (f & MachO::MH_FORCE_FLAT) {
-      outs() << " FORCE_FLAT";
-      f &= ~MachO::MH_FORCE_FLAT;
-    }
-    if (f & MachO::MH_NOMULTIDEFS) {
-      outs() << " NOMULTIDEFS";
-      f &= ~MachO::MH_NOMULTIDEFS;
-    }
-    if (f & MachO::MH_NOFIXPREBINDING) {
-      outs() << " NOFIXPREBINDING";
-      f &= ~MachO::MH_NOFIXPREBINDING;
-    }
-    if (f & MachO::MH_PREBINDABLE) {
-      outs() << " PREBINDABLE";
-      f &= ~MachO::MH_PREBINDABLE;
-    }
-    if (f & MachO::MH_ALLMODSBOUND) {
-      outs() << " ALLMODSBOUND";
-      f &= ~MachO::MH_ALLMODSBOUND;
-    }
-    if (f & MachO::MH_SUBSECTIONS_VIA_SYMBOLS) {
-      outs() << " SUBSECTIONS_VIA_SYMBOLS";
-      f &= ~MachO::MH_SUBSECTIONS_VIA_SYMBOLS;
-    }
-    if (f & MachO::MH_CANONICAL) {
-      outs() << " CANONICAL";
-      f &= ~MachO::MH_CANONICAL;
-    }
-    if (f & MachO::MH_WEAK_DEFINES) {
-      outs() << " WEAK_DEFINES";
-      f &= ~MachO::MH_WEAK_DEFINES;
-    }
-    if (f & MachO::MH_BINDS_TO_WEAK) {
-      outs() << " BINDS_TO_WEAK";
-      f &= ~MachO::MH_BINDS_TO_WEAK;
-    }
-    if (f & MachO::MH_ALLOW_STACK_EXECUTION) {
-      outs() << " ALLOW_STACK_EXECUTION";
-      f &= ~MachO::MH_ALLOW_STACK_EXECUTION;
-    }
-    if (f & MachO::MH_DEAD_STRIPPABLE_DYLIB) {
-      outs() << " DEAD_STRIPPABLE_DYLIB";
-      f &= ~MachO::MH_DEAD_STRIPPABLE_DYLIB;
-    }
-    if (f & MachO::MH_PIE) {
-      outs() << " PIE";
-      f &= ~MachO::MH_PIE;
-    }
-    if (f & MachO::MH_NO_REEXPORTED_DYLIBS) {
-      outs() << " NO_REEXPORTED_DYLIBS";
-      f &= ~MachO::MH_NO_REEXPORTED_DYLIBS;
-    }
-    if (f & MachO::MH_HAS_TLV_DESCRIPTORS) {
-      outs() << " MH_HAS_TLV_DESCRIPTORS";
-      f &= ~MachO::MH_HAS_TLV_DESCRIPTORS;
-    }
-    if (f & MachO::MH_NO_HEAP_EXECUTION) {
-      outs() << " MH_NO_HEAP_EXECUTION";
-      f &= ~MachO::MH_NO_HEAP_EXECUTION;
-    }
-    if (f & MachO::MH_APP_EXTENSION_SAFE) {
-      outs() << " APP_EXTENSION_SAFE";
-      f &= ~MachO::MH_APP_EXTENSION_SAFE;
-    }
-    if (f & MachO::MH_NLIST_OUTOFSYNC_WITH_DYLDINFO) {
-      outs() << " NLIST_OUTOFSYNC_WITH_DYLDINFO";
-      f &= ~MachO::MH_NLIST_OUTOFSYNC_WITH_DYLDINFO;
-    }
-    if (f != 0 || flags == 0)
-      outs() << format(" 0x%08" PRIx32, f);
-  } else {
-    outs() << format(" 0x%08" PRIx32, magic);
-    outs() << format(" %7d", cputype);
-    outs() << format(" %10d", cpusubtype & ~MachO::CPU_SUBTYPE_MASK);
-    outs() << format("  0x%02" PRIx32,
-                     (cpusubtype & MachO::CPU_SUBTYPE_MASK) >> 24);
-    outs() << format("  %10u", filetype);
-    outs() << format(" %5u", ncmds);
-    outs() << format(" %10u", sizeofcmds);
-    outs() << format(" 0x%08" PRIx32, flags);
-  }
-  outs() << "\n";
-}
-
-static void PrintSegmentCommand(uint32_t cmd, uint32_t cmdsize,
-                                StringRef SegName, uint64_t vmaddr,
-                                uint64_t vmsize, uint64_t fileoff,
-                                uint64_t filesize, uint32_t maxprot,
-                                uint32_t initprot, uint32_t nsects,
-                                uint32_t flags, uint32_t object_size,
-                                bool verbose) {
-  uint64_t expected_cmdsize;
-  if (cmd == MachO::LC_SEGMENT) {
-    outs() << "      cmd LC_SEGMENT\n";
-    expected_cmdsize = nsects;
-    expected_cmdsize *= sizeof(struct MachO::section);
-    expected_cmdsize += sizeof(struct MachO::segment_command);
-  } else {
-    outs() << "      cmd LC_SEGMENT_64\n";
-    expected_cmdsize = nsects;
-    expected_cmdsize *= sizeof(struct MachO::section_64);
-    expected_cmdsize += sizeof(struct MachO::segment_command_64);
-  }
-  outs() << "  cmdsize " << cmdsize;
-  if (cmdsize != expected_cmdsize)
-    outs() << " Inconsistent size\n";
-  else
-    outs() << "\n";
-  outs() << "  segname " << SegName << "\n";
-  if (cmd == MachO::LC_SEGMENT_64) {
-    outs() << "   vmaddr " << format("0x%016" PRIx64, vmaddr) << "\n";
-    outs() << "   vmsize " << format("0x%016" PRIx64, vmsize) << "\n";
-  } else {
-    outs() << "   vmaddr " << format("0x%08" PRIx64, vmaddr) << "\n";
-    outs() << "   vmsize " << format("0x%08" PRIx64, vmsize) << "\n";
-  }
-  outs() << "  fileoff " << fileoff;
-  if (fileoff > object_size)
-    outs() << " (past end of file)\n";
-  else
-    outs() << "\n";
-  outs() << " filesize " << filesize;
-  if (fileoff + filesize > object_size)
-    outs() << " (past end of file)\n";
-  else
-    outs() << "\n";
-  if (verbose) {
-    if ((maxprot &
-         ~(MachO::VM_PROT_READ | MachO::VM_PROT_WRITE |
-           MachO::VM_PROT_EXECUTE)) != 0)
-      outs() << "  maxprot ?" << format("0x%08" PRIx32, maxprot) << "\n";
-    else {
-      outs() << "  maxprot ";
-      outs() << ((maxprot & MachO::VM_PROT_READ) ? "r" : "-");
-      outs() << ((maxprot & MachO::VM_PROT_WRITE) ? "w" : "-");
-      outs() << ((maxprot & MachO::VM_PROT_EXECUTE) ? "x\n" : "-\n");
-    }
-    if ((initprot &
-         ~(MachO::VM_PROT_READ | MachO::VM_PROT_WRITE |
-           MachO::VM_PROT_EXECUTE)) != 0)
-      outs() << " initprot ?" << format("0x%08" PRIx32, initprot) << "\n";
-    else {
-      outs() << " initprot ";
-      outs() << ((initprot & MachO::VM_PROT_READ) ? "r" : "-");
-      outs() << ((initprot & MachO::VM_PROT_WRITE) ? "w" : "-");
-      outs() << ((initprot & MachO::VM_PROT_EXECUTE) ? "x\n" : "-\n");
-    }
-  } else {
-    outs() << "  maxprot " << format("0x%08" PRIx32, maxprot) << "\n";
-    outs() << " initprot " << format("0x%08" PRIx32, initprot) << "\n";
-  }
-  outs() << "   nsects " << nsects << "\n";
-  if (verbose) {
-    outs() << "    flags";
-    if (flags == 0)
-      outs() << " (none)\n";
-    else {
-      if (flags & MachO::SG_HIGHVM) {
-        outs() << " HIGHVM";
-        flags &= ~MachO::SG_HIGHVM;
-      }
-      if (flags & MachO::SG_FVMLIB) {
-        outs() << " FVMLIB";
-        flags &= ~MachO::SG_FVMLIB;
-      }
-      if (flags & MachO::SG_NORELOC) {
-        outs() << " NORELOC";
-        flags &= ~MachO::SG_NORELOC;
-      }
-      if (flags & MachO::SG_PROTECTED_VERSION_1) {
-        outs() << " PROTECTED_VERSION_1";
-        flags &= ~MachO::SG_PROTECTED_VERSION_1;
-      }
-      if (flags)
-        outs() << format(" 0x%08" PRIx32, flags) << " (unknown flags)\n";
-      else
-        outs() << "\n";
-    }
-  } else {
-    outs() << "    flags " << format("0x%" PRIx32, flags) << "\n";
-  }
-}
-
-static void PrintSection(const char *sectname, const char *segname,
-                         uint64_t addr, uint64_t size, uint32_t offset,
-                         uint32_t align, uint32_t reloff, uint32_t nreloc,
-                         uint32_t flags, uint32_t reserved1, uint32_t reserved2,
-                         uint32_t cmd, const char *sg_segname,
-                         uint32_t filetype, uint32_t object_size,
-                         bool verbose) {
-  outs() << "Section\n";
-  outs() << "  sectname " << format("%.16s\n", sectname);
-  outs() << "   segname " << format("%.16s", segname);
-  if (filetype != MachO::MH_OBJECT && strncmp(sg_segname, segname, 16) != 0)
-    outs() << " (does not match segment)\n";
-  else
-    outs() << "\n";
-  if (cmd == MachO::LC_SEGMENT_64) {
-    outs() << "      addr " << format("0x%016" PRIx64, addr) << "\n";
-    outs() << "      size " << format("0x%016" PRIx64, size);
-  } else {
-    outs() << "      addr " << format("0x%08" PRIx64, addr) << "\n";
-    outs() << "      size " << format("0x%08" PRIx64, size);
-  }
-  if ((flags & MachO::S_ZEROFILL) != 0 && offset + size > object_size)
-    outs() << " (past end of file)\n";
-  else
-    outs() << "\n";
-  outs() << "    offset " << offset;
-  if (offset > object_size)
-    outs() << " (past end of file)\n";
-  else
-    outs() << "\n";
-  uint32_t align_shifted = 1 << align;
-  outs() << "     align 2^" << align << " (" << align_shifted << ")\n";
-  outs() << "    reloff " << reloff;
-  if (reloff > object_size)
-    outs() << " (past end of file)\n";
-  else
-    outs() << "\n";
-  outs() << "    nreloc " << nreloc;
-  if (reloff + nreloc * sizeof(struct MachO::relocation_info) > object_size)
-    outs() << " (past end of file)\n";
-  else
-    outs() << "\n";
-  uint32_t section_type = flags & MachO::SECTION_TYPE;
-  if (verbose) {
-    outs() << "      type";
-    if (section_type == MachO::S_REGULAR)
-      outs() << " S_REGULAR\n";
-    else if (section_type == MachO::S_ZEROFILL)
-      outs() << " S_ZEROFILL\n";
-    else if (section_type == MachO::S_CSTRING_LITERALS)
-      outs() << " S_CSTRING_LITERALS\n";
-    else if (section_type == MachO::S_4BYTE_LITERALS)
-      outs() << " S_4BYTE_LITERALS\n";
-    else if (section_type == MachO::S_8BYTE_LITERALS)
-      outs() << " S_8BYTE_LITERALS\n";
-    else if (section_type == MachO::S_16BYTE_LITERALS)
-      outs() << " S_16BYTE_LITERALS\n";
-    else if (section_type == MachO::S_LITERAL_POINTERS)
-      outs() << " S_LITERAL_POINTERS\n";
-    else if (section_type == MachO::S_NON_LAZY_SYMBOL_POINTERS)
-      outs() << " S_NON_LAZY_SYMBOL_POINTERS\n";
-    else if (section_type == MachO::S_LAZY_SYMBOL_POINTERS)
-      outs() << " S_LAZY_SYMBOL_POINTERS\n";
-    else if (section_type == MachO::S_SYMBOL_STUBS)
-      outs() << " S_SYMBOL_STUBS\n";
-    else if (section_type == MachO::S_MOD_INIT_FUNC_POINTERS)
-      outs() << " S_MOD_INIT_FUNC_POINTERS\n";
-    else if (section_type == MachO::S_MOD_TERM_FUNC_POINTERS)
-      outs() << " S_MOD_TERM_FUNC_POINTERS\n";
-    else if (section_type == MachO::S_COALESCED)
-      outs() << " S_COALESCED\n";
-    else if (section_type == MachO::S_INTERPOSING)
-      outs() << " S_INTERPOSING\n";
-    else if (section_type == MachO::S_DTRACE_DOF)
-      outs() << " S_DTRACE_DOF\n";
-    else if (section_type == MachO::S_LAZY_DYLIB_SYMBOL_POINTERS)
-      outs() << " S_LAZY_DYLIB_SYMBOL_POINTERS\n";
-    else if (section_type == MachO::S_THREAD_LOCAL_REGULAR)
-      outs() << " S_THREAD_LOCAL_REGULAR\n";
-    else if (section_type == MachO::S_THREAD_LOCAL_ZEROFILL)
-      outs() << " S_THREAD_LOCAL_ZEROFILL\n";
-    else if (section_type == MachO::S_THREAD_LOCAL_VARIABLES)
-      outs() << " S_THREAD_LOCAL_VARIABLES\n";
-    else if (section_type == MachO::S_THREAD_LOCAL_VARIABLE_POINTERS)
-      outs() << " S_THREAD_LOCAL_VARIABLE_POINTERS\n";
-    else if (section_type == MachO::S_THREAD_LOCAL_INIT_FUNCTION_POINTERS)
-      outs() << " S_THREAD_LOCAL_INIT_FUNCTION_POINTERS\n";
-    else
-      outs() << format("0x%08" PRIx32, section_type) << "\n";
-    outs() << "attributes";
-    uint32_t section_attributes = flags & MachO::SECTION_ATTRIBUTES;
-    if (section_attributes & MachO::S_ATTR_PURE_INSTRUCTIONS)
-      outs() << " PURE_INSTRUCTIONS";
-    if (section_attributes & MachO::S_ATTR_NO_TOC)
-      outs() << " NO_TOC";
-    if (section_attributes & MachO::S_ATTR_STRIP_STATIC_SYMS)
-      outs() << " STRIP_STATIC_SYMS";
-    if (section_attributes & MachO::S_ATTR_NO_DEAD_STRIP)
-      outs() << " NO_DEAD_STRIP";
-    if (section_attributes & MachO::S_ATTR_LIVE_SUPPORT)
-      outs() << " LIVE_SUPPORT";
-    if (section_attributes & MachO::S_ATTR_SELF_MODIFYING_CODE)
-      outs() << " SELF_MODIFYING_CODE";
-    if (section_attributes & MachO::S_ATTR_DEBUG)
-      outs() << " DEBUG";
-    if (section_attributes & MachO::S_ATTR_SOME_INSTRUCTIONS)
-      outs() << " SOME_INSTRUCTIONS";
-    if (section_attributes & MachO::S_ATTR_EXT_RELOC)
-      outs() << " EXT_RELOC";
-    if (section_attributes & MachO::S_ATTR_LOC_RELOC)
-      outs() << " LOC_RELOC";
-    if (section_attributes == 0)
-      outs() << " (none)";
-    outs() << "\n";
-  } else
-    outs() << "     flags " << format("0x%08" PRIx32, flags) << "\n";
-  outs() << " reserved1 " << reserved1;
-  if (section_type == MachO::S_SYMBOL_STUBS ||
-      section_type == MachO::S_LAZY_SYMBOL_POINTERS ||
-      section_type == MachO::S_LAZY_DYLIB_SYMBOL_POINTERS ||
-      section_type == MachO::S_NON_LAZY_SYMBOL_POINTERS ||
-      section_type == MachO::S_THREAD_LOCAL_VARIABLE_POINTERS)
-    outs() << " (index into indirect symbol table)\n";
-  else
-    outs() << "\n";
-  outs() << " reserved2 " << reserved2;
-  if (section_type == MachO::S_SYMBOL_STUBS)
-    outs() << " (size of stubs)\n";
-  else
-    outs() << "\n";
-}
-
-static void PrintSymtabLoadCommand(MachO::symtab_command st, bool Is64Bit,
-                                   uint32_t object_size) {
-  outs() << "     cmd LC_SYMTAB\n";
-  outs() << " cmdsize " << st.cmdsize;
-  if (st.cmdsize != sizeof(struct MachO::symtab_command))
-    outs() << " Incorrect size\n";
-  else
-    outs() << "\n";
-  outs() << "  symoff " << st.symoff;
-  if (st.symoff > object_size)
-    outs() << " (past end of file)\n";
-  else
-    outs() << "\n";
-  outs() << "   nsyms " << st.nsyms;
-  uint64_t big_size;
-  if (Is64Bit) {
-    big_size = st.nsyms;
-    big_size *= sizeof(struct MachO::nlist_64);
-    big_size += st.symoff;
-    if (big_size > object_size)
-      outs() << " (past end of file)\n";
-    else
-      outs() << "\n";
-  } else {
-    big_size = st.nsyms;
-    big_size *= sizeof(struct MachO::nlist);
-    big_size += st.symoff;
-    if (big_size > object_size)
-      outs() << " (past end of file)\n";
-    else
-      outs() << "\n";
-  }
-  outs() << "  stroff " << st.stroff;
-  if (st.stroff > object_size)
-    outs() << " (past end of file)\n";
-  else
-    outs() << "\n";
-  outs() << " strsize " << st.strsize;
-  big_size = st.stroff;
-  big_size += st.strsize;
-  if (big_size > object_size)
-    outs() << " (past end of file)\n";
-  else
-    outs() << "\n";
-}
-
-static void PrintDysymtabLoadCommand(MachO::dysymtab_command dyst,
-                                     uint32_t nsyms, uint32_t object_size,
-                                     bool Is64Bit) {
-  outs() << "            cmd LC_DYSYMTAB\n";
-  outs() << "        cmdsize " << dyst.cmdsize;
-  if (dyst.cmdsize != sizeof(struct MachO::dysymtab_command))
-    outs() << " Incorrect size\n";
-  else
-    outs() << "\n";
-  outs() << "      ilocalsym " << dyst.ilocalsym;
-  if (dyst.ilocalsym > nsyms)
-    outs() << " (greater than the number of symbols)\n";
-  else
-    outs() << "\n";
-  outs() << "      nlocalsym " << dyst.nlocalsym;
-  uint64_t big_size;
-  big_size = dyst.ilocalsym;
-  big_size += dyst.nlocalsym;
-  if (big_size > nsyms)
-    outs() << " (past the end of the symbol table)\n";
-  else
-    outs() << "\n";
-  outs() << "     iextdefsym " << dyst.iextdefsym;
-  if (dyst.iextdefsym > nsyms)
-    outs() << " (greater than the number of symbols)\n";
-  else
-    outs() << "\n";
-  outs() << "     nextdefsym " << dyst.nextdefsym;
-  big_size = dyst.iextdefsym;
-  big_size += dyst.nextdefsym;
-  if (big_size > nsyms)
-    outs() << " (past the end of the symbol table)\n";
-  else
-    outs() << "\n";
-  outs() << "      iundefsym " << dyst.iundefsym;
-  if (dyst.iundefsym > nsyms)
-    outs() << " (greater than the number of symbols)\n";
-  else
-    outs() << "\n";
-  outs() << "      nundefsym " << dyst.nundefsym;
-  big_size = dyst.iundefsym;
-  big_size += dyst.nundefsym;
-  if (big_size > nsyms)
-    outs() << " (past the end of the symbol table)\n";
-  else
-    outs() << "\n";
-  outs() << "         tocoff " << dyst.tocoff;
-  if (dyst.tocoff > object_size)
-    outs() << " (past end of file)\n";
-  else
-    outs() << "\n";
-  outs() << "           ntoc " << dyst.ntoc;
-  big_size = dyst.ntoc;
-  big_size *= sizeof(struct MachO::dylib_table_of_contents);
-  big_size += dyst.tocoff;
-  if (big_size > object_size)
-    outs() << " (past end of file)\n";
-  else
-    outs() << "\n";
-  outs() << "      modtaboff " << dyst.modtaboff;
-  if (dyst.modtaboff > object_size)
-    outs() << " (past end of file)\n";
-  else
-    outs() << "\n";
-  outs() << "        nmodtab " << dyst.nmodtab;
-  uint64_t modtabend;
-  if (Is64Bit) {
-    modtabend = dyst.nmodtab;
-    modtabend *= sizeof(struct MachO::dylib_module_64);
-    modtabend += dyst.modtaboff;
-  } else {
-    modtabend = dyst.nmodtab;
-    modtabend *= sizeof(struct MachO::dylib_module);
-    modtabend += dyst.modtaboff;
-  }
-  if (modtabend > object_size)
-    outs() << " (past end of file)\n";
-  else
-    outs() << "\n";
-  outs() << "   extrefsymoff " << dyst.extrefsymoff;
-  if (dyst.extrefsymoff > object_size)
-    outs() << " (past end of file)\n";
-  else
-    outs() << "\n";
-  outs() << "    nextrefsyms " << dyst.nextrefsyms;
-  big_size = dyst.nextrefsyms;
-  big_size *= sizeof(struct MachO::dylib_reference);
-  big_size += dyst.extrefsymoff;
-  if (big_size > object_size)
-    outs() << " (past end of file)\n";
-  else
-    outs() << "\n";
-  outs() << " indirectsymoff " << dyst.indirectsymoff;
-  if (dyst.indirectsymoff > object_size)
-    outs() << " (past end of file)\n";
-  else
-    outs() << "\n";
-  outs() << "  nindirectsyms " << dyst.nindirectsyms;
-  big_size = dyst.nindirectsyms;
-  big_size *= sizeof(uint32_t);
-  big_size += dyst.indirectsymoff;
-  if (big_size > object_size)
-    outs() << " (past end of file)\n";
-  else
-    outs() << "\n";
-  outs() << "      extreloff " << dyst.extreloff;
-  if (dyst.extreloff > object_size)
-    outs() << " (past end of file)\n";
-  else
-    outs() << "\n";
-  outs() << "        nextrel " << dyst.nextrel;
-  big_size = dyst.nextrel;
-  big_size *= sizeof(struct MachO::relocation_info);
-  big_size += dyst.extreloff;
-  if (big_size > object_size)
-    outs() << " (past end of file)\n";
-  else
-    outs() << "\n";
-  outs() << "      locreloff " << dyst.locreloff;
-  if (dyst.locreloff > object_size)
-    outs() << " (past end of file)\n";
-  else
-    outs() << "\n";
-  outs() << "        nlocrel " << dyst.nlocrel;
-  big_size = dyst.nlocrel;
-  big_size *= sizeof(struct MachO::relocation_info);
-  big_size += dyst.locreloff;
-  if (big_size > object_size)
-    outs() << " (past end of file)\n";
-  else
-    outs() << "\n";
-}
-
-static void PrintDyldInfoLoadCommand(MachO::dyld_info_command dc,
-                                     uint32_t object_size) {
-  if (dc.cmd == MachO::LC_DYLD_INFO)
-    outs() << "            cmd LC_DYLD_INFO\n";
-  else
-    outs() << "            cmd LC_DYLD_INFO_ONLY\n";
-  outs() << "        cmdsize " << dc.cmdsize;
-  if (dc.cmdsize != sizeof(struct MachO::dyld_info_command))
-    outs() << " Incorrect size\n";
-  else
-    outs() << "\n";
-  outs() << "     rebase_off " << dc.rebase_off;
-  if (dc.rebase_off > object_size)
-    outs() << " (past end of file)\n";
-  else
-    outs() << "\n";
-  outs() << "    rebase_size " << dc.rebase_size;
-  uint64_t big_size;
-  big_size = dc.rebase_off;
-  big_size += dc.rebase_size;
-  if (big_size > object_size)
-    outs() << " (past end of file)\n";
-  else
-    outs() << "\n";
-  outs() << "       bind_off " << dc.bind_off;
-  if (dc.bind_off > object_size)
-    outs() << " (past end of file)\n";
-  else
-    outs() << "\n";
-  outs() << "      bind_size " << dc.bind_size;
-  big_size = dc.bind_off;
-  big_size += dc.bind_size;
-  if (big_size > object_size)
-    outs() << " (past end of file)\n";
-  else
-    outs() << "\n";
-  outs() << "  weak_bind_off " << dc.weak_bind_off;
-  if (dc.weak_bind_off > object_size)
-    outs() << " (past end of file)\n";
-  else
-    outs() << "\n";
-  outs() << " weak_bind_size " << dc.weak_bind_size;
-  big_size = dc.weak_bind_off;
-  big_size += dc.weak_bind_size;
-  if (big_size > object_size)
-    outs() << " (past end of file)\n";
-  else
-    outs() << "\n";
-  outs() << "  lazy_bind_off " << dc.lazy_bind_off;
-  if (dc.lazy_bind_off > object_size)
-    outs() << " (past end of file)\n";
-  else
-    outs() << "\n";
-  outs() << " lazy_bind_size " << dc.lazy_bind_size;
-  big_size = dc.lazy_bind_off;
-  big_size += dc.lazy_bind_size;
-  if (big_size > object_size)
-    outs() << " (past end of file)\n";
-  else
-    outs() << "\n";
-  outs() << "     export_off " << dc.export_off;
-  if (dc.export_off > object_size)
-    outs() << " (past end of file)\n";
-  else
-    outs() << "\n";
-  outs() << "    export_size " << dc.export_size;
-  big_size = dc.export_off;
-  big_size += dc.export_size;
-  if (big_size > object_size)
-    outs() << " (past end of file)\n";
-  else
-    outs() << "\n";
-}
-
-static void PrintDyldLoadCommand(MachO::dylinker_command dyld,
-                                 const char *Ptr) {
-  if (dyld.cmd == MachO::LC_ID_DYLINKER)
-    outs() << "          cmd LC_ID_DYLINKER\n";
-  else if (dyld.cmd == MachO::LC_LOAD_DYLINKER)
-    outs() << "          cmd LC_LOAD_DYLINKER\n";
-  else if (dyld.cmd == MachO::LC_DYLD_ENVIRONMENT)
-    outs() << "          cmd LC_DYLD_ENVIRONMENT\n";
-  else
-    outs() << "          cmd ?(" << dyld.cmd << ")\n";
-  outs() << "      cmdsize " << dyld.cmdsize;
-  if (dyld.cmdsize < sizeof(struct MachO::dylinker_command))
-    outs() << " Incorrect size\n";
-  else
-    outs() << "\n";
-  if (dyld.name >= dyld.cmdsize)
-    outs() << "         name ?(bad offset " << dyld.name << ")\n";
-  else {
-    const char *P = (const char *)(Ptr) + dyld.name;
-    outs() << "         name " << P << " (offset " << dyld.name << ")\n";
-  }
-}
-
-static void PrintUuidLoadCommand(MachO::uuid_command uuid) {
-  outs() << "     cmd LC_UUID\n";
-  outs() << " cmdsize " << uuid.cmdsize;
-  if (uuid.cmdsize != sizeof(struct MachO::uuid_command))
-    outs() << " Incorrect size\n";
-  else
-    outs() << "\n";
-  outs() << "    uuid ";
-  for (int i = 0; i < 16; ++i) {
-    outs() << format("%02" PRIX32, uuid.uuid[i]);
-    if (i == 3 || i == 5 || i == 7 || i == 9)
-      outs() << "-";
-  }
-  outs() << "\n";
-}
-
-static void PrintRpathLoadCommand(MachO::rpath_command rpath, const char *Ptr) {
-  outs() << "          cmd LC_RPATH\n";
-  outs() << "      cmdsize " << rpath.cmdsize;
-  if (rpath.cmdsize < sizeof(struct MachO::rpath_command))
-    outs() << " Incorrect size\n";
-  else
-    outs() << "\n";
-  if (rpath.path >= rpath.cmdsize)
-    outs() << "         path ?(bad offset " << rpath.path << ")\n";
-  else {
-    const char *P = (const char *)(Ptr) + rpath.path;
-    outs() << "         path " << P << " (offset " << rpath.path << ")\n";
-  }
-}
-
-static void PrintVersionMinLoadCommand(MachO::version_min_command vd) {
-  StringRef LoadCmdName;
-  switch (vd.cmd) {
-  case MachO::LC_VERSION_MIN_MACOSX:
-    LoadCmdName = "LC_VERSION_MIN_MACOSX";
-    break;
-  case MachO::LC_VERSION_MIN_IPHONEOS:
-    LoadCmdName = "LC_VERSION_MIN_IPHONEOS";
-    break;
-  case MachO::LC_VERSION_MIN_TVOS:
-    LoadCmdName = "LC_VERSION_MIN_TVOS";
-    break;
-  case MachO::LC_VERSION_MIN_WATCHOS:
-    LoadCmdName = "LC_VERSION_MIN_WATCHOS";
-    break;
-  default:
-    llvm_unreachable("Unknown version min load command");
-  }
-
-  outs() << "      cmd " << LoadCmdName << '\n';
-  outs() << "  cmdsize " << vd.cmdsize;
-  if (vd.cmdsize != sizeof(struct MachO::version_min_command))
-    outs() << " Incorrect size\n";
-  else
-    outs() << "\n";
-  outs() << "  version "
-         << MachOObjectFile::getVersionMinMajor(vd, false) << "."
-         << MachOObjectFile::getVersionMinMinor(vd, false);
-  uint32_t Update = MachOObjectFile::getVersionMinUpdate(vd, false);
-  if (Update != 0)
-    outs() << "." << Update;
-  outs() << "\n";
-  if (vd.sdk == 0)
-    outs() << "      sdk n/a";
-  else {
-    outs() << "      sdk "
-           << MachOObjectFile::getVersionMinMajor(vd, true) << "."
-           << MachOObjectFile::getVersionMinMinor(vd, true);
-  }
-  Update = MachOObjectFile::getVersionMinUpdate(vd, true);
-  if (Update != 0)
-    outs() << "." << Update;
-  outs() << "\n";
-}
-
-static void PrintNoteLoadCommand(MachO::note_command Nt) {
-  outs() << "       cmd LC_NOTE\n";
-  outs() << "   cmdsize " << Nt.cmdsize;
-  if (Nt.cmdsize != sizeof(struct MachO::note_command))
-    outs() << " Incorrect size\n";
-  else
-    outs() << "\n";
-  const char *d = Nt.data_owner;
-  outs() << "data_owner " << format("%.16s\n", d);
-  outs() << "    offset " << Nt.offset << "\n";
-  outs() << "      size " << Nt.size << "\n";
-}
-
-static void PrintBuildToolVersion(MachO::build_tool_version bv) {
-  outs() << "      tool " << MachOObjectFile::getBuildTool(bv.tool) << "\n";
-  outs() << "   version " << MachOObjectFile::getVersionString(bv.version)
-         << "\n";
-}
-
-static void PrintBuildVersionLoadCommand(const MachOObjectFile *obj,
-                                         MachO::build_version_command bd) {
-  outs() << "       cmd LC_BUILD_VERSION\n";
-  outs() << "   cmdsize " << bd.cmdsize;
-  if (bd.cmdsize !=
-      sizeof(struct MachO::build_version_command) +
-          bd.ntools * sizeof(struct MachO::build_tool_version))
-    outs() << " Incorrect size\n";
-  else
-    outs() << "\n";
-  outs() << "  platform " << MachOObjectFile::getBuildPlatform(bd.platform)
-         << "\n";
-  if (bd.sdk)
-    outs() << "       sdk " << MachOObjectFile::getVersionString(bd.sdk)
-           << "\n";
-  else
-    outs() << "       sdk n/a\n";
-  outs() << "     minos " << MachOObjectFile::getVersionString(bd.minos)
-         << "\n";
-  outs() << "    ntools " << bd.ntools << "\n";
-  for (unsigned i = 0; i < bd.ntools; ++i) {
-    MachO::build_tool_version bv = obj->getBuildToolVersion(i);
-    PrintBuildToolVersion(bv);
-  }
-}
-
-static void PrintSourceVersionCommand(MachO::source_version_command sd) {
-  outs() << "      cmd LC_SOURCE_VERSION\n";
-  outs() << "  cmdsize " << sd.cmdsize;
-  if (sd.cmdsize != sizeof(struct MachO::source_version_command))
-    outs() << " Incorrect size\n";
-  else
-    outs() << "\n";
-  uint64_t a = (sd.version >> 40) & 0xffffff;
-  uint64_t b = (sd.version >> 30) & 0x3ff;
-  uint64_t c = (sd.version >> 20) & 0x3ff;
-  uint64_t d = (sd.version >> 10) & 0x3ff;
-  uint64_t e = sd.version & 0x3ff;
-  outs() << "  version " << a << "." << b;
-  if (e != 0)
-    outs() << "." << c << "." << d << "." << e;
-  else if (d != 0)
-    outs() << "." << c << "." << d;
-  else if (c != 0)
-    outs() << "." << c;
-  outs() << "\n";
-}
-
-static void PrintEntryPointCommand(MachO::entry_point_command ep) {
-  outs() << "       cmd LC_MAIN\n";
-  outs() << "   cmdsize " << ep.cmdsize;
-  if (ep.cmdsize != sizeof(struct MachO::entry_point_command))
-    outs() << " Incorrect size\n";
-  else
-    outs() << "\n";
-  outs() << "  entryoff " << ep.entryoff << "\n";
-  outs() << " stacksize " << ep.stacksize << "\n";
-}
-
-static void PrintEncryptionInfoCommand(MachO::encryption_info_command ec,
-                                       uint32_t object_size) {
-  outs() << "          cmd LC_ENCRYPTION_INFO\n";
-  outs() << "      cmdsize " << ec.cmdsize;
-  if (ec.cmdsize != sizeof(struct MachO::encryption_info_command))
-    outs() << " Incorrect size\n";
-  else
-    outs() << "\n";
-  outs() << "     cryptoff " << ec.cryptoff;
-  if (ec.cryptoff > object_size)
-    outs() << " (past end of file)\n";
-  else
-    outs() << "\n";
-  outs() << "    cryptsize " << ec.cryptsize;
-  if (ec.cryptsize > object_size)
-    outs() << " (past end of file)\n";
-  else
-    outs() << "\n";
-  outs() << "      cryptid " << ec.cryptid << "\n";
-}
-
-static void PrintEncryptionInfoCommand64(MachO::encryption_info_command_64 ec,
-                                         uint32_t object_size) {
-  outs() << "          cmd LC_ENCRYPTION_INFO_64\n";
-  outs() << "      cmdsize " << ec.cmdsize;
-  if (ec.cmdsize != sizeof(struct MachO::encryption_info_command_64))
-    outs() << " Incorrect size\n";
-  else
-    outs() << "\n";
-  outs() << "     cryptoff " << ec.cryptoff;
-  if (ec.cryptoff > object_size)
-    outs() << " (past end of file)\n";
-  else
-    outs() << "\n";
-  outs() << "    cryptsize " << ec.cryptsize;
-  if (ec.cryptsize > object_size)
-    outs() << " (past end of file)\n";
-  else
-    outs() << "\n";
-  outs() << "      cryptid " << ec.cryptid << "\n";
-  outs() << "          pad " << ec.pad << "\n";
-}
-
-static void PrintLinkerOptionCommand(MachO::linker_option_command lo,
-                                     const char *Ptr) {
-  outs() << "     cmd LC_LINKER_OPTION\n";
-  outs() << " cmdsize " << lo.cmdsize;
-  if (lo.cmdsize < sizeof(struct MachO::linker_option_command))
-    outs() << " Incorrect size\n";
-  else
-    outs() << "\n";
-  outs() << "   count " << lo.count << "\n";
-  const char *string = Ptr + sizeof(struct MachO::linker_option_command);
-  uint32_t left = lo.cmdsize - sizeof(struct MachO::linker_option_command);
-  uint32_t i = 0;
-  while (left > 0) {
-    while (*string == '\0' && left > 0) {
-      string++;
-      left--;
-    }
-    if (left > 0) {
-      i++;
-      outs() << "  string #" << i << " " << format("%.*s\n", left, string);
-      uint32_t NullPos = StringRef(string, left).find('\0');
-      uint32_t len = std::min(NullPos, left) + 1;
-      string += len;
-      left -= len;
-    }
-  }
-  if (lo.count != i)
-    outs() << "   count " << lo.count << " does not match number of strings "
-           << i << "\n";
-}
-
-static void PrintSubFrameworkCommand(MachO::sub_framework_command sub,
-                                     const char *Ptr) {
-  outs() << "          cmd LC_SUB_FRAMEWORK\n";
-  outs() << "      cmdsize " << sub.cmdsize;
-  if (sub.cmdsize < sizeof(struct MachO::sub_framework_command))
-    outs() << " Incorrect size\n";
-  else
-    outs() << "\n";
-  if (sub.umbrella < sub.cmdsize) {
-    const char *P = Ptr + sub.umbrella;
-    outs() << "     umbrella " << P << " (offset " << sub.umbrella << ")\n";
-  } else {
-    outs() << "     umbrella ?(bad offset " << sub.umbrella << ")\n";
-  }
-}
-
-static void PrintSubUmbrellaCommand(MachO::sub_umbrella_command sub,
-                                    const char *Ptr) {
-  outs() << "          cmd LC_SUB_UMBRELLA\n";
-  outs() << "      cmdsize " << sub.cmdsize;
-  if (sub.cmdsize < sizeof(struct MachO::sub_umbrella_command))
-    outs() << " Incorrect size\n";
-  else
-    outs() << "\n";
-  if (sub.sub_umbrella < sub.cmdsize) {
-    const char *P = Ptr + sub.sub_umbrella;
-    outs() << " sub_umbrella " << P << " (offset " << sub.sub_umbrella << ")\n";
-  } else {
-    outs() << " sub_umbrella ?(bad offset " << sub.sub_umbrella << ")\n";
-  }
-}
-
-static void PrintSubLibraryCommand(MachO::sub_library_command sub,
-                                   const char *Ptr) {
-  outs() << "          cmd LC_SUB_LIBRARY\n";
-  outs() << "      cmdsize " << sub.cmdsize;
-  if (sub.cmdsize < sizeof(struct MachO::sub_library_command))
-    outs() << " Incorrect size\n";
-  else
-    outs() << "\n";
-  if (sub.sub_library < sub.cmdsize) {
-    const char *P = Ptr + sub.sub_library;
-    outs() << "  sub_library " << P << " (offset " << sub.sub_library << ")\n";
-  } else {
-    outs() << "  sub_library ?(bad offset " << sub.sub_library << ")\n";
-  }
-}
-
-static void PrintSubClientCommand(MachO::sub_client_command sub,
-                                  const char *Ptr) {
-  outs() << "          cmd LC_SUB_CLIENT\n";
-  outs() << "      cmdsize " << sub.cmdsize;
-  if (sub.cmdsize < sizeof(struct MachO::sub_client_command))
-    outs() << " Incorrect size\n";
-  else
-    outs() << "\n";
-  if (sub.client < sub.cmdsize) {
-    const char *P = Ptr + sub.client;
-    outs() << "       client " << P << " (offset " << sub.client << ")\n";
-  } else {
-    outs() << "       client ?(bad offset " << sub.client << ")\n";
-  }
-}
-
-static void PrintRoutinesCommand(MachO::routines_command r) {
-  outs() << "          cmd LC_ROUTINES\n";
-  outs() << "      cmdsize " << r.cmdsize;
-  if (r.cmdsize != sizeof(struct MachO::routines_command))
-    outs() << " Incorrect size\n";
-  else
-    outs() << "\n";
-  outs() << " init_address " << format("0x%08" PRIx32, r.init_address) << "\n";
-  outs() << "  init_module " << r.init_module << "\n";
-  outs() << "    reserved1 " << r.reserved1 << "\n";
-  outs() << "    reserved2 " << r.reserved2 << "\n";
-  outs() << "    reserved3 " << r.reserved3 << "\n";
-  outs() << "    reserved4 " << r.reserved4 << "\n";
-  outs() << "    reserved5 " << r.reserved5 << "\n";
-  outs() << "    reserved6 " << r.reserved6 << "\n";
-}
-
-static void PrintRoutinesCommand64(MachO::routines_command_64 r) {
-  outs() << "          cmd LC_ROUTINES_64\n";
-  outs() << "      cmdsize " << r.cmdsize;
-  if (r.cmdsize != sizeof(struct MachO::routines_command_64))
-    outs() << " Incorrect size\n";
-  else
-    outs() << "\n";
-  outs() << " init_address " << format("0x%016" PRIx64, r.init_address) << "\n";
-  outs() << "  init_module " << r.init_module << "\n";
-  outs() << "    reserved1 " << r.reserved1 << "\n";
-  outs() << "    reserved2 " << r.reserved2 << "\n";
-  outs() << "    reserved3 " << r.reserved3 << "\n";
-  outs() << "    reserved4 " << r.reserved4 << "\n";
-  outs() << "    reserved5 " << r.reserved5 << "\n";
-  outs() << "    reserved6 " << r.reserved6 << "\n";
-}
-
-static void Print_x86_thread_state32_t(MachO::x86_thread_state32_t &cpu32) {
-  outs() << "\t    eax " << format("0x%08" PRIx32, cpu32.eax);
-  outs() << " ebx    " << format("0x%08" PRIx32, cpu32.ebx);
-  outs() << " ecx " << format("0x%08" PRIx32, cpu32.ecx);
-  outs() << " edx " << format("0x%08" PRIx32, cpu32.edx) << "\n";
-  outs() << "\t    edi " << format("0x%08" PRIx32, cpu32.edi);
-  outs() << " esi    " << format("0x%08" PRIx32, cpu32.esi);
-  outs() << " ebp " << format("0x%08" PRIx32, cpu32.ebp);
-  outs() << " esp " << format("0x%08" PRIx32, cpu32.esp) << "\n";
-  outs() << "\t    ss  " << format("0x%08" PRIx32, cpu32.ss);
-  outs() << " eflags " << format("0x%08" PRIx32, cpu32.eflags);
-  outs() << " eip " << format("0x%08" PRIx32, cpu32.eip);
-  outs() << " cs  " << format("0x%08" PRIx32, cpu32.cs) << "\n";
-  outs() << "\t    ds  " << format("0x%08" PRIx32, cpu32.ds);
-  outs() << " es     " << format("0x%08" PRIx32, cpu32.es);
-  outs() << " fs  " << format("0x%08" PRIx32, cpu32.fs);
-  outs() << " gs  " << format("0x%08" PRIx32, cpu32.gs) << "\n";
-}
-
-static void Print_x86_thread_state64_t(MachO::x86_thread_state64_t &cpu64) {
-  outs() << "   rax  " << format("0x%016" PRIx64, cpu64.rax);
-  outs() << " rbx " << format("0x%016" PRIx64, cpu64.rbx);
-  outs() << " rcx  " << format("0x%016" PRIx64, cpu64.rcx) << "\n";
-  outs() << "   rdx  " << format("0x%016" PRIx64, cpu64.rdx);
-  outs() << " rdi " << format("0x%016" PRIx64, cpu64.rdi);
-  outs() << " rsi  " << format("0x%016" PRIx64, cpu64.rsi) << "\n";
-  outs() << "   rbp  " << format("0x%016" PRIx64, cpu64.rbp);
-  outs() << " rsp " << format("0x%016" PRIx64, cpu64.rsp);
-  outs() << " r8   " << format("0x%016" PRIx64, cpu64.r8) << "\n";
-  outs() << "    r9  " << format("0x%016" PRIx64, cpu64.r9);
-  outs() << " r10 " << format("0x%016" PRIx64, cpu64.r10);
-  outs() << " r11  " << format("0x%016" PRIx64, cpu64.r11) << "\n";
-  outs() << "   r12  " << format("0x%016" PRIx64, cpu64.r12);
-  outs() << " r13 " << format("0x%016" PRIx64, cpu64.r13);
-  outs() << " r14  " << format("0x%016" PRIx64, cpu64.r14) << "\n";
-  outs() << "   r15  " << format("0x%016" PRIx64, cpu64.r15);
-  outs() << " rip " << format("0x%016" PRIx64, cpu64.rip) << "\n";
-  outs() << "rflags  " << format("0x%016" PRIx64, cpu64.rflags);
-  outs() << " cs  " << format("0x%016" PRIx64, cpu64.cs);
-  outs() << " fs   " << format("0x%016" PRIx64, cpu64.fs) << "\n";
-  outs() << "    gs  " << format("0x%016" PRIx64, cpu64.gs) << "\n";
-}
-
-static void Print_mmst_reg(MachO::mmst_reg_t &r) {
-  uint32_t f;
-  outs() << "\t      mmst_reg  ";
-  for (f = 0; f < 10; f++)
-    outs() << format("%02" PRIx32, (r.mmst_reg[f] & 0xff)) << " ";
-  outs() << "\n";
-  outs() << "\t      mmst_rsrv ";
-  for (f = 0; f < 6; f++)
-    outs() << format("%02" PRIx32, (r.mmst_rsrv[f] & 0xff)) << " ";
-  outs() << "\n";
-}
-
-static void Print_xmm_reg(MachO::xmm_reg_t &r) {
-  uint32_t f;
-  outs() << "\t      xmm_reg ";
-  for (f = 0; f < 16; f++)
-    outs() << format("%02" PRIx32, (r.xmm_reg[f] & 0xff)) << " ";
-  outs() << "\n";
-}
-
-static void Print_x86_float_state_t(MachO::x86_float_state64_t &fpu) {
-  outs() << "\t    fpu_reserved[0] " << fpu.fpu_reserved[0];
-  outs() << " fpu_reserved[1] " << fpu.fpu_reserved[1] << "\n";
-  outs() << "\t    control: invalid " << fpu.fpu_fcw.invalid;
-  outs() << " denorm " << fpu.fpu_fcw.denorm;
-  outs() << " zdiv " << fpu.fpu_fcw.zdiv;
-  outs() << " ovrfl " << fpu.fpu_fcw.ovrfl;
-  outs() << " undfl " << fpu.fpu_fcw.undfl;
-  outs() << " precis " << fpu.fpu_fcw.precis << "\n";
-  outs() << "\t\t     pc ";
-  if (fpu.fpu_fcw.pc == MachO::x86_FP_PREC_24B)
-    outs() << "FP_PREC_24B ";
-  else if (fpu.fpu_fcw.pc == MachO::x86_FP_PREC_53B)
-    outs() << "FP_PREC_53B ";
-  else if (fpu.fpu_fcw.pc == MachO::x86_FP_PREC_64B)
-    outs() << "FP_PREC_64B ";
-  else
-    outs() << fpu.fpu_fcw.pc << " ";
-  outs() << "rc ";
-  if (fpu.fpu_fcw.rc == MachO::x86_FP_RND_NEAR)
-    outs() << "FP_RND_NEAR ";
-  else if (fpu.fpu_fcw.rc == MachO::x86_FP_RND_DOWN)
-    outs() << "FP_RND_DOWN ";
-  else if (fpu.fpu_fcw.rc == MachO::x86_FP_RND_UP)
-    outs() << "FP_RND_UP ";
-  else if (fpu.fpu_fcw.rc == MachO::x86_FP_CHOP)
-    outs() << "FP_CHOP ";
-  outs() << "\n";
-  outs() << "\t    status: invalid " << fpu.fpu_fsw.invalid;
-  outs() << " denorm " << fpu.fpu_fsw.denorm;
-  outs() << " zdiv " << fpu.fpu_fsw.zdiv;
-  outs() << " ovrfl " << fpu.fpu_fsw.ovrfl;
-  outs() << " undfl " << fpu.fpu_fsw.undfl;
-  outs() << " precis " << fpu.fpu_fsw.precis;
-  outs() << " stkflt " << fpu.fpu_fsw.stkflt << "\n";
-  outs() << "\t            errsumm " << fpu.fpu_fsw.errsumm;
-  outs() << " c0 " << fpu.fpu_fsw.c0;
-  outs() << " c1 " << fpu.fpu_fsw.c1;
-  outs() << " c2 " << fpu.fpu_fsw.c2;
-  outs() << " tos " << fpu.fpu_fsw.tos;
-  outs() << " c3 " << fpu.fpu_fsw.c3;
-  outs() << " busy " << fpu.fpu_fsw.busy << "\n";
-  outs() << "\t    fpu_ftw " << format("0x%02" PRIx32, fpu.fpu_ftw);
-  outs() << " fpu_rsrv1 " << format("0x%02" PRIx32, fpu.fpu_rsrv1);
-  outs() << " fpu_fop " << format("0x%04" PRIx32, fpu.fpu_fop);
-  outs() << " fpu_ip " << format("0x%08" PRIx32, fpu.fpu_ip) << "\n";
-  outs() << "\t    fpu_cs " << format("0x%04" PRIx32, fpu.fpu_cs);
-  outs() << " fpu_rsrv2 " << format("0x%04" PRIx32, fpu.fpu_rsrv2);
-  outs() << " fpu_dp " << format("0x%08" PRIx32, fpu.fpu_dp);
-  outs() << " fpu_ds " << format("0x%04" PRIx32, fpu.fpu_ds) << "\n";
-  outs() << "\t    fpu_rsrv3 " << format("0x%04" PRIx32, fpu.fpu_rsrv3);
-  outs() << " fpu_mxcsr " << format("0x%08" PRIx32, fpu.fpu_mxcsr);
-  outs() << " fpu_mxcsrmask " << format("0x%08" PRIx32, fpu.fpu_mxcsrmask);
-  outs() << "\n";
-  outs() << "\t    fpu_stmm0:\n";
-  Print_mmst_reg(fpu.fpu_stmm0);
-  outs() << "\t    fpu_stmm1:\n";
-  Print_mmst_reg(fpu.fpu_stmm1);
-  outs() << "\t    fpu_stmm2:\n";
-  Print_mmst_reg(fpu.fpu_stmm2);
-  outs() << "\t    fpu_stmm3:\n";
-  Print_mmst_reg(fpu.fpu_stmm3);
-  outs() << "\t    fpu_stmm4:\n";
-  Print_mmst_reg(fpu.fpu_stmm4);
-  outs() << "\t    fpu_stmm5:\n";
-  Print_mmst_reg(fpu.fpu_stmm5);
-  outs() << "\t    fpu_stmm6:\n";
-  Print_mmst_reg(fpu.fpu_stmm6);
-  outs() << "\t    fpu_stmm7:\n";
-  Print_mmst_reg(fpu.fpu_stmm7);
-  outs() << "\t    fpu_xmm0:\n";
-  Print_xmm_reg(fpu.fpu_xmm0);
-  outs() << "\t    fpu_xmm1:\n";
-  Print_xmm_reg(fpu.fpu_xmm1);
-  outs() << "\t    fpu_xmm2:\n";
-  Print_xmm_reg(fpu.fpu_xmm2);
-  outs() << "\t    fpu_xmm3:\n";
-  Print_xmm_reg(fpu.fpu_xmm3);
-  outs() << "\t    fpu_xmm4:\n";
-  Print_xmm_reg(fpu.fpu_xmm4);
-  outs() << "\t    fpu_xmm5:\n";
-  Print_xmm_reg(fpu.fpu_xmm5);
-  outs() << "\t    fpu_xmm6:\n";
-  Print_xmm_reg(fpu.fpu_xmm6);
-  outs() << "\t    fpu_xmm7:\n";
-  Print_xmm_reg(fpu.fpu_xmm7);
-  outs() << "\t    fpu_xmm8:\n";
-  Print_xmm_reg(fpu.fpu_xmm8);
-  outs() << "\t    fpu_xmm9:\n";
-  Print_xmm_reg(fpu.fpu_xmm9);
-  outs() << "\t    fpu_xmm10:\n";
-  Print_xmm_reg(fpu.fpu_xmm10);
-  outs() << "\t    fpu_xmm11:\n";
-  Print_xmm_reg(fpu.fpu_xmm11);
-  outs() << "\t    fpu_xmm12:\n";
-  Print_xmm_reg(fpu.fpu_xmm12);
-  outs() << "\t    fpu_xmm13:\n";
-  Print_xmm_reg(fpu.fpu_xmm13);
-  outs() << "\t    fpu_xmm14:\n";
-  Print_xmm_reg(fpu.fpu_xmm14);
-  outs() << "\t    fpu_xmm15:\n";
-  Print_xmm_reg(fpu.fpu_xmm15);
-  outs() << "\t    fpu_rsrv4:\n";
-  for (uint32_t f = 0; f < 6; f++) {
-    outs() << "\t            ";
-    for (uint32_t g = 0; g < 16; g++)
-      outs() << format("%02" PRIx32, fpu.fpu_rsrv4[f * g]) << " ";
-    outs() << "\n";
-  }
-  outs() << "\t    fpu_reserved1 " << format("0x%08" PRIx32, fpu.fpu_reserved1);
-  outs() << "\n";
-}
-
-static void Print_x86_exception_state_t(MachO::x86_exception_state64_t &exc64) {
-  outs() << "\t    trapno " << format("0x%08" PRIx32, exc64.trapno);
-  outs() << " err " << format("0x%08" PRIx32, exc64.err);
-  outs() << " faultvaddr " << format("0x%016" PRIx64, exc64.faultvaddr) << "\n";
-}
-
-static void Print_arm_thread_state32_t(MachO::arm_thread_state32_t &cpu32) {
-  outs() << "\t    r0  " << format("0x%08" PRIx32, cpu32.r[0]);
-  outs() << " r1     "   << format("0x%08" PRIx32, cpu32.r[1]);
-  outs() << " r2  "      << format("0x%08" PRIx32, cpu32.r[2]);
-  outs() << " r3  "      << format("0x%08" PRIx32, cpu32.r[3]) << "\n";
-  outs() << "\t    r4  " << format("0x%08" PRIx32, cpu32.r[4]);
-  outs() << " r5     "   << format("0x%08" PRIx32, cpu32.r[5]);
-  outs() << " r6  "      << format("0x%08" PRIx32, cpu32.r[6]);
-  outs() << " r7  "      << format("0x%08" PRIx32, cpu32.r[7]) << "\n";
-  outs() << "\t    r8  " << format("0x%08" PRIx32, cpu32.r[8]);
-  outs() << " r9     "   << format("0x%08" PRIx32, cpu32.r[9]);
-  outs() << " r10 "      << format("0x%08" PRIx32, cpu32.r[10]);
-  outs() << " r11 "      << format("0x%08" PRIx32, cpu32.r[11]) << "\n";
-  outs() << "\t    r12 " << format("0x%08" PRIx32, cpu32.r[12]);
-  outs() << " sp     "   << format("0x%08" PRIx32, cpu32.sp);
-  outs() << " lr  "      << format("0x%08" PRIx32, cpu32.lr);
-  outs() << " pc  "      << format("0x%08" PRIx32, cpu32.pc) << "\n";
-  outs() << "\t   cpsr " << format("0x%08" PRIx32, cpu32.cpsr) << "\n";
-}
-
-static void Print_arm_thread_state64_t(MachO::arm_thread_state64_t &cpu64) {
-  outs() << "\t    x0  " << format("0x%016" PRIx64, cpu64.x[0]);
-  outs() << " x1  "      << format("0x%016" PRIx64, cpu64.x[1]);
-  outs() << " x2  "      << format("0x%016" PRIx64, cpu64.x[2]) << "\n";
-  outs() << "\t    x3  " << format("0x%016" PRIx64, cpu64.x[3]);
-  outs() << " x4  "      << format("0x%016" PRIx64, cpu64.x[4]);
-  outs() << " x5  "      << format("0x%016" PRIx64, cpu64.x[5]) << "\n";
-  outs() << "\t    x6  " << format("0x%016" PRIx64, cpu64.x[6]);
-  outs() << " x7  "      << format("0x%016" PRIx64, cpu64.x[7]);
-  outs() << " x8  "      << format("0x%016" PRIx64, cpu64.x[8]) << "\n";
-  outs() << "\t    x9  " << format("0x%016" PRIx64, cpu64.x[9]);
-  outs() << " x10 "      << format("0x%016" PRIx64, cpu64.x[10]);
-  outs() << " x11 "      << format("0x%016" PRIx64, cpu64.x[11]) << "\n";
-  outs() << "\t    x12 " << format("0x%016" PRIx64, cpu64.x[12]);
-  outs() << " x13 "      << format("0x%016" PRIx64, cpu64.x[13]);
-  outs() << " x14 "      << format("0x%016" PRIx64, cpu64.x[14]) << "\n";
-  outs() << "\t    x15 " << format("0x%016" PRIx64, cpu64.x[15]);
-  outs() << " x16 "      << format("0x%016" PRIx64, cpu64.x[16]);
-  outs() << " x17 "      << format("0x%016" PRIx64, cpu64.x[17]) << "\n";
-  outs() << "\t    x18 " << format("0x%016" PRIx64, cpu64.x[18]);
-  outs() << " x19 "      << format("0x%016" PRIx64, cpu64.x[19]);
-  outs() << " x20 "      << format("0x%016" PRIx64, cpu64.x[20]) << "\n";
-  outs() << "\t    x21 " << format("0x%016" PRIx64, cpu64.x[21]);
-  outs() << " x22 "      << format("0x%016" PRIx64, cpu64.x[22]);
-  outs() << " x23 "      << format("0x%016" PRIx64, cpu64.x[23]) << "\n";
-  outs() << "\t    x24 " << format("0x%016" PRIx64, cpu64.x[24]);
-  outs() << " x25 "      << format("0x%016" PRIx64, cpu64.x[25]);
-  outs() << " x26 "      << format("0x%016" PRIx64, cpu64.x[26]) << "\n";
-  outs() << "\t    x27 " << format("0x%016" PRIx64, cpu64.x[27]);
-  outs() << " x28 "      << format("0x%016" PRIx64, cpu64.x[28]);
-  outs() << "  fp "      << format("0x%016" PRIx64, cpu64.fp) << "\n";
-  outs() << "\t     lr " << format("0x%016" PRIx64, cpu64.lr);
-  outs() << " sp  "      << format("0x%016" PRIx64, cpu64.sp);
-  outs() << "  pc "      << format("0x%016" PRIx64, cpu64.pc) << "\n";
-  outs() << "\t   cpsr " << format("0x%08"  PRIx32, cpu64.cpsr) << "\n";
-}
-
-static void PrintThreadCommand(MachO::thread_command t, const char *Ptr,
-                               bool isLittleEndian, uint32_t cputype) {
-  if (t.cmd == MachO::LC_THREAD)
-    outs() << "        cmd LC_THREAD\n";
-  else if (t.cmd == MachO::LC_UNIXTHREAD)
-    outs() << "        cmd LC_UNIXTHREAD\n";
-  else
-    outs() << "        cmd " << t.cmd << " (unknown)\n";
-  outs() << "    cmdsize " << t.cmdsize;
-  if (t.cmdsize < sizeof(struct MachO::thread_command) + 2 * sizeof(uint32_t))
-    outs() << " Incorrect size\n";
-  else
-    outs() << "\n";
-
-  const char *begin = Ptr + sizeof(struct MachO::thread_command);
-  const char *end = Ptr + t.cmdsize;
-  uint32_t flavor, count, left;
-  if (cputype == MachO::CPU_TYPE_I386) {
-    while (begin < end) {
-      if (end - begin > (ptrdiff_t)sizeof(uint32_t)) {
-        memcpy((char *)&flavor, begin, sizeof(uint32_t));
-        begin += sizeof(uint32_t);
-      } else {
-        flavor = 0;
-        begin = end;
-      }
-      if (isLittleEndian != sys::IsLittleEndianHost)
-        sys::swapByteOrder(flavor);
-      if (end - begin > (ptrdiff_t)sizeof(uint32_t)) {
-        memcpy((char *)&count, begin, sizeof(uint32_t));
-        begin += sizeof(uint32_t);
-      } else {
-        count = 0;
-        begin = end;
-      }
-      if (isLittleEndian != sys::IsLittleEndianHost)
-        sys::swapByteOrder(count);
-      if (flavor == MachO::x86_THREAD_STATE32) {
-        outs() << "     flavor i386_THREAD_STATE\n";
-        if (count == MachO::x86_THREAD_STATE32_COUNT)
-          outs() << "      count i386_THREAD_STATE_COUNT\n";
-        else
-          outs() << "      count " << count
-                 << " (not x86_THREAD_STATE32_COUNT)\n";
-        MachO::x86_thread_state32_t cpu32;
-        left = end - begin;
-        if (left >= sizeof(MachO::x86_thread_state32_t)) {
-          memcpy(&cpu32, begin, sizeof(MachO::x86_thread_state32_t));
-          begin += sizeof(MachO::x86_thread_state32_t);
-        } else {
-          memset(&cpu32, '\0', sizeof(MachO::x86_thread_state32_t));
-          memcpy(&cpu32, begin, left);
-          begin += left;
-        }
-        if (isLittleEndian != sys::IsLittleEndianHost)
-          swapStruct(cpu32);
-        Print_x86_thread_state32_t(cpu32);
-      } else if (flavor == MachO::x86_THREAD_STATE) {
-        outs() << "     flavor x86_THREAD_STATE\n";
-        if (count == MachO::x86_THREAD_STATE_COUNT)
-          outs() << "      count x86_THREAD_STATE_COUNT\n";
-        else
-          outs() << "      count " << count
-                 << " (not x86_THREAD_STATE_COUNT)\n";
-        struct MachO::x86_thread_state_t ts;
-        left = end - begin;
-        if (left >= sizeof(MachO::x86_thread_state_t)) {
-          memcpy(&ts, begin, sizeof(MachO::x86_thread_state_t));
-          begin += sizeof(MachO::x86_thread_state_t);
-        } else {
-          memset(&ts, '\0', sizeof(MachO::x86_thread_state_t));
-          memcpy(&ts, begin, left);
-          begin += left;
-        }
-        if (isLittleEndian != sys::IsLittleEndianHost)
-          swapStruct(ts);
-        if (ts.tsh.flavor == MachO::x86_THREAD_STATE32) {
-          outs() << "\t    tsh.flavor x86_THREAD_STATE32 ";
-          if (ts.tsh.count == MachO::x86_THREAD_STATE32_COUNT)
-            outs() << "tsh.count x86_THREAD_STATE32_COUNT\n";
-          else
-            outs() << "tsh.count " << ts.tsh.count
-                   << " (not x86_THREAD_STATE32_COUNT\n";
-          Print_x86_thread_state32_t(ts.uts.ts32);
-        } else {
-          outs() << "\t    tsh.flavor " << ts.tsh.flavor << "  tsh.count "
-                 << ts.tsh.count << "\n";
-        }
-      } else {
-        outs() << "     flavor " << flavor << " (unknown)\n";
-        outs() << "      count " << count << "\n";
-        outs() << "      state (unknown)\n";
-        begin += count * sizeof(uint32_t);
-      }
-    }
-  } else if (cputype == MachO::CPU_TYPE_X86_64) {
-    while (begin < end) {
-      if (end - begin > (ptrdiff_t)sizeof(uint32_t)) {
-        memcpy((char *)&flavor, begin, sizeof(uint32_t));
-        begin += sizeof(uint32_t);
-      } else {
-        flavor = 0;
-        begin = end;
-      }
-      if (isLittleEndian != sys::IsLittleEndianHost)
-        sys::swapByteOrder(flavor);
-      if (end - begin > (ptrdiff_t)sizeof(uint32_t)) {
-        memcpy((char *)&count, begin, sizeof(uint32_t));
-        begin += sizeof(uint32_t);
-      } else {
-        count = 0;
-        begin = end;
-      }
-      if (isLittleEndian != sys::IsLittleEndianHost)
-        sys::swapByteOrder(count);
-      if (flavor == MachO::x86_THREAD_STATE64) {
-        outs() << "     flavor x86_THREAD_STATE64\n";
-        if (count == MachO::x86_THREAD_STATE64_COUNT)
-          outs() << "      count x86_THREAD_STATE64_COUNT\n";
-        else
-          outs() << "      count " << count
-                 << " (not x86_THREAD_STATE64_COUNT)\n";
-        MachO::x86_thread_state64_t cpu64;
-        left = end - begin;
-        if (left >= sizeof(MachO::x86_thread_state64_t)) {
-          memcpy(&cpu64, begin, sizeof(MachO::x86_thread_state64_t));
-          begin += sizeof(MachO::x86_thread_state64_t);
-        } else {
-          memset(&cpu64, '\0', sizeof(MachO::x86_thread_state64_t));
-          memcpy(&cpu64, begin, left);
-          begin += left;
-        }
-        if (isLittleEndian != sys::IsLittleEndianHost)
-          swapStruct(cpu64);
-        Print_x86_thread_state64_t(cpu64);
-      } else if (flavor == MachO::x86_THREAD_STATE) {
-        outs() << "     flavor x86_THREAD_STATE\n";
-        if (count == MachO::x86_THREAD_STATE_COUNT)
-          outs() << "      count x86_THREAD_STATE_COUNT\n";
-        else
-          outs() << "      count " << count
-                 << " (not x86_THREAD_STATE_COUNT)\n";
-        struct MachO::x86_thread_state_t ts;
-        left = end - begin;
-        if (left >= sizeof(MachO::x86_thread_state_t)) {
-          memcpy(&ts, begin, sizeof(MachO::x86_thread_state_t));
-          begin += sizeof(MachO::x86_thread_state_t);
-        } else {
-          memset(&ts, '\0', sizeof(MachO::x86_thread_state_t));
-          memcpy(&ts, begin, left);
-          begin += left;
-        }
-        if (isLittleEndian != sys::IsLittleEndianHost)
-          swapStruct(ts);
-        if (ts.tsh.flavor == MachO::x86_THREAD_STATE64) {
-          outs() << "\t    tsh.flavor x86_THREAD_STATE64 ";
-          if (ts.tsh.count == MachO::x86_THREAD_STATE64_COUNT)
-            outs() << "tsh.count x86_THREAD_STATE64_COUNT\n";
-          else
-            outs() << "tsh.count " << ts.tsh.count
-                   << " (not x86_THREAD_STATE64_COUNT\n";
-          Print_x86_thread_state64_t(ts.uts.ts64);
-        } else {
-          outs() << "\t    tsh.flavor " << ts.tsh.flavor << "  tsh.count "
-                 << ts.tsh.count << "\n";
-        }
-      } else if (flavor == MachO::x86_FLOAT_STATE) {
-        outs() << "     flavor x86_FLOAT_STATE\n";
-        if (count == MachO::x86_FLOAT_STATE_COUNT)
-          outs() << "      count x86_FLOAT_STATE_COUNT\n";
-        else
-          outs() << "      count " << count << " (not x86_FLOAT_STATE_COUNT)\n";
-        struct MachO::x86_float_state_t fs;
-        left = end - begin;
-        if (left >= sizeof(MachO::x86_float_state_t)) {
-          memcpy(&fs, begin, sizeof(MachO::x86_float_state_t));
-          begin += sizeof(MachO::x86_float_state_t);
-        } else {
-          memset(&fs, '\0', sizeof(MachO::x86_float_state_t));
-          memcpy(&fs, begin, left);
-          begin += left;
-        }
-        if (isLittleEndian != sys::IsLittleEndianHost)
-          swapStruct(fs);
-        if (fs.fsh.flavor == MachO::x86_FLOAT_STATE64) {
-          outs() << "\t    fsh.flavor x86_FLOAT_STATE64 ";
-          if (fs.fsh.count == MachO::x86_FLOAT_STATE64_COUNT)
-            outs() << "fsh.count x86_FLOAT_STATE64_COUNT\n";
-          else
-            outs() << "fsh.count " << fs.fsh.count
-                   << " (not x86_FLOAT_STATE64_COUNT\n";
-          Print_x86_float_state_t(fs.ufs.fs64);
-        } else {
-          outs() << "\t    fsh.flavor " << fs.fsh.flavor << "  fsh.count "
-                 << fs.fsh.count << "\n";
-        }
-      } else if (flavor == MachO::x86_EXCEPTION_STATE) {
-        outs() << "     flavor x86_EXCEPTION_STATE\n";
-        if (count == MachO::x86_EXCEPTION_STATE_COUNT)
-          outs() << "      count x86_EXCEPTION_STATE_COUNT\n";
-        else
-          outs() << "      count " << count
-                 << " (not x86_EXCEPTION_STATE_COUNT)\n";
-        struct MachO::x86_exception_state_t es;
-        left = end - begin;
-        if (left >= sizeof(MachO::x86_exception_state_t)) {
-          memcpy(&es, begin, sizeof(MachO::x86_exception_state_t));
-          begin += sizeof(MachO::x86_exception_state_t);
-        } else {
-          memset(&es, '\0', sizeof(MachO::x86_exception_state_t));
-          memcpy(&es, begin, left);
-          begin += left;
-        }
-        if (isLittleEndian != sys::IsLittleEndianHost)
-          swapStruct(es);
-        if (es.esh.flavor == MachO::x86_EXCEPTION_STATE64) {
-          outs() << "\t    esh.flavor x86_EXCEPTION_STATE64\n";
-          if (es.esh.count == MachO::x86_EXCEPTION_STATE64_COUNT)
-            outs() << "\t    esh.count x86_EXCEPTION_STATE64_COUNT\n";
-          else
-            outs() << "\t    esh.count " << es.esh.count
-                   << " (not x86_EXCEPTION_STATE64_COUNT\n";
-          Print_x86_exception_state_t(es.ues.es64);
-        } else {
-          outs() << "\t    esh.flavor " << es.esh.flavor << "  esh.count "
-                 << es.esh.count << "\n";
-        }
-      } else if (flavor == MachO::x86_EXCEPTION_STATE64) {
-        outs() << "     flavor x86_EXCEPTION_STATE64\n";
-        if (count == MachO::x86_EXCEPTION_STATE64_COUNT)
-          outs() << "      count x86_EXCEPTION_STATE64_COUNT\n";
-        else
-          outs() << "      count " << count
-                 << " (not x86_EXCEPTION_STATE64_COUNT)\n";
-        struct MachO::x86_exception_state64_t es64;
-        left = end - begin;
-        if (left >= sizeof(MachO::x86_exception_state64_t)) {
-          memcpy(&es64, begin, sizeof(MachO::x86_exception_state64_t));
-          begin += sizeof(MachO::x86_exception_state64_t);
-        } else {
-          memset(&es64, '\0', sizeof(MachO::x86_exception_state64_t));
-          memcpy(&es64, begin, left);
-          begin += left;
-        }
-        if (isLittleEndian != sys::IsLittleEndianHost)
-          swapStruct(es64);
-        Print_x86_exception_state_t(es64);
-      } else {
-        outs() << "     flavor " << flavor << " (unknown)\n";
-        outs() << "      count " << count << "\n";
-        outs() << "      state (unknown)\n";
-        begin += count * sizeof(uint32_t);
-      }
-    }
-  } else if (cputype == MachO::CPU_TYPE_ARM) {
-    while (begin < end) {
-      if (end - begin > (ptrdiff_t)sizeof(uint32_t)) {
-        memcpy((char *)&flavor, begin, sizeof(uint32_t));
-        begin += sizeof(uint32_t);
-      } else {
-        flavor = 0;
-        begin = end;
-      }
-      if (isLittleEndian != sys::IsLittleEndianHost)
-        sys::swapByteOrder(flavor);
-      if (end - begin > (ptrdiff_t)sizeof(uint32_t)) {
-        memcpy((char *)&count, begin, sizeof(uint32_t));
-        begin += sizeof(uint32_t);
-      } else {
-        count = 0;
-        begin = end;
-      }
-      if (isLittleEndian != sys::IsLittleEndianHost)
-        sys::swapByteOrder(count);
-      if (flavor == MachO::ARM_THREAD_STATE) {
-        outs() << "     flavor ARM_THREAD_STATE\n";
-        if (count == MachO::ARM_THREAD_STATE_COUNT)
-          outs() << "      count ARM_THREAD_STATE_COUNT\n";
-        else
-          outs() << "      count " << count
-                 << " (not ARM_THREAD_STATE_COUNT)\n";
-        MachO::arm_thread_state32_t cpu32;
-        left = end - begin;
-        if (left >= sizeof(MachO::arm_thread_state32_t)) {
-          memcpy(&cpu32, begin, sizeof(MachO::arm_thread_state32_t));
-          begin += sizeof(MachO::arm_thread_state32_t);
-        } else {
-          memset(&cpu32, '\0', sizeof(MachO::arm_thread_state32_t));
-          memcpy(&cpu32, begin, left);
-          begin += left;
-        }
-        if (isLittleEndian != sys::IsLittleEndianHost)
-          swapStruct(cpu32);
-        Print_arm_thread_state32_t(cpu32);
-      } else {
-        outs() << "     flavor " << flavor << " (unknown)\n";
-        outs() << "      count " << count << "\n";
-        outs() << "      state (unknown)\n";
-        begin += count * sizeof(uint32_t);
-      }
-    }
-  } else if (cputype == MachO::CPU_TYPE_ARM64 ||
-             cputype == MachO::CPU_TYPE_ARM64_32) {
-    while (begin < end) {
-      if (end - begin > (ptrdiff_t)sizeof(uint32_t)) {
-        memcpy((char *)&flavor, begin, sizeof(uint32_t));
-        begin += sizeof(uint32_t);
-      } else {
-        flavor = 0;
-        begin = end;
-      }
-      if (isLittleEndian != sys::IsLittleEndianHost)
-        sys::swapByteOrder(flavor);
-      if (end - begin > (ptrdiff_t)sizeof(uint32_t)) {
-        memcpy((char *)&count, begin, sizeof(uint32_t));
-        begin += sizeof(uint32_t);
-      } else {
-        count = 0;
-        begin = end;
-      }
-      if (isLittleEndian != sys::IsLittleEndianHost)
-        sys::swapByteOrder(count);
-      if (flavor == MachO::ARM_THREAD_STATE64) {
-        outs() << "     flavor ARM_THREAD_STATE64\n";
-        if (count == MachO::ARM_THREAD_STATE64_COUNT)
-          outs() << "      count ARM_THREAD_STATE64_COUNT\n";
-        else
-          outs() << "      count " << count
-                 << " (not ARM_THREAD_STATE64_COUNT)\n";
-        MachO::arm_thread_state64_t cpu64;
-        left = end - begin;
-        if (left >= sizeof(MachO::arm_thread_state64_t)) {
-          memcpy(&cpu64, begin, sizeof(MachO::arm_thread_state64_t));
-          begin += sizeof(MachO::arm_thread_state64_t);
-        } else {
-          memset(&cpu64, '\0', sizeof(MachO::arm_thread_state64_t));
-          memcpy(&cpu64, begin, left);
-          begin += left;
-        }
-        if (isLittleEndian != sys::IsLittleEndianHost)
-          swapStruct(cpu64);
-        Print_arm_thread_state64_t(cpu64);
-      } else {
-        outs() << "     flavor " << flavor << " (unknown)\n";
-        outs() << "      count " << count << "\n";
-        outs() << "      state (unknown)\n";
-        begin += count * sizeof(uint32_t);
-      }
-    }
-  } else {
-    while (begin < end) {
-      if (end - begin > (ptrdiff_t)sizeof(uint32_t)) {
-        memcpy((char *)&flavor, begin, sizeof(uint32_t));
-        begin += sizeof(uint32_t);
-      } else {
-        flavor = 0;
-        begin = end;
-      }
-      if (isLittleEndian != sys::IsLittleEndianHost)
-        sys::swapByteOrder(flavor);
-      if (end - begin > (ptrdiff_t)sizeof(uint32_t)) {
-        memcpy((char *)&count, begin, sizeof(uint32_t));
-        begin += sizeof(uint32_t);
-      } else {
-        count = 0;
-        begin = end;
-      }
-      if (isLittleEndian != sys::IsLittleEndianHost)
-        sys::swapByteOrder(count);
-      outs() << "     flavor " << flavor << "\n";
-      outs() << "      count " << count << "\n";
-      outs() << "      state (Unknown cputype/cpusubtype)\n";
-      begin += count * sizeof(uint32_t);
-    }
-  }
-}
-
-static void PrintDylibCommand(MachO::dylib_command dl, const char *Ptr) {
-  if (dl.cmd == MachO::LC_ID_DYLIB)
-    outs() << "          cmd LC_ID_DYLIB\n";
-  else if (dl.cmd == MachO::LC_LOAD_DYLIB)
-    outs() << "          cmd LC_LOAD_DYLIB\n";
-  else if (dl.cmd == MachO::LC_LOAD_WEAK_DYLIB)
-    outs() << "          cmd LC_LOAD_WEAK_DYLIB\n";
-  else if (dl.cmd == MachO::LC_REEXPORT_DYLIB)
-    outs() << "          cmd LC_REEXPORT_DYLIB\n";
-  else if (dl.cmd == MachO::LC_LAZY_LOAD_DYLIB)
-    outs() << "          cmd LC_LAZY_LOAD_DYLIB\n";
-  else if (dl.cmd == MachO::LC_LOAD_UPWARD_DYLIB)
-    outs() << "          cmd LC_LOAD_UPWARD_DYLIB\n";
-  else
-    outs() << "          cmd " << dl.cmd << " (unknown)\n";
-  outs() << "      cmdsize " << dl.cmdsize;
-  if (dl.cmdsize < sizeof(struct MachO::dylib_command))
-    outs() << " Incorrect size\n";
-  else
-    outs() << "\n";
-  if (dl.dylib.name < dl.cmdsize) {
-    const char *P = (const char *)(Ptr) + dl.dylib.name;
-    outs() << "         name " << P << " (offset " << dl.dylib.name << ")\n";
-  } else {
-    outs() << "         name ?(bad offset " << dl.dylib.name << ")\n";
-  }
-  outs() << "   time stamp " << dl.dylib.timestamp << " ";
-  time_t t = dl.dylib.timestamp;
-  outs() << ctime(&t);
-  outs() << "      current version ";
-  if (dl.dylib.current_version == 0xffffffff)
-    outs() << "n/a\n";
-  else
-    outs() << ((dl.dylib.current_version >> 16) & 0xffff) << "."
-           << ((dl.dylib.current_version >> 8) & 0xff) << "."
-           << (dl.dylib.current_version & 0xff) << "\n";
-  outs() << "compatibility version ";
-  if (dl.dylib.compatibility_version == 0xffffffff)
-    outs() << "n/a\n";
-  else
-    outs() << ((dl.dylib.compatibility_version >> 16) & 0xffff) << "."
-           << ((dl.dylib.compatibility_version >> 8) & 0xff) << "."
-           << (dl.dylib.compatibility_version & 0xff) << "\n";
-}
-
-static void PrintLinkEditDataCommand(MachO::linkedit_data_command ld,
-                                     uint32_t object_size) {
-  if (ld.cmd == MachO::LC_CODE_SIGNATURE)
-    outs() << "      cmd LC_CODE_SIGNATURE\n";
-  else if (ld.cmd == MachO::LC_SEGMENT_SPLIT_INFO)
-    outs() << "      cmd LC_SEGMENT_SPLIT_INFO\n";
-  else if (ld.cmd == MachO::LC_FUNCTION_STARTS)
-    outs() << "      cmd LC_FUNCTION_STARTS\n";
-  else if (ld.cmd == MachO::LC_DATA_IN_CODE)
-    outs() << "      cmd LC_DATA_IN_CODE\n";
-  else if (ld.cmd == MachO::LC_DYLIB_CODE_SIGN_DRS)
-    outs() << "      cmd LC_DYLIB_CODE_SIGN_DRS\n";
-  else if (ld.cmd == MachO::LC_LINKER_OPTIMIZATION_HINT)
-    outs() << "      cmd LC_LINKER_OPTIMIZATION_HINT\n";
-  else
-    outs() << "      cmd " << ld.cmd << " (?)\n";
-  outs() << "  cmdsize " << ld.cmdsize;
-  if (ld.cmdsize != sizeof(struct MachO::linkedit_data_command))
-    outs() << " Incorrect size\n";
-  else
-    outs() << "\n";
-  outs() << "  dataoff " << ld.dataoff;
-  if (ld.dataoff > object_size)
-    outs() << " (past end of file)\n";
-  else
-    outs() << "\n";
-  outs() << " datasize " << ld.datasize;
-  uint64_t big_size = ld.dataoff;
-  big_size += ld.datasize;
-  if (big_size > object_size)
-    outs() << " (past end of file)\n";
-  else
-    outs() << "\n";
-}
-
-static void PrintLoadCommands(const MachOObjectFile *Obj, uint32_t filetype,
-                              uint32_t cputype, bool verbose) {
-  StringRef Buf = Obj->getData();
-  unsigned Index = 0;
-  for (const auto &Command : Obj->load_commands()) {
-    outs() << "Load command " << Index++ << "\n";
-    if (Command.C.cmd == MachO::LC_SEGMENT) {
-      MachO::segment_command SLC = Obj->getSegmentLoadCommand(Command);
-      const char *sg_segname = SLC.segname;
-      PrintSegmentCommand(SLC.cmd, SLC.cmdsize, SLC.segname, SLC.vmaddr,
-                          SLC.vmsize, SLC.fileoff, SLC.filesize, SLC.maxprot,
-                          SLC.initprot, SLC.nsects, SLC.flags, Buf.size(),
-                          verbose);
-      for (unsigned j = 0; j < SLC.nsects; j++) {
-        MachO::section S = Obj->getSection(Command, j);
-        PrintSection(S.sectname, S.segname, S.addr, S.size, S.offset, S.align,
-                     S.reloff, S.nreloc, S.flags, S.reserved1, S.reserved2,
-                     SLC.cmd, sg_segname, filetype, Buf.size(), verbose);
-      }
-    } else if (Command.C.cmd == MachO::LC_SEGMENT_64) {
-      MachO::segment_command_64 SLC_64 = Obj->getSegment64LoadCommand(Command);
-      const char *sg_segname = SLC_64.segname;
-      PrintSegmentCommand(SLC_64.cmd, SLC_64.cmdsize, SLC_64.segname,
-                          SLC_64.vmaddr, SLC_64.vmsize, SLC_64.fileoff,
-                          SLC_64.filesize, SLC_64.maxprot, SLC_64.initprot,
-                          SLC_64.nsects, SLC_64.flags, Buf.size(), verbose);
-      for (unsigned j = 0; j < SLC_64.nsects; j++) {
-        MachO::section_64 S_64 = Obj->getSection64(Command, j);
-        PrintSection(S_64.sectname, S_64.segname, S_64.addr, S_64.size,
-                     S_64.offset, S_64.align, S_64.reloff, S_64.nreloc,
-                     S_64.flags, S_64.reserved1, S_64.reserved2, SLC_64.cmd,
-                     sg_segname, filetype, Buf.size(), verbose);
-      }
-    } else if (Command.C.cmd == MachO::LC_SYMTAB) {
-      MachO::symtab_command Symtab = Obj->getSymtabLoadCommand();
-      PrintSymtabLoadCommand(Symtab, Obj->is64Bit(), Buf.size());
-    } else if (Command.C.cmd == MachO::LC_DYSYMTAB) {
-      MachO::dysymtab_command Dysymtab = Obj->getDysymtabLoadCommand();
-      MachO::symtab_command Symtab = Obj->getSymtabLoadCommand();
-      PrintDysymtabLoadCommand(Dysymtab, Symtab.nsyms, Buf.size(),
-                               Obj->is64Bit());
-    } else if (Command.C.cmd == MachO::LC_DYLD_INFO ||
-               Command.C.cmd == MachO::LC_DYLD_INFO_ONLY) {
-      MachO::dyld_info_command DyldInfo = Obj->getDyldInfoLoadCommand(Command);
-      PrintDyldInfoLoadCommand(DyldInfo, Buf.size());
-    } else if (Command.C.cmd == MachO::LC_LOAD_DYLINKER ||
-               Command.C.cmd == MachO::LC_ID_DYLINKER ||
-               Command.C.cmd == MachO::LC_DYLD_ENVIRONMENT) {
-      MachO::dylinker_command Dyld = Obj->getDylinkerCommand(Command);
-      PrintDyldLoadCommand(Dyld, Command.Ptr);
-    } else if (Command.C.cmd == MachO::LC_UUID) {
-      MachO::uuid_command Uuid = Obj->getUuidCommand(Command);
-      PrintUuidLoadCommand(Uuid);
-    } else if (Command.C.cmd == MachO::LC_RPATH) {
-      MachO::rpath_command Rpath = Obj->getRpathCommand(Command);
-      PrintRpathLoadCommand(Rpath, Command.Ptr);
-    } else if (Command.C.cmd == MachO::LC_VERSION_MIN_MACOSX ||
-               Command.C.cmd == MachO::LC_VERSION_MIN_IPHONEOS ||
-               Command.C.cmd == MachO::LC_VERSION_MIN_TVOS ||
-               Command.C.cmd == MachO::LC_VERSION_MIN_WATCHOS) {
-      MachO::version_min_command Vd = Obj->getVersionMinLoadCommand(Command);
-      PrintVersionMinLoadCommand(Vd);
-    } else if (Command.C.cmd == MachO::LC_NOTE) {
-      MachO::note_command Nt = Obj->getNoteLoadCommand(Command);
-      PrintNoteLoadCommand(Nt);
-    } else if (Command.C.cmd == MachO::LC_BUILD_VERSION) {
-      MachO::build_version_command Bv =
-          Obj->getBuildVersionLoadCommand(Command);
-      PrintBuildVersionLoadCommand(Obj, Bv);
-    } else if (Command.C.cmd == MachO::LC_SOURCE_VERSION) {
-      MachO::source_version_command Sd = Obj->getSourceVersionCommand(Command);
-      PrintSourceVersionCommand(Sd);
-    } else if (Command.C.cmd == MachO::LC_MAIN) {
-      MachO::entry_point_command Ep = Obj->getEntryPointCommand(Command);
-      PrintEntryPointCommand(Ep);
-    } else if (Command.C.cmd == MachO::LC_ENCRYPTION_INFO) {
-      MachO::encryption_info_command Ei =
-          Obj->getEncryptionInfoCommand(Command);
-      PrintEncryptionInfoCommand(Ei, Buf.size());
-    } else if (Command.C.cmd == MachO::LC_ENCRYPTION_INFO_64) {
-      MachO::encryption_info_command_64 Ei =
-          Obj->getEncryptionInfoCommand64(Command);
-      PrintEncryptionInfoCommand64(Ei, Buf.size());
-    } else if (Command.C.cmd == MachO::LC_LINKER_OPTION) {
-      MachO::linker_option_command Lo =
-          Obj->getLinkerOptionLoadCommand(Command);
-      PrintLinkerOptionCommand(Lo, Command.Ptr);
-    } else if (Command.C.cmd == MachO::LC_SUB_FRAMEWORK) {
-      MachO::sub_framework_command Sf = Obj->getSubFrameworkCommand(Command);
-      PrintSubFrameworkCommand(Sf, Command.Ptr);
-    } else if (Command.C.cmd == MachO::LC_SUB_UMBRELLA) {
-      MachO::sub_umbrella_command Sf = Obj->getSubUmbrellaCommand(Command);
-      PrintSubUmbrellaCommand(Sf, Command.Ptr);
-    } else if (Command.C.cmd == MachO::LC_SUB_LIBRARY) {
-      MachO::sub_library_command Sl = Obj->getSubLibraryCommand(Command);
-      PrintSubLibraryCommand(Sl, Command.Ptr);
-    } else if (Command.C.cmd == MachO::LC_SUB_CLIENT) {
-      MachO::sub_client_command Sc = Obj->getSubClientCommand(Command);
-      PrintSubClientCommand(Sc, Command.Ptr);
-    } else if (Command.C.cmd == MachO::LC_ROUTINES) {
-      MachO::routines_command Rc = Obj->getRoutinesCommand(Command);
-      PrintRoutinesCommand(Rc);
-    } else if (Command.C.cmd == MachO::LC_ROUTINES_64) {
-      MachO::routines_command_64 Rc = Obj->getRoutinesCommand64(Command);
-      PrintRoutinesCommand64(Rc);
-    } else if (Command.C.cmd == MachO::LC_THREAD ||
-               Command.C.cmd == MachO::LC_UNIXTHREAD) {
-      MachO::thread_command Tc = Obj->getThreadCommand(Command);
-      PrintThreadCommand(Tc, Command.Ptr, Obj->isLittleEndian(), cputype);
-    } else if (Command.C.cmd == MachO::LC_LOAD_DYLIB ||
-               Command.C.cmd == MachO::LC_ID_DYLIB ||
-               Command.C.cmd == MachO::LC_LOAD_WEAK_DYLIB ||
-               Command.C.cmd == MachO::LC_REEXPORT_DYLIB ||
-               Command.C.cmd == MachO::LC_LAZY_LOAD_DYLIB ||
-               Command.C.cmd == MachO::LC_LOAD_UPWARD_DYLIB) {
-      MachO::dylib_command Dl = Obj->getDylibIDLoadCommand(Command);
-      PrintDylibCommand(Dl, Command.Ptr);
-    } else if (Command.C.cmd == MachO::LC_CODE_SIGNATURE ||
-               Command.C.cmd == MachO::LC_SEGMENT_SPLIT_INFO ||
-               Command.C.cmd == MachO::LC_FUNCTION_STARTS ||
-               Command.C.cmd == MachO::LC_DATA_IN_CODE ||
-               Command.C.cmd == MachO::LC_DYLIB_CODE_SIGN_DRS ||
-               Command.C.cmd == MachO::LC_LINKER_OPTIMIZATION_HINT) {
-      MachO::linkedit_data_command Ld =
-          Obj->getLinkeditDataLoadCommand(Command);
-      PrintLinkEditDataCommand(Ld, Buf.size());
-    } else {
-      outs() << "      cmd ?(" << format("0x%08" PRIx32, Command.C.cmd)
-             << ")\n";
-      outs() << "  cmdsize " << Command.C.cmdsize << "\n";
-      // TODO: get and print the raw bytes of the load command.
-    }
-    // TODO: print all the other kinds of load commands.
-  }
-}
-
-static void PrintMachHeader(const MachOObjectFile *Obj, bool verbose) {
-  if (Obj->is64Bit()) {
-    MachO::mach_header_64 H_64;
-    H_64 = Obj->getHeader64();
-    PrintMachHeader(H_64.magic, H_64.cputype, H_64.cpusubtype, H_64.filetype,
-                    H_64.ncmds, H_64.sizeofcmds, H_64.flags, verbose);
-  } else {
-    MachO::mach_header H;
-    H = Obj->getHeader();
-    PrintMachHeader(H.magic, H.cputype, H.cpusubtype, H.filetype, H.ncmds,
-                    H.sizeofcmds, H.flags, verbose);
-  }
-}
-
-void printMachOFileHeader(const object::ObjectFile *Obj) {
-  const MachOObjectFile *file = dyn_cast<const MachOObjectFile>(Obj);
-  PrintMachHeader(file, !NonVerbose);
-}
-
-void printMachOLoadCommands(const object::ObjectFile *Obj) {
-  const MachOObjectFile *file = dyn_cast<const MachOObjectFile>(Obj);
-  uint32_t filetype = 0;
-  uint32_t cputype = 0;
-  if (file->is64Bit()) {
-    MachO::mach_header_64 H_64;
-    H_64 = file->getHeader64();
-    filetype = H_64.filetype;
-    cputype = H_64.cputype;
-  } else {
-    MachO::mach_header H;
-    H = file->getHeader();
-    filetype = H.filetype;
-    cputype = H.cputype;
-  }
-  PrintLoadCommands(file, filetype, cputype, !NonVerbose);
-}
-
-//===----------------------------------------------------------------------===//
-// export trie dumping
-//===----------------------------------------------------------------------===//
-
-void printMachOExportsTrie(const object::MachOObjectFile *Obj) {
-  uint64_t BaseSegmentAddress = 0;
-  for (const auto &Command : Obj->load_commands()) {
-    if (Command.C.cmd == MachO::LC_SEGMENT) {
-      MachO::segment_command Seg = Obj->getSegmentLoadCommand(Command);
-      if (Seg.fileoff == 0 && Seg.filesize != 0) {
-        BaseSegmentAddress = Seg.vmaddr;
-        break;
-      }
-    } else if (Command.C.cmd == MachO::LC_SEGMENT_64) {
-      MachO::segment_command_64 Seg = Obj->getSegment64LoadCommand(Command);
-      if (Seg.fileoff == 0 && Seg.filesize != 0) {
-        BaseSegmentAddress = Seg.vmaddr;
-        break;
-      }
-    }
-  }
-  Error Err = Error::success();
-  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);
-    bool ThreadLocal = ((Flags & MachO::EXPORT_SYMBOL_FLAGS_KIND_MASK) ==
-                        MachO::EXPORT_SYMBOL_FLAGS_KIND_THREAD_LOCAL);
-    bool Abs = ((Flags & MachO::EXPORT_SYMBOL_FLAGS_KIND_MASK) ==
-                MachO::EXPORT_SYMBOL_FLAGS_KIND_ABSOLUTE);
-    bool Resolver = (Flags & MachO::EXPORT_SYMBOL_FLAGS_STUB_AND_RESOLVER);
-    if (ReExport)
-      outs() << "[re-export] ";
-    else
-      outs() << format("0x%08llX  ",
-                       Entry.address() + BaseSegmentAddress);
-    outs() << Entry.name();
-    if (WeakDef || ThreadLocal || Resolver || Abs) {
-      bool NeedsComma = false;
-      outs() << " [";
-      if (WeakDef) {
-        outs() << "weak_def";
-        NeedsComma = true;
-      }
-      if (ThreadLocal) {
-        if (NeedsComma)
-          outs() << ", ";
-        outs() << "per-thread";
-        NeedsComma = true;
-      }
-      if (Abs) {
-        if (NeedsComma)
-          outs() << ", ";
-        outs() << "absolute";
-        NeedsComma = true;
-      }
-      if (Resolver) {
-        if (NeedsComma)
-          outs() << ", ";
-        outs() << format("resolver=0x%08llX", Entry.other());
-        NeedsComma = true;
-      }
-      outs() << "]";
-    }
-    if (ReExport) {
-      StringRef DylibName = "unknown";
-      int Ordinal = Entry.other() - 1;
-      Obj->getLibraryShortNameByIndex(Ordinal, DylibName);
-      if (Entry.otherName().empty())
-        outs() << " (from " << DylibName << ")";
-      else
-        outs() << " (" << Entry.otherName() << " from " << DylibName << ")";
-    }
-    outs() << "\n";
-  }
-  if (Err)
-    report_error(std::move(Err), Obj->getFileName());
-}
-
-//===----------------------------------------------------------------------===//
-// rebase table dumping
-//===----------------------------------------------------------------------===//
-
-void printMachORebaseTable(object::MachOObjectFile *Obj) {
-  outs() << "segment  section            address     type\n";
-  Error Err = Error::success();
-  for (const object::MachORebaseEntry &Entry : Obj->rebaseTable(Err)) {
-    StringRef SegmentName = Entry.segmentName();
-    StringRef SectionName = Entry.sectionName();
-    uint64_t Address = Entry.address();
-
-    // Table lines look like: __DATA  __nl_symbol_ptr  0x0000F00C  pointer
-    outs() << format("%-8s %-18s 0x%08" PRIX64 "  %s\n",
-                     SegmentName.str().c_str(), SectionName.str().c_str(),
-                     Address, Entry.typeName().str().c_str());
-  }
-  if (Err)
-    report_error(std::move(Err), Obj->getFileName());
-}
-
-static StringRef ordinalName(const object::MachOObjectFile *Obj, int Ordinal) {
-  StringRef DylibName;
-  switch (Ordinal) {
-  case MachO::BIND_SPECIAL_DYLIB_SELF:
-    return "this-image";
-  case MachO::BIND_SPECIAL_DYLIB_MAIN_EXECUTABLE:
-    return "main-executable";
-  case MachO::BIND_SPECIAL_DYLIB_FLAT_LOOKUP:
-    return "flat-namespace";
-  default:
-    if (Ordinal > 0) {
-      std::error_code EC =
-          Obj->getLibraryShortNameByIndex(Ordinal - 1, DylibName);
-      if (EC)
-        return "<<bad library ordinal>>";
-      return DylibName;
-    }
-  }
-  return "<<unknown special ordinal>>";
-}
-
-//===----------------------------------------------------------------------===//
-// bind table dumping
-//===----------------------------------------------------------------------===//
-
-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 object::MachOBindEntry &Entry : Obj->bindTable(Err)) {
-    StringRef SegmentName = Entry.segmentName();
-    StringRef SectionName = Entry.sectionName();
-    uint64_t Address = Entry.address();
-
-    // Table lines look like:
-    //  __DATA  __got  0x00012010    pointer   0 libSystem ___stack_chk_guard
-    StringRef Attr;
-    if (Entry.flags() & MachO::BIND_SYMBOL_FLAGS_WEAK_IMPORT)
-      Attr = " (weak_import)";
-    outs() << left_justify(SegmentName, 8) << " "
-           << left_justify(SectionName, 18) << " "
-           << format_hex(Address, 10, true) << " "
-           << left_justify(Entry.typeName(), 8) << " "
-           << format_decimal(Entry.addend(), 8) << " "
-           << left_justify(ordinalName(Obj, Entry.ordinal()), 16) << " "
-           << Entry.symbolName() << Attr << "\n";
-  }
-  if (Err)
-    report_error(std::move(Err), Obj->getFileName());
-}
-
-//===----------------------------------------------------------------------===//
-// lazy bind table dumping
-//===----------------------------------------------------------------------===//
-
-void printMachOLazyBindTable(object::MachOObjectFile *Obj) {
-  outs() << "segment  section            address     "
-            "dylib            symbol\n";
-  Error Err = Error::success();
-  for (const object::MachOBindEntry &Entry : Obj->lazyBindTable(Err)) {
-    StringRef SegmentName = Entry.segmentName();
-    StringRef SectionName = Entry.sectionName();
-    uint64_t Address = Entry.address();
-
-    // Table lines look like:
-    //  __DATA  __got  0x00012010 libSystem ___stack_chk_guard
-    outs() << left_justify(SegmentName, 8) << " "
-           << left_justify(SectionName, 18) << " "
-           << format_hex(Address, 10, true) << " "
-           << left_justify(ordinalName(Obj, Entry.ordinal()), 16) << " "
-           << Entry.symbolName() << "\n";
-  }
-  if (Err)
-    report_error(std::move(Err), Obj->getFileName());
-}
-
-//===----------------------------------------------------------------------===//
-// weak bind table dumping
-//===----------------------------------------------------------------------===//
-
-void printMachOWeakBindTable(object::MachOObjectFile *Obj) {
-  outs() << "segment  section            address     "
-            "type       addend   symbol\n";
-  Error Err = Error::success();
-  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              "
-             << Entry.symbolName() << "\n";
-      continue;
-    }
-    StringRef SegmentName = Entry.segmentName();
-    StringRef SectionName = Entry.sectionName();
-    uint64_t Address = Entry.address();
-
-    // Table lines look like:
-    // __DATA  __data  0x00001000  pointer    0   _foo
-    outs() << left_justify(SegmentName, 8) << " "
-           << left_justify(SectionName, 18) << " "
-           << format_hex(Address, 10, true) << " "
-           << left_justify(Entry.typeName(), 8) << " "
-           << format_decimal(Entry.addend(), 8) << "   " << Entry.symbolName()
-           << "\n";
-  }
-  if (Err)
-    report_error(std::move(Err), Obj->getFileName());
-}
-
-// get_dyld_bind_info_symbolname() is used for disassembly and passed an
-// address, ReferenceValue, in the Mach-O file and looks in the dyld bind
-// information for that address. If the address is found its binding symbol
-// name is returned.  If not nullptr is returned.
-static const char *get_dyld_bind_info_symbolname(uint64_t ReferenceValue,
-                                                 struct DisassembleInfo *info) {
-  if (info->bindtable == nullptr) {
-    info->bindtable = llvm::make_unique<SymbolAddressMap>();
-    Error Err = Error::success();
-    for (const object::MachOBindEntry &Entry : info->O->bindTable(Err)) {
-      uint64_t Address = Entry.address();
-      StringRef name = Entry.symbolName();
-      if (!name.empty())
-        (*info->bindtable)[Address] = name;
-    }
-    if (Err)
-      report_error(std::move(Err), info->O->getFileName());
-  }
-  auto name = info->bindtable->lookup(ReferenceValue);
-  return !name.empty() ? name.data() : nullptr;
-}
-
-void printLazyBindTable(ObjectFile *o) {
-  outs() << "Lazy bind table:\n";
-  if (MachOObjectFile *MachO = dyn_cast<MachOObjectFile>(o))
-    printMachOLazyBindTable(MachO);
-  else
-    WithColor::error()
-        << "This operation is only currently supported "
-           "for Mach-O executable files.\n";
-}
-
-void printWeakBindTable(ObjectFile *o) {
-  outs() << "Weak bind table:\n";
-  if (MachOObjectFile *MachO = dyn_cast<MachOObjectFile>(o))
-    printMachOWeakBindTable(MachO);
-  else
-    WithColor::error()
-        << "This operation is only currently supported "
-           "for Mach-O executable files.\n";
-}
-
-void printExportsTrie(const ObjectFile *o) {
-  outs() << "Exports trie:\n";
-  if (const MachOObjectFile *MachO = dyn_cast<MachOObjectFile>(o))
-    printMachOExportsTrie(MachO);
-  else
-    WithColor::error()
-        << "This operation is only currently supported "
-           "for Mach-O executable files.\n";
-}
-
-void printRebaseTable(ObjectFile *o) {
-  outs() << "Rebase table:\n";
-  if (MachOObjectFile *MachO = dyn_cast<MachOObjectFile>(o))
-    printMachORebaseTable(MachO);
-  else
-    WithColor::error()
-        << "This operation is only currently supported "
-           "for Mach-O executable files.\n";
-}
-
-void printBindTable(ObjectFile *o) {
-  outs() << "Bind table:\n";
-  if (MachOObjectFile *MachO = dyn_cast<MachOObjectFile>(o))
-    printMachOBindTable(MachO);
-  else
-    WithColor::error()
-        << "This operation is only currently supported "
-           "for Mach-O executable files.\n";
-}
-} // namespace llvm
diff --git a/contrib/llvm/tools/llvm-objdump/WasmDump.cpp b/contrib/llvm/tools/llvm-objdump/WasmDump.cpp
deleted file mode 100644
index da27a4acbb5f..000000000000
--- a/contrib/llvm/tools/llvm-objdump/WasmDump.cpp
+++ /dev/null
@@ -1,52 +0,0 @@
-//===-- WasmDump.cpp - wasm-specific dumper ---------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-///
-/// \file
-/// This file implements the wasm-specific dumper for llvm-objdump.
-///
-//===----------------------------------------------------------------------===//
-
-#include "llvm-objdump.h"
-#include "llvm/Object/Wasm.h"
-
-using namespace llvm::object;
-
-namespace llvm {
-void printWasmFileHeader(const object::ObjectFile *Obj) {
-  const auto *File = dyn_cast<const WasmObjectFile>(Obj);
-
-  outs() << "Program Header:\n";
-  outs() << "Version: 0x";
-  outs().write_hex(File->getHeader().Version);
-  outs() << "\n";
-}
-
-Error getWasmRelocationValueString(const WasmObjectFile *Obj,
-                                         const RelocationRef &RelRef,
-                                         SmallVectorImpl<char> &Result) {
-  const wasm::WasmRelocation &Rel = Obj->getWasmRelocation(RelRef);
-  symbol_iterator SI = RelRef.getSymbol();
-  std::string FmtBuf;
-  raw_string_ostream Fmt(FmtBuf);
-  if (SI == Obj->symbol_end()) {
-    // Not all wasm relocations have symbols associated with them.
-    // In particular R_WASM_TYPE_INDEX_LEB.
-    Fmt << Rel.Index;
-  } else {
-    Expected<StringRef> SymNameOrErr = SI->getName();
-    if (!SymNameOrErr)
-      return SymNameOrErr.takeError();
-    StringRef SymName = *SymNameOrErr;
-    Result.append(SymName.begin(), SymName.end());
-  }
-  Fmt << (Rel.Addend < 0 ? "" : "+") << Rel.Addend;
-  Fmt.flush();
-  Result.append(FmtBuf.begin(), FmtBuf.end());
-  return Error::success();
-}
-} // namespace llvm
diff --git a/contrib/llvm/tools/llvm-objdump/llvm-objdump.cpp b/contrib/llvm/tools/llvm-objdump/llvm-objdump.cpp
deleted file mode 100644
index 58981203c59e..000000000000
--- a/contrib/llvm/tools/llvm-objdump/llvm-objdump.cpp
+++ /dev/null
@@ -1,2187 +0,0 @@
-//===-- llvm-objdump.cpp - Object file dumping utility for llvm -----------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-//
-// This program is a utility that works like binutils "objdump", that is, it
-// dumps out a plethora of information about an object file depending on the
-// flags.
-//
-// The flags and output of this program should be near identical to those of
-// binutils objdump.
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm-objdump.h"
-#include "llvm/ADT/Optional.h"
-#include "llvm/ADT/STLExtras.h"
-#include "llvm/ADT/SetOperations.h"
-#include "llvm/ADT/StringExtras.h"
-#include "llvm/ADT/StringSet.h"
-#include "llvm/ADT/Triple.h"
-#include "llvm/CodeGen/FaultMaps.h"
-#include "llvm/DebugInfo/DWARF/DWARFContext.h"
-#include "llvm/DebugInfo/Symbolize/Symbolize.h"
-#include "llvm/Demangle/Demangle.h"
-#include "llvm/MC/MCAsmInfo.h"
-#include "llvm/MC/MCContext.h"
-#include "llvm/MC/MCDisassembler/MCDisassembler.h"
-#include "llvm/MC/MCDisassembler/MCRelocationInfo.h"
-#include "llvm/MC/MCInst.h"
-#include "llvm/MC/MCInstPrinter.h"
-#include "llvm/MC/MCInstrAnalysis.h"
-#include "llvm/MC/MCInstrInfo.h"
-#include "llvm/MC/MCObjectFileInfo.h"
-#include "llvm/MC/MCRegisterInfo.h"
-#include "llvm/MC/MCSubtargetInfo.h"
-#include "llvm/Object/Archive.h"
-#include "llvm/Object/COFF.h"
-#include "llvm/Object/COFFImportFile.h"
-#include "llvm/Object/ELFObjectFile.h"
-#include "llvm/Object/MachO.h"
-#include "llvm/Object/MachOUniversal.h"
-#include "llvm/Object/ObjectFile.h"
-#include "llvm/Object/Wasm.h"
-#include "llvm/Support/Casting.h"
-#include "llvm/Support/CommandLine.h"
-#include "llvm/Support/Debug.h"
-#include "llvm/Support/Errc.h"
-#include "llvm/Support/FileSystem.h"
-#include "llvm/Support/Format.h"
-#include "llvm/Support/GraphWriter.h"
-#include "llvm/Support/Host.h"
-#include "llvm/Support/InitLLVM.h"
-#include "llvm/Support/MemoryBuffer.h"
-#include "llvm/Support/SourceMgr.h"
-#include "llvm/Support/StringSaver.h"
-#include "llvm/Support/TargetRegistry.h"
-#include "llvm/Support/TargetSelect.h"
-#include "llvm/Support/WithColor.h"
-#include "llvm/Support/raw_ostream.h"
-#include <algorithm>
-#include <cctype>
-#include <cstring>
-#include <system_error>
-#include <unordered_map>
-#include <utility>
-
-using namespace llvm::object;
-
-namespace llvm {
-
-cl::OptionCategory ObjdumpCat("llvm-objdump Options");
-
-// MachO specific
-extern cl::OptionCategory MachOCat;
-extern cl::opt<bool> Bind;
-extern cl::opt<bool> DataInCode;
-extern cl::opt<bool> DylibsUsed;
-extern cl::opt<bool> DylibId;
-extern cl::opt<bool> ExportsTrie;
-extern cl::opt<bool> FirstPrivateHeader;
-extern cl::opt<bool> IndirectSymbols;
-extern cl::opt<bool> InfoPlist;
-extern cl::opt<bool> LazyBind;
-extern cl::opt<bool> LinkOptHints;
-extern cl::opt<bool> ObjcMetaData;
-extern cl::opt<bool> Rebase;
-extern cl::opt<bool> UniversalHeaders;
-extern cl::opt<bool> WeakBind;
-
-static cl::opt<uint64_t> AdjustVMA(
-    "adjust-vma",
-    cl::desc("Increase the displayed address by the specified offset"),
-    cl::value_desc("offset"), cl::init(0), cl::cat(ObjdumpCat));
-
-static cl::opt<bool>
-    AllHeaders("all-headers",
-               cl::desc("Display all available header information"),
-               cl::cat(ObjdumpCat));
-static cl::alias AllHeadersShort("x", cl::desc("Alias for --all-headers"),
-                                 cl::NotHidden, cl::Grouping,
-                                 cl::aliasopt(AllHeaders));
-
-static cl::opt<std::string>
-    ArchName("arch-name",
-             cl::desc("Target arch to disassemble for, "
-                      "see -version for available targets"),
-             cl::cat(ObjdumpCat));
-
-cl::opt<bool> ArchiveHeaders("archive-headers",
-                             cl::desc("Display archive header information"),
-                             cl::cat(ObjdumpCat));
-static cl::alias ArchiveHeadersShort("a",
-                                     cl::desc("Alias for --archive-headers"),
-                                     cl::NotHidden, cl::Grouping,
-                                     cl::aliasopt(ArchiveHeaders));
-
-cl::opt<bool> Demangle("demangle", cl::desc("Demangle symbols names"),
-                       cl::init(false), cl::cat(ObjdumpCat));
-static cl::alias DemangleShort("C", cl::desc("Alias for --demangle"),
-                               cl::NotHidden, cl::Grouping,
-                               cl::aliasopt(Demangle));
-
-cl::opt<bool> Disassemble(
-    "disassemble",
-    cl::desc("Display assembler mnemonics for the machine instructions"),
-    cl::cat(ObjdumpCat));
-static cl::alias DisassembleShort("d", cl::desc("Alias for --disassemble"),
-                                  cl::NotHidden, cl::Grouping,
-                                  cl::aliasopt(Disassemble));
-
-cl::opt<bool> DisassembleAll(
-    "disassemble-all",
-    cl::desc("Display assembler mnemonics for the machine instructions"),
-    cl::cat(ObjdumpCat));
-static cl::alias DisassembleAllShort("D",
-                                     cl::desc("Alias for --disassemble-all"),
-                                     cl::NotHidden, cl::Grouping,
-                                     cl::aliasopt(DisassembleAll));
-
-static cl::list<std::string>
-    DisassembleFunctions("disassemble-functions", cl::CommaSeparated,
-                         cl::desc("List of functions to disassemble. "
-                                  "Accept demangled names when --demangle is "
-                                  "specified, otherwise accept mangled names"),
-                         cl::cat(ObjdumpCat));
-
-static cl::opt<bool> DisassembleZeroes(
-    "disassemble-zeroes",
-    cl::desc("Do not skip blocks of zeroes when disassembling"),
-    cl::cat(ObjdumpCat));
-static cl::alias
-    DisassembleZeroesShort("z", cl::desc("Alias for --disassemble-zeroes"),
-                           cl::NotHidden, cl::Grouping,
-                           cl::aliasopt(DisassembleZeroes));
-
-static cl::list<std::string>
-    DisassemblerOptions("disassembler-options",
-                        cl::desc("Pass target specific disassembler options"),
-                        cl::value_desc("options"), cl::CommaSeparated,
-                        cl::cat(ObjdumpCat));
-static cl::alias
-    DisassemblerOptionsShort("M", cl::desc("Alias for --disassembler-options"),
-                             cl::NotHidden, cl::Grouping, cl::Prefix,
-                             cl::CommaSeparated,
-                             cl::aliasopt(DisassemblerOptions));
-
-cl::opt<DIDumpType> DwarfDumpType(
-    "dwarf", cl::init(DIDT_Null), cl::desc("Dump of dwarf debug sections:"),
-    cl::values(clEnumValN(DIDT_DebugFrame, "frames", ".debug_frame")),
-    cl::cat(ObjdumpCat));
-
-static cl::opt<bool> DynamicRelocations(
-    "dynamic-reloc",
-    cl::desc("Display the dynamic relocation entries in the file"),
-    cl::cat(ObjdumpCat));
-static cl::alias DynamicRelocationShort("R",
-                                        cl::desc("Alias for --dynamic-reloc"),
-                                        cl::NotHidden, cl::Grouping,
-                                        cl::aliasopt(DynamicRelocations));
-
-static cl::opt<bool>
-    FaultMapSection("fault-map-section",
-                    cl::desc("Display contents of faultmap section"),
-                    cl::cat(ObjdumpCat));
-
-static cl::opt<bool>
-    FileHeaders("file-headers",
-                cl::desc("Display the contents of the overall file header"),
-                cl::cat(ObjdumpCat));
-static cl::alias FileHeadersShort("f", cl::desc("Alias for --file-headers"),
-                                  cl::NotHidden, cl::Grouping,
-                                  cl::aliasopt(FileHeaders));
-
-cl::opt<bool> SectionContents("full-contents",
-                              cl::desc("Display the content of each section"),
-                              cl::cat(ObjdumpCat));
-static cl::alias SectionContentsShort("s",
-                                      cl::desc("Alias for --full-contents"),
-                                      cl::NotHidden, cl::Grouping,
-                                      cl::aliasopt(SectionContents));
-
-static cl::list<std::string> InputFilenames(cl::Positional,
-                                            cl::desc("<input object files>"),
-                                            cl::ZeroOrMore,
-                                            cl::cat(ObjdumpCat));
-
-static cl::opt<bool>
-    PrintLines("line-numbers",
-               cl::desc("Display source line numbers with "
-                        "disassembly. Implies disassemble object"),
-               cl::cat(ObjdumpCat));
-static cl::alias PrintLinesShort("l", cl::desc("Alias for --line-numbers"),
-                                 cl::NotHidden, cl::Grouping,
-                                 cl::aliasopt(PrintLines));
-
-static cl::opt<bool> MachOOpt("macho",
-                              cl::desc("Use MachO specific object file parser"),
-                              cl::cat(ObjdumpCat));
-static cl::alias MachOm("m", cl::desc("Alias for --macho"), cl::NotHidden,
-                        cl::Grouping, cl::aliasopt(MachOOpt));
-
-cl::opt<std::string>
-    MCPU("mcpu",
-         cl::desc("Target a specific cpu type (-mcpu=help for details)"),
-         cl::value_desc("cpu-name"), cl::init(""), cl::cat(ObjdumpCat));
-
-cl::list<std::string> MAttrs("mattr", cl::CommaSeparated,
-                             cl::desc("Target specific attributes"),
-                             cl::value_desc("a1,+a2,-a3,..."),
-                             cl::cat(ObjdumpCat));
-
-cl::opt<bool> NoShowRawInsn("no-show-raw-insn",
-                            cl::desc("When disassembling "
-                                     "instructions, do not print "
-                                     "the instruction bytes."),
-                            cl::cat(ObjdumpCat));
-cl::opt<bool> NoLeadingAddr("no-leading-addr",
-                            cl::desc("Print no leading address"),
-                            cl::cat(ObjdumpCat));
-
-static cl::opt<bool> RawClangAST(
-    "raw-clang-ast",
-    cl::desc("Dump the raw binary contents of the clang AST section"),
-    cl::cat(ObjdumpCat));
-
-cl::opt<bool>
-    Relocations("reloc", cl::desc("Display the relocation entries in the file"),
-                cl::cat(ObjdumpCat));
-static cl::alias RelocationsShort("r", cl::desc("Alias for --reloc"),
-                                  cl::NotHidden, cl::Grouping,
-                                  cl::aliasopt(Relocations));
-
-cl::opt<bool> PrintImmHex("print-imm-hex",
-                          cl::desc("Use hex format for immediate values"),
-                          cl::cat(ObjdumpCat));
-
-cl::opt<bool> PrivateHeaders("private-headers",
-                             cl::desc("Display format specific file headers"),
-                             cl::cat(ObjdumpCat));
-static cl::alias PrivateHeadersShort("p",
-                                     cl::desc("Alias for --private-headers"),
-                                     cl::NotHidden, cl::Grouping,
-                                     cl::aliasopt(PrivateHeaders));
-
-cl::list<std::string>
-    FilterSections("section",
-                   cl::desc("Operate on the specified sections only. "
-                            "With -macho dump segment,section"),
-                   cl::cat(ObjdumpCat));
-static cl::alias FilterSectionsj("j", cl::desc("Alias for --section"),
-                                 cl::NotHidden, cl::Grouping, cl::Prefix,
-                                 cl::aliasopt(FilterSections));
-
-cl::opt<bool> SectionHeaders("section-headers",
-                             cl::desc("Display summaries of the "
-                                      "headers for each section."),
-                             cl::cat(ObjdumpCat));
-static cl::alias SectionHeadersShort("headers",
-                                     cl::desc("Alias for --section-headers"),
-                                     cl::NotHidden,
-                                     cl::aliasopt(SectionHeaders));
-static cl::alias SectionHeadersShorter("h",
-                                       cl::desc("Alias for --section-headers"),
-                                       cl::NotHidden, cl::Grouping,
-                                       cl::aliasopt(SectionHeaders));
-
-static cl::opt<bool>
-    ShowLMA("show-lma",
-            cl::desc("Display LMA column when dumping ELF section headers"),
-            cl::cat(ObjdumpCat));
-
-static cl::opt<bool> PrintSource(
-    "source",
-    cl::desc(
-        "Display source inlined with disassembly. Implies disassemble object"),
-    cl::cat(ObjdumpCat));
-static cl::alias PrintSourceShort("S", cl::desc("Alias for -source"),
-                                  cl::NotHidden, cl::Grouping,
-                                  cl::aliasopt(PrintSource));
-
-static cl::opt<uint64_t>
-    StartAddress("start-address", cl::desc("Disassemble beginning at address"),
-                 cl::value_desc("address"), cl::init(0), cl::cat(ObjdumpCat));
-static cl::opt<uint64_t> StopAddress("stop-address",
-                                     cl::desc("Stop disassembly at address"),
-                                     cl::value_desc("address"),
-                                     cl::init(UINT64_MAX), cl::cat(ObjdumpCat));
-
-cl::opt<bool> SymbolTable("syms", cl::desc("Display the symbol table"),
-                          cl::cat(ObjdumpCat));
-static cl::alias SymbolTableShort("t", cl::desc("Alias for --syms"),
-                                  cl::NotHidden, cl::Grouping,
-                                  cl::aliasopt(SymbolTable));
-
-cl::opt<std::string> TripleName("triple",
-                                cl::desc("Target triple to disassemble for, "
-                                         "see -version for available targets"),
-                                cl::cat(ObjdumpCat));
-
-cl::opt<bool> UnwindInfo("unwind-info", cl::desc("Display unwind information"),
-                         cl::cat(ObjdumpCat));
-static cl::alias UnwindInfoShort("u", cl::desc("Alias for --unwind-info"),
-                                 cl::NotHidden, cl::Grouping,
-                                 cl::aliasopt(UnwindInfo));
-
-static cl::opt<bool>
-    Wide("wide", cl::desc("Ignored for compatibility with GNU objdump"),
-         cl::cat(ObjdumpCat));
-static cl::alias WideShort("w", cl::Grouping, cl::aliasopt(Wide));
-
-static cl::extrahelp
-    HelpResponse("\nPass @FILE as argument to read options from FILE.\n");
-
-static StringSet<> DisasmFuncsSet;
-static StringSet<> FoundSectionSet;
-static StringRef ToolName;
-
-typedef std::vector<std::tuple<uint64_t, StringRef, uint8_t>> SectionSymbolsTy;
-
-static bool shouldKeep(object::SectionRef S) {
-  if (FilterSections.empty())
-    return true;
-  StringRef SecName;
-  std::error_code error = S.getName(SecName);
-  if (error)
-    return false;
-  // StringSet does not allow empty key so avoid adding sections with
-  // no name (such as the section with index 0) here.
-  if (!SecName.empty())
-    FoundSectionSet.insert(SecName);
-  return is_contained(FilterSections, SecName);
-}
-
-SectionFilter ToolSectionFilter(object::ObjectFile const &O) {
-  return SectionFilter([](object::SectionRef S) { return shouldKeep(S); }, O);
-}
-
-void error(std::error_code EC) {
-  if (!EC)
-    return;
-  WithColor::error(errs(), ToolName)
-      << "reading file: " << EC.message() << ".\n";
-  errs().flush();
-  exit(1);
-}
-
-void error(Error E) {
-  if (!E)
-    return;
-  WithColor::error(errs(), ToolName) << toString(std::move(E));
-  exit(1);
-}
-
-LLVM_ATTRIBUTE_NORETURN void error(Twine Message) {
-  WithColor::error(errs(), ToolName) << Message << ".\n";
-  errs().flush();
-  exit(1);
-}
-
-void warn(StringRef Message) {
-  WithColor::warning(errs(), ToolName) << Message << ".\n";
-  errs().flush();
-}
-
-static void warn(Twine Message) {
-  // Output order between errs() and outs() matters especially for archive
-  // files where the output is per member object.
-  outs().flush();
-  WithColor::warning(errs(), ToolName) << Message << "\n";
-  errs().flush();
-}
-
-LLVM_ATTRIBUTE_NORETURN void report_error(StringRef File, Twine Message) {
-  WithColor::error(errs(), ToolName)
-      << "'" << File << "': " << Message << ".\n";
-  exit(1);
-}
-
-LLVM_ATTRIBUTE_NORETURN void report_error(Error E, StringRef File) {
-  assert(E);
-  std::string Buf;
-  raw_string_ostream OS(Buf);
-  logAllUnhandledErrors(std::move(E), OS);
-  OS.flush();
-  WithColor::error(errs(), ToolName) << "'" << File << "': " << Buf;
-  exit(1);
-}
-
-LLVM_ATTRIBUTE_NORETURN void report_error(Error E, StringRef ArchiveName,
-                                          StringRef FileName,
-                                          StringRef ArchitectureName) {
-  assert(E);
-  WithColor::error(errs(), ToolName);
-  if (ArchiveName != "")
-    errs() << ArchiveName << "(" << FileName << ")";
-  else
-    errs() << "'" << FileName << "'";
-  if (!ArchitectureName.empty())
-    errs() << " (for architecture " << ArchitectureName << ")";
-  std::string Buf;
-  raw_string_ostream OS(Buf);
-  logAllUnhandledErrors(std::move(E), OS);
-  OS.flush();
-  errs() << ": " << Buf;
-  exit(1);
-}
-
-LLVM_ATTRIBUTE_NORETURN void report_error(Error E, StringRef ArchiveName,
-                                          const object::Archive::Child &C,
-                                          StringRef ArchitectureName) {
-  Expected<StringRef> 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());
-    report_error(std::move(E), ArchiveName, "???", ArchitectureName);
-  } else
-    report_error(std::move(E), ArchiveName, NameOrErr.get(), ArchitectureName);
-}
-
-static void warnOnNoMatchForSections() {
-  SetVector<StringRef> MissingSections;
-  for (StringRef S : FilterSections) {
-    if (FoundSectionSet.count(S))
-      return;
-    // User may specify a unnamed section. Don't warn for it.
-    if (!S.empty())
-      MissingSections.insert(S);
-  }
-
-  // Warn only if no section in FilterSections is matched.
-  for (StringRef S : MissingSections)
-    warn("section '" + S + "' mentioned in a -j/--section option, but not "
-         "found in any input file");
-}
-
-static const Target *getTarget(const ObjectFile *Obj = nullptr) {
-  // Figure out the target triple.
-  Triple TheTriple("unknown-unknown-unknown");
-  if (TripleName.empty()) {
-    if (Obj)
-      TheTriple = Obj->makeTriple();
-  } else {
-    TheTriple.setTriple(Triple::normalize(TripleName));
-
-    // Use the triple, but also try to combine with ARM build attributes.
-    if (Obj) {
-      auto Arch = Obj->getArch();
-      if (Arch == Triple::arm || Arch == Triple::armeb)
-        Obj->setARMSubArch(TheTriple);
-    }
-  }
-
-  // Get the target specific parser.
-  std::string Error;
-  const Target *TheTarget = TargetRegistry::lookupTarget(ArchName, TheTriple,
-                                                         Error);
-  if (!TheTarget) {
-    if (Obj)
-      report_error(Obj->getFileName(), "can't find target: " + Error);
-    else
-      error("can't find target: " + Error);
-  }
-
-  // Update the triple name and return the found target.
-  TripleName = TheTriple.getTriple();
-  return TheTarget;
-}
-
-bool isRelocAddressLess(RelocationRef A, RelocationRef B) {
-  return A.getOffset() < B.getOffset();
-}
-
-static Error getRelocationValueString(const RelocationRef &Rel,
-                                      SmallVectorImpl<char> &Result) {
-  const ObjectFile *Obj = Rel.getObject();
-  if (auto *ELF = dyn_cast<ELFObjectFileBase>(Obj))
-    return getELFRelocationValueString(ELF, Rel, Result);
-  if (auto *COFF = dyn_cast<COFFObjectFile>(Obj))
-    return getCOFFRelocationValueString(COFF, Rel, Result);
-  if (auto *Wasm = dyn_cast<WasmObjectFile>(Obj))
-    return getWasmRelocationValueString(Wasm, Rel, Result);
-  if (auto *MachO = dyn_cast<MachOObjectFile>(Obj))
-    return getMachORelocationValueString(MachO, Rel, Result);
-  llvm_unreachable("unknown object file format");
-}
-
-/// Indicates whether this relocation should hidden when listing
-/// relocations, usually because it is the trailing part of a multipart
-/// relocation that will be printed as part of the leading relocation.
-static bool getHidden(RelocationRef RelRef) {
-  auto *MachO = dyn_cast<MachOObjectFile>(RelRef.getObject());
-  if (!MachO)
-    return false;
-
-  unsigned Arch = MachO->getArch();
-  DataRefImpl Rel = RelRef.getRawDataRefImpl();
-  uint64_t Type = MachO->getRelocationType(Rel);
-
-  // On arches that use the generic relocations, GENERIC_RELOC_PAIR
-  // is always hidden.
-  if (Arch == Triple::x86 || Arch == Triple::arm || Arch == Triple::ppc)
-    return Type == MachO::GENERIC_RELOC_PAIR;
-
-  if (Arch == Triple::x86_64) {
-    // On x86_64, X86_64_RELOC_UNSIGNED is hidden only when it follows
-    // an X86_64_RELOC_SUBTRACTOR.
-    if (Type == MachO::X86_64_RELOC_UNSIGNED && Rel.d.a > 0) {
-      DataRefImpl RelPrev = Rel;
-      RelPrev.d.a--;
-      uint64_t PrevType = MachO->getRelocationType(RelPrev);
-      if (PrevType == MachO::X86_64_RELOC_SUBTRACTOR)
-        return true;
-    }
-  }
-
-  return false;
-}
-
-namespace {
-class SourcePrinter {
-protected:
-  DILineInfo OldLineInfo;
-  const ObjectFile *Obj = nullptr;
-  std::unique_ptr<symbolize::LLVMSymbolizer> Symbolizer;
-  // File name to file contents of source
-  std::unordered_map<std::string, std::unique_ptr<MemoryBuffer>> SourceCache;
-  // Mark the line endings of the cached source
-  std::unordered_map<std::string, std::vector<StringRef>> LineCache;
-
-private:
-  bool cacheSource(const DILineInfo& LineInfoFile);
-
-public:
-  SourcePrinter() = default;
-  SourcePrinter(const ObjectFile *Obj, StringRef DefaultArch) : Obj(Obj) {
-    symbolize::LLVMSymbolizer::Options SymbolizerOpts;
-    SymbolizerOpts.PrintFunctions = DILineInfoSpecifier::FunctionNameKind::None;
-    SymbolizerOpts.Demangle = false;
-    SymbolizerOpts.DefaultArch = DefaultArch;
-    Symbolizer.reset(new symbolize::LLVMSymbolizer(SymbolizerOpts));
-  }
-  virtual ~SourcePrinter() = default;
-  virtual void printSourceLine(raw_ostream &OS,
-                               object::SectionedAddress Address,
-                               StringRef Delimiter = "; ");
-};
-
-bool SourcePrinter::cacheSource(const DILineInfo &LineInfo) {
-  std::unique_ptr<MemoryBuffer> Buffer;
-  if (LineInfo.Source) {
-    Buffer = MemoryBuffer::getMemBuffer(*LineInfo.Source);
-  } else {
-    auto BufferOrError = MemoryBuffer::getFile(LineInfo.FileName);
-    if (!BufferOrError)
-      return false;
-    Buffer = std::move(*BufferOrError);
-  }
-  // Chomp the file to get lines
-  const char *BufferStart = Buffer->getBufferStart(),
-             *BufferEnd = Buffer->getBufferEnd();
-  std::vector<StringRef> &Lines = LineCache[LineInfo.FileName];
-  const char *Start = BufferStart;
-  for (const char *I = BufferStart; I != BufferEnd; ++I)
-    if (*I == '\n') {
-      Lines.emplace_back(Start, I - Start - (BufferStart < I && I[-1] == '\r'));
-      Start = I + 1;
-    }
-  if (Start < BufferEnd)
-    Lines.emplace_back(Start, BufferEnd - Start);
-  SourceCache[LineInfo.FileName] = std::move(Buffer);
-  return true;
-}
-
-void SourcePrinter::printSourceLine(raw_ostream &OS,
-                                    object::SectionedAddress Address,
-                                    StringRef Delimiter) {
-  if (!Symbolizer)
-    return;
-
-  DILineInfo LineInfo = DILineInfo();
-  auto ExpectedLineInfo = Symbolizer->symbolizeCode(*Obj, Address);
-  if (!ExpectedLineInfo)
-    consumeError(ExpectedLineInfo.takeError());
-  else
-    LineInfo = *ExpectedLineInfo;
-
-  if ((LineInfo.FileName == "<invalid>") || LineInfo.Line == 0 ||
-      ((OldLineInfo.Line == LineInfo.Line) &&
-       (OldLineInfo.FileName == LineInfo.FileName)))
-    return;
-
-  if (PrintLines)
-    OS << Delimiter << LineInfo.FileName << ":" << LineInfo.Line << "\n";
-  if (PrintSource) {
-    if (SourceCache.find(LineInfo.FileName) == SourceCache.end())
-      if (!cacheSource(LineInfo))
-        return;
-    auto LineBuffer = LineCache.find(LineInfo.FileName);
-    if (LineBuffer != LineCache.end()) {
-      if (LineInfo.Line > LineBuffer->second.size())
-        return;
-      // Vector begins at 0, line numbers are non-zero
-      OS << Delimiter << LineBuffer->second[LineInfo.Line - 1] << '\n';
-    }
-  }
-  OldLineInfo = LineInfo;
-}
-
-static bool isAArch64Elf(const ObjectFile *Obj) {
-  const auto *Elf = dyn_cast<ELFObjectFileBase>(Obj);
-  return Elf && Elf->getEMachine() == ELF::EM_AARCH64;
-}
-
-static bool isArmElf(const ObjectFile *Obj) {
-  const auto *Elf = dyn_cast<ELFObjectFileBase>(Obj);
-  return Elf && Elf->getEMachine() == ELF::EM_ARM;
-}
-
-static bool hasMappingSymbols(const ObjectFile *Obj) {
-  return isArmElf(Obj) || isAArch64Elf(Obj);
-}
-
-static void printRelocation(const RelocationRef &Rel, uint64_t Address,
-                            bool Is64Bits) {
-  StringRef Fmt = Is64Bits ? "\t\t%016" PRIx64 ":  " : "\t\t\t%08" PRIx64 ":  ";
-  SmallString<16> Name;
-  SmallString<32> Val;
-  Rel.getTypeName(Name);
-  error(getRelocationValueString(Rel, Val));
-  outs() << format(Fmt.data(), Address) << Name << "\t" << Val << "\n";
-}
-
-class PrettyPrinter {
-public:
-  virtual ~PrettyPrinter() = default;
-  virtual void printInst(MCInstPrinter &IP, const MCInst *MI,
-                         ArrayRef<uint8_t> Bytes,
-                         object::SectionedAddress Address, raw_ostream &OS,
-                         StringRef Annot, MCSubtargetInfo const &STI,
-                         SourcePrinter *SP,
-                         std::vector<RelocationRef> *Rels = nullptr) {
-    if (SP && (PrintSource || PrintLines))
-      SP->printSourceLine(OS, Address);
-
-    {
-      formatted_raw_ostream FOS(OS);
-      if (!NoLeadingAddr)
-        FOS << format("%8" PRIx64 ":", Address.Address);
-      if (!NoShowRawInsn) {
-        FOS << ' ';
-        dumpBytes(Bytes, FOS);
-      }
-      FOS.flush();
-      // The output of printInst starts with a tab. Print some spaces so that
-      // the tab has 1 column and advances to the target tab stop.
-      unsigned TabStop = NoShowRawInsn ? 16 : 40;
-      unsigned Column = FOS.getColumn();
-      FOS.indent(Column < TabStop - 1 ? TabStop - 1 - Column : 7 - Column % 8);
-
-      // The dtor calls flush() to ensure the indent comes before printInst().
-    }
-
-    if (MI)
-      IP.printInst(MI, OS, "", STI);
-    else
-      OS << "\t<unknown>";
-  }
-};
-PrettyPrinter PrettyPrinterInst;
-
-class HexagonPrettyPrinter : public PrettyPrinter {
-public:
-  void printLead(ArrayRef<uint8_t> Bytes, uint64_t Address,
-                 raw_ostream &OS) {
-    uint32_t opcode =
-      (Bytes[3] << 24) | (Bytes[2] << 16) | (Bytes[1] << 8) | Bytes[0];
-    if (!NoLeadingAddr)
-      OS << format("%8" PRIx64 ":", Address);
-    if (!NoShowRawInsn) {
-      OS << "\t";
-      dumpBytes(Bytes.slice(0, 4), OS);
-      OS << format("\t%08" PRIx32, opcode);
-    }
-  }
-  void printInst(MCInstPrinter &IP, const MCInst *MI, ArrayRef<uint8_t> Bytes,
-                 object::SectionedAddress Address, raw_ostream &OS,
-                 StringRef Annot, MCSubtargetInfo const &STI, SourcePrinter *SP,
-                 std::vector<RelocationRef> *Rels) override {
-    if (SP && (PrintSource || PrintLines))
-      SP->printSourceLine(OS, Address, "");
-    if (!MI) {
-      printLead(Bytes, Address.Address, OS);
-      OS << " <unknown>";
-      return;
-    }
-    std::string Buffer;
-    {
-      raw_string_ostream TempStream(Buffer);
-      IP.printInst(MI, TempStream, "", STI);
-    }
-    StringRef Contents(Buffer);
-    // Split off bundle attributes
-    auto PacketBundle = Contents.rsplit('\n');
-    // Split off first instruction from the rest
-    auto HeadTail = PacketBundle.first.split('\n');
-    auto Preamble = " { ";
-    auto Separator = "";
-
-    // Hexagon's packets require relocations to be inline rather than
-    // clustered at the end of the packet.
-    std::vector<RelocationRef>::const_iterator RelCur = Rels->begin();
-    std::vector<RelocationRef>::const_iterator RelEnd = Rels->end();
-    auto PrintReloc = [&]() -> void {
-      while ((RelCur != RelEnd) && (RelCur->getOffset() <= Address.Address)) {
-        if (RelCur->getOffset() == Address.Address) {
-          printRelocation(*RelCur, Address.Address, false);
-          return;
-        }
-        ++RelCur;
-      }
-    };
-
-    while (!HeadTail.first.empty()) {
-      OS << Separator;
-      Separator = "\n";
-      if (SP && (PrintSource || PrintLines))
-        SP->printSourceLine(OS, Address, "");
-      printLead(Bytes, Address.Address, OS);
-      OS << Preamble;
-      Preamble = "   ";
-      StringRef Inst;
-      auto Duplex = HeadTail.first.split('\v');
-      if (!Duplex.second.empty()) {
-        OS << Duplex.first;
-        OS << "; ";
-        Inst = Duplex.second;
-      }
-      else
-        Inst = HeadTail.first;
-      OS << Inst;
-      HeadTail = HeadTail.second.split('\n');
-      if (HeadTail.first.empty())
-        OS << " } " << PacketBundle.second;
-      PrintReloc();
-      Bytes = Bytes.slice(4);
-      Address.Address += 4;
-    }
-  }
-};
-HexagonPrettyPrinter HexagonPrettyPrinterInst;
-
-class AMDGCNPrettyPrinter : public PrettyPrinter {
-public:
-  void printInst(MCInstPrinter &IP, const MCInst *MI, ArrayRef<uint8_t> Bytes,
-                 object::SectionedAddress Address, raw_ostream &OS,
-                 StringRef Annot, MCSubtargetInfo const &STI, SourcePrinter *SP,
-                 std::vector<RelocationRef> *Rels) override {
-    if (SP && (PrintSource || PrintLines))
-      SP->printSourceLine(OS, Address);
-
-    if (MI) {
-      SmallString<40> InstStr;
-      raw_svector_ostream IS(InstStr);
-
-      IP.printInst(MI, IS, "", STI);
-
-      OS << left_justify(IS.str(), 60);
-    } else {
-      // an unrecognized encoding - this is probably data so represent it
-      // using the .long directive, or .byte directive if fewer than 4 bytes
-      // remaining
-      if (Bytes.size() >= 4) {
-        OS << format("\t.long 0x%08" PRIx32 " ",
-                     support::endian::read32<support::little>(Bytes.data()));
-        OS.indent(42);
-      } else {
-          OS << format("\t.byte 0x%02" PRIx8, Bytes[0]);
-          for (unsigned int i = 1; i < Bytes.size(); i++)
-            OS << format(", 0x%02" PRIx8, Bytes[i]);
-          OS.indent(55 - (6 * Bytes.size()));
-      }
-    }
-
-    OS << format("// %012" PRIX64 ":", Address.Address);
-    if (Bytes.size() >= 4) {
-      // D should be casted to uint32_t here as it is passed by format to
-      // snprintf as vararg.
-      for (uint32_t D : makeArrayRef(
-               reinterpret_cast<const support::little32_t *>(Bytes.data()),
-               Bytes.size() / 4))
-        OS << format(" %08" PRIX32, D);
-    } else {
-      for (unsigned char B : Bytes)
-        OS << format(" %02" PRIX8, B);
-    }
-
-    if (!Annot.empty())
-      OS << " // " << Annot;
-  }
-};
-AMDGCNPrettyPrinter AMDGCNPrettyPrinterInst;
-
-class BPFPrettyPrinter : public PrettyPrinter {
-public:
-  void printInst(MCInstPrinter &IP, const MCInst *MI, ArrayRef<uint8_t> Bytes,
-                 object::SectionedAddress Address, raw_ostream &OS,
-                 StringRef Annot, MCSubtargetInfo const &STI, SourcePrinter *SP,
-                 std::vector<RelocationRef> *Rels) override {
-    if (SP && (PrintSource || PrintLines))
-      SP->printSourceLine(OS, Address);
-    if (!NoLeadingAddr)
-      OS << format("%8" PRId64 ":", Address.Address / 8);
-    if (!NoShowRawInsn) {
-      OS << "\t";
-      dumpBytes(Bytes, OS);
-    }
-    if (MI)
-      IP.printInst(MI, OS, "", STI);
-    else
-      OS << "\t<unknown>";
-  }
-};
-BPFPrettyPrinter BPFPrettyPrinterInst;
-
-PrettyPrinter &selectPrettyPrinter(Triple const &Triple) {
-  switch(Triple.getArch()) {
-  default:
-    return PrettyPrinterInst;
-  case Triple::hexagon:
-    return HexagonPrettyPrinterInst;
-  case Triple::amdgcn:
-    return AMDGCNPrettyPrinterInst;
-  case Triple::bpfel:
-  case Triple::bpfeb:
-    return BPFPrettyPrinterInst;
-  }
-}
-}
-
-static uint8_t getElfSymbolType(const ObjectFile *Obj, const SymbolRef &Sym) {
-  assert(Obj->isELF());
-  if (auto *Elf32LEObj = dyn_cast<ELF32LEObjectFile>(Obj))
-    return Elf32LEObj->getSymbol(Sym.getRawDataRefImpl())->getType();
-  if (auto *Elf64LEObj = dyn_cast<ELF64LEObjectFile>(Obj))
-    return Elf64LEObj->getSymbol(Sym.getRawDataRefImpl())->getType();
-  if (auto *Elf32BEObj = dyn_cast<ELF32BEObjectFile>(Obj))
-    return Elf32BEObj->getSymbol(Sym.getRawDataRefImpl())->getType();
-  if (auto *Elf64BEObj = cast<ELF64BEObjectFile>(Obj))
-    return Elf64BEObj->getSymbol(Sym.getRawDataRefImpl())->getType();
-  llvm_unreachable("Unsupported binary format");
-}
-
-template <class ELFT> static void
-addDynamicElfSymbols(const ELFObjectFile<ELFT> *Obj,
-                     std::map<SectionRef, SectionSymbolsTy> &AllSymbols) {
-  for (auto Symbol : Obj->getDynamicSymbolIterators()) {
-    uint8_t SymbolType = Symbol.getELFType();
-    if (SymbolType == ELF::STT_SECTION)
-      continue;
-
-    uint64_t Address = unwrapOrError(Symbol.getAddress(), Obj->getFileName());
-    // ELFSymbolRef::getAddress() returns size instead of value for common
-    // symbols which is not desirable for disassembly output. Overriding.
-    if (SymbolType == ELF::STT_COMMON)
-      Address = Obj->getSymbol(Symbol.getRawDataRefImpl())->st_value;
-
-    StringRef Name = unwrapOrError(Symbol.getName(), Obj->getFileName());
-    if (Name.empty())
-      continue;
-
-    section_iterator SecI =
-        unwrapOrError(Symbol.getSection(), Obj->getFileName());
-    if (SecI == Obj->section_end())
-      continue;
-
-    AllSymbols[*SecI].emplace_back(Address, Name, SymbolType);
-  }
-}
-
-static void
-addDynamicElfSymbols(const ObjectFile *Obj,
-                     std::map<SectionRef, SectionSymbolsTy> &AllSymbols) {
-  assert(Obj->isELF());
-  if (auto *Elf32LEObj = dyn_cast<ELF32LEObjectFile>(Obj))
-    addDynamicElfSymbols(Elf32LEObj, AllSymbols);
-  else if (auto *Elf64LEObj = dyn_cast<ELF64LEObjectFile>(Obj))
-    addDynamicElfSymbols(Elf64LEObj, AllSymbols);
-  else if (auto *Elf32BEObj = dyn_cast<ELF32BEObjectFile>(Obj))
-    addDynamicElfSymbols(Elf32BEObj, AllSymbols);
-  else if (auto *Elf64BEObj = cast<ELF64BEObjectFile>(Obj))
-    addDynamicElfSymbols(Elf64BEObj, AllSymbols);
-  else
-    llvm_unreachable("Unsupported binary format");
-}
-
-static void addPltEntries(const ObjectFile *Obj,
-                          std::map<SectionRef, SectionSymbolsTy> &AllSymbols,
-                          StringSaver &Saver) {
-  Optional<SectionRef> Plt = None;
-  for (const SectionRef &Section : Obj->sections()) {
-    StringRef Name;
-    if (Section.getName(Name))
-      continue;
-    if (Name == ".plt")
-      Plt = Section;
-  }
-  if (!Plt)
-    return;
-  if (auto *ElfObj = dyn_cast<ELFObjectFileBase>(Obj)) {
-    for (auto PltEntry : ElfObj->getPltAddresses()) {
-      SymbolRef Symbol(PltEntry.first, ElfObj);
-      uint8_t SymbolType = getElfSymbolType(Obj, Symbol);
-
-      StringRef Name = unwrapOrError(Symbol.getName(), Obj->getFileName());
-      if (!Name.empty())
-        AllSymbols[*Plt].emplace_back(
-            PltEntry.second, Saver.save((Name + "@plt").str()), SymbolType);
-    }
-  }
-}
-
-// Normally the disassembly output will skip blocks of zeroes. This function
-// returns the number of zero bytes that can be skipped when dumping the
-// disassembly of the instructions in Buf.
-static size_t countSkippableZeroBytes(ArrayRef<uint8_t> Buf) {
-  // Find the number of leading zeroes.
-  size_t N = 0;
-  while (N < Buf.size() && !Buf[N])
-    ++N;
-
-  // We may want to skip blocks of zero bytes, but unless we see
-  // at least 8 of them in a row.
-  if (N < 8)
-    return 0;
-
-  // We skip zeroes in multiples of 4 because do not want to truncate an
-  // instruction if it starts with a zero byte.
-  return N & ~0x3;
-}
-
-// Returns a map from sections to their relocations.
-static std::map<SectionRef, std::vector<RelocationRef>>
-getRelocsMap(object::ObjectFile const &Obj) {
-  std::map<SectionRef, std::vector<RelocationRef>> Ret;
-  for (SectionRef Sec : Obj.sections()) {
-    section_iterator Relocated = Sec.getRelocatedSection();
-    if (Relocated == Obj.section_end() || !shouldKeep(*Relocated))
-      continue;
-    std::vector<RelocationRef> &V = Ret[*Relocated];
-    for (const RelocationRef &R : Sec.relocations())
-      V.push_back(R);
-    // Sort relocations by address.
-    llvm::stable_sort(V, isRelocAddressLess);
-  }
-  return Ret;
-}
-
-// Used for --adjust-vma to check if address should be adjusted by the
-// specified value for a given section.
-// For ELF we do not adjust non-allocatable sections like debug ones,
-// because they are not loadable.
-// TODO: implement for other file formats.
-static bool shouldAdjustVA(const SectionRef &Section) {
-  const ObjectFile *Obj = Section.getObject();
-  if (isa<object::ELFObjectFileBase>(Obj))
-    return ELFSectionRef(Section).getFlags() & ELF::SHF_ALLOC;
-  return false;
-}
-
-
-typedef std::pair<uint64_t, char> MappingSymbolPair;
-static char getMappingSymbolKind(ArrayRef<MappingSymbolPair> MappingSymbols,
-                                 uint64_t Address) {
-  auto It =
-      partition_point(MappingSymbols, [Address](const MappingSymbolPair &Val) {
-        return Val.first <= Address;
-      });
-  // Return zero for any address before the first mapping symbol; this means
-  // we should use the default disassembly mode, depending on the target.
-  if (It == MappingSymbols.begin())
-    return '\x00';
-  return (It - 1)->second;
-}
-
-static uint64_t
-dumpARMELFData(uint64_t SectionAddr, uint64_t Index, uint64_t End,
-               const ObjectFile *Obj, ArrayRef<uint8_t> Bytes,
-               ArrayRef<MappingSymbolPair> MappingSymbols) {
-  support::endianness Endian =
-      Obj->isLittleEndian() ? support::little : support::big;
-  while (Index < End) {
-    outs() << format("%8" PRIx64 ":", SectionAddr + Index);
-    outs() << "\t";
-    if (Index + 4 <= End) {
-      dumpBytes(Bytes.slice(Index, 4), outs());
-      outs() << "\t.word\t"
-             << format_hex(
-                    support::endian::read32(Bytes.data() + Index, Endian), 10);
-      Index += 4;
-    } else if (Index + 2 <= End) {
-      dumpBytes(Bytes.slice(Index, 2), outs());
-      outs() << "\t\t.short\t"
-             << format_hex(
-                    support::endian::read16(Bytes.data() + Index, Endian), 6);
-      Index += 2;
-    } else {
-      dumpBytes(Bytes.slice(Index, 1), outs());
-      outs() << "\t\t.byte\t" << format_hex(Bytes[0], 4);
-      ++Index;
-    }
-    outs() << "\n";
-    if (getMappingSymbolKind(MappingSymbols, Index) != 'd')
-      break;
-  }
-  return Index;
-}
-
-static void dumpELFData(uint64_t SectionAddr, uint64_t Index, uint64_t End,
-                        ArrayRef<uint8_t> Bytes) {
-  // print out data up to 8 bytes at a time in hex and ascii
-  uint8_t AsciiData[9] = {'\0'};
-  uint8_t Byte;
-  int NumBytes = 0;
-
-  for (; Index < End; ++Index) {
-    if (NumBytes == 0)
-      outs() << format("%8" PRIx64 ":", SectionAddr + Index);
-    Byte = Bytes.slice(Index)[0];
-    outs() << format(" %02x", Byte);
-    AsciiData[NumBytes] = isPrint(Byte) ? Byte : '.';
-
-    uint8_t IndentOffset = 0;
-    NumBytes++;
-    if (Index == End - 1 || NumBytes > 8) {
-      // Indent the space for less than 8 bytes data.
-      // 2 spaces for byte and one for space between bytes
-      IndentOffset = 3 * (8 - NumBytes);
-      for (int Excess = NumBytes; Excess < 8; Excess++)
-        AsciiData[Excess] = '\0';
-      NumBytes = 8;
-    }
-    if (NumBytes == 8) {
-      AsciiData[8] = '\0';
-      outs() << std::string(IndentOffset, ' ') << "         ";
-      outs() << reinterpret_cast<char *>(AsciiData);
-      outs() << '\n';
-      NumBytes = 0;
-    }
-  }
-}
-
-static void disassembleObject(const Target *TheTarget, const ObjectFile *Obj,
-                              MCContext &Ctx, MCDisassembler *PrimaryDisAsm,
-                              MCDisassembler *SecondaryDisAsm,
-                              const MCInstrAnalysis *MIA, MCInstPrinter *IP,
-                              const MCSubtargetInfo *PrimarySTI,
-                              const MCSubtargetInfo *SecondarySTI,
-                              PrettyPrinter &PIP,
-                              SourcePrinter &SP, bool InlineRelocs) {
-  const MCSubtargetInfo *STI = PrimarySTI;
-  MCDisassembler *DisAsm = PrimaryDisAsm;
-  bool PrimaryIsThumb = false;
-  if (isArmElf(Obj))
-    PrimaryIsThumb = STI->checkFeatures("+thumb-mode");
-
-  std::map<SectionRef, std::vector<RelocationRef>> RelocMap;
-  if (InlineRelocs)
-    RelocMap = getRelocsMap(*Obj);
-  bool Is64Bits = Obj->getBytesInAddress() > 4;
-
-  // Create a mapping from virtual address to symbol name.  This is used to
-  // pretty print the symbols while disassembling.
-  std::map<SectionRef, SectionSymbolsTy> AllSymbols;
-  SectionSymbolsTy AbsoluteSymbols;
-  const StringRef FileName = Obj->getFileName();
-  for (const SymbolRef &Symbol : Obj->symbols()) {
-    uint64_t Address = unwrapOrError(Symbol.getAddress(), FileName);
-
-    StringRef Name = unwrapOrError(Symbol.getName(), FileName);
-    if (Name.empty())
-      continue;
-
-    uint8_t SymbolType = ELF::STT_NOTYPE;
-    if (Obj->isELF()) {
-      SymbolType = getElfSymbolType(Obj, Symbol);
-      if (SymbolType == ELF::STT_SECTION)
-        continue;
-    }
-
-    section_iterator SecI = unwrapOrError(Symbol.getSection(), FileName);
-    if (SecI != Obj->section_end())
-      AllSymbols[*SecI].emplace_back(Address, Name, SymbolType);
-    else
-      AbsoluteSymbols.emplace_back(Address, Name, SymbolType);
-  }
-  if (AllSymbols.empty() && Obj->isELF())
-    addDynamicElfSymbols(Obj, AllSymbols);
-
-  BumpPtrAllocator A;
-  StringSaver Saver(A);
-  addPltEntries(Obj, AllSymbols, Saver);
-
-  // Create a mapping from virtual address to section.
-  std::vector<std::pair<uint64_t, SectionRef>> SectionAddresses;
-  for (SectionRef Sec : Obj->sections())
-    SectionAddresses.emplace_back(Sec.getAddress(), Sec);
-  array_pod_sort(SectionAddresses.begin(), SectionAddresses.end());
-
-  // Linked executables (.exe and .dll files) typically don't include a real
-  // symbol table but they might contain an export table.
-  if (const auto *COFFObj = dyn_cast<COFFObjectFile>(Obj)) {
-    for (const auto &ExportEntry : COFFObj->export_directories()) {
-      StringRef Name;
-      error(ExportEntry.getSymbolName(Name));
-      if (Name.empty())
-        continue;
-      uint32_t RVA;
-      error(ExportEntry.getExportRVA(RVA));
-
-      uint64_t VA = COFFObj->getImageBase() + RVA;
-      auto Sec = partition_point(
-          SectionAddresses, [VA](const std::pair<uint64_t, SectionRef> &O) {
-            return O.first <= VA;
-          });
-      if (Sec != SectionAddresses.begin()) {
-        --Sec;
-        AllSymbols[Sec->second].emplace_back(VA, Name, ELF::STT_NOTYPE);
-      } else
-        AbsoluteSymbols.emplace_back(VA, Name, ELF::STT_NOTYPE);
-    }
-  }
-
-  // Sort all the symbols, this allows us to use a simple binary search to find
-  // a symbol near an address.
-  StringSet<> FoundDisasmFuncsSet;
-  for (std::pair<const SectionRef, SectionSymbolsTy> &SecSyms : AllSymbols)
-    array_pod_sort(SecSyms.second.begin(), SecSyms.second.end());
-  array_pod_sort(AbsoluteSymbols.begin(), AbsoluteSymbols.end());
-
-  for (const SectionRef &Section : ToolSectionFilter(*Obj)) {
-    if (FilterSections.empty() && !DisassembleAll &&
-        (!Section.isText() || Section.isVirtual()))
-      continue;
-
-    uint64_t SectionAddr = Section.getAddress();
-    uint64_t SectSize = Section.getSize();
-    if (!SectSize)
-      continue;
-
-    // Get the list of all the symbols in this section.
-    SectionSymbolsTy &Symbols = AllSymbols[Section];
-    std::vector<MappingSymbolPair> MappingSymbols;
-    if (hasMappingSymbols(Obj)) {
-      for (const auto &Symb : Symbols) {
-        uint64_t Address = std::get<0>(Symb);
-        StringRef Name = std::get<1>(Symb);
-        if (Name.startswith("$d"))
-          MappingSymbols.emplace_back(Address - SectionAddr, 'd');
-        if (Name.startswith("$x"))
-          MappingSymbols.emplace_back(Address - SectionAddr, 'x');
-        if (Name.startswith("$a"))
-          MappingSymbols.emplace_back(Address - SectionAddr, 'a');
-        if (Name.startswith("$t"))
-          MappingSymbols.emplace_back(Address - SectionAddr, 't');
-      }
-    }
-
-    llvm::sort(MappingSymbols);
-
-    if (Obj->isELF() && Obj->getArch() == Triple::amdgcn) {
-      // AMDGPU disassembler uses symbolizer for printing labels
-      std::unique_ptr<MCRelocationInfo> RelInfo(
-        TheTarget->createMCRelocationInfo(TripleName, Ctx));
-      if (RelInfo) {
-        std::unique_ptr<MCSymbolizer> Symbolizer(
-          TheTarget->createMCSymbolizer(
-            TripleName, nullptr, nullptr, &Symbols, &Ctx, std::move(RelInfo)));
-        DisAsm->setSymbolizer(std::move(Symbolizer));
-      }
-    }
-
-    StringRef SegmentName = "";
-    if (const MachOObjectFile *MachO = dyn_cast<const MachOObjectFile>(Obj)) {
-      DataRefImpl DR = Section.getRawDataRefImpl();
-      SegmentName = MachO->getSectionFinalSegmentName(DR);
-    }
-    StringRef SectionName;
-    error(Section.getName(SectionName));
-
-    // If the section has no symbol at the start, just insert a dummy one.
-    if (Symbols.empty() || std::get<0>(Symbols[0]) != 0) {
-      Symbols.insert(
-          Symbols.begin(),
-          std::make_tuple(SectionAddr, SectionName,
-                          Section.isText() ? ELF::STT_FUNC : ELF::STT_OBJECT));
-    }
-
-    SmallString<40> Comments;
-    raw_svector_ostream CommentStream(Comments);
-
-    ArrayRef<uint8_t> Bytes = arrayRefFromStringRef(
-        unwrapOrError(Section.getContents(), Obj->getFileName()));
-
-    uint64_t VMAAdjustment = 0;
-    if (shouldAdjustVA(Section))
-      VMAAdjustment = AdjustVMA;
-
-    uint64_t Size;
-    uint64_t Index;
-    bool PrintedSection = false;
-    std::vector<RelocationRef> Rels = RelocMap[Section];
-    std::vector<RelocationRef>::const_iterator RelCur = Rels.begin();
-    std::vector<RelocationRef>::const_iterator RelEnd = Rels.end();
-    // Disassemble symbol by symbol.
-    for (unsigned SI = 0, SE = Symbols.size(); SI != SE; ++SI) {
-      std::string SymbolName = std::get<1>(Symbols[SI]).str();
-      if (Demangle)
-        SymbolName = demangle(SymbolName);
-
-      // Skip if --disassemble-functions is not empty and the symbol is not in
-      // the list.
-      if (!DisasmFuncsSet.empty() && !DisasmFuncsSet.count(SymbolName))
-        continue;
-
-      uint64_t Start = std::get<0>(Symbols[SI]);
-      if (Start < SectionAddr || StopAddress <= Start)
-        continue;
-      else
-        FoundDisasmFuncsSet.insert(SymbolName);
-
-      // The end is the section end, the beginning of the next symbol, or
-      // --stop-address.
-      uint64_t End = std::min<uint64_t>(SectionAddr + SectSize, StopAddress);
-      if (SI + 1 < SE)
-        End = std::min(End, std::get<0>(Symbols[SI + 1]));
-      if (Start >= End || End <= StartAddress)
-        continue;
-      Start -= SectionAddr;
-      End -= SectionAddr;
-
-      if (!PrintedSection) {
-        PrintedSection = true;
-        outs() << "\nDisassembly of section ";
-        if (!SegmentName.empty())
-          outs() << SegmentName << ",";
-        outs() << SectionName << ":\n";
-      }
-
-      if (Obj->isELF() && Obj->getArch() == Triple::amdgcn) {
-        if (std::get<2>(Symbols[SI]) == ELF::STT_AMDGPU_HSA_KERNEL) {
-          // skip amd_kernel_code_t at the begining of kernel symbol (256 bytes)
-          Start += 256;
-        }
-        if (SI == SE - 1 ||
-            std::get<2>(Symbols[SI + 1]) == ELF::STT_AMDGPU_HSA_KERNEL) {
-          // cut trailing zeroes at the end of kernel
-          // cut up to 256 bytes
-          const uint64_t EndAlign = 256;
-          const auto Limit = End - (std::min)(EndAlign, End - Start);
-          while (End > Limit &&
-            *reinterpret_cast<const support::ulittle32_t*>(&Bytes[End - 4]) == 0)
-            End -= 4;
-        }
-      }
-
-      outs() << '\n';
-      if (!NoLeadingAddr)
-        outs() << format(Is64Bits ? "%016" PRIx64 " " : "%08" PRIx64 " ",
-                         SectionAddr + Start + VMAAdjustment);
-
-      outs() << SymbolName << ":\n";
-
-      // Don't print raw contents of a virtual section. A virtual section
-      // doesn't have any contents in the file.
-      if (Section.isVirtual()) {
-        outs() << "...\n";
-        continue;
-      }
-
-#ifndef NDEBUG
-      raw_ostream &DebugOut = DebugFlag ? dbgs() : nulls();
-#else
-      raw_ostream &DebugOut = nulls();
-#endif
-
-      // Some targets (like WebAssembly) have a special prelude at the start
-      // of each symbol.
-      DisAsm->onSymbolStart(SymbolName, Size, Bytes.slice(Start, End - Start),
-                            SectionAddr + Start, DebugOut, CommentStream);
-      Start += Size;
-
-      Index = Start;
-      if (SectionAddr < StartAddress)
-        Index = std::max<uint64_t>(Index, StartAddress - SectionAddr);
-
-      // 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
-      // situation where we must print the data and not disassemble it.
-      if (Obj->isELF() && !DisassembleAll && Section.isText()) {
-        uint8_t SymTy = std::get<2>(Symbols[SI]);
-        if (SymTy == ELF::STT_OBJECT || SymTy == ELF::STT_COMMON) {
-          dumpELFData(SectionAddr, Index, End, Bytes);
-          Index = End;
-        }
-      }
-
-      bool CheckARMELFData = hasMappingSymbols(Obj) &&
-                             std::get<2>(Symbols[SI]) != ELF::STT_OBJECT &&
-                             !DisassembleAll;
-      while (Index < End) {
-        // ARM and AArch64 ELF binaries can interleave data and text in the
-        // same section. We rely on the markers introduced to understand what
-        // we need to dump. If the data marker is within a function, it is
-        // denoted as a word/short etc.
-        if (CheckARMELFData &&
-            getMappingSymbolKind(MappingSymbols, Index) == 'd') {
-          Index = dumpARMELFData(SectionAddr, Index, End, Obj, Bytes,
-                                 MappingSymbols);
-          continue;
-        }
-
-        // When -z or --disassemble-zeroes are given we always dissasemble
-        // them. Otherwise we might want to skip zero bytes we see.
-        if (!DisassembleZeroes) {
-          uint64_t MaxOffset = End - Index;
-          // For -reloc: print zero blocks patched by relocations, so that
-          // relocations can be shown in the dump.
-          if (RelCur != RelEnd)
-            MaxOffset = RelCur->getOffset() - Index;
-
-          if (size_t N =
-                  countSkippableZeroBytes(Bytes.slice(Index, MaxOffset))) {
-            outs() << "\t\t..." << '\n';
-            Index += N;
-            continue;
-          }
-        }
-
-        if (SecondarySTI) {
-          if (getMappingSymbolKind(MappingSymbols, Index) == 'a') {
-            STI = PrimaryIsThumb ? SecondarySTI : PrimarySTI;
-            DisAsm = PrimaryIsThumb ? SecondaryDisAsm : PrimaryDisAsm;
-          } else if (getMappingSymbolKind(MappingSymbols, Index) == 't') {
-            STI = PrimaryIsThumb ? PrimarySTI : SecondarySTI;
-            DisAsm = PrimaryIsThumb ? PrimaryDisAsm : SecondaryDisAsm;
-          }
-        }
-
-        // Disassemble a real instruction or a data when disassemble all is
-        // provided
-        MCInst Inst;
-        bool Disassembled = DisAsm->getInstruction(
-            Inst, Size, Bytes.slice(Index), SectionAddr + Index, DebugOut,
-            CommentStream);
-        if (Size == 0)
-          Size = 1;
-
-        PIP.printInst(
-            *IP, Disassembled ? &Inst : nullptr, Bytes.slice(Index, Size),
-            {SectionAddr + Index + VMAAdjustment, Section.getIndex()}, outs(),
-            "", *STI, &SP, &Rels);
-        outs() << CommentStream.str();
-        Comments.clear();
-
-        // Try to resolve the target of a call, tail call, etc. to a specific
-        // symbol.
-        if (MIA && (MIA->isCall(Inst) || MIA->isUnconditionalBranch(Inst) ||
-                    MIA->isConditionalBranch(Inst))) {
-          uint64_t Target;
-          if (MIA->evaluateBranch(Inst, SectionAddr + Index, Size, Target)) {
-            // In a relocatable object, the target's section must reside in
-            // the same section as the call instruction or it is accessed
-            // through a relocation.
-            //
-            // In a non-relocatable object, the target may be in any section.
-            //
-            // N.B. We don't walk the relocations in the relocatable case yet.
-            auto *TargetSectionSymbols = &Symbols;
-            if (!Obj->isRelocatableObject()) {
-              auto It = partition_point(
-                  SectionAddresses,
-                  [=](const std::pair<uint64_t, SectionRef> &O) {
-                    return O.first <= Target;
-                  });
-              if (It != SectionAddresses.begin()) {
-                --It;
-                TargetSectionSymbols = &AllSymbols[It->second];
-              } else {
-                TargetSectionSymbols = &AbsoluteSymbols;
-              }
-            }
-
-            // Find the last symbol in the section whose offset is less than
-            // or equal to the target. If there isn't a section that contains
-            // the target, find the nearest preceding absolute symbol.
-            auto TargetSym = partition_point(
-                *TargetSectionSymbols,
-                [=](const std::tuple<uint64_t, StringRef, uint8_t> &O) {
-                  return std::get<0>(O) <= Target;
-                });
-            if (TargetSym == TargetSectionSymbols->begin()) {
-              TargetSectionSymbols = &AbsoluteSymbols;
-              TargetSym = partition_point(
-                  AbsoluteSymbols,
-                  [=](const std::tuple<uint64_t, StringRef, uint8_t> &O) {
-                    return std::get<0>(O) <= Target;
-                  });
-            }
-            if (TargetSym != TargetSectionSymbols->begin()) {
-              --TargetSym;
-              uint64_t TargetAddress = std::get<0>(*TargetSym);
-              StringRef TargetName = std::get<1>(*TargetSym);
-              outs() << " <" << TargetName;
-              uint64_t Disp = Target - TargetAddress;
-              if (Disp)
-                outs() << "+0x" << Twine::utohexstr(Disp);
-              outs() << '>';
-            }
-          }
-        }
-        outs() << "\n";
-
-        // Hexagon does this in pretty printer
-        if (Obj->getArch() != Triple::hexagon) {
-          // Print relocation for instruction.
-          while (RelCur != RelEnd) {
-            uint64_t Offset = RelCur->getOffset();
-            // If this relocation is hidden, skip it.
-            if (getHidden(*RelCur) || SectionAddr + Offset < StartAddress) {
-              ++RelCur;
-              continue;
-            }
-
-            // Stop when RelCur's offset is past the current instruction.
-            if (Offset >= Index + Size)
-              break;
-
-            // When --adjust-vma is used, update the address printed.
-            if (RelCur->getSymbol() != Obj->symbol_end()) {
-              Expected<section_iterator> SymSI =
-                  RelCur->getSymbol()->getSection();
-              if (SymSI && *SymSI != Obj->section_end() &&
-                  shouldAdjustVA(**SymSI))
-                Offset += AdjustVMA;
-            }
-
-            printRelocation(*RelCur, SectionAddr + Offset, Is64Bits);
-            ++RelCur;
-          }
-        }
-
-        Index += Size;
-      }
-    }
-  }
-  StringSet<> MissingDisasmFuncsSet =
-      set_difference(DisasmFuncsSet, FoundDisasmFuncsSet);
-  for (StringRef MissingDisasmFunc : MissingDisasmFuncsSet.keys())
-    warn("failed to disassemble missing function " + MissingDisasmFunc);
-}
-
-static void disassembleObject(const ObjectFile *Obj, bool InlineRelocs) {
-  const Target *TheTarget = getTarget(Obj);
-
-  // Package up features to be passed to target/subtarget
-  SubtargetFeatures Features = Obj->getFeatures();
-  if (!MAttrs.empty())
-    for (unsigned I = 0; I != MAttrs.size(); ++I)
-      Features.AddFeature(MAttrs[I]);
-
-  std::unique_ptr<const MCRegisterInfo> MRI(
-      TheTarget->createMCRegInfo(TripleName));
-  if (!MRI)
-    report_error(Obj->getFileName(),
-                 "no register info for target " + TripleName);
-
-  // Set up disassembler.
-  std::unique_ptr<const MCAsmInfo> AsmInfo(
-      TheTarget->createMCAsmInfo(*MRI, TripleName));
-  if (!AsmInfo)
-    report_error(Obj->getFileName(),
-                 "no assembly info for target " + TripleName);
-  std::unique_ptr<const MCSubtargetInfo> STI(
-      TheTarget->createMCSubtargetInfo(TripleName, MCPU, Features.getString()));
-  if (!STI)
-    report_error(Obj->getFileName(),
-                 "no subtarget info for target " + TripleName);
-  std::unique_ptr<const MCInstrInfo> MII(TheTarget->createMCInstrInfo());
-  if (!MII)
-    report_error(Obj->getFileName(),
-                 "no instruction info for target " + TripleName);
-  MCObjectFileInfo MOFI;
-  MCContext Ctx(AsmInfo.get(), MRI.get(), &MOFI);
-  // FIXME: for now initialize MCObjectFileInfo with default values
-  MOFI.InitMCObjectFileInfo(Triple(TripleName), false, Ctx);
-
-  std::unique_ptr<MCDisassembler> DisAsm(
-      TheTarget->createMCDisassembler(*STI, Ctx));
-  if (!DisAsm)
-    report_error(Obj->getFileName(),
-                 "no disassembler for target " + TripleName);
-
-  // If we have an ARM object file, we need a second disassembler, because
-  // ARM CPUs have two different instruction sets: ARM mode, and Thumb mode.
-  // We use mapping symbols to switch between the two assemblers, where
-  // appropriate.
-  std::unique_ptr<MCDisassembler> SecondaryDisAsm;
-  std::unique_ptr<const MCSubtargetInfo> SecondarySTI;
-  if (isArmElf(Obj) && !STI->checkFeatures("+mclass")) {
-    if (STI->checkFeatures("+thumb-mode"))
-      Features.AddFeature("-thumb-mode");
-    else
-      Features.AddFeature("+thumb-mode");
-    SecondarySTI.reset(TheTarget->createMCSubtargetInfo(TripleName, MCPU,
-                                                        Features.getString()));
-    SecondaryDisAsm.reset(TheTarget->createMCDisassembler(*SecondarySTI, Ctx));
-  }
-
-  std::unique_ptr<const MCInstrAnalysis> MIA(
-      TheTarget->createMCInstrAnalysis(MII.get()));
-
-  int AsmPrinterVariant = AsmInfo->getAssemblerDialect();
-  std::unique_ptr<MCInstPrinter> IP(TheTarget->createMCInstPrinter(
-      Triple(TripleName), AsmPrinterVariant, *AsmInfo, *MII, *MRI));
-  if (!IP)
-    report_error(Obj->getFileName(),
-                 "no instruction printer for target " + TripleName);
-  IP->setPrintImmHex(PrintImmHex);
-
-  PrettyPrinter &PIP = selectPrettyPrinter(Triple(TripleName));
-  SourcePrinter SP(Obj, TheTarget->getName());
-
-  for (StringRef Opt : DisassemblerOptions)
-    if (!IP->applyTargetSpecificCLOption(Opt))
-      error("Unrecognized disassembler option: " + Opt);
-
-  disassembleObject(TheTarget, Obj, Ctx, DisAsm.get(), SecondaryDisAsm.get(),
-                    MIA.get(), IP.get(), STI.get(), SecondarySTI.get(), PIP,
-                    SP, InlineRelocs);
-}
-
-void printRelocations(const ObjectFile *Obj) {
-  StringRef Fmt = Obj->getBytesInAddress() > 4 ? "%016" PRIx64 :
-                                                 "%08" PRIx64;
-  // Regular objdump doesn't print relocations in non-relocatable object
-  // files.
-  if (!Obj->isRelocatableObject())
-    return;
-
-  // Build a mapping from relocation target to a vector of relocation
-  // sections. Usually, there is an only one relocation section for
-  // each relocated section.
-  MapVector<SectionRef, std::vector<SectionRef>> SecToRelSec;
-  for (const SectionRef &Section : ToolSectionFilter(*Obj)) {
-    if (Section.relocation_begin() == Section.relocation_end())
-      continue;
-    const SectionRef TargetSec = *Section.getRelocatedSection();
-    SecToRelSec[TargetSec].push_back(Section);
-  }
-
-  for (std::pair<SectionRef, std::vector<SectionRef>> &P : SecToRelSec) {
-    StringRef SecName;
-    error(P.first.getName(SecName));
-    outs() << "RELOCATION RECORDS FOR [" << SecName << "]:\n";
-
-    for (SectionRef Section : P.second) {
-      for (const RelocationRef &Reloc : Section.relocations()) {
-        uint64_t Address = Reloc.getOffset();
-        SmallString<32> RelocName;
-        SmallString<32> ValueStr;
-        if (Address < StartAddress || Address > StopAddress || getHidden(Reloc))
-          continue;
-        Reloc.getTypeName(RelocName);
-        error(getRelocationValueString(Reloc, ValueStr));
-        outs() << format(Fmt.data(), Address) << " " << RelocName << " "
-               << ValueStr << "\n";
-      }
-    }
-    outs() << "\n";
-  }
-}
-
-void printDynamicRelocations(const ObjectFile *Obj) {
-  // For the moment, this option is for ELF only
-  if (!Obj->isELF())
-    return;
-
-  const auto *Elf = dyn_cast<ELFObjectFileBase>(Obj);
-  if (!Elf || Elf->getEType() != ELF::ET_DYN) {
-    error("not a dynamic object");
-    return;
-  }
-
-  std::vector<SectionRef> DynRelSec = Obj->dynamic_relocation_sections();
-  if (DynRelSec.empty())
-    return;
-
-  outs() << "DYNAMIC RELOCATION RECORDS\n";
-  StringRef Fmt = Obj->getBytesInAddress() > 4 ? "%016" PRIx64 : "%08" PRIx64;
-  for (const SectionRef &Section : DynRelSec)
-    for (const RelocationRef &Reloc : Section.relocations()) {
-      uint64_t Address = Reloc.getOffset();
-      SmallString<32> RelocName;
-      SmallString<32> ValueStr;
-      Reloc.getTypeName(RelocName);
-      error(getRelocationValueString(Reloc, ValueStr));
-      outs() << format(Fmt.data(), Address) << " " << RelocName << " "
-             << ValueStr << "\n";
-    }
-}
-
-// 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
-// whose VMA and LMA are different and/or when --show-lma flag is used.
-static bool shouldDisplayLMA(const ObjectFile *Obj) {
-  if (!Obj->isELF())
-    return false;
-  for (const SectionRef &S : ToolSectionFilter(*Obj))
-    if (S.getAddress() != getELFSectionLMA(S))
-      return true;
-  return ShowLMA;
-}
-
-void printSectionHeaders(const ObjectFile *Obj) {
-  bool HasLMAColumn = shouldDisplayLMA(Obj);
-  if (HasLMAColumn)
-    outs() << "Sections:\n"
-              "Idx Name          Size     VMA              LMA              "
-              "Type\n";
-  else
-    outs() << "Sections:\n"
-              "Idx Name          Size     VMA          Type\n";
-
-  for (const SectionRef &Section : ToolSectionFilter(*Obj)) {
-    StringRef Name;
-    error(Section.getName(Name));
-    uint64_t VMA = Section.getAddress();
-    if (shouldAdjustVA(Section))
-      VMA += AdjustVMA;
-
-    uint64_t Size = Section.getSize();
-    bool Text = Section.isText();
-    bool Data = Section.isData();
-    bool BSS = Section.isBSS();
-    std::string Type = (std::string(Text ? "TEXT " : "") +
-                        (Data ? "DATA " : "") + (BSS ? "BSS" : ""));
-
-    if (HasLMAColumn)
-      outs() << format("%3d %-13s %08" PRIx64 " %016" PRIx64 " %016" PRIx64
-                       " %s\n",
-                       (unsigned)Section.getIndex(), Name.str().c_str(), Size,
-                       VMA, getELFSectionLMA(Section), Type.c_str());
-    else
-      outs() << format("%3d %-13s %08" PRIx64 " %016" PRIx64 " %s\n",
-                       (unsigned)Section.getIndex(), Name.str().c_str(), Size,
-                       VMA, Type.c_str());
-  }
-  outs() << "\n";
-}
-
-void printSectionContents(const ObjectFile *Obj) {
-  for (const SectionRef &Section : ToolSectionFilter(*Obj)) {
-    StringRef Name;
-    error(Section.getName(Name));
-    uint64_t BaseAddr = Section.getAddress();
-    uint64_t Size = Section.getSize();
-    if (!Size)
-      continue;
-
-    outs() << "Contents of section " << Name << ":\n";
-    if (Section.isBSS()) {
-      outs() << format("<skipping contents of bss section at [%04" PRIx64
-                       ", %04" PRIx64 ")>\n",
-                       BaseAddr, BaseAddr + Size);
-      continue;
-    }
-
-    StringRef Contents = unwrapOrError(Section.getContents(), Obj->getFileName());
-
-    // Dump out the content as hex and printable ascii characters.
-    for (std::size_t Addr = 0, End = Contents.size(); Addr < End; Addr += 16) {
-      outs() << format(" %04" PRIx64 " ", BaseAddr + Addr);
-      // Dump line of hex.
-      for (std::size_t I = 0; I < 16; ++I) {
-        if (I != 0 && I % 4 == 0)
-          outs() << ' ';
-        if (Addr + I < End)
-          outs() << hexdigit((Contents[Addr + I] >> 4) & 0xF, true)
-                 << hexdigit(Contents[Addr + I] & 0xF, true);
-        else
-          outs() << "  ";
-      }
-      // Print ascii.
-      outs() << "  ";
-      for (std::size_t I = 0; I < 16 && Addr + I < End; ++I) {
-        if (isPrint(static_cast<unsigned char>(Contents[Addr + I]) & 0xFF))
-          outs() << Contents[Addr + I];
-        else
-          outs() << ".";
-      }
-      outs() << "\n";
-    }
-  }
-}
-
-void printSymbolTable(const ObjectFile *O, StringRef ArchiveName,
-                      StringRef ArchitectureName) {
-  outs() << "SYMBOL TABLE:\n";
-
-  if (const COFFObjectFile *Coff = dyn_cast<const COFFObjectFile>(O)) {
-    printCOFFSymbolTable(Coff);
-    return;
-  }
-
-  const StringRef FileName = O->getFileName();
-  for (auto I = O->symbol_begin(), E = O->symbol_end(); I != E; ++I) {
-    const SymbolRef &Symbol = *I;
-    uint64_t Address = unwrapOrError(Symbol.getAddress(), ArchiveName, FileName,
-                                     ArchitectureName);
-    if ((Address < StartAddress) || (Address > StopAddress))
-      continue;
-    SymbolRef::Type Type = unwrapOrError(Symbol.getType(), ArchiveName,
-                                         FileName, ArchitectureName);
-    uint32_t Flags = Symbol.getFlags();
-    section_iterator Section = unwrapOrError(Symbol.getSection(), ArchiveName,
-                                             FileName, ArchitectureName);
-    StringRef Name;
-    if (Type == SymbolRef::ST_Debug && Section != O->section_end())
-      Section->getName(Name);
-    else
-      Name = unwrapOrError(Symbol.getName(), ArchiveName, FileName,
-                           ArchitectureName);
-
-    bool Global = Flags & SymbolRef::SF_Global;
-    bool Weak = Flags & SymbolRef::SF_Weak;
-    bool Absolute = Flags & SymbolRef::SF_Absolute;
-    bool Common = Flags & SymbolRef::SF_Common;
-    bool Hidden = Flags & SymbolRef::SF_Hidden;
-
-    char GlobLoc = ' ';
-    if (Type != SymbolRef::ST_Unknown)
-      GlobLoc = Global ? 'g' : 'l';
-    char Debug = (Type == SymbolRef::ST_Debug || Type == SymbolRef::ST_File)
-                 ? 'd' : ' ';
-    char FileFunc = ' ';
-    if (Type == SymbolRef::ST_File)
-      FileFunc = 'f';
-    else if (Type == SymbolRef::ST_Function)
-      FileFunc = 'F';
-    else if (Type == SymbolRef::ST_Data)
-      FileFunc = 'O';
-
-    const char *Fmt = O->getBytesInAddress() > 4 ? "%016" PRIx64 :
-                                                   "%08" PRIx64;
-
-    outs() << format(Fmt, Address) << " "
-           << GlobLoc // Local -> 'l', Global -> 'g', Neither -> ' '
-           << (Weak ? 'w' : ' ') // Weak?
-           << ' ' // Constructor. Not supported yet.
-           << ' ' // Warning. Not supported yet.
-           << ' ' // Indirect reference to another symbol.
-           << Debug // Debugging (d) or dynamic (D) symbol.
-           << FileFunc // Name of function (F), file (f) or object (O).
-           << ' ';
-    if (Absolute) {
-      outs() << "*ABS*";
-    } else if (Common) {
-      outs() << "*COM*";
-    } else if (Section == O->section_end()) {
-      outs() << "*UND*";
-    } else {
-      if (const MachOObjectFile *MachO =
-          dyn_cast<const MachOObjectFile>(O)) {
-        DataRefImpl DR = Section->getRawDataRefImpl();
-        StringRef SegmentName = MachO->getSectionFinalSegmentName(DR);
-        outs() << SegmentName << ",";
-      }
-      StringRef SectionName;
-      error(Section->getName(SectionName));
-      outs() << SectionName;
-    }
-
-    if (Common || isa<ELFObjectFileBase>(O)) {
-      uint64_t Val =
-          Common ? Symbol.getAlignment() : ELFSymbolRef(Symbol).getSize();
-      outs() << format("\t%08" PRIx64, Val);
-    }
-
-    if (isa<ELFObjectFileBase>(O)) {
-      uint8_t Other = ELFSymbolRef(Symbol).getOther();
-      switch (Other) {
-      case ELF::STV_DEFAULT:
-        break;
-      case ELF::STV_INTERNAL:
-        outs() << " .internal";
-        break;
-      case ELF::STV_HIDDEN:
-        outs() << " .hidden";
-        break;
-      case ELF::STV_PROTECTED:
-        outs() << " .protected";
-        break;
-      default:
-        outs() << format(" 0x%02x", Other);
-        break;
-      }
-    } else if (Hidden) {
-      outs() << " .hidden";
-    }
-
-    if (Demangle)
-      outs() << ' ' << demangle(Name) << '\n';
-    else
-      outs() << ' ' << Name << '\n';
-  }
-}
-
-static void printUnwindInfo(const ObjectFile *O) {
-  outs() << "Unwind info:\n\n";
-
-  if (const COFFObjectFile *Coff = dyn_cast<COFFObjectFile>(O))
-    printCOFFUnwindInfo(Coff);
-  else if (const MachOObjectFile *MachO = dyn_cast<MachOObjectFile>(O))
-    printMachOUnwindInfo(MachO);
-  else
-    // TODO: Extract DWARF dump tool to objdump.
-    WithColor::error(errs(), ToolName)
-        << "This operation is only currently supported "
-           "for COFF and MachO object files.\n";
-}
-
-/// Dump the raw contents of the __clangast section so the output can be piped
-/// into llvm-bcanalyzer.
-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 "
-           "the clang ast section.\n"
-           "Please redirect the output to a file or another program such as "
-           "llvm-bcanalyzer.\n";
-    return;
-  }
-
-  StringRef ClangASTSectionName("__clangast");
-  if (isa<COFFObjectFile>(Obj)) {
-    ClangASTSectionName = "clangast";
-  }
-
-  Optional<object::SectionRef> ClangASTSection;
-  for (auto Sec : ToolSectionFilter(*Obj)) {
-    StringRef Name;
-    Sec.getName(Name);
-    if (Name == ClangASTSectionName) {
-      ClangASTSection = Sec;
-      break;
-    }
-  }
-  if (!ClangASTSection)
-    return;
-
-  StringRef ClangASTContents = unwrapOrError(
-      ClangASTSection.getValue().getContents(), Obj->getFileName());
-  outs().write(ClangASTContents.data(), ClangASTContents.size());
-}
-
-static void printFaultMaps(const ObjectFile *Obj) {
-  StringRef FaultMapSectionName;
-
-  if (isa<ELFObjectFileBase>(Obj)) {
-    FaultMapSectionName = ".llvm_faultmaps";
-  } else if (isa<MachOObjectFile>(Obj)) {
-    FaultMapSectionName = "__llvm_faultmaps";
-  } else {
-    WithColor::error(errs(), ToolName)
-        << "This operation is only currently supported "
-           "for ELF and Mach-O executable files.\n";
-    return;
-  }
-
-  Optional<object::SectionRef> FaultMapSection;
-
-  for (auto Sec : ToolSectionFilter(*Obj)) {
-    StringRef Name;
-    Sec.getName(Name);
-    if (Name == FaultMapSectionName) {
-      FaultMapSection = Sec;
-      break;
-    }
-  }
-
-  outs() << "FaultMap table:\n";
-
-  if (!FaultMapSection.hasValue()) {
-    outs() << "<not found>\n";
-    return;
-  }
-
-  StringRef FaultMapContents =
-      unwrapOrError(FaultMapSection.getValue().getContents(), Obj->getFileName());
-  FaultMapParser FMP(FaultMapContents.bytes_begin(),
-                     FaultMapContents.bytes_end());
-
-  outs() << FMP;
-}
-
-static void printPrivateFileHeaders(const ObjectFile *O, bool OnlyFirst) {
-  if (O->isELF()) {
-    printELFFileHeader(O);
-    printELFDynamicSection(O);
-    printELFSymbolVersionInfo(O);
-    return;
-  }
-  if (O->isCOFF())
-    return printCOFFFileHeader(O);
-  if (O->isWasm())
-    return printWasmFileHeader(O);
-  if (O->isMachO()) {
-    printMachOFileHeader(O);
-    if (!OnlyFirst)
-      printMachOLoadCommands(O);
-    return;
-  }
-  report_error(O->getFileName(), "Invalid/Unsupported object file format");
-}
-
-static void printFileHeaders(const ObjectFile *O) {
-  if (!O->isELF() && !O->isCOFF())
-    report_error(O->getFileName(), "Invalid/Unsupported object file format");
-
-  Triple::ArchType AT = O->getArch();
-  outs() << "architecture: " << Triple::getArchTypeName(AT) << "\n";
-  uint64_t Address = unwrapOrError(O->getStartAddress(), O->getFileName());
-
-  StringRef Fmt = O->getBytesInAddress() > 4 ? "%016" PRIx64 : "%08" PRIx64;
-  outs() << "start address: "
-         << "0x" << format(Fmt.data(), Address) << "\n\n";
-}
-
-static void printArchiveChild(StringRef Filename, const Archive::Child &C) {
-  Expected<sys::fs::perms> ModeOrErr = C.getAccessMode();
-  if (!ModeOrErr) {
-    WithColor::error(errs(), ToolName) << "ill-formed archive entry.\n";
-    consumeError(ModeOrErr.takeError());
-    return;
-  }
-  sys::fs::perms Mode = ModeOrErr.get();
-  outs() << ((Mode & sys::fs::owner_read) ? "r" : "-");
-  outs() << ((Mode & sys::fs::owner_write) ? "w" : "-");
-  outs() << ((Mode & sys::fs::owner_exe) ? "x" : "-");
-  outs() << ((Mode & sys::fs::group_read) ? "r" : "-");
-  outs() << ((Mode & sys::fs::group_write) ? "w" : "-");
-  outs() << ((Mode & sys::fs::group_exe) ? "x" : "-");
-  outs() << ((Mode & sys::fs::others_read) ? "r" : "-");
-  outs() << ((Mode & sys::fs::others_write) ? "w" : "-");
-  outs() << ((Mode & sys::fs::others_exe) ? "x" : "-");
-
-  outs() << " ";
-
-  outs() << format("%d/%d %6" PRId64 " ", unwrapOrError(C.getUID(), Filename),
-                   unwrapOrError(C.getGID(), Filename),
-                   unwrapOrError(C.getRawSize(), Filename));
-
-  StringRef RawLastModified = C.getRawLastModified();
-  unsigned Seconds;
-  if (RawLastModified.getAsInteger(10, Seconds))
-    outs() << "(date: \"" << RawLastModified
-           << "\" contains non-decimal chars) ";
-  else {
-    // Since ctime(3) returns a 26 character string of the form:
-    // "Sun Sep 16 01:03:52 1973\n\0"
-    // just print 24 characters.
-    time_t t = Seconds;
-    outs() << format("%.24s ", ctime(&t));
-  }
-
-  StringRef Name = "";
-  Expected<StringRef> NameOrErr = C.getName();
-  if (!NameOrErr) {
-    consumeError(NameOrErr.takeError());
-    Name = unwrapOrError(C.getRawName(), Filename);
-  } else {
-    Name = NameOrErr.get();
-  }
-  outs() << Name << "\n";
-}
-
-static void dumpObject(ObjectFile *O, const Archive *A = nullptr,
-                       const Archive::Child *C = nullptr) {
-  // Avoid other output when using a raw option.
-  if (!RawClangAST) {
-    outs() << '\n';
-    if (A)
-      outs() << A->getFileName() << "(" << O->getFileName() << ")";
-    else
-      outs() << O->getFileName();
-    outs() << ":\tfile format " << O->getFileFormatName() << "\n\n";
-  }
-
-  StringRef ArchiveName = A ? A->getFileName() : "";
-  if (FileHeaders)
-    printFileHeaders(O);
-  if (ArchiveHeaders && !MachOOpt && C)
-    printArchiveChild(ArchiveName, *C);
-  if (Disassemble)
-    disassembleObject(O, Relocations);
-  if (Relocations && !Disassemble)
-    printRelocations(O);
-  if (DynamicRelocations)
-    printDynamicRelocations(O);
-  if (SectionHeaders)
-    printSectionHeaders(O);
-  if (SectionContents)
-    printSectionContents(O);
-  if (SymbolTable)
-    printSymbolTable(O, ArchiveName);
-  if (UnwindInfo)
-    printUnwindInfo(O);
-  if (PrivateHeaders || FirstPrivateHeader)
-    printPrivateFileHeaders(O, FirstPrivateHeader);
-  if (ExportsTrie)
-    printExportsTrie(O);
-  if (Rebase)
-    printRebaseTable(O);
-  if (Bind)
-    printBindTable(O);
-  if (LazyBind)
-    printLazyBindTable(O);
-  if (WeakBind)
-    printWeakBindTable(O);
-  if (RawClangAST)
-    printRawClangAST(O);
-  if (FaultMapSection)
-    printFaultMaps(O);
-  if (DwarfDumpType != DIDT_Null) {
-    std::unique_ptr<DIContext> DICtx = DWARFContext::create(*O);
-    // Dump the complete DWARF structure.
-    DIDumpOptions DumpOpts;
-    DumpOpts.DumpType = DwarfDumpType;
-    DICtx->dump(outs(), DumpOpts);
-  }
-}
-
-static void dumpObject(const COFFImportFile *I, const Archive *A,
-                       const Archive::Child *C = nullptr) {
-  StringRef ArchiveName = A ? A->getFileName() : "";
-
-  // Avoid other output when using a raw option.
-  if (!RawClangAST)
-    outs() << '\n'
-           << ArchiveName << "(" << I->getFileName() << ")"
-           << ":\tfile format COFF-import-file"
-           << "\n\n";
-
-  if (ArchiveHeaders && !MachOOpt && C)
-    printArchiveChild(ArchiveName, *C);
-  if (SymbolTable)
-    printCOFFSymbolTable(I);
-}
-
-/// Dump each object file in \a a;
-static void dumpArchive(const Archive *A) {
-  Error Err = Error::success();
-  for (auto &C : A->children(Err)) {
-    Expected<std::unique_ptr<Binary>> ChildOrErr = C.getAsBinary();
-    if (!ChildOrErr) {
-      if (auto E = isNotObjectErrorInvalidFileType(ChildOrErr.takeError()))
-        report_error(std::move(E), A->getFileName(), C);
-      continue;
-    }
-    if (ObjectFile *O = dyn_cast<ObjectFile>(&*ChildOrErr.get()))
-      dumpObject(O, A, &C);
-    else if (COFFImportFile *I = dyn_cast<COFFImportFile>(&*ChildOrErr.get()))
-      dumpObject(I, A, &C);
-    else
-      report_error(errorCodeToError(object_error::invalid_file_type),
-                   A->getFileName());
-  }
-  if (Err)
-    report_error(std::move(Err), A->getFileName());
-}
-
-/// Open file and figure out how to dump it.
-static void dumpInput(StringRef file) {
-  // If we are using the Mach-O specific object file parser, then let it parse
-  // the file and process the command line options.  So the -arch flags can
-  // be used to select specific slices, etc.
-  if (MachOOpt) {
-    parseInputMachO(file);
-    return;
-  }
-
-  // Attempt to open the binary.
-  OwningBinary<Binary> OBinary = unwrapOrError(createBinary(file), file);
-  Binary &Binary = *OBinary.getBinary();
-
-  if (Archive *A = dyn_cast<Archive>(&Binary))
-    dumpArchive(A);
-  else if (ObjectFile *O = dyn_cast<ObjectFile>(&Binary))
-    dumpObject(O);
-  else if (MachOUniversalBinary *UB = dyn_cast<MachOUniversalBinary>(&Binary))
-    parseInputMachO(UB);
-  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);
-  const cl::OptionCategory *OptionFilters[] = {&ObjdumpCat, &MachOCat};
-  cl::HideUnrelatedOptions(OptionFilters);
-
-  // Initialize targets and assembly printers/parsers.
-  InitializeAllTargetInfos();
-  InitializeAllTargetMCs();
-  InitializeAllDisassemblers();
-
-  // Register the target printer for --version.
-  cl::AddExtraVersionPrinter(TargetRegistry::printRegisteredTargetsForVersion);
-
-  cl::ParseCommandLineOptions(argc, argv, "llvm object file dumper\n");
-
-  if (StartAddress >= StopAddress)
-    error("start address should be less than stop address");
-
-  ToolName = argv[0];
-
-  // Defaults to a.out if no filenames specified.
-  if (InputFilenames.empty())
-    InputFilenames.push_back("a.out");
-
-  if (AllHeaders)
-    ArchiveHeaders = FileHeaders = PrivateHeaders = Relocations =
-        SectionHeaders = SymbolTable = true;
-
-  if (DisassembleAll || PrintSource || PrintLines ||
-      (!DisassembleFunctions.empty()))
-    Disassemble = true;
-
-  if (!ArchiveHeaders && !Disassemble && DwarfDumpType == DIDT_Null &&
-      !DynamicRelocations && !FileHeaders && !PrivateHeaders && !RawClangAST &&
-      !Relocations && !SectionHeaders && !SectionContents && !SymbolTable &&
-      !UnwindInfo && !FaultMapSection &&
-      !(MachOOpt &&
-        (Bind || DataInCode || DylibId || DylibsUsed || ExportsTrie ||
-         FirstPrivateHeader || IndirectSymbols || InfoPlist || LazyBind ||
-         LinkOptHints || ObjcMetaData || Rebase || UniversalHeaders ||
-         WeakBind || !FilterSections.empty()))) {
-    cl::PrintHelpMessage();
-    return 2;
-  }
-
-  DisasmFuncsSet.insert(DisassembleFunctions.begin(),
-                        DisassembleFunctions.end());
-
-  llvm::for_each(InputFilenames, dumpInput);
-
-  warnOnNoMatchForSections();
-
-  return EXIT_SUCCESS;
-}
diff --git a/contrib/llvm/tools/llvm-objdump/llvm-objdump.h b/contrib/llvm/tools/llvm-objdump/llvm-objdump.h
deleted file mode 100644
index e58d4a05c2e6..000000000000
--- a/contrib/llvm/tools/llvm-objdump/llvm-objdump.h
+++ /dev/null
@@ -1,152 +0,0 @@
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LLVM_TOOLS_LLVM_OBJDUMP_LLVM_OBJDUMP_H
-#define LLVM_TOOLS_LLVM_OBJDUMP_LLVM_OBJDUMP_H
-
-#include "llvm/DebugInfo/DIContext.h"
-#include "llvm/Support/CommandLine.h"
-#include "llvm/Support/Compiler.h"
-#include "llvm/Support/DataTypes.h"
-#include "llvm/Object/Archive.h"
-
-namespace llvm {
-class StringRef;
-
-namespace object {
-class COFFObjectFile;
-class COFFImportFile;
-class ELFObjectFileBase;
-class ELFSectionRef;
-class MachOObjectFile;
-class MachOUniversalBinary;
-class RelocationRef;
-}
-
-extern cl::opt<bool> Demangle;
-
-typedef std::function<bool(llvm::object::SectionRef const &)> FilterPredicate;
-
-class SectionFilterIterator {
-public:
-  SectionFilterIterator(FilterPredicate P,
-                        llvm::object::section_iterator const &I,
-                        llvm::object::section_iterator const &E)
-      : Predicate(std::move(P)), Iterator(I), End(E) {
-    ScanPredicate();
-  }
-  const llvm::object::SectionRef &operator*() const { return *Iterator; }
-  SectionFilterIterator &operator++() {
-    ++Iterator;
-    ScanPredicate();
-    return *this;
-  }
-  bool operator!=(SectionFilterIterator const &Other) const {
-    return Iterator != Other.Iterator;
-  }
-
-private:
-  void ScanPredicate() {
-    while (Iterator != End && !Predicate(*Iterator)) {
-      ++Iterator;
-    }
-  }
-  FilterPredicate Predicate;
-  llvm::object::section_iterator Iterator;
-  llvm::object::section_iterator End;
-};
-
-class SectionFilter {
-public:
-  SectionFilter(FilterPredicate P, llvm::object::ObjectFile const &O)
-      : Predicate(std::move(P)), Object(O) {}
-  SectionFilterIterator begin() {
-    return SectionFilterIterator(Predicate, Object.section_begin(),
-                                 Object.section_end());
-  }
-  SectionFilterIterator end() {
-    return SectionFilterIterator(Predicate, Object.section_end(),
-                                 Object.section_end());
-  }
-
-private:
-  FilterPredicate Predicate;
-  llvm::object::ObjectFile const &Object;
-};
-
-// Various helper functions.
-SectionFilter ToolSectionFilter(llvm::object::ObjectFile const &O);
-
-Error getELFRelocationValueString(const object::ELFObjectFileBase *Obj,
-                                  const object::RelocationRef &Rel,
-                                  llvm::SmallVectorImpl<char> &Result);
-Error getCOFFRelocationValueString(const object::COFFObjectFile *Obj,
-                                   const object::RelocationRef &Rel,
-                                   llvm::SmallVectorImpl<char> &Result);
-Error getWasmRelocationValueString(const object::WasmObjectFile *Obj,
-                                   const object::RelocationRef &RelRef,
-                                   llvm::SmallVectorImpl<char> &Result);
-Error getMachORelocationValueString(const object::MachOObjectFile *Obj,
-                                    const object::RelocationRef &RelRef,
-                                    llvm::SmallVectorImpl<char> &Result);
-
-uint64_t getELFSectionLMA(const object::ELFSectionRef& Sec);
-
-void error(std::error_code ec);
-void error(Error E);
-bool isRelocAddressLess(object::RelocationRef A, object::RelocationRef B);
-void parseInputMachO(StringRef Filename);
-void parseInputMachO(object::MachOUniversalBinary *UB);
-void printCOFFUnwindInfo(const object::COFFObjectFile *O);
-void printMachOUnwindInfo(const object::MachOObjectFile *O);
-void printMachOExportsTrie(const object::MachOObjectFile *O);
-void printMachORebaseTable(object::MachOObjectFile *O);
-void printMachOBindTable(object::MachOObjectFile *O);
-void printMachOLazyBindTable(object::MachOObjectFile *O);
-void printMachOWeakBindTable(object::MachOObjectFile *O);
-void printELFFileHeader(const object::ObjectFile *O);
-void printELFDynamicSection(const object::ObjectFile *Obj);
-void printELFSymbolVersionInfo(const object::ObjectFile *Obj);
-void printCOFFFileHeader(const object::ObjectFile *O);
-void printCOFFSymbolTable(const object::COFFImportFile *I);
-void printCOFFSymbolTable(const object::COFFObjectFile *O);
-void printMachOFileHeader(const object::ObjectFile *O);
-void printMachOLoadCommands(const object::ObjectFile *O);
-void printWasmFileHeader(const object::ObjectFile *O);
-void printExportsTrie(const object::ObjectFile *O);
-void printRebaseTable(object::ObjectFile *O);
-void printBindTable(object::ObjectFile *O);
-void printLazyBindTable(object::ObjectFile *O);
-void printWeakBindTable(object::ObjectFile *O);
-void printRawClangAST(const object::ObjectFile *O);
-void printRelocations(const object::ObjectFile *O);
-void printDynamicRelocations(const object::ObjectFile *O);
-void printSectionHeaders(const object::ObjectFile *O);
-void printSectionContents(const object::ObjectFile *O);
-void printSymbolTable(const object::ObjectFile *O, StringRef ArchiveName,
-                      StringRef ArchitectureName = StringRef());
-void warn(StringRef Message);
-LLVM_ATTRIBUTE_NORETURN void error(Twine Message);
-LLVM_ATTRIBUTE_NORETURN void report_error(StringRef File, Twine Message);
-LLVM_ATTRIBUTE_NORETURN void report_error(Error E, StringRef File);
-LLVM_ATTRIBUTE_NORETURN void
-report_error(Error E, StringRef FileName, StringRef ArchiveName,
-             StringRef ArchitectureName = StringRef());
-LLVM_ATTRIBUTE_NORETURN void
-report_error(Error E, StringRef ArchiveName, const object::Archive::Child &C,
-             StringRef ArchitectureName = StringRef());
-
-template <typename T, typename... Ts>
-T unwrapOrError(Expected<T> EO, Ts &&... Args) {
-  if (EO)
-    return std::move(*EO);
-  report_error(EO.takeError(), std::forward<Ts>(Args)...);
-}
-
-} // end namespace llvm
-
-#endif