diff options
author | bunnei <bunneidev@gmail.com> | 2022-01-15 08:26:52 +0100 |
---|---|---|
committer | bunnei <bunneidev@gmail.com> | 2022-01-23 05:51:34 +0100 |
commit | ee25e0a40b0be6baa2674bcbca1d7248ec63dbfc (patch) | |
tree | ce9fef105d11bb3133b9484b3041d1cea8c5a499 | |
parent | core: hle: kernel: KPageTable: ResetTransferMemory: Various cleanup. (diff) | |
download | yuzu-ee25e0a40b0be6baa2674bcbca1d7248ec63dbfc.tar yuzu-ee25e0a40b0be6baa2674bcbca1d7248ec63dbfc.tar.gz yuzu-ee25e0a40b0be6baa2674bcbca1d7248ec63dbfc.tar.bz2 yuzu-ee25e0a40b0be6baa2674bcbca1d7248ec63dbfc.tar.lz yuzu-ee25e0a40b0be6baa2674bcbca1d7248ec63dbfc.tar.xz yuzu-ee25e0a40b0be6baa2674bcbca1d7248ec63dbfc.tar.zst yuzu-ee25e0a40b0be6baa2674bcbca1d7248ec63dbfc.zip |
-rw-r--r-- | src/core/hle/kernel/k_page_table.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/core/hle/kernel/k_page_table.cpp b/src/core/hle/kernel/k_page_table.cpp index 6efd15c78..223c0d491 100644 --- a/src/core/hle/kernel/k_page_table.cpp +++ b/src/core/hle/kernel/k_page_table.cpp @@ -782,12 +782,12 @@ ResultCode KPageTable::ReserveTransferMemory(VAddr addr, std::size_t size, KMemo KMemoryState state{}; KMemoryAttribute attribute{}; - CASCADE_CODE(CheckMemoryState( - &state, nullptr, &attribute, nullptr, addr, size, - KMemoryState::FlagCanTransfer | KMemoryState::FlagReferenceCounted, - KMemoryState::FlagCanTransfer | KMemoryState::FlagReferenceCounted, KMemoryPermission::All, - KMemoryPermission::UserReadWrite, KMemoryAttribute::Mask, KMemoryAttribute::None, - KMemoryAttribute::IpcAndDeviceMapped)); + R_TRY(CheckMemoryState(&state, nullptr, &attribute, nullptr, addr, size, + KMemoryState::FlagCanTransfer | KMemoryState::FlagReferenceCounted, + KMemoryState::FlagCanTransfer | KMemoryState::FlagReferenceCounted, + KMemoryPermission::All, KMemoryPermission::UserReadWrite, + KMemoryAttribute::Mask, KMemoryAttribute::None, + KMemoryAttribute::IpcAndDeviceMapped)); block_manager->Update(addr, size / PageSize, state, perm, attribute | KMemoryAttribute::Locked); |