Skip to content

[llvm-readobj][COFF] Add support for more CET and hotpatch flags #150967

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
merged 7 commits into from
Jul 29, 2025
Merged

[llvm-readobj][COFF] Add support for more CET and hotpatch flags #150967

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
50cfe1d
[llvm-readobj][COFF] Add support for more CET and hotpatch flags
kkent030315 Jul 28, 2025
15b1cae
fix typo
kkent030315 Jul 28, 2025
4c44c62
Merge branch 'main' into addcoffexchara
kkent030315 Jul 28, 2025
da5f522
squash has-*.exe into the one
kkent030315 Jul 29, 2025
3fb3e31
squash tests into the one
kkent030315 Jul 29, 2025
5a7675e
check without strict order
kkent030315 Jul 29, 2025
bf3752d
fix comment
kkent030315 Jul 29, 2025
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
19 changes: 18 additions & 1 deletion llvm/include/llvm/BinaryFormat/COFF.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -694,7 +694,24 @@ enum DLLCharacteristics : unsigned {

enum ExtendedDLLCharacteristics : unsigned {
/// Image is CET compatible
IMAGE_DLL_CHARACTERISTICS_EX_CET_COMPAT = 0x0001
IMAGE_DLL_CHARACTERISTICS_EX_CET_COMPAT = 0x0001,
/// Image is CET compatible in strict mode
IMAGE_DLL_CHARACTERISTICS_EX_CET_COMPAT_STRICT_MODE = 0x0002,
/// Image is CET compatible in such a way that context IP validation is
/// relaxed
IMAGE_DLL_CHARACTERISTICS_EX_CET_SET_CONTEXT_IP_VALIDATION_RELAXED_MODE =
0x0004,
/// Image is CET compatible in such a way that the use of
/// dynamic APIs is restricted to processes only
IMAGE_DLL_CHARACTERISTICS_EX_CET_DYNAMIC_APIS_ALLOW_IN_PROC_ONLY = 0x0008,
/// Reserved for future use. Not used by MSVC link.exe
IMAGE_DLL_CHARACTERISTICS_EX_CET_RESERVED_1 = 0x0010,
/// Reserved for future use. Not used by MSVC link.exe
IMAGE_DLL_CHARACTERISTICS_EX_CET_RESERVED_2 = 0x0020,
/// Image is CFI compatible.
IMAGE_DLL_CHARACTERISTICS_EX_FORWARD_CFI_COMPAT = 0x0040,
/// Image is hotpatch compatible.
IMAGE_DLL_CHARACTERISTICS_EX_HOTPATCH_COMPATIBLE = 0x0080,
};

enum DebugType : unsigned {
Expand Down
Binary file removed llvm/test/tools/llvm-readobj/COFF/Inputs/has-cet.exe
View file
Open in desktop
Binary file not shown.
Binary file added llvm/test/tools/llvm-readobj/COFF/Inputs/has-exdllcharacteristics.exe
View file
Open in desktop
Binary file not shown.
16 changes: 0 additions & 16 deletions llvm/test/tools/llvm-readobj/COFF/cetcompat.test
View file
Open in desktop

This file was deleted.

22 changes: 22 additions & 0 deletions llvm/test/tools/llvm-readobj/COFF/exdllcharacteristics.test
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
# To regenerate has-exdllcharacteristics.exe
# $ echo int main() { return 0; } > has-exdllcharacteristics.c
# To make minimum possible stub file (to decrease the binary size)
# $ echo -n '4D5A00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000' | xxd -r -p > stub
# $ cl has-exdllcharacteristics.c /link /entry:main /STUB:stub /NOCOFFGRPINFO /EMITTOOLVERSIONINFO:NO /EMITPOGOPHASEINFO /NOVCFEATURE /MANIFEST:NO /cetcompat /cetcompatstrict /cetdynamicapisinproc /cetipvalidationrelaxed /hotpatchcompatible /functionpadmin:6
RUN: llvm-readobj --coff-debug-directory %p/Inputs/has-exdllcharacteristics.exe | FileCheck %s

CHECK: DebugEntry {
CHECK: Characteristics: 0x0
CHECK: Type: ExtendedDLLCharacteristics (0x14)
CHECK: ExtendedCharacteristics [ (0x8F)
CHECK-DAG: IMAGE_DLL_CHARACTERISTICS_EX_CET_COMPAT (0x1)
CHECK-DAG: IMAGE_DLL_CHARACTERISTICS_EX_CET_COMPAT_STRICT_MODE (0x2)
CHECK-DAG: IMAGE_DLL_CHARACTERISTICS_EX_CET_SET_CONTEXT_IP_VALIDATION_RELAXED_MODE (0x4)
CHECK-DAG: IMAGE_DLL_CHARACTERISTICS_EX_CET_DYNAMIC_APIS_ALLOW_IN_PROC_ONLY (0x8)
CHECK-DAG: IMAGE_DLL_CHARACTERISTICS_EX_HOTPATCH_COMPATIBLE (0x80)
CHECK: ]
CHECK: RawData (
CHECK: 0000: 8F000000 |....|
CHECK: )
CHECK: }

11 changes: 10 additions & 1 deletion llvm/tools/llvm-readobj/COFFDumper.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -412,10 +412,19 @@ const EnumEntry<COFF::DLLCharacteristics> PEDLLCharacteristics[] = {
LLVM_READOBJ_ENUM_ENT(COFF, IMAGE_DLL_CHARACTERISTICS_TERMINAL_SERVER_AWARE),
};

// clang-format off
static const EnumEntry<COFF::ExtendedDLLCharacteristics>
PEExtendedDLLCharacteristics[] = {
LLVM_READOBJ_ENUM_ENT(COFF, IMAGE_DLL_CHARACTERISTICS_EX_CET_COMPAT),
LLVM_READOBJ_ENUM_ENT(COFF, IMAGE_DLL_CHARACTERISTICS_EX_CET_COMPAT ),
LLVM_READOBJ_ENUM_ENT(COFF, IMAGE_DLL_CHARACTERISTICS_EX_CET_COMPAT_STRICT_MODE ),
LLVM_READOBJ_ENUM_ENT(COFF, IMAGE_DLL_CHARACTERISTICS_EX_CET_SET_CONTEXT_IP_VALIDATION_RELAXED_MODE),
LLVM_READOBJ_ENUM_ENT(COFF, IMAGE_DLL_CHARACTERISTICS_EX_CET_DYNAMIC_APIS_ALLOW_IN_PROC_ONLY ),
LLVM_READOBJ_ENUM_ENT(COFF, IMAGE_DLL_CHARACTERISTICS_EX_CET_RESERVED_1 ),
LLVM_READOBJ_ENUM_ENT(COFF, IMAGE_DLL_CHARACTERISTICS_EX_CET_RESERVED_2 ),
LLVM_READOBJ_ENUM_ENT(COFF, IMAGE_DLL_CHARACTERISTICS_EX_FORWARD_CFI_COMPAT ),
LLVM_READOBJ_ENUM_ENT(COFF, IMAGE_DLL_CHARACTERISTICS_EX_HOTPATCH_COMPATIBLE ),
};
// clang-format on

static const EnumEntry<COFF::SectionCharacteristics>
ImageSectionCharacteristics[] = {
Expand Down