Lightemerald/windows-user-space-emulator
2
0
Fork 0
mirror of https://github.com/momo5502/emulator.git synced 2026-01-18 19:23:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Optimize relocation handling

Browse Source
This commit is contained in:
momo5502
2024-08-31 15:14:38 +02:00
parent 4b7eebca88
commit 880a4cd037
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/windows_emulator/module_mapper.cpp
View File

@@ -53,10 +53,12 @@ namespace
emulator_object<IMAGE_BASE_RELOCATION> relocation_object{emu, binary.image_base + directory->VirtualAddress};
const auto end_address = relocation_object.value() + directory->Size;
std::vector<uint16_t> relocations{};
while (relocation_object.value() < end_address)
{
const auto relocation = relocation_object.read();
if (relocation.VirtualAddress <= 0)
if (relocation.VirtualAddress <= 0 || relocation.SizeOfBlock <= 0)
{
break;
}
@@ -66,12 +68,14 @@ namespace
const auto data_size = relocation.SizeOfBlock - sizeof(IMAGE_BASE_RELOCATION);
const auto entry_count = data_size / sizeof(uint16_t);
std::vector<uint16_t> relocations{};
relocations.resize(entry_count);
if (relocations.size() < entry_count)
{
relocations.resize(entry_count);
}
emu.read_memory(relocation_object.value() + relocation_object.size(), relocations.data(), data_size);
for (const auto entry : relocations)
for (const auto entry : std::span(relocations.data(), entry_count))
{
const int type = entry >> 12;
const int offset = entry & 0xfff;