summaryrefslogtreecommitdiffstats
path: root/src/core/hle/kernel/k_memory_block_manager.h
diff options
context:
space:
mode:
authorLiam <byteslice@airmail.cc>2023-10-11 17:39:09 +0200
committerLiam <byteslice@airmail.cc>2023-10-20 08:34:15 +0200
commit0441853d0f82ce244f2fa1dec61f64e86304e636 (patch)
treea2c3bdc51de4d56fe197431921dab862091a0a41 /src/core/hle/kernel/k_memory_block_manager.h
parentk_page_table: add new CheckMemoryState helper (diff)
downloadyuzu-0441853d0f82ce244f2fa1dec61f64e86304e636.tar
yuzu-0441853d0f82ce244f2fa1dec61f64e86304e636.tar.gz
yuzu-0441853d0f82ce244f2fa1dec61f64e86304e636.tar.bz2
yuzu-0441853d0f82ce244f2fa1dec61f64e86304e636.tar.lz
yuzu-0441853d0f82ce244f2fa1dec61f64e86304e636.tar.xz
yuzu-0441853d0f82ce244f2fa1dec61f64e86304e636.tar.zst
yuzu-0441853d0f82ce244f2fa1dec61f64e86304e636.zip
Diffstat (limited to '')
-rw-r--r--src/core/hle/kernel/k_memory_block_manager.h6
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(