diff options
author | GPUCode <geoster3d@gmail.com> | 2023-11-17 20:43:15 +0100 |
---|---|---|
committer | t895 <clombardo169@gmail.com> | 2023-11-25 06:46:15 +0100 |
commit | 5938a9582a238d7679eb15f9812f8a85bfdb1cc3 (patch) | |
tree | 935356a1cc03fea528e349d5027f2d885537272a /src/core/memory.cpp | |
parent | host_memory: Switch to FreeRegionManager (diff) | |
download | yuzu-5938a9582a238d7679eb15f9812f8a85bfdb1cc3.tar yuzu-5938a9582a238d7679eb15f9812f8a85bfdb1cc3.tar.gz yuzu-5938a9582a238d7679eb15f9812f8a85bfdb1cc3.tar.bz2 yuzu-5938a9582a238d7679eb15f9812f8a85bfdb1cc3.tar.lz yuzu-5938a9582a238d7679eb15f9812f8a85bfdb1cc3.tar.xz yuzu-5938a9582a238d7679eb15f9812f8a85bfdb1cc3.tar.zst yuzu-5938a9582a238d7679eb15f9812f8a85bfdb1cc3.zip |
Diffstat (limited to '')
-rw-r--r-- | src/core/memory.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/core/memory.cpp b/src/core/memory.cpp index a3431772a..14db64f9d 100644 --- a/src/core/memory.cpp +++ b/src/core/memory.cpp @@ -53,7 +53,7 @@ struct Memory::Impl { } void MapMemoryRegion(Common::PageTable& page_table, Common::ProcessAddress base, u64 size, - Common::PhysicalAddress target) { + Common::PhysicalAddress target, Common::MemoryPermission perms) { ASSERT_MSG((size & YUZU_PAGEMASK) == 0, "non-page aligned size: {:016X}", size); ASSERT_MSG((base & YUZU_PAGEMASK) == 0, "non-page aligned base: {:016X}", GetInteger(base)); ASSERT_MSG(target >= DramMemoryMap::Base, "Out of bounds target: {:016X}", @@ -63,7 +63,7 @@ struct Memory::Impl { if (Settings::IsFastmemEnabled()) { system.DeviceMemory().buffer.Map(GetInteger(base), - GetInteger(target) - DramMemoryMap::Base, size); + GetInteger(target) - DramMemoryMap::Base, size, perms); } } @@ -831,8 +831,8 @@ void Memory::SetCurrentPageTable(Kernel::KProcess& process, u32 core_id) { } void Memory::MapMemoryRegion(Common::PageTable& page_table, Common::ProcessAddress base, u64 size, - Common::PhysicalAddress target) { - impl->MapMemoryRegion(page_table, base, size, target); + Common::PhysicalAddress target, Common::MemoryPermission perms) { + impl->MapMemoryRegion(page_table, base, size, target, perms); } void Memory::UnmapRegion(Common::PageTable& page_table, Common::ProcessAddress base, u64 size) { |