diff options
author | bunnei <bunneidev@gmail.com> | 2021-02-13 02:58:31 +0100 |
---|---|---|
committer | bunnei <bunneidev@gmail.com> | 2021-02-19 01:16:25 +0100 |
commit | 93e20867b0ab2e737e231a9b5bb29d40947fb311 (patch) | |
tree | 84df7c7b56e9c78ce92809328f260edd68ccd490 /src/core/hle/service/ldr/ldr.cpp | |
parent | hle: kernel: Migrate MemoryManager to KMemoryManager. (diff) | |
download | yuzu-93e20867b0ab2e737e231a9b5bb29d40947fb311.tar yuzu-93e20867b0ab2e737e231a9b5bb29d40947fb311.tar.gz yuzu-93e20867b0ab2e737e231a9b5bb29d40947fb311.tar.bz2 yuzu-93e20867b0ab2e737e231a9b5bb29d40947fb311.tar.lz yuzu-93e20867b0ab2e737e231a9b5bb29d40947fb311.tar.xz yuzu-93e20867b0ab2e737e231a9b5bb29d40947fb311.tar.zst yuzu-93e20867b0ab2e737e231a9b5bb29d40947fb311.zip |
Diffstat (limited to '')
-rw-r--r-- | src/core/hle/service/ldr/ldr.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/core/hle/service/ldr/ldr.cpp b/src/core/hle/service/ldr/ldr.cpp index b42184a3b..d111c1357 100644 --- a/src/core/hle/service/ldr/ldr.cpp +++ b/src/core/hle/service/ldr/ldr.cpp @@ -11,8 +11,8 @@ #include "common/scope_exit.h" #include "core/core.h" #include "core/hle/ipc_helpers.h" +#include "core/hle/kernel/k_page_table.h" #include "core/hle/kernel/k_system_control.h" -#include "core/hle/kernel/memory/page_table.h" #include "core/hle/kernel/process.h" #include "core/hle/kernel/svc_results.h" #include "core/hle/service/ldr/ldr.h" @@ -287,8 +287,7 @@ public: rb.Push(RESULT_SUCCESS); } - bool ValidateRegionForMap(Kernel::Memory::PageTable& page_table, VAddr start, - std::size_t size) const { + bool ValidateRegionForMap(Kernel::KPageTable& page_table, VAddr start, std::size_t size) const { constexpr std::size_t padding_size{4 * Kernel::PageSize}; const auto start_info{page_table.QueryInfo(start - 1)}; @@ -309,7 +308,7 @@ public: return (start + size + padding_size) <= (end_info.GetAddress() + end_info.GetSize()); } - VAddr GetRandomMapRegion(const Kernel::Memory::PageTable& page_table, std::size_t size) const { + VAddr GetRandomMapRegion(const Kernel::KPageTable& page_table, std::size_t size) const { VAddr addr{}; const std::size_t end_pages{(page_table.GetAliasCodeRegionSize() - size) >> Kernel::PageBits}; |