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/kernel/svc.cpp | |
| 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/kernel/svc.cpp')
| -rw-r--r-- | src/core/hle/kernel/svc.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/core/hle/kernel/svc.cpp b/src/core/hle/kernel/svc.cpp index 4ffd65d33..cc8fa6576 100644 --- a/src/core/hle/kernel/svc.cpp +++ b/src/core/hle/kernel/svc.cpp | |||
| @@ -29,6 +29,7 @@ | |||
| 29 | #include "core/hle/kernel/k_event.h" | 29 | #include "core/hle/kernel/k_event.h" |
| 30 | #include "core/hle/kernel/k_memory_block.h" | 30 | #include "core/hle/kernel/k_memory_block.h" |
| 31 | #include "core/hle/kernel/k_memory_layout.h" | 31 | #include "core/hle/kernel/k_memory_layout.h" |
| 32 | #include "core/hle/kernel/k_page_table.h" | ||
| 32 | #include "core/hle/kernel/k_readable_event.h" | 33 | #include "core/hle/kernel/k_readable_event.h" |
| 33 | #include "core/hle/kernel/k_resource_limit.h" | 34 | #include "core/hle/kernel/k_resource_limit.h" |
| 34 | #include "core/hle/kernel/k_scheduler.h" | 35 | #include "core/hle/kernel/k_scheduler.h" |
| @@ -39,7 +40,6 @@ | |||
| 39 | #include "core/hle/kernel/k_thread.h" | 40 | #include "core/hle/kernel/k_thread.h" |
| 40 | #include "core/hle/kernel/k_writable_event.h" | 41 | #include "core/hle/kernel/k_writable_event.h" |
| 41 | #include "core/hle/kernel/kernel.h" | 42 | #include "core/hle/kernel/kernel.h" |
| 42 | #include "core/hle/kernel/memory/page_table.h" | ||
| 43 | #include "core/hle/kernel/physical_core.h" | 43 | #include "core/hle/kernel/physical_core.h" |
| 44 | #include "core/hle/kernel/process.h" | 44 | #include "core/hle/kernel/process.h" |
| 45 | #include "core/hle/kernel/svc.h" | 45 | #include "core/hle/kernel/svc.h" |
| @@ -67,8 +67,8 @@ constexpr bool IsValidAddressRange(VAddr address, u64 size) { | |||
| 67 | // Helper function that performs the common sanity checks for svcMapMemory | 67 | // Helper function that performs the common sanity checks for svcMapMemory |
| 68 | // and svcUnmapMemory. This is doable, as both functions perform their sanitizing | 68 | // and svcUnmapMemory. This is doable, as both functions perform their sanitizing |
| 69 | // in the same order. | 69 | // in the same order. |
| 70 | ResultCode MapUnmapMemorySanityChecks(const Memory::PageTable& manager, VAddr dst_addr, | 70 | ResultCode MapUnmapMemorySanityChecks(const KPageTable& manager, VAddr dst_addr, VAddr src_addr, |
| 71 | VAddr src_addr, u64 size) { | 71 | u64 size) { |
| 72 | if (!Common::Is4KBAligned(dst_addr)) { | 72 | if (!Common::Is4KBAligned(dst_addr)) { |
| 73 | LOG_ERROR(Kernel_SVC, "Destination address is not aligned to 4KB, 0x{:016X}", dst_addr); | 73 | LOG_ERROR(Kernel_SVC, "Destination address is not aligned to 4KB, 0x{:016X}", dst_addr); |
| 74 | return ResultInvalidAddress; | 74 | return ResultInvalidAddress; |