summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2022-01-15 08:26:33 +0100
committerbunnei <bunneidev@gmail.com>2022-01-23 05:51:34 +0100
commit0cee5e1af8fa5b9b32a69a618903a8780b86d57f (patch)
tree238b520f8244aa6b44dcb8efa80d49031e23fc17
parentcore: hle: kernel: KPageTable: SetMemoryAttribute: Various cleanup. (diff)
downloadyuzu-0cee5e1af8fa5b9b32a69a618903a8780b86d57f.tar
yuzu-0cee5e1af8fa5b9b32a69a618903a8780b86d57f.tar.gz
yuzu-0cee5e1af8fa5b9b32a69a618903a8780b86d57f.tar.bz2
yuzu-0cee5e1af8fa5b9b32a69a618903a8780b86d57f.tar.lz
yuzu-0cee5e1af8fa5b9b32a69a618903a8780b86d57f.tar.xz
yuzu-0cee5e1af8fa5b9b32a69a618903a8780b86d57f.tar.zst
yuzu-0cee5e1af8fa5b9b32a69a618903a8780b86d57f.zip
-rw-r--r--src/core/hle/kernel/k_page_table.cpp11
1 files changed, 5 insertions, 6 deletions
diff --git a/src/core/hle/kernel/k_page_table.cpp b/src/core/hle/kernel/k_page_table.cpp
index 45d487004..6efd15c78 100644
--- a/src/core/hle/kernel/k_page_table.cpp
+++ b/src/core/hle/kernel/k_page_table.cpp
@@ -799,12 +799,11 @@ ResultCode KPageTable::ResetTransferMemory(VAddr addr, std::size_t size) {
KMemoryState state{};
- CASCADE_CODE(
- CheckMemoryState(&state, nullptr, nullptr, nullptr, addr, size,
- KMemoryState::FlagCanTransfer | KMemoryState::FlagReferenceCounted,
- KMemoryState::FlagCanTransfer | KMemoryState::FlagReferenceCounted,
- KMemoryPermission::None, KMemoryPermission::None, KMemoryAttribute::Mask,
- KMemoryAttribute::Locked, KMemoryAttribute::IpcAndDeviceMapped));
+ R_TRY(CheckMemoryState(&state, nullptr, nullptr, nullptr, addr, size,
+ KMemoryState::FlagCanTransfer | KMemoryState::FlagReferenceCounted,
+ KMemoryState::FlagCanTransfer | KMemoryState::FlagReferenceCounted,
+ KMemoryPermission::None, KMemoryPermission::None, KMemoryAttribute::Mask,
+ KMemoryAttribute::Locked, KMemoryAttribute::IpcAndDeviceMapped));
block_manager->Update(addr, size / PageSize, state, KMemoryPermission::UserReadWrite);
return ResultSuccess;