diff options
| author | 2021-02-12 17:58:31 -0800 | |
|---|---|---|
| committer | 2021-02-18 16:16:25 -0800 | |
| commit | 93e20867b0ab2e737e231a9b5bb29d40947fb311 (patch) | |
| tree | 84df7c7b56e9c78ce92809328f260edd68ccd490 /src/core/hle/service/ldr | |
| parent | hle: kernel: Migrate MemoryManager to KMemoryManager. (diff) | |
| download | yuzu-93e20867b0ab2e737e231a9b5bb29d40947fb311.tar.gz yuzu-93e20867b0ab2e737e231a9b5bb29d40947fb311.tar.xz yuzu-93e20867b0ab2e737e231a9b5bb29d40947fb311.zip | |
hle: kernel: Migrate PageHeap/PageTable to KPageHeap/KPageTable.
Diffstat (limited to 'src/core/hle/service/ldr')
| -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 @@ | |||
| 11 | #include "common/scope_exit.h" | 11 | #include "common/scope_exit.h" |
| 12 | #include "core/core.h" | 12 | #include "core/core.h" |
| 13 | #include "core/hle/ipc_helpers.h" | 13 | #include "core/hle/ipc_helpers.h" |
| 14 | #include "core/hle/kernel/k_page_table.h" | ||
| 14 | #include "core/hle/kernel/k_system_control.h" | 15 | #include "core/hle/kernel/k_system_control.h" |
| 15 | #include "core/hle/kernel/memory/page_table.h" | ||
| 16 | #include "core/hle/kernel/process.h" | 16 | #include "core/hle/kernel/process.h" |
| 17 | #include "core/hle/kernel/svc_results.h" | 17 | #include "core/hle/kernel/svc_results.h" |
| 18 | #include "core/hle/service/ldr/ldr.h" | 18 | #include "core/hle/service/ldr/ldr.h" |
| @@ -287,8 +287,7 @@ public: | |||
| 287 | rb.Push(RESULT_SUCCESS); | 287 | rb.Push(RESULT_SUCCESS); |
| 288 | } | 288 | } |
| 289 | 289 | ||
| 290 | bool ValidateRegionForMap(Kernel::Memory::PageTable& page_table, VAddr start, | 290 | bool ValidateRegionForMap(Kernel::KPageTable& page_table, VAddr start, std::size_t size) const { |
| 291 | std::size_t size) const { | ||
| 292 | constexpr std::size_t padding_size{4 * Kernel::PageSize}; | 291 | constexpr std::size_t padding_size{4 * Kernel::PageSize}; |
| 293 | const auto start_info{page_table.QueryInfo(start - 1)}; | 292 | const auto start_info{page_table.QueryInfo(start - 1)}; |
| 294 | 293 | ||
| @@ -309,7 +308,7 @@ public: | |||
| 309 | return (start + size + padding_size) <= (end_info.GetAddress() + end_info.GetSize()); | 308 | return (start + size + padding_size) <= (end_info.GetAddress() + end_info.GetSize()); |
| 310 | } | 309 | } |
| 311 | 310 | ||
| 312 | VAddr GetRandomMapRegion(const Kernel::Memory::PageTable& page_table, std::size_t size) const { | 311 | VAddr GetRandomMapRegion(const Kernel::KPageTable& page_table, std::size_t size) const { |
| 313 | VAddr addr{}; | 312 | VAddr addr{}; |
| 314 | const std::size_t end_pages{(page_table.GetAliasCodeRegionSize() - size) >> | 313 | const std::size_t end_pages{(page_table.GetAliasCodeRegionSize() - size) >> |
| 315 | Kernel::PageBits}; | 314 | Kernel::PageBits}; |