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

fixed typo in 'committed_region' struct (#86)

Browse Source
This commit is contained in:
Maurice Heumann
2025-01-17 16:59:49 +01:00
committed by GitHub
parent c4d3e480a9 6879d1b06c
commit e28317ea8f
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/emulator/memory_manager.cpp
View File

@@ -26,7 +26,7 @@ namespace
i->second.length = first_length;
regions[split_point] = memory_manager::committed_region{second_length, i->second.pemissions};
regions[split_point] = memory_manager::committed_region{second_length, i->second.permissions};
}
}
}
@@ -51,7 +51,7 @@ namespace
const auto end = i->first + i->second.length;
assert(end <= next->first);
if (end != next->first || i->second.pemissions != next->second.pemissions)
if (end != next->first || i->second.permissions != next->second.permissions)
{
++i;
continue;
@@ -68,13 +68,13 @@ namespace utils
static void serialize(buffer_serializer& buffer, const memory_manager::committed_region& region)
{
buffer.write<uint64_t>(region.length);
buffer.write(region.pemissions);
buffer.write(region.permissions);
}
static void deserialize(buffer_deserializer& buffer, memory_manager::committed_region& region)
{
region.length = static_cast<size_t>(buffer.read<uint64_t>());
region.pemissions = buffer.read<memory_permission>();
region.permissions = buffer.read<memory_permission>();
}
static void serialize(buffer_serializer& buffer, const memory_manager::reserved_region& region)
@@ -160,7 +160,7 @@ void memory_manager::deserialize_memory_state(utils::buffer_deserializer& buffer
buffer.read(data.data(), region.second.length);
this->map_memory(region.first, region.second.length, region.second.pemissions);
this->map_memory(region.first, region.second.length, region.second.permissions);
this->write_memory(region.first, data.data(), region.second.length);
}
}
@@ -200,11 +200,11 @@ bool memory_manager::protect_memory(const uint64_t address, const size_t size, c
{
if (!old_first_permissions.has_value())
{
old_first_permissions = sub_region.second.pemissions;
old_first_permissions = sub_region.second.permissions;
}
this->apply_memory_protection(sub_region.first, sub_region.second.length, permissions);
sub_region.second.pemissions = permissions;
sub_region.second.permissions = permissions;
}
}
@@ -515,7 +515,7 @@ region_info memory_manager::get_region_info(const uint64_t address)
result.is_committed = true;
result.start = committed_entry->first;
result.length = committed_entry->second.length;
result.permissions = committed_entry->second.pemissions;
result.permissions = committed_entry->second.permissions;
return result;
}

2
src/emulator/memory_manager.hpp
View File

@@ -22,7 +22,7 @@ class memory_manager
struct committed_region
{
size_t length{};
memory_permission pemissions{};
memory_permission permissions{};
};
using committed_region_map = std::map<uint64_t, committed_region>;