This is an archive of the discontinued LLVM Phabricator instance.

Differential D156797

[llvm-readobj] [Object] [NFC] Introduce inline helpers for chpe_range_entry.
ClosedPublic

Authored by jacek on Aug 1 2023, 7:22 AM.

Details

Reviewers
jhenderson
MaskRay
efriedma
Commits
rG627512a96c2b: [llvm-readobj] [Object] [NFC] Introduce inline helpers for chpe_range_entry.
Summary

As suggested in D149095.

Diff Detail

Event Timeline

jacek created this revision.Aug 1 2023, 7:22 AM
Herald added a reviewer: jhenderson. · View Herald TranscriptAug 1 2023, 7:22 AM
Herald added a project: Restricted Project. · View Herald Transcript
jacek requested review of this revision.Aug 1 2023, 7:22 AM
Herald added a project: Restricted Project. · View Herald TranscriptAug 1 2023, 7:22 AM
Herald added subscribers: llvm-commits, wangpc, MaskRay. · View Herald Transcript
jacek added reviewers: MaskRay, efriedma.Aug 1 2023, 7:22 AM
jacek added a child revision: D149095: [llvm-objdump] Support CHPE code ranges in disassembler..
jacek mentioned this in D149095: [llvm-objdump] Support CHPE code ranges in disassembler..Aug 1 2023, 7:26 AM
Harbormaster completed remote builds in B249483: Diff 546048.Aug 1 2023, 8:10 AM
jhenderson added inline comments.Aug 1 2023, 11:27 AM
llvm/include/llvm/Object/COFF.h
757–758

Possibly worth a unittest for each of these in ObjectTests?

jacek updated this revision to Diff 546197.Aug 1 2023, 1:23 PM

Added a test.

Harbormaster completed remote builds in B249587: Diff 546197.Aug 1 2023, 3:18 PM
jhenderson accepted this revision.Aug 10 2023, 12:21 AM

LGTM.

This revision is now accepted and ready to land.Aug 10 2023, 12:21 AM
MaskRay accepted this revision.Aug 10 2023, 9:19 AM
Closed by commit rG627512a96c2b: [llvm-readobj] [Object] [NFC] Introduce inline helpers for chpe_range_entry. (authored by jacek). · Explain WhyAug 13 2023, 1:12 PM
This revision was automatically updated to reflect the committed changes.
jacek marked an inline comment as done.
jacek added a commit: rG627512a96c2b: [llvm-readobj] [Object] [NFC] Introduce inline helpers for chpe_range_entry..

Revision Contents

PathSize
llvm/
include/
llvm/
Object/
10 lines
tools/
llvm-readobj/
10 lines

Diff 546048

llvm/include/llvm/Object/COFF.h

Show First 20 Lines • Show All 739 Lines • ▼ Show 20 Linesstruct chpe_metadata {
support::ulittle32_t GetX64InformationFunctionPointer; support::ulittle32_t GetX64InformationFunctionPointer;
support::ulittle32_t SetX64InformationFunctionPointer; support::ulittle32_t SetX64InformationFunctionPointer;
support::ulittle32_t ExtraRFETable; support::ulittle32_t ExtraRFETable;
support::ulittle32_t ExtraRFETableSize; support::ulittle32_t ExtraRFETableSize;
support::ulittle32_t __os_arm64x_dispatch_fptr; support::ulittle32_t __os_arm64x_dispatch_fptr;
support::ulittle32_t AuxiliaryIATCopy; support::ulittle32_t AuxiliaryIATCopy;
}; };
enum chpe_range_type { Arm64 = 0, Arm64EC = 1, Amd64 = 2 };
struct chpe_range_entry { struct chpe_range_entry {
support::ulittle32_t StartOffset; support::ulittle32_t StartOffset;
support::ulittle32_t Length; support::ulittle32_t Length;
};
enum chpe_range_type { CHPE_RANGE_ARM64, CHPE_RANGE_ARM64EC, CHPE_RANGE_AMD64 }; // The two low bits of StartOffset contain a range type.
static constexpr uint32_t TypeMask = 3;
uint32_t getStart() const { return StartOffset & ~TypeMask; }
uint16_t getType() const { return StartOffset & TypeMask; }
jhendersonUnsubmitted
Done
ReplyInline Actions

Possibly worth a unittest for each of these in ObjectTests?

jhenderson: Possibly worth a unittest for each of these in ObjectTests?
};
struct chpe_code_range_entry { struct chpe_code_range_entry {
support::ulittle32_t StartRva; support::ulittle32_t StartRva;
support::ulittle32_t EndRva; support::ulittle32_t EndRva;
support::ulittle32_t EntryPoint; support::ulittle32_t EntryPoint;
}; };
struct chpe_redirection_entry { struct chpe_redirection_entry {
▲ Show 20 Lines • Show All 601 Lines • Show Last 20 Lines

llvm/tools/llvm-readobj/COFFDumper.cpp

Show First 20 Lines • Show All 848 Lines • ▼ Show 20 Lines if (auto CHPE = Obj->getCHPEMetadata()) {
if (CHPE->CodeMapCount) { if (CHPE->CodeMapCount) {
ListScope CMLS(W, "CodeMap"); ListScope CMLS(W, "CodeMap");
uintptr_t CodeMapInt; uintptr_t CodeMapInt;
if (Error E = Obj->getRvaPtr(CHPE->CodeMap, CodeMapInt)) if (Error E = Obj->getRvaPtr(CHPE->CodeMap, CodeMapInt))
reportError(std::move(E), Obj->getFileName()); reportError(std::move(E), Obj->getFileName());
auto CodeMap = reinterpret_cast<const chpe_range_entry *>(CodeMapInt); auto CodeMap = reinterpret_cast<const chpe_range_entry *>(CodeMapInt);
for (uint32_t i = 0; i < CHPE->CodeMapCount; i++) { for (uint32_t i = 0; i < CHPE->CodeMapCount; i++) {
uint32_t Start = CodeMap[i].StartOffset & ~3; uint32_t Start = CodeMap[i].getStart();
W.startLine() << W.hex(Start) << " - " W.startLine() << W.hex(Start) << " - "
<< W.hex(Start + CodeMap[i].Length) << " "; << W.hex(Start + CodeMap[i].Length) << " ";
switch (CodeMap[i].StartOffset & 3) { switch (CodeMap[i].getType()) {
case CHPE_RANGE_ARM64: case chpe_range_type::Arm64:
W.getOStream() << "ARM64\n"; W.getOStream() << "ARM64\n";
break; break;
case CHPE_RANGE_ARM64EC: case chpe_range_type::Arm64EC:
W.getOStream() << "ARM64EC\n"; W.getOStream() << "ARM64EC\n";
break; break;
case CHPE_RANGE_AMD64: case chpe_range_type::Amd64:
W.getOStream() << "X64\n"; W.getOStream() << "X64\n";
break; break;
default: default:
W.getOStream() << W.hex(CodeMap[i].StartOffset & 3) << "\n"; W.getOStream() << W.hex(CodeMap[i].StartOffset & 3) << "\n";
break; break;
} }
} }
} else { } else {
▲ Show 20 Lines • Show All 1,359 Lines • Show Last 20 Lines