diff options
| author | Fernando S <fsahmkow27@gmail.com> | 2023-10-20 17:08:00 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-10-20 17:08:00 +0200 |
| commit | 2e760a98333520f3de1fa7c7a1f9298fd7241ceb (patch) | |
| tree | 90e8a1aa75a91659c0b553f3746ea4febc0bf273 /src/core/hle/kernel/k_memory_block_manager.h | |
| parent | Merge pull request #11825 from liamwhite/system-resource (diff) | |
| parent | gdbstub: add PermissionLocked to mappings table (diff) | |
| download | yuzu-2e760a98333520f3de1fa7c7a1f9298fd7241ceb.tar yuzu-2e760a98333520f3de1fa7c7a1f9298fd7241ceb.tar.gz yuzu-2e760a98333520f3de1fa7c7a1f9298fd7241ceb.tar.bz2 yuzu-2e760a98333520f3de1fa7c7a1f9298fd7241ceb.tar.lz yuzu-2e760a98333520f3de1fa7c7a1f9298fd7241ceb.tar.xz yuzu-2e760a98333520f3de1fa7c7a1f9298fd7241ceb.tar.zst yuzu-2e760a98333520f3de1fa7c7a1f9298fd7241ceb.zip | |
Diffstat (limited to 'src/core/hle/kernel/k_memory_block_manager.h')
| -rw-r--r-- | src/core/hle/kernel/k_memory_block_manager.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/core/hle/kernel/k_memory_block_manager.h b/src/core/hle/kernel/k_memory_block_manager.h index 96496e990..cb7b6f430 100644 --- a/src/core/hle/kernel/k_memory_block_manager.h +++ b/src/core/hle/kernel/k_memory_block_manager.h @@ -115,7 +115,11 @@ public: void UpdateIfMatch(KMemoryBlockManagerUpdateAllocator* allocator, KProcessAddress address, size_t num_pages, KMemoryState test_state, KMemoryPermission test_perm, KMemoryAttribute test_attr, KMemoryState state, KMemoryPermission perm, - KMemoryAttribute attr); + KMemoryAttribute attr, KMemoryBlockDisableMergeAttribute set_disable_attr, + KMemoryBlockDisableMergeAttribute clear_disable_attr); + + void UpdateAttribute(KMemoryBlockManagerUpdateAllocator* allocator, KProcessAddress address, + size_t num_pages, KMemoryAttribute mask, KMemoryAttribute attr); iterator FindIterator(KProcessAddress address) const { return m_memory_block_tree.find(KMemoryBlock( |