mirror of
https://github.com/momo5502/emulator.git
synced 2026-01-18 19:23:56 +00:00
remove references to nt_memory_permission from backend
This commit is contained in:
@@ -1,4 +1,3 @@
|
||||
#include "memory_permission.hpp"
|
||||
#include "std_include.hpp"
|
||||
#include "memory_manager.hpp"
|
||||
|
||||
@@ -269,12 +268,9 @@ bool memory_manager::allocate_memory(const uint64_t address, const size_t size,
|
||||
|
||||
if (!reserve_only)
|
||||
{
|
||||
this->map_memory(address, size, permissions);
|
||||
|
||||
auto common = memory_permission::read_write;
|
||||
auto extended = permissions.is_guarded() ? memory_permission_ext::guard : memory_permission_ext::none;
|
||||
|
||||
entry->second.committed_regions[address] = committed_region{size, nt_memory_permission{common, extended}};
|
||||
this->map_memory(address, size, permissions.is_guarded() ? memory_permission::none : permissions.common);
|
||||
entry->second.committed_regions[address] =
|
||||
committed_region{size, nt_memory_permission{memory_permission::read_write, permissions.extended}};
|
||||
}
|
||||
|
||||
this->update_layout_version();
|
||||
@@ -630,11 +626,9 @@ void memory_manager::map_mmio(const uint64_t address, const size_t size, mmio_re
|
||||
this->memory_->map_mmio(address, size, std::move(read_cb), std::move(write_cb));
|
||||
}
|
||||
|
||||
void memory_manager::map_memory(const uint64_t address, const size_t size, const nt_memory_permission permissions)
|
||||
void memory_manager::map_memory(const uint64_t address, const size_t size, const memory_permission permissions)
|
||||
{
|
||||
auto perms = permissions.is_guarded() ? nt_memory_permission(memory_permission::none) : permissions;
|
||||
|
||||
this->memory_->map_memory(address, size, perms);
|
||||
this->memory_->map_memory(address, size, permissions);
|
||||
}
|
||||
|
||||
void memory_manager::unmap_memory(const uint64_t address, const size_t size)
|
||||
@@ -643,7 +637,7 @@ void memory_manager::unmap_memory(const uint64_t address, const size_t size)
|
||||
}
|
||||
|
||||
void memory_manager::apply_memory_protection(const uint64_t address, const size_t size,
|
||||
const nt_memory_permission permissions)
|
||||
const memory_permission permissions)
|
||||
{
|
||||
this->memory_->apply_memory_protection(address, size, permissions);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user