diff options
author | Liam <byteslice@airmail.cc> | 2023-10-23 03:16:38 +0200 |
---|---|---|
committer | Liam <byteslice@airmail.cc> | 2023-11-10 18:01:35 +0100 |
commit | 2a255b2d61a445fb2b83cc8af7632e3d720e1292 (patch) | |
tree | 37f5c16ba52339d91e57c5b975639dc1eb60b9f7 /src/core/hle/kernel/svc/svc_memory.cpp | |
parent | Merge pull request #11981 from lucasreis1/patch (diff) | |
download | yuzu-2a255b2d61a445fb2b83cc8af7632e3d720e1292.tar yuzu-2a255b2d61a445fb2b83cc8af7632e3d720e1292.tar.gz yuzu-2a255b2d61a445fb2b83cc8af7632e3d720e1292.tar.bz2 yuzu-2a255b2d61a445fb2b83cc8af7632e3d720e1292.tar.lz yuzu-2a255b2d61a445fb2b83cc8af7632e3d720e1292.tar.xz yuzu-2a255b2d61a445fb2b83cc8af7632e3d720e1292.tar.zst yuzu-2a255b2d61a445fb2b83cc8af7632e3d720e1292.zip |
Diffstat (limited to 'src/core/hle/kernel/svc/svc_memory.cpp')
-rw-r--r-- | src/core/hle/kernel/svc/svc_memory.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/core/hle/kernel/svc/svc_memory.cpp b/src/core/hle/kernel/svc/svc_memory.cpp index 97f1210de..4ca62860d 100644 --- a/src/core/hle/kernel/svc/svc_memory.cpp +++ b/src/core/hle/kernel/svc/svc_memory.cpp @@ -29,7 +29,8 @@ constexpr bool IsValidAddressRange(u64 address, u64 size) { // Helper function that performs the common sanity checks for svcMapMemory // and svcUnmapMemory. This is doable, as both functions perform their sanitizing // in the same order. -Result MapUnmapMemorySanityChecks(const KPageTable& manager, u64 dst_addr, u64 src_addr, u64 size) { +Result MapUnmapMemorySanityChecks(const KProcessPageTable& manager, u64 dst_addr, u64 src_addr, + u64 size) { if (!Common::Is4KBAligned(dst_addr)) { LOG_ERROR(Kernel_SVC, "Destination address is not aligned to 4KB, 0x{:016X}", dst_addr); R_THROW(ResultInvalidAddress); @@ -123,7 +124,8 @@ Result SetMemoryAttribute(Core::System& system, u64 address, u64 size, u32 mask, R_UNLESS(page_table.Contains(address, size), ResultInvalidCurrentMemory); // Set the memory attribute. - R_RETURN(page_table.SetMemoryAttribute(address, size, mask, attr)); + R_RETURN(page_table.SetMemoryAttribute(address, size, static_cast<KMemoryAttribute>(mask), + static_cast<KMemoryAttribute>(attr))); } /// Maps a memory range into a different range. |