Skip to content

[llvm-objdump][NFC] Use EnumEntry from Support #174155

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
aengelke merged 1 commit into from
Jan 7, 2026
Merged

[llvm-objdump][NFC] Use EnumEntry from Support #174155

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 14 additions & 18 deletions llvm/tools/llvm-objdump/COFFDump.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
#include "llvm/Object/COFFImportFile.h"
#include "llvm/Object/ObjectFile.h"
#include "llvm/Support/Format.h"
#include "llvm/Support/ScopedPrinter.h"
#include "llvm/Support/Win64EH.h"
#include "llvm/Support/WithColor.h"
#include "llvm/Support/raw_ostream.h"
Expand All @@ -32,11 +33,6 @@ using namespace llvm::object;
using namespace llvm::Win64EH;

namespace {
template <typename T> struct EnumEntry {
T Value;
StringRef Name;
};

class COFFDumper : public Dumper {
public:
explicit COFFDumper(const llvm::object::COFFObjectFile &O)
Expand Down Expand Up @@ -67,22 +63,22 @@ objdump::createCOFFDumper(const object::COFFObjectFile &Obj) {
}

constexpr EnumEntry<uint16_t> PEHeaderMagic[] = {
{uint16_t(COFF::PE32Header::PE32), "PE32"},
{uint16_t(COFF::PE32Header::PE32_PLUS), "PE32+"},
{"PE32", uint16_t(COFF::PE32Header::PE32)},
{"PE32+", uint16_t(COFF::PE32Header::PE32_PLUS)},
};

constexpr EnumEntry<COFF::WindowsSubsystem> PEWindowsSubsystem[] = {
{COFF::IMAGE_SUBSYSTEM_UNKNOWN, "unspecified"},
{COFF::IMAGE_SUBSYSTEM_NATIVE, "NT native"},
{COFF::IMAGE_SUBSYSTEM_WINDOWS_GUI, "Windows GUI"},
{COFF::IMAGE_SUBSYSTEM_WINDOWS_CUI, "Windows CUI"},
{COFF::IMAGE_SUBSYSTEM_POSIX_CUI, "POSIX CUI"},
{COFF::IMAGE_SUBSYSTEM_WINDOWS_CE_GUI, "Wince CUI"},
{COFF::IMAGE_SUBSYSTEM_EFI_APPLICATION, "EFI application"},
{COFF::IMAGE_SUBSYSTEM_EFI_BOOT_SERVICE_DRIVER, "EFI boot service driver"},
{COFF::IMAGE_SUBSYSTEM_EFI_RUNTIME_DRIVER, "EFI runtime driver"},
{COFF::IMAGE_SUBSYSTEM_EFI_ROM, "SAL runtime driver"},
{COFF::IMAGE_SUBSYSTEM_XBOX, "XBOX"},
{"unspecified", COFF::IMAGE_SUBSYSTEM_UNKNOWN},
{"NT native", COFF::IMAGE_SUBSYSTEM_NATIVE},
{"Windows GUI", COFF::IMAGE_SUBSYSTEM_WINDOWS_GUI},
{"Windows CUI", COFF::IMAGE_SUBSYSTEM_WINDOWS_CUI},
{"POSIX CUI", COFF::IMAGE_SUBSYSTEM_POSIX_CUI},
{"Wince CUI", COFF::IMAGE_SUBSYSTEM_WINDOWS_CE_GUI},
{"EFI application", COFF::IMAGE_SUBSYSTEM_EFI_APPLICATION},
{"EFI boot service driver", COFF::IMAGE_SUBSYSTEM_EFI_BOOT_SERVICE_DRIVER},
{"EFI runtime driver", COFF::IMAGE_SUBSYSTEM_EFI_RUNTIME_DRIVER},
{"SAL runtime driver", COFF::IMAGE_SUBSYSTEM_EFI_ROM},
{"XBOX", COFF::IMAGE_SUBSYSTEM_XBOX},
};

template <typename T, typename TEnum>
Expand Down