Skip to content

[SharedCache] Add a section for an image header #6514

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

Closed
WeiN76LQh wants to merge 1 commit into from
Closed

[SharedCache] Add a section for an image header #6514

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
36 changes: 36 additions & 0 deletions view/sharedcache/core/SharedCache.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2422,8 +2422,28 @@ void SharedCache::InitializeHeader(
if (settings && settings->Contains("loader.dsc.processFunctionStarts"))
applyFunctionStarts = settings->Get<bool>("loader.dsc.processFunctionStarts", view);

// For identifying the span of memory containing the image header if it
// hasn't already been initialized
uint64_t headerRegionEnd = 0;
MemoryRegion const* headerRegion = nullptr;
for (const auto& region : regionsToLoad)
{
if (region->start != header.textBase)
continue;

if (!MemoryRegionIsHeaderInitialized(lock, *region))
{
headerRegion = region;
headerRegionEnd = region->start + region->size;
}
break;
}

for (size_t i = 0; i < header.sections.size(); i++)
{
if (headerRegion && header.sections[i].addr < headerRegionEnd)
headerRegionEnd = header.sections[i].addr;

bool skip = false;
for (const auto& region : regionsToLoad)
{
Expand Down Expand Up @@ -2549,6 +2569,22 @@ void SharedCache::InitializeHeader(
type, header.sections[i].align);
}

// If the memory region containing the header is not initialized and was
// found then add a section for it
if (headerRegion && headerRegionEnd > headerRegion->start)
{
for (const auto& region : regionsToLoad)
{
if (region->start != header.textBase)
continue;

const auto headerSectionName = fmt::format("{}::__header", header.identifierPrefix);
view->AddUserSection(headerSectionName, region->start, headerRegionEnd - region->start,
SectionSemanticsForRegion(*region));
break;
}
}

auto typeLib = view->GetTypeLibrary(header.installName);

BinaryReader virtualReader(view);
Expand Down