diff options
| author | liamwhite <liamwhite@users.noreply.github.com> | 2023-10-02 17:28:24 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-10-02 17:28:24 +0200 |
| commit | ff57c667734706be0769f7c2a11a27dd93677771 (patch) | |
| tree | 1030ff20708832367bffaa61ee121ddfeca3c4c7 /src | |
| parent | Merge pull request #11655 from liamwhite/additional-dump-targets (diff) | |
| parent | k_page_table: skip page table clearing on finalization (diff) | |
| download | yuzu-ff57c667734706be0769f7c2a11a27dd93677771.tar yuzu-ff57c667734706be0769f7c2a11a27dd93677771.tar.gz yuzu-ff57c667734706be0769f7c2a11a27dd93677771.tar.bz2 yuzu-ff57c667734706be0769f7c2a11a27dd93677771.tar.lz yuzu-ff57c667734706be0769f7c2a11a27dd93677771.tar.xz yuzu-ff57c667734706be0769f7c2a11a27dd93677771.tar.zst yuzu-ff57c667734706be0769f7c2a11a27dd93677771.zip | |
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/hle/kernel/k_page_table.cpp | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/src/core/hle/kernel/k_page_table.cpp b/src/core/hle/kernel/k_page_table.cpp index 9bfc85b34..5b51edf30 100644 --- a/src/core/hle/kernel/k_page_table.cpp +++ b/src/core/hle/kernel/k_page_table.cpp @@ -5,6 +5,7 @@ #include "common/assert.h" #include "common/literals.h" #include "common/scope_exit.h" +#include "common/settings.h" #include "core/core.h" #include "core/hle/kernel/k_address_space_info.h" #include "core/hle/kernel/k_memory_block.h" @@ -337,11 +338,14 @@ Result KPageTable::InitializeForProcess(FileSys::ProgramAddressSpaceType as_type } void KPageTable::Finalize() { + auto HostUnmapCallback = [&](KProcessAddress addr, u64 size) { + if (Settings::IsFastmemEnabled()) { + m_system.DeviceMemory().buffer.Unmap(GetInteger(addr), size); + } + }; + // Finalize memory blocks. - m_memory_block_manager.Finalize(m_memory_block_slab_manager, - [&](KProcessAddress addr, u64 size) { - m_memory->UnmapRegion(*m_page_table_impl, addr, size); - }); + m_memory_block_manager.Finalize(m_memory_block_slab_manager, std::move(HostUnmapCallback)); // Release any insecure mapped memory. if (m_mapped_insecure_memory) { |