Просмотр исходного кода

core: hle: kernel: KPageTable: ResetTransferMemory: Various cleanup.

bunnei 4 лет назад
Родитель
Сommit
0cee5e1af8
1 измененных файлов с 5 добавлено и 6 удалено
  1. 5 6
      src/core/hle/kernel/k_page_table.cpp

+ 5 - 6
src/core/hle/kernel/k_page_table.cpp

@@ -799,12 +799,11 @@ ResultCode KPageTable::ResetTransferMemory(VAddr addr, std::size_t size) {
 
 
     KMemoryState state{};
     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);
     block_manager->Update(addr, size / PageSize, state, KMemoryPermission::UserReadWrite);
     return ResultSuccess;
     return ResultSuccess;