diff --git a/llvm/test/tools/llvm-objdump/MachO/arm64-disassembly-color.s b/llvm/test/tools/llvm-objdump/MachO/arm64-disassembly-color.s index 50cd24c766763..af58cd61902df 100644 --- a/llvm/test/tools/llvm-objdump/MachO/arm64-disassembly-color.s +++ b/llvm/test/tools/llvm-objdump/MachO/arm64-disassembly-color.s @@ -6,6 +6,10 @@ // RUN: llvm-objdump --disassembler-color=off --disassemble %t | FileCheck %s --check-prefix=NOCOLOR // RUN: llvm-objdump --disassembler-color=terminal --disassemble %t | FileCheck %s --check-prefix=NOCOLOR +//// Test with --macho flag to ensure DisassembleMachO respects color settings. +// RUN: llvm-objdump --disassembler-color=on --macho --disassemble %t | FileCheck %s --check-prefix=COLOR +// RUN: llvm-objdump --disassembler-color=off --macho --disassemble %t | FileCheck %s --check-prefix=NOCOLOR + sub sp, sp, #16 str w0, [sp, #12] ldr w8, [sp, #12] diff --git a/llvm/tools/llvm-objdump/MachODump.cpp b/llvm/tools/llvm-objdump/MachODump.cpp index 8e9c91fde544d..812d0f26d984f 100644 --- a/llvm/tools/llvm-objdump/MachODump.cpp +++ b/llvm/tools/llvm-objdump/MachODump.cpp @@ -7235,6 +7235,22 @@ objdump::getMachODSymObject(const MachOObjectFile *MachOOF, StringRef Filename, return DbgObj; } +static void setUpMachOInstPrinter(MCInstPrinter *IP) { + IP->setPrintImmHex(PrintImmHex); + switch (DisassemblyColor) { + case ColorOutput::Enable: + IP->setUseColor(true); + break; + case ColorOutput::Auto: + IP->setUseColor(outs().has_colors()); + break; + case ColorOutput::Disable: + case ColorOutput::Invalid: + IP->setUseColor(false); + break; + } +} + static void DisassembleMachO(StringRef Filename, MachOObjectFile *MachOOF, StringRef DisSegName, StringRef DisSectName) { const char *McpuDefault = nullptr; @@ -7319,8 +7335,8 @@ static void DisassembleMachO(StringRef Filename, MachOObjectFile *MachOOF, std::unique_ptr IP(TheTarget->createMCInstPrinter( TheTriple, AsmPrinterVariant, *AsmInfo, *InstrInfo, *MRI)); CHECK_TARGET_INFO_CREATION(IP); - // Set the display preference for hex vs. decimal immediates. - IP->setPrintImmHex(PrintImmHex); + setUpMachOInstPrinter(IP.get()); + // Comment stream and backing vector. SmallString<128> CommentsToEmit; raw_svector_ostream CommentStream(CommentsToEmit); @@ -7372,8 +7388,7 @@ static void DisassembleMachO(StringRef Filename, MachOObjectFile *MachOOF, ThumbTriple, ThumbAsmPrinterVariant, *ThumbAsmInfo, *ThumbInstrInfo, *ThumbMRI)); CHECK_THUMB_TARGET_INFO_CREATION(ThumbIP); - // Set the display preference for hex vs. decimal immediates. - ThumbIP->setPrintImmHex(PrintImmHex); + setUpMachOInstPrinter(ThumbIP.get()); } #undef CHECK_TARGET_INFO_CREATION diff --git a/llvm/tools/llvm-objdump/llvm-objdump.cpp b/llvm/tools/llvm-objdump/llvm-objdump.cpp index 3ec644a472bfc..aa3106f268397 100644 --- a/llvm/tools/llvm-objdump/llvm-objdump.cpp +++ b/llvm/tools/llvm-objdump/llvm-objdump.cpp @@ -291,13 +291,6 @@ class BBAddrMapInfo { #define DEBUG_TYPE "objdump" -enum class ColorOutput { - Auto, - Enable, - Disable, - Invalid, -}; - static uint64_t AdjustVMA; static bool AllHeaders; static std::string ArchName; @@ -310,7 +303,7 @@ bool objdump::SymbolDescription; bool objdump::TracebackTable; static std::vector DisassembleSymbols; static bool DisassembleZeroes; -static ColorOutput DisassemblyColor; +ColorOutput objdump::DisassemblyColor; DIDumpType objdump::DwarfDumpType; static bool DynamicRelocations; static bool FaultMapSection; diff --git a/llvm/tools/llvm-objdump/llvm-objdump.h b/llvm/tools/llvm-objdump/llvm-objdump.h index 3525be9a5314a..ed0918c93c28e 100644 --- a/llvm/tools/llvm-objdump/llvm-objdump.h +++ b/llvm/tools/llvm-objdump/llvm-objdump.h @@ -43,6 +43,13 @@ namespace objdump { enum DebugFormat { DFASCII, DFDisabled, DFInvalid, DFLimitsOnly, DFUnicode }; +enum class ColorOutput { + Auto, + Enable, + Disable, + Invalid, +}; + extern bool ArchiveHeaders; extern int DbgIndent; extern DebugFormat DbgVariables; @@ -51,6 +58,7 @@ extern bool Demangle; extern bool Disassemble; extern bool DisassembleAll; extern std::vector DisassemblerOptions; +extern ColorOutput DisassemblyColor; extern DIDumpType DwarfDumpType; extern std::vector FilterSections; extern bool LeadingAddr;